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

style: tests: simplify the handling of some C++ tests

Browse Source 
* tests/c++.at: here.
(Doxygen): Pass %define, so that files such as position.hh etc.
are generated, instead of putting everything into input.hh.
This commit is contained in:
Akim Demaille
2015-01-08 14:03:09 +01:00
parent 821394a3c8
commit e1d06b5235
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/c++.at
View File

@@ -369,6 +369,7 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
AT_DATA([input.yy], AT_DATA([input.yy],
[[%skeleton "lalr1.cc" [[%skeleton "lalr1.cc"
%locations %locations
%defines
%debug %debug
%% %%
exp: /* empty */; exp: /* empty */;
@@ -376,7 +377,7 @@ exp: /* empty */;
]AT_YYERROR_DEFINE[ ]AT_YYERROR_DEFINE[
]]) ]])
AT_BISON_CHECK([-o input.cc input.yy], 0) AT_BISON_CHECK([-o input.cc input.yy])
AT_DATA([Doxyfile], AT_DATA([Doxyfile],
[# The PROJECT_NAME tag is a single word (or a sequence of words [# The PROJECT_NAME tag is a single word (or a sequence of words
@@ -447,7 +448,7 @@ AT_CHECK_DOXYGEN([Private])
# so don't check compilation. # so don't check compilation.
m4_pushdef([AT_TEST], m4_pushdef([AT_TEST],
[AT_BISON_OPTION_PUSHDEFS([%language "C++" %define api.namespace {$1}]) [AT_BISON_OPTION_PUSHDEFS([%language "C++" %define api.namespace {$1}])
AT_DATA_GRAMMAR([[input.y]], AT_DATA_GRAMMAR([[input.yy]],
[[%language "C++" [[%language "C++"
%define api.namespace {]$1[} %define api.namespace {]$1[}
%union { int i; } %union { int i; }
@@ -479,10 +480,10 @@ void
]]) ]])
AT_BISON_CHECK([[-o input.cc input.y]]) AT_BISON_CHECK([[-o input.cc input.yy]])
m4_if([$#], [1], m4_if([$#], [1],
[AT_COMPILE_CXX([[input]], [[input.cc]]) [AT_COMPILE_CXX([[input]])
AT_PARSER_CHECK([[./input]])]) AT_PARSER_CHECK([[./input]])])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS
]) ])
@@ -526,7 +527,7 @@ AT_SETUP([[Syntax error discarding no lookahead]])
AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"]) AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
AT_DATA_GRAMMAR([[input.yy]], AT_DATA_GRAMMAR([[input.y]],
[[%skeleton "lalr1.cc" [[%skeleton "lalr1.cc"
%code { %code {
@@ -579,8 +580,7 @@ yy::parser::error (const std::string &m)
]AT_MAIN_DEFINE[ ]AT_MAIN_DEFINE[
]]) ]])
AT_BISON_CHECK([[-o input.cc input.yy]]) AT_FULL_COMPILE([[input]])
AT_COMPILE_CXX([[input]])
# This used to print "Discarding 'a'." again at the end. # This used to print "Discarding 'a'." again at the end.
AT_PARSER_CHECK([[./input]], [[1]], [[]], AT_PARSER_CHECK([[./input]], [[1]], [[]],
[[syntax error [[syntax error
@@ -600,7 +600,7 @@ AT_SETUP([[Syntax error as exception]])
AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"]) AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
AT_DATA_GRAMMAR([[input.yy]], AT_DATA_GRAMMAR([[input.y]],
[[%skeleton "lalr1.cc" [[%skeleton "lalr1.cc"
%code %code
@@ -655,8 +655,7 @@ yy::parser::error (const std::string &m)
]AT_MAIN_DEFINE[ ]AT_MAIN_DEFINE[
]]) ]])
AT_BISON_CHECK([[-o input.cc input.yy]]) AT_FULL_COMPILE([[input]])
AT_COMPILE_CXX([[input]])
AT_PARSER_CHECK([[./input]], [[0]], [[]], AT_PARSER_CHECK([[./input]], [[0]], [[]],
[[error: invalid expression [[error: invalid expression
@@ -953,9 +952,9 @@ AT_TEST([%define api.value.type variant], [without])
m4_popdef([AT_TEST]) m4_popdef([AT_TEST])
## ------------------------------------ ## ## ------------------------------------- ##
## C++ GLR parser identifier shadowing ## ## C++ GLR parser identifier shadowing. ##
## ------------------------------------ ## ## ------------------------------------- ##
AT_SETUP([[C++ GLR parser identifier shadowing]]) AT_SETUP([[C++ GLR parser identifier shadowing]])
@@ -991,7 +990,7 @@ int yylex (yy::parser::semantic_type *yylval)
void yy::parser::error (std::string const&) void yy::parser::error (std::string const&)
{} {}
int main() int main ()
{} {}
]) ])