pike.git/ src/ language.yacc

2000-07-09

2000-07-09 17:54:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 019b3db291a27816d3a2530d2065877de1831944 (25 lines) (+15/-10) ^{[ Show | Annotate ]}
  Branch: 7.9

Moved current_modifiers to the program_state.

Rev: src/compilation.h:1.16
Rev: src/language.yacc:1.197

109:   /* This is the grammar definition of Pike. */      #include "global.h" - RCSID("$Id: language.yacc,v 1.196 2000/07/07 22:37:31 grubba Exp $"); + RCSID("$Id: language.yacc,v 1.197 2000/07/09 17:54:08 grubba Exp $");   #ifdef HAVE_MEMORY_H   #include <memory.h>   #endif
146:   static node *lexical_islocal(struct pike_string *);      static int varargs; - static INT32 current_modifiers; +    static struct pike_string *last_identifier=0;   static int inherit_depth;   static struct program_state *inherit_state = NULL;
483:    $3=mknode(F_COMMA_EXPR,$3,0);    Pike_compiler->compiler_pass=tmp;    -  if ((current_modifiers & ID_EXTERN) && (Pike_compiler->compiler_pass == 1)) { +  if ((Pike_compiler->current_modifiers & ID_EXTERN) && +  (Pike_compiler->compiler_pass == 1)) {    yywarning("Extern declared constant.");    }   
492:    if(Pike_compiler->compiler_pass==2)    yyerror("Constant definition is not constant.");    else -  add_constant($1->u.sval.u.string, 0, current_modifiers & ~ID_EXTERN); +  add_constant($1->u.sval.u.string, 0, +  Pike_compiler->current_modifiers & ~ID_EXTERN);    } else {    if(!Pike_compiler->num_parse_error)    {
503:    }else{    pop_n_elems(tmp-1);    add_constant($1->u.sval.u.string, Pike_sp-1, -  current_modifiers & ~ID_EXTERN); +  Pike_compiler->current_modifiers & ~ID_EXTERN);    pop_stack();    }    }
908:      modifiers: modifier_list    { -  $$=current_modifiers=$1 | (lex.pragmas & ID_MODIFIER_MASK); +  $$=Pike_compiler->current_modifiers=$1 | (lex.pragmas & ID_MODIFIER_MASK);    }    ;   
1269:    }    while($1--) push_type(T_ARRAY);    type=compiler_pop_type(); -  define_variable($2->u.sval.u.string, type, current_modifiers); +  define_variable($2->u.sval.u.string, type, +  Pike_compiler->current_modifiers);    free_string(type);    free_node($2);    }
1283:    }    while($1--) push_type(T_ARRAY);    type=compiler_pop_type(); -  if ((current_modifiers & ID_EXTERN) && (Pike_compiler->compiler_pass == 1)) { +  if ((Pike_compiler->current_modifiers & ID_EXTERN) && +  (Pike_compiler->compiler_pass == 1)) {    yywarning("Extern declared variable has initializer.");    }    $<number>$=define_variable($2->u.sval.u.string, type, -  current_modifiers & (~ID_EXTERN)); +  Pike_compiler->current_modifiers & (~ID_EXTERN));    free_string(type);    }    expr0
1786:    $4->u.sval.u.string->str);       /* Add the identifier both globally and locally. */ -  define_variable($4->u.sval.u.string, type, current_modifiers); +  define_variable($4->u.sval.u.string, type, +  Pike_compiler->current_modifiers);    add_local_name($4->u.sval.u.string, type, 0);       /* free_string(type); */