Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use nested scopes properly. Updated according to cf_define_symbol() changes.

Browse source 
The rest of code doesn't need changing since it doesn't use nesting.
This commit is contained in:
Martin Mares 2000-06-04 19:30:55 +00:00
parent 04dc62a011
commit bf3eb98eb8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
filter/config.Y
View file

@ -46,7 +46,7 @@ CF_GRAMMAR
CF_ADDTO(conf, filter_def) CF_ADDTO(conf, filter_def)
filter_def: filter_def:
FILTER SYM { cf_push_scope( $2 ); } filter_body { FILTER SYM { cf_push_scope( $2 ); } filter_body {
cf_define_symbol($2, SYM_FILTER, $4); $2 = cf_define_symbol($2, SYM_FILTER, $4);
$4->name = $2->name; $4->name = $2->name;
DBG( "We have new filter defined (%s)\n", $2->name ); DBG( "We have new filter defined (%s)\n", $2->name );
cf_pop_scope(); cf_pop_scope();
@ -80,7 +80,7 @@ type:
one_decl: one_decl:
type SYM { type SYM {
cf_define_symbol($2, SYM_VARIABLE | $1, NULL); $2 = cf_define_symbol($2, SYM_VARIABLE | $1, NULL);
DBG( "New variable %s type %x\n", $2->name, $1 ); DBG( "New variable %s type %x\n", $2->name, $1 );
$2->aux = 0; $2->aux = 0;
{ {
@ -163,8 +163,11 @@ function_body:
CF_ADDTO(conf, function_def) CF_ADDTO(conf, function_def)
function_def: function_def:
FUNCTION SYM { DBG( "Beginning of function %s\n", $2->name ); cf_push_scope($2); } function_params function_body { FUNCTION SYM { DBG( "Beginning of function %s\n", $2->name );
cf_define_symbol($2, SYM_FUNCTION, $5); $2 = cf_define_symbol($2, SYM_FUNCTION, NULL);
cf_push_scope($2);
} function_params function_body {
$2->def = $5;
$2->aux = (int) $4; $2->aux = (int) $4;
$2->aux2 = $5; $2->aux2 = $5;
DBG("Hmm, we've got one function here - %s\n", $2->name); DBG("Hmm, we've got one function here - %s\n", $2->name);