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

tests: dispatch per lang on AT_DATA_GRAMMAR

Browse Source 
* tests/java.at: Do that.
* tests/conflicts.at: Simplify.

* tests/actions.at, tests/c++.at, tests/input.at, tests/local.at,
* tests/named-refs.at:
Use AT_BISON_OPTION_PUSHDEFS/AT_BISON_OPTION_POPDEFS.
This commit is contained in:
Akim Demaille
2019-02-19 21:08:40 +01:00
parent 7d6747cec9
commit 948f3decb4
7 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/local.at
View File

@@ -397,15 +397,13 @@ m4_define([AT_DATA_SOURCE],
$2])
])
# AT_DATA_GRAMMAR(NAME, CONTENT)
# ------------------------------
# Generate the file NAME, which CONTENT is preceded by
# AT_DATA_GRAMMAR_PROLOGUE.
m4_define([AT_DATA_GRAMMAR],
[AT_DATA([$1],
[AT_DATA_GRAMMAR_PROLOGUE
$2])
])
m4_define([AT_DATA_GRAMMAR], [AT_LANG_DISPATCH([$0], $@)])
# AT_YYLEX_PROTOTYPE
# AT_YYLEX_DECLARE_EXTERN
@@ -455,6 +453,15 @@ m4_define([AT_MAIN_DEFINE], [AT_LANG_DISPATCH([$0], $@)])
## C. ##
## --- ##
# AT_DATA_GRAMMAR(c)(NAME, CONTENT)
# ---------------------------------
# Generate the file NAME, with CONTENT.
m4_define([AT_DATA_GRAMMAR(c)],
[AT_DATA([$1],
[AT_DATA_GRAMMAR_PROLOGUE
$2])
])
m4_define([AT_YYERROR_FORMALS(c)],
[AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE const * const llocp, ])AT_PARSE_PARAMS[const char *msg]])
@@ -566,6 +573,11 @@ m4_define([AT_LANG_FOR_EACH_STD(c)],
## C++. ##
## ----- ##
# AT_DATA_GRAMMAR(NAME, CONTENT)
# ------------------------------
m4_copy([AT_DATA_GRAMMAR(c)], [AT_DATA_GRAMMAR(c++)])
# No need to declare, it's part of the class interface.
m4_define([AT_YYERROR_DECLARE(c++)], [])
m4_define([AT_YYERROR_DECLARE_EXTERN(c++)], [])
@@ -625,6 +637,12 @@ CXXFLAGS=$at_for_each_std_CXXFLAGS_save
## Java. ##
## ------ ##
# AT_DATA_GRAMMAR(NAME, CONTENT)
# ------------------------------
m4_copy([AT_DATA], [AT_DATA_GRAMMAR(java)])
m4_define([AT_YYERROR_DEFINE(java)],
[AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s)
{