Branch: Tag:

2007-04-18

2007-04-18 11:58:59 by Henrik Grubbström (Grubba) <grubba@grubba.org>

More or_pike_types() et al fixes.

Rev: src/pike_types.c:1.291

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: pike_types.c,v 1.290 2007/04/17 13:07:26 grubba Exp $ + || $Id: pike_types.c,v 1.291 2007/04/18 11:58:59 grubba Exp $   */      #include "global.h"
2292:   #endif    if (t1 == t2) {    t = t1; -  } else if (zero_implied && (t1->type == T_MIXED || t2->type == T_MIXED)) { -  t = mixed_type_string; +     } else if (t1->type < t2->type) {    t = t1;    ret = -1;
2388:    } else {    switch(t->type) {    case T_FLOAT: +  case T_MIXED: +  case T_VOID: +  case T_ZERO:    /* There can only be one. */    break;    case T_INT: