pike.git/ src/ operators.c

2003-11-12

2003-11-12 19:01:29 by Martin Stjernholm <mast@lysator.liu.se>

• cfad76e5de18d45ea60db864dc1d534582f746b6 (37 lines) (+35/-2) ^{[ Show | Annotate ]}
  Branch: 7.4

Fixed handling of UNDEFINED for multisets in `+.

Rev: src/operators.c:1.168

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.167 2003/11/10 01:22:15 mast Exp $ + || $Id: operators.c,v 1.168 2003/11/12 19:01:29 mast Exp $   */      #include "global.h"   #include <math.h> - RCSID("$Id: operators.c,v 1.167 2003/11/10 01:22:15 mast Exp $"); + RCSID("$Id: operators.c,v 1.168 2003/11/12 19:01:29 mast Exp $");   #include "interpret.h"   #include "svalue.h"   #include "multiset.h"
589:    break;    }    +  case BIT_MULTISET|BIT_INT: +  { +  if(IS_UNDEFINED(sp-args)) +  { +  int e; +  struct multiset *a; +  +  for(e=1;e<args;e++) +  if(sp[e-args].type != T_MULTISET) +  SIMPLE_BAD_ARG_ERROR("`+", e+1, "multiset"); +  +  a=add_multisets(sp-args+1,args-1); +  pop_n_elems(args); +  push_multiset(a); +  return; +  } +  if (sp[-args].type == T_INT) { +  int e; +  for(e=1;e<args;e++) +  if (sp[e-args].type != T_INT) +  SIMPLE_BAD_ARG_ERROR("`+", e+1, "int"); +  } else { +  int e; +  for(e=0;e<args;e++) +  if (sp[e-args].type != T_MULTISET) +  SIMPLE_BAD_ARG_ERROR("`+", e+1, "multiset"); +  } +  /* Probably not reached, but... */ +  bad_arg_error("`+", sp-args, args, 1, "multiset", sp-args, +  "Trying to add integers and multisets.\n"); +  } +     case BIT_MULTISET:    {    struct multiset *l;