Check for unrecognized %define variables similar to checking for

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

View File

@@ -788,3 +788,28 @@ special-char-@:>@.y:3.7-8: `' is not a recognized %code qualifier
]])
AT_CLEANUP
## ---------------- ##
## %define errors. ##
## ---------------- ##
AT_SETUP([%define errors])
AT_DATA([input.y],
[[%define "var" "value1"
%define "var" "value1"
%define "var" "value2"
%%
start: ;
]])
AT_CHECK([[bison input.y]], [1], [],
[[input.y:2.9-13: warning: %define: `var' redefined
input.y:3.10-14: warning: %define: `var' redefined
input.y:1.9-13: `var' is not a recognized %define variable
input.y:2.9-13: `var' is not a recognized %define variable
input.y:3.10-14: `var' is not a recognized %define variable
]])
AT_CLEANUP