pike.git/ src/ builtin.cmod

2004-04-06

2004-04-06 15:37:56 by Martin Nilsson <mani@lysator.liu.se>

• eb82b873dc2f122af765fc3278161acc11ec49a4 (15 lines) (+4/-11) ^{[ Show | Annotate ]}
  Branch: 7.9

--without-new-multisets no longer builds and no one would really be interested in doing that anymore. Removing PIKE_NEW_MULTISETS

Rev: src/acconfig.h:1.140
Rev: src/array.c:1.158
Rev: src/builtin.cmod:1.152
Rev: src/builtin_functions.c:1.537
Rev: src/configure.in:1.827
Rev: src/encode.c:1.211
Rev: src/gc.c:1.251
Rev: src/iterators.cmod:1.54
Rev: src/main.c:1.199
Rev: src/modules/Oracle/oracle.c:1.81
Rev: src/multiset.c:1.84
Rev: src/multiset.h:1.33
Rev: src/operators.c:1.188
Rev: src/svalue.c:1.192

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: builtin.cmod,v 1.151 2004/03/17 12:58:41 mast Exp $ + || $Id: builtin.cmod,v 1.152 2004/04/06 15:37:54 nilsson Exp $   */      #include "global.h"
846:      PIKEFUN int get_weak_flag(multiset m)   { - #ifdef PIKE_NEW_MULTISETS +     RETURN multiset_get_flags(m) & MULTISET_WEAK; - #else -  RETURN (m->ind->flags & (ARRAY_WEAK_FLAG|ARRAY_WEAK_SHRINK)) ? -  PIKE_WEAK_INDICES : 0; - #endif +    }      /*! @decl program __empty_program(int|void line, string|void file)
1117:   {    if(multiset_is_empty (m))    SIMPLE_BAD_ARG_ERROR("random", 1, "multiset with elements in it"); - #ifdef PIKE_NEW_MULTISETS +     if (multiset_indval (m)) {    ptrdiff_t nodepos = multiset_get_nth (m, my_rand() % multiset_sizeof (m));    push_multiset_index (m, nodepos);
1126:    f_aggregate (2);    }    else { -  push_multiset_index (m, multiset_get_nth (m, my_rand() % multiset_sizeof (m))); +  push_multiset_index (m, multiset_get_nth (m, my_rand() % +  multiset_sizeof (m)));    sub_msnode_ref (m);    } - #else -  push_svalue(m->ind->item + (my_rand() % m->ind->size)); - #endif +     stack_swap();    pop_stack();   }