pike.git/ src/ operators.c

2007-04-03

2007-04-03 17:05:30 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• b62f3fb5aec38b2494aeaa1a298280d5c4d93a55 (9 lines) (+6/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed return values for `+() and `-() when objects are involved.
Detected by the new type checker.

Rev: src/operators.c:1.218

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: operators.c,v 1.217 2007/03/31 12:58:02 grubba Exp $ + || $Id: operators.c,v 1.218 2007/04/03 17:05:30 grubba Exp $   */      #include "global.h"
5444:    add_efun2("`>=",f_ge,CMP_TYPE,OPT_TRY_OPTIMIZE,0,generate_comparison);       ADD_EFUN2("`+",f_add, -  tOr7(tIfnot(tFuncV(tNone,tNot(tOr(tObj,tMix)),tMix),tFunction), +  tOr7(tIfnot(tFuncV(tNone,tNot(tOr(tObj,tMix)),tMix), +  tFuncV(tNone,tMix,tMix),    tFuncV(tInt,tInt,tInt),    tIfnot(tFuncV(tNone, tNot(tFlt), tMix),    tFuncV(tOr(tInt,tFlt),tOr(tInt,tFlt),tFlt)),
5460:    OPT_TRY_OPTIMIZE,optimize_binary,generate_sum);       ADD_EFUN2("`-",f_minus, -  tOr7(tIfnot(tFuncV(tNone,tNot(tOr(tObj,tMix)),tMix),tFunction), +  tOr7(tIfnot(tFuncV(tNone,tNot(tOr(tObj,tMix)),tMix), +  tFuncV(tNone,tMix,tMix)),    tFuncV(tInt,tInt,tInt),    tIfnot(tFuncV(tNone,tNot(tFlt),tMix),    tFuncV(tOr(tInt,tFlt),tOr(tInt,tFlt),tFlt)),