pike.git/ src/ builtin_functions.c

2008-04-14

2008-04-14 10:14:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• e021fe12b6e37a84a53c1b5c72150b62422307b8 (104 lines) (+46/-58) ^{[ Show | Annotate ]}
  Branch: 7.9

Pike compiler mega patch.
Added predef::CompilerEnvironment, which is a wrapper for struct compilation.
Moved the definition of struct compilation to the new header file "pike_compiler.h".
The compilation struct is now contained in the current context in the current_object during compilation.
The global variable lex is no more, it has moved into the compilation struct.
Added enter_compiler() and exit_compiler().
predef::compile() is now shorthand for predef::CompilerContext()->compile().

Rev: src/builtin_functions.c:1.652
Rev: src/compilation.h:1.35
Rev: src/docode.c:1.197
Rev: src/docode.h:1.20
Rev: src/dynamic_load.c:1.90
Rev: src/encode.c:1.263
Rev: src/language.yacc:1.411
Rev: src/las.c:1.406
Rev: src/lex.c:1.121
Rev: src/lex.h:1.36
Rev: src/lexer.h:1.66
Rev: src/module.c:1.52
Rev: src/object.c:1.284
Rev: src/operators.c:1.230
Rev: src/pike_compiler.h:1.1
Rev: src/pike_types.c:1.321
Rev: src/program.c:1.660
Rev: src/program.h:1.237

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.651 2008/01/29 20:10:06 grubba Exp $ + || $Id: builtin_functions.c,v 1.652 2008/04/14 10:14:35 grubba Exp $   */      #include "global.h"
44:   #include "docode.h"   #include "lex.h"   #include "pike_float.h" + #include "pike_compiler.h"      #ifdef HAVE_POLL   #ifdef HAVE_POLL_H
1463:      static int generate_zero_type(node *n)   { +  struct compilation *c = THIS_COMPILATION; +  CHECK_COMPILER();    if(count_args(CDR(n)) != 1) return 0;    if(do_docode(CDR(n),DO_NOT_COPY) != 1)    Pike_fatal("Count args was wrong in generate_zero_type().\n");
2386:    */   PMOD_EXPORT void f_get_active_compilation_handler(INT32 args)   { +  struct compilation *c = NULL; +  +  if (compilation_program) { +  struct pike_frame *compiler_frame = Pike_fp; +  +  while (compiler_frame && +  (compiler_frame->context->prog != compilation_program)) { +  compiler_frame = compiler_frame->next; +  } +  +  if (compiler_frame) { +  c = (struct compilation *)compiler_frame->current_storage; +  } +  } +     pop_n_elems(args); -  if (compat_handler) { -  ref_push_object(compat_handler); +  if (c && c->compat_handler) { +  ref_push_object(c->compat_handler);    } else {    push_int(0);    }
2408:    */   PMOD_EXPORT void f_get_active_error_handler(INT32 args)   { +  struct compilation *c = NULL; +  +  if (compilation_program) { +  struct pike_frame *compiler_frame = Pike_fp; +  +  while (compiler_frame && +  (compiler_frame->context->prog != compilation_program)) { +  compiler_frame = compiler_frame->next; +  } +  +  if (compiler_frame) { +  c = (struct compilation *)compiler_frame->current_storage; +  } +  } +     pop_n_elems(args); -  if (error_handler) { -  ref_push_object(error_handler); +  if (c && c->handler) { +  ref_push_object(c->handler);    } else {    push_int(0);    }
2550:   static int generate_this_object(node *n)   {    int level; +  struct compilation *c = THIS_COMPILATION; +  CHECK_COMPILER();       if (CDR (n)) {    if (CDR (n)->token != F_CONSTANT)
4076:    */   PMOD_EXPORT void f_compile(INT32 args)   { -  struct program *p=0; -  struct object *o; -  struct object *placeholder=0; -  int major=-1; -  int minor=-1; +  struct object *ce = clone_object(compilation_program, 0); +  ONERROR err;    -  +  SET_ONERROR(err, do_free_object, ce);    -  check_all_args("compile",args, -  BIT_STRING, -  BIT_VOID | BIT_INT | BIT_OBJECT, -  BIT_VOID | BIT_INT, -  BIT_VOID | BIT_INT, -  BIT_VOID | BIT_INT | BIT_PROGRAM, -  BIT_VOID | BIT_INT | BIT_OBJECT, -  0); +  apply_low(ce, CE_COMPILE_FUN_NUM, args);    -  check_c_stack(65536); -  -  o=0; -  switch(args) -  { -  case 3: -  SIMPLE_BAD_ARG_ERROR("compile", 4, "int"); -  default: -  if(Pike_sp[5-args].type == T_OBJECT) { -  if (Pike_sp[5-args].subtype) { -  Pike_error("compile: " -  "Subtyped placeholder objects are not supported yet.\n"); +  CALL_AND_UNSET_ONERROR(err);   } -  placeholder=Pike_sp[5-args].u.object; -  } +     -  case 5: -  if(Pike_sp[4-args].type == T_PROGRAM) -  p=Pike_sp[4-args].u.program; +     -  case 4: -  major=Pike_sp[2-args].u.integer; -  minor=Pike_sp[3-args].u.integer; -  -  case 2: -  if(Pike_sp[1-args].type == T_OBJECT) { -  if (Pike_sp[1-args].subtype) { -  Pike_error("compile: " -  "Subtyped handler objects are not supported yet.\n"); -  } -  o=Pike_sp[1-args].u.object; -  } -  -  case 0: case 1: break; -  } -  -  p = compile(Pike_sp[-args].u.string, o, major, minor, p, placeholder); -  -  pop_n_elems(args); -  push_program(p); - } -  -  +    /*! @decl array|mapping|multiset set_weak_flag(array|mapping|multiset m, @    *! int state)    *!