Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 13:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for unrecognized %define variables similar to checking for

Browse Source 
unrecognized %code qualifiers.  Check for redefined %define variables.
* data/bison.m4 (b4_check_for_unrecognized_names): New macro that
generalizes...
(b4_check_percent_code_qualifiers): ... this, which now wraps it.
(b4_check_percent_define_variables): New, also wraps it.
* data/glr.c: Unless glr.cc is wrapping glr.c, declare no valid %define
variables using b4_check_percent_define_variables.
* data/glr.cc, data/lalr1.cc: Declare the valid %define variables as
all those exercised in the test suite and all those listed in the
`Default values' section of c++.m4.  Are there others?
* data/push.c, data/yacc.c: Declare no valid %define variables.
* src/muscle_tab.c, src/muscle_tab.h (muscle_find_const): New function,
similar to muscle_find, but it works even when the muscle stores a
const value.
(muscle_grow_used_name_list): New function for constructing the used
name list muscles that b4_check_for_unrecognized_names requires.
* src/parse-gram.y (prologue_declaration): Warn if a variable is
%define'd more than once.  Define the b4_used_percent_define_variables
muscle with muscle_grow_used_name_list.
(grammar_declaration): Abbreviate %code code with
muscle_grow_used_name_list.
* tests/input.at (%define errors): New.
This commit is contained in:
Joel E. Denny
2007-01-07 07:50:27 +00:00
parent 3fc65ead4d
commit 7eb8a0bcca
13 changed files with 472 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/parse-gram.y
View File

@@ -82,7 +82,6 @@ static int current_prec = 0;
%locations
%pure-parser
%error-verbose
%defines
%name-prefix="gram_"
%expect 0
@@ -233,7 +232,15 @@ prologue_declaration:
code_scanner_last_string_free ();
}
| "%debug" { debug_flag = true; }
| "%define" STRING content.opt { muscle_insert ($2, $3); }
| "%define" STRING content.opt
{
/* FIXME: Special characters in $2 may break %define.
For example: `['. */
if (muscle_find_const ($2))
warn_at (@2, _("%s: `%s' redefined"), "%define", $2);
muscle_insert ($2, $3);
muscle_grow_used_name_list ("used_percent_define_variables", $2, @2);
}
| "%defines" { defines_flag = true; }
| "%defines" STRING
{
@@ -316,6 +323,8 @@ grammar_declaration:
}
| "%code" STRING braceless
{
/* FIXME: Special characters in $2 may break %code.
For example: `['. */
char const name_prefix[] = "percent_code_";
char *name = xmalloc (sizeof name_prefix + strlen ($2));
strcpy (name, name_prefix);
@@ -323,13 +332,7 @@ grammar_declaration:
muscle_code_grow (uniqstr_new (name), $3, @3);
free (name);
code_scanner_last_string_free ();
muscle_grow ("used_percent_code_qualifiers", "[[[[", ",");
muscle_grow ("used_percent_code_qualifiers", $2, "");
muscle_grow ("used_percent_code_qualifiers", "]], [[", "");
muscle_boundary_grow ("used_percent_code_qualifiers", @2.start);
muscle_grow ("used_percent_code_qualifiers", "]], [[", "");
muscle_boundary_grow ("used_percent_code_qualifiers", @2.end);
muscle_grow ("used_percent_code_qualifiers", "]]]]", "");
muscle_grow_used_name_list ("used_percent_code_qualifiers", $2, @2);
}
;