pike.git/ src/ builtin_functions.c

1999-08-12

1999-08-12 20:05:27 by Martin Stjernholm <mast@lysator.liu.se>

• 114fe5f6275cbec793ee39c6c07ffa8466ddc2da (33 lines) (+22/-11) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed a bug in f_map. Do something more meaningful with
filter(array,array).

Rev: src/builtin_functions.c:1.181

5:   \*/   /**/   #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.180 1999/08/03 00:43:57 hubbe Exp $"); + RCSID("$Id: builtin_functions.c,v 1.181 1999/08/12 20:05:27 mast Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
4276:    sp--;    push_array_items(sp->u.array);    f_call_function(1+splice); -  apply_svalue(mysp-2,1+mysp[-1].u.array->size); +     return;    }    /* no break here */
4293:       _arr__________goes________    -  array keep=map(arr,fun,@extra); +  array if fun is an array:    for (i=0; i<sizeof(arr); i++) -  +  if (fun[i]) res+=({arr[i]}); +  otherwise: +  keep=map(arr,fun,@extra); +  for (i=0; i<sizeof(arr); i++)    if (keep[i]) res+=({arr[i]});       multiset (multiset)filter((array)arr,fun,@extra);
4322:    switch (sp[-args].type)    {    case T_ARRAY: +  if (args >= 2 && sp[1-args].type == T_ARRAY) { +  if (sp[1-args].u.array->size != sp[-args].u.array->size) +  SIMPLE_BAD_ARG_ERROR("filter", 2, "array of same size as the first"); +  pop_n_elems(args-2); +  } +  else {    MEMMOVE(sp-args+1,sp-args,args*sizeof(*sp));    sp++;    add_ref_svalue(sp-args); -  +     f_map(args); -  +  } +     f=sp[-1].u.array;    a=sp[-2].u.array;    n=a->size;