pike.git/ src/ builtin_functions.c

2008-04-26

2008-04-26 19:04:26 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 8853883a2a1548529993e6d2b394c510151c150d (11 lines) (+8/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Moved compilation_depth to struct compilation.
Yet another step on the way to making the compiler thread safe.
Got rid of some now unused cleanup code in dynamic_load.c.

Rev: src/builtin_functions.c:1.656
Rev: src/dynamic_load.c:1.91
Rev: src/encode.c:1.264
Rev: src/language.yacc:1.416
Rev: src/pike_compiler.h:1.9
Rev: src/program.c:1.679
Rev: src/program.h:1.240

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.655 2008/04/23 07:37:04 mast Exp $ + || $Id: builtin_functions.c,v 1.656 2008/04/26 19:04:25 grubba Exp $   */      #include "global.h"
2535:    int level = 0;       if (CDR (n)) { +  struct compilation *c = THIS_COMPILATION;    struct program_state *state = Pike_compiler; -  +  +  CHECK_COMPILER(); +     if (CDR (n)->token != F_CONSTANT) {    /* Not a constant expression. Make sure there are parent    * pointers all the way. */    int i; -  for (i = 0; i < compilation_depth; i++, state = state->previous) +  for (i = 0; i < c->compilation_depth; i++, state = state->previous)    state->new_program->flags |= PROGRAM_USES_PARENT | PROGRAM_NEEDS_PARENT;    return NULL;    }
2551:    Pike_fatal ("The type check for this_object() failed.\n");   #endif    level = CDR (n)->u.sval.u.integer; -  for (i = MINIMUM(level, compilation_depth); i; +  for (i = MINIMUM(level, c->compilation_depth); i;    i--, state = state->previous) {    state->new_program->flags |=    PROGRAM_USES_PARENT | PROGRAM_NEEDS_PARENT;