pike.git/ src/ builtin_functions.c

2006-03-09

2006-03-09 15:55:07 by Henrik Grubbström (Grubba) <grubba@grubba.org>

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

Added minor optimization to replace().
Added support for replace(string, array(string), string) ==> string.

Rev: src/builtin_functions.c:1.606

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_functions.c,v 1.605 2006/01/27 20:29:28 grubba Exp $ + || $Id: builtin_functions.c,v 1.606 2006/03/09 15:55:07 grubba Exp $   */      #include "global.h"
3392:    (array_fix_type_field(to) & ~BIT_STRING) )    Pike_error("replace: to array not array(string).\n");    +  if (from->size == 1) { +  /* Just a single string... */ +  return string_replace(str, from->item[0].u.string, to->item[0].u.string); +  } +     /* NOTE: The following test is needed, since sizeof(struct tupel)    * is somewhat greater than sizeof(struct svalue).    */
3478:      /*! @decl string replace(string s, string from, string to)    *! @decl string replace(string s, array(string) from, array(string) to) +  *! @decl string replace(string s, array(string) from, string to)    *! @decl string replace(string s, mapping(string:string) replacements)    *! @decl array replace(array a, mixed from, mixed to)    *! @decl mapping replace(mapping a, mixed from, mixed to)
3530:    }    else    SIMPLE_TOO_FEW_ARGS_ERROR("replace", 3); +  } else if (args > 3) { +  pop_n_elems(args-3); +  args = 3;    }       switch(Pike_sp[-args].type)
3566:    break;       case T_ARRAY: -  if(Pike_sp[2-args].type != T_ARRAY) -  SIMPLE_BAD_ARG_ERROR("replace", 3, "array"); +  if (Pike_sp[2-args].type == T_STRING) { +  push_int(Pike_sp[1-args].u.array->size); +  stack_swap(); +  f_allocate(2); +  } else if(Pike_sp[2-args].type != T_ARRAY) +  SIMPLE_BAD_ARG_ERROR("replace", 3, "array|string");       s=replace_many(Pike_sp[-args].u.string,    Pike_sp[1-args].u.array,
8639:       ADD_EFUN2("replace", f_replace,    tOr5(tFunc(tStr tStr tStr,tStr), -  tFunc(tStr tArr(tStr) tArr(tStr),tStr), +  tFunc(tStr tArr(tStr) tOr(tArr(tStr), tStr), tStr),    tFunc(tStr tMap(tStr,tStr),tStr),    tFunc(tSetvar(0,tArray) tMix tMix,tVar(0)),    tFunc(tSetvar(1,tMapping) tMix tMix,tVar(1))),