pike.git/ src/ language.yacc

2008-04-26

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

• 8853883a2a1548529993e6d2b394c510151c150d (9 lines) (+6/-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: language.yacc,v 1.415 2008/04/25 13:04:15 grubba Exp $ + || $Id: language.yacc,v 1.416 2008/04/26 19:04:26 grubba Exp $   */      %pure_parser
3730:      inherit_specifier: TOK_IDENTIFIER TOK_COLON_COLON    { +  struct compilation *c = THIS_COMPILATION;    int e = -1;       inherit_state = Pike_compiler;
3740:    e = inh;    break;    } -  if (inherit_depth == compilation_depth) break; +  if (inherit_depth == c->compilation_depth) break;    if (!TEST_COMPAT (7, 2) &&    ID_FROM_INT (inherit_state->previous->new_program,    inherit_state->parent_identifier)->name ==
3768:    }    | TOK_GLOBAL TOK_COLON_COLON    { +  struct compilation *c = THIS_COMPILATION;    inherit_state = Pike_compiler; -  for (inherit_depth = 0; inherit_depth < compilation_depth; +  for (inherit_depth = 0; inherit_depth < c->compilation_depth;    inherit_depth++, inherit_state = inherit_state->previous) {}    $$ = 0;    }