pike.git/ src/ builtin_functions.c

2001-06-06

2001-06-06 02:22:39 by Martin Stjernholm <mast@lysator.liu.se>

• be08a8c4c2e37b5e824a2c4dca50a29b32a9425b (18 lines) (+11/-7) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed [bug 1728 (#1728)] where setting the weak flag on an empty array or multiset
caused multisets created later to also be weak.

Rev: src/array.c:1.106
Rev: src/array.h:1.35
Rev: src/builtin_functions.c:1.373
Rev: src/gc.c:1.152

5:   \*/   /**/   #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.372 2001/06/05 10:11:52 hubbe Exp $"); + RCSID("$Id: builtin_functions.c,v 1.373 2001/06/06 02:22:39 mast Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
3370:   {    struct svalue *s;    INT_TYPE ret; +  int flags;       get_all_args("set_weak_flag",args,"%*%i",&s,&ret);   
3378:    switch(s->type)    {    case T_ARRAY: -  SETFLAG(s->u.array->flags,ARRAY_WEAK_FLAG,ret & PIKE_WEAK_VALUES); +  flags = array_get_flags(s->u.array); +  SETFLAG(flags,ARRAY_WEAK_FLAG,ret & PIKE_WEAK_VALUES); +  s->u.array = array_set_flags(s->u.array, flags);    break; -  case T_MAPPING: { -  int flags = mapping_get_flags(s->u.mapping); +  case T_MAPPING: +  flags = mapping_get_flags(s->u.mapping);    flags = (flags & ~PIKE_WEAK_BOTH) | (ret & PIKE_WEAK_BOTH);    mapping_set_flags(s->u.mapping, flags);    break; -  } +     case T_MULTISET: -  SETFLAG(s->u.multiset->ind->flags,(ARRAY_WEAK_FLAG|ARRAY_WEAK_SHRINK), -  ret & PIKE_WEAK_INDICES); +  flags = array_get_flags(s->u.multiset->ind); +  SETFLAG(flags,(ARRAY_WEAK_FLAG|ARRAY_WEAK_SHRINK), ret & PIKE_WEAK_INDICES); +  s->u.multiset->ind = array_set_flags(s->u.multiset->ind, flags);    break;    default:    SIMPLE_BAD_ARG_ERROR("set_weak_flag",1,"array|mapping|multiset");