pike.git/ src/ builtin_functions.c

1998-01-13

1998-01-13 23:01:47 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• b1f4eb39528f16bb6a6f876e2458255e588283a1 (122 lines) (+57/-65) ^{[ Show | Annotate ]}
  Branch: 7.9

Compiler update to use two pass

Rev: src/acconfig.h:1.14
Rev: src/builtin_functions.c:1.59
Rev: src/builtin_functions.h:1.5
Rev: src/compilation.h:1.4
Rev: src/configure.in:1.149
Rev: src/cpp.c:1.3
Rev: src/docode.c:1.24
Rev: src/docode.h:1.4
Rev: src/gc.c:1.24
Rev: src/interpret.c:1.57
Rev: src/interpret.h:1.16
Rev: src/language.yacc:1.51
Rev: src/las.c:1.40
Rev: src/las.h:1.9
Rev: src/lex.c:1.37
Rev: src/lex.h:1.7
Rev: src/main.c:1.32
Rev: src/modules/Image/blit.c:1.26
Rev: src/modules/Image/colortable.c:1.33
Rev: src/modules/Image/dct.c:1.11
Rev: src/modules/Image/image.c:1.73
Rev: src/modules/Image/matrix.c:1.13
Rev: src/modules/Image/operator.c:1.11
Rev: src/modules/Image/pattern.c:1.11
Rev: src/modules/Image/pnm.c:1.9
Rev: src/modules/Image/polyfill.c:1.18
Rev: src/modules/Image/togif.c:1.29
Rev: src/modules/Image/x.c:1.17
Rev: src/modules/Pipe/pipe.c:1.15
Rev: src/modules/Regexp/glue.c:1.9
Rev: src/modules/_Crypto/cbc.c:1.10
Rev: src/modules/_Crypto/crypto.c:1.24
Rev: src/modules/_Crypto/des.c:1.11
Rev: src/modules/_Crypto/pipe.c:1.11
Rev: src/modules/_Crypto/sha.c:1.9
Rev: src/modules/files/socktest.pike:1.6
Rev: src/modules/system/system.c:1.37
Rev: src/object.c:1.31
Rev: src/object.h:1.13
Rev: src/opcodes.c:1.10
Rev: src/operators.c:1.22
Rev: src/peep.c:1.16
Rev: src/peep.in:1.9
Rev: src/pike_types.c:1.27
Rev: src/pike_types.h:1.6
Rev: src/program.c:1.48
Rev: src/program.h:1.24
Rev: src/program_areas.h:1.2
Rev: src/stralloc.c:1.21
Rev: src/stralloc.h:1.10
Rev: src/svalue.c:1.18
Rev: src/testsuite.in:1.64
Rev: src/threads.c:1.51
Rev: src/threads.h:1.26

4:   ||| See the files COPYING and DISCLAIMER for more information.   \*/   #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.58 1997/11/17 03:23:14 hubbe Exp $"); + RCSID("$Id: builtin_functions.c,v 1.59 1998/01/13 22:56:39 hubbe Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
261:    }   }    - void f_call_function(INT32 args) - { -  INT32 expected_stack=sp-args+2-evaluator_stack; -  -  strict_apply_svalue(sp-args, args - 1); -  if(sp < expected_stack + evaluator_stack) -  { - #ifdef DEBUG -  if(sp+1 != expected_stack + evaluator_stack) -  fatal("Stack underflow!\n"); - #endif -  -  pop_stack(); -  push_int(0); -  }else{ -  free_svalue(sp-2); -  sp[-2]=sp[-1]; -  sp--; -  } - } -  +    void f_backtrace(INT32 args)   {    INT32 frames;
372:    pop_n_elems(args);   }    - void f_compile_file(INT32 args) - { -  struct program *p; -  if(args<1) -  error("Too few arguments to compile_file.\n"); -  -  if(sp[-args].type!=T_STRING) -  error("Bad argument 1 to compile_file.\n"); -  -  p=compile_file(sp[-args].u.string); -  pop_n_elems(args); -  push_program(p); - } -  +    static char *combine_path(char *cwd,char *file)   {    /* cwd is supposed to be combined already */
874:      void f_object_program(INT32 args)   { -  struct program *p; +     if(args < 1)    error("Too few argumenets to object_program()\n");       if(sp[-args].type == T_OBJECT) -  p=sp[-args].u.object->prog; -  else -  p=0; -  -  pop_n_elems(args); -  -  if(!p) +     { -  push_int(0); +  struct object *o=sp[-args].u.object; +  struct program *p; +  if((p=o->prog)) +  { +  if(o->parent && o->parent->prog) +  { +  INT32 id=o->parent_identifier; +  o=o->parent; +  o->refs++; +  pop_n_elems(args); +  push_object(o); +  sp[-1].subtype=id; +  sp[-1].type=T_FUNCTION; +  return;    }else{    p->refs++; -  +  pop_n_elems(args);    push_program(p); -  +  return;    }    } -  +  }    -  +  pop_n_elems(args); +  push_int(0); + } +    void f_reverse(INT32 args)   {    if(args < 1)
1103:    }   }    - void f_compile_string(INT32 args) + void f_compile(INT32 args)   {       struct program *p;    if(args < 1) -  error("Too few arguments to compile_string()\n"); +  error("Too few arguments to compile()\n");       if(sp[-args].type != T_STRING) -  error("Bad argument 1 to compile_string()\n"); +  error("Bad argument 1 to compile()\n");    -  if(args < 2) -  { -  push_string(make_shared_string("-")); -  args++; -  } -  -  if(sp[1-args].type != T_STRING) -  error("Bad argument 2 to compile_string()\n"); -  -  p=compile_string(sp[-args].u.string,sp[1-args].u.string); +  p=compile(sp[-args].u.string);    pop_n_elems(args);    push_program(p);   }
1239:    push_int(t); \   }    - TYPEP(f_programp, "programp", T_PROGRAM) +  + void f_programp(INT32 args) + { +  if(args<1) +  error("Too few arguments to programp()\n"); +  switch(sp[-args].type) +  { +  case T_PROGRAM: +  pop_n_elems(args); +  push_int(1); +  return; +  +  case T_FUNCTION: +  if(program_from_function(sp-args)) +  { +  pop_n_elems(args); +  push_int(1); +  return; +  } +  +  default: +  pop_n_elems(args); +  push_int(0); +  } + } +    TYPEP(f_intp, "intpp", T_INT)   TYPEP(f_mappingp, "mappingp", T_MAPPING)   TYPEP(f_arrayp, "arrayp", T_ARRAY)
1825:    add_efun("allocate", f_allocate, "function(int, string|void:mixed *)", 0);    add_efun("arrayp", f_arrayp, "function(mixed:int)",0);    add_efun("backtrace",f_backtrace,"function(:array(array(function|int|string)))",OPT_EXTERNAL_DEPEND); -  add_efun("call_function",f_call_function,"function(mixed,mixed ...:mixed)",OPT_SIDE_EFFECT | OPT_EXTERNAL_DEPEND); +        add_efun("column",f_column,"function(array,mixed:array)",0);    add_efun("combine_path",f_combine_path,"function(string,string:string)",0); -  add_efun("compile_file",f_compile_file,"function(string:program)",OPT_EXTERNAL_DEPEND); -  add_efun("compile_string",f_compile_string,"function(string,string|void:program)",OPT_EXTERNAL_DEPEND); +  add_efun("compile",f_compile,"function(string:program)",OPT_EXTERNAL_DEPEND);    add_efun("copy_value",f_copy_value,"function(mixed:mixed)",0);    add_efun("crypt",f_crypt,"function(string:string)|function(string,string:int)",OPT_EXTERNAL_DEPEND);    add_efun("ctime",f_ctime,"function(int:string)",OPT_TRY_OPTIMIZE);