X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/55f48c48314bf63e224f5cbfad7f9c52b6d78df7..77519a7d18266500754693b5e9e4b89608d6ed2c:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index e93b901e..ac7d55ee 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -24,6 +24,7 @@ AT_BANNER([[Regression tests.]]) AT_SETUP([Trivial grammars]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[%{ ]AT_YYERROR_DECLARE_EXTERN[ @@ -37,9 +38,10 @@ AT_DATA_GRAMMAR([input.y], program: 'x'; ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) AT_COMPILE([input.o], [-DYYDEBUG -c input.c]) AT_CLEANUP @@ -52,6 +54,7 @@ AT_CLEANUP AT_SETUP([YYSTYPE typedef]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[%{ ]AT_YYERROR_DECLARE_EXTERN[ @@ -65,9 +68,10 @@ typedef union { char const *val; } YYSTYPE; program: { $$ = ""; }; ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) AT_CLEANUP @@ -83,6 +87,7 @@ AT_SETUP([Early token definitions with --yacc]) # Found in GCJ: they expect the tokens to be defined before the user # prologue, so that they can use the token definitions in it. +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[%{ ]AT_YYERROR_DECLARE_EXTERN[ @@ -103,9 +108,10 @@ AT_DATA_GRAMMAR([input.y], exp: MY_TOKEN; %% ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-y -o input.c input.y]) -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) AT_CLEANUP @@ -121,6 +127,7 @@ AT_SETUP([Early token definitions without --yacc]) # Found in GCJ: they expect the tokens to be defined before the user # prologue, so that they can use the token definitions in it. +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[%{ #include @@ -146,9 +153,10 @@ print_my_token (void) exp: MY_TOKEN; %% ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) AT_CLEANUP @@ -161,6 +169,7 @@ AT_CLEANUP AT_SETUP([Braces parsing]) +AT_BISON_OPTION_PUSHDEFS AT_DATA([input.y], [[/* Bison used to swallow the character after '}'. */ @@ -168,6 +177,7 @@ AT_DATA([input.y], exp: { tests = {{{{{{{{{{}}}}}}}}}}; }; %% ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-v -o input.c input.y]) @@ -183,6 +193,7 @@ AT_CLEANUP AT_SETUP([Duplicate string]) +AT_BISON_OPTION_PUSHDEFS AT_DATA([input.y], [[/* 'Bison -v' used to dump core when two tokens are defined with the same string, as LE and GE below. */ @@ -195,6 +206,7 @@ AT_DATA([input.y], exp: '(' exp ')' | NUM ; %% ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-v -o input.c input.y], 0, [], [[input.y:6.8-14: warning: symbol "<=" used more than once as a literal string @@ -211,6 +223,7 @@ AT_SETUP([Rule Line Numbers]) AT_KEYWORDS([report]) +AT_BISON_OPTION_PUSHDEFS AT_DATA([input.y], [[%% expr: @@ -240,6 +253,7 @@ expr: }; ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c -v input.y]) @@ -428,6 +442,7 @@ AT_CLEANUP AT_SETUP([Token definitions]) +AT_BISON_OPTION_PUSHDEFS # Bison managed, when fed with '%token 'f' "f"' to #define 'f'! AT_DATA_GRAMMAR([input.y], [%{ @@ -447,11 +462,7 @@ AT_DATA_GRAMMAR([input.y], %% exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"; %% -void -yyerror (char const *s) -{ - fprintf (stderr, "%s\n", s); -} +]AT_YYERROR_DEFINE[ int yylex (void) @@ -468,6 +479,7 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS # Checking the warning message guarantees that the trigraph "??!" isn't # unnecessarily escaped here even though it would need to be if encoded in a @@ -515,7 +527,7 @@ exp: AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) AT_CLEANUP @@ -885,15 +897,9 @@ member: STRING | INVALID ; %% -AT_LALR1_CC_IF( -[/* A C++ error reporting function. */ -void -yy::parser::error (const location&, const std::string& m) -{ - std::cerr << m << std::endl; -} - -int +AT_YYERROR_DEFINE[ +]AT_LALR1_CC_IF( +[int yyparse () { yy::parser parser; @@ -902,13 +908,9 @@ yyparse () #endif return parser.parse (); } -], -[static void -yyerror (const char *s) -{ - fprintf (stderr, "%s\n", s); -}]) +]) +#include static int yylex (AT_LALR1_CC_IF([int *lval], [void])) [{ @@ -918,8 +920,7 @@ yylex (AT_LALR1_CC_IF([int *lval], [void])) }; static size_t toknum; ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC. */])[ - if (! (toknum < sizeof tokens / sizeof *tokens)) - abort (); + assert (toknum < sizeof tokens / sizeof *tokens); return tokens[toknum++]; }] @@ -962,12 +963,12 @@ AT_CHECK_DANCER([%skeleton "lalr1.cc"]) # -------------------------------- m4_define([_AT_DATA_EXPECT2_Y], [AT_DATA_GRAMMAR([expect2.y], -[%{ -static int yylex (AT_LALR1_CC_IF([int *], [void])); +[[%{ +static int yylex (]AT_LALR1_CC_IF([int *], [void])); AT_LALR1_CC_IF([], -[#include +[[#include #include -]AT_YYERROR_DECLARE[]) +]AT_YYERROR_DECLARE])[ %} $1 %defines @@ -984,52 +985,41 @@ e: e '+' t | t; t: A | B; %% -AT_LALR1_CC_IF( -[/* A C++ error reporting function. */ -void -yy::parser::error (const location&, const std::string& m) -{ - std::cerr << m << std::endl; -} - -int +]AT_YYERROR_DEFINE[ +]AT_LALR1_CC_IF( +[int yyparse () { yy::parser parser; return parser.parse (); } -], -[static void -yyerror (const char *s) -{ - fprintf (stderr, "%s\n", s); -}]) +])[ +#include static int -yylex (AT_LALR1_CC_IF([int *lval], [void])) -[{ +yylex (]AT_LALR1_CC_IF([int *lval], [void])[) +{ static int const tokens[] = { 1000, '+', '+', -1 }; static size_t toknum; ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC. */])[ - if (! (toknum < sizeof tokens / sizeof *tokens)) - abort (); + assert (toknum < sizeof tokens / sizeof *tokens); return tokens[toknum++]; -}] +} int main (void) { return yyparse (); } -]) +]]) ])# _AT_DATA_EXPECT2_Y # AT_CHECK_EXPECT2(BISON-OPTIONS) -# ------------------------------ +# ------------------------------- # Generate the grammar, compile it, run it. m4_define([AT_CHECK_EXPECT2], [AT_SETUP([Expecting two tokens $1])