X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/91ce0b3a66b75bb5b66f48a5a3cf59f3be08c0a8..39845e8e405f4aa74e93d04481c2c5d8004833fc:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index 4208153a..758825c7 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -463,15 +463,7 @@ AT_DATA_GRAMMAR([input.y], exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"; %% ]AT_YYERROR_DEFINE[ - -int -yylex (void) -{ - static int called; - if (called++) - abort (); - return SPECIAL; -} +]AT_YYLEX_DEFINE([{ SPECIAL }])[ int main (void) @@ -846,13 +838,11 @@ AT_CLEANUP # so that possible bound checking compilers could check all the skeletons. m4_define([_AT_DATA_DANCER_Y], [AT_DATA_GRAMMAR([dancer.y], -[%{ -static int yylex (AT_LALR1_CC_IF([int *], [void])); -AT_LALR1_CC_IF([], -[#include -#include -]AT_YYERROR_DECLARE[]) -%} +[[%code provides +{ + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ +} $1 %token ARROW INVALID NUMBER STRING DATA %defines @@ -897,7 +887,8 @@ member: STRING | INVALID ; %% -AT_YYERROR_DEFINE[ +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE([":"])[ ]AT_LALR1_CC_IF( [int yyparse () @@ -908,28 +899,14 @@ yyparse () #endif return parser.parse (); } -]) - -static int -yylex (AT_LALR1_CC_IF([int *lval], [void])) -[{ - static int const tokens[] = - { - ':', -1 - }; - static size_t toknum; - ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC. */])[ - if (! (toknum < sizeof tokens / sizeof *tokens)) - abort (); - return tokens[toknum++]; -}] +])[ int main (void) { return yyparse (); } -]) +]]) ])# _AT_DATA_DANCER_Y @@ -940,7 +917,6 @@ m4_define([AT_CHECK_DANCER], [AT_SETUP([Dancer $1]) AT_BISON_OPTION_PUSHDEFS([$1]) _AT_DATA_DANCER_Y([$1]) -AT_BISON_CHECK([-o dancer.c dancer.y]) AT_FULL_COMPILE([dancer]) AT_PARSER_CHECK([./dancer], 1, [], [syntax error, unexpected ':' @@ -995,6 +971,7 @@ yyparse () } ])[ +#include static int yylex (]AT_LALR1_CC_IF([int *lval], [void])[) { @@ -1004,8 +981,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++]; } @@ -1025,7 +1001,6 @@ m4_define([AT_CHECK_EXPECT2], [AT_SETUP([Expecting two tokens $1]) AT_BISON_OPTION_PUSHDEFS([$1]) _AT_DATA_EXPECT2_Y([$1]) -AT_BISON_CHECK([-o expect2.c expect2.y]) AT_FULL_COMPILE([expect2]) AT_PARSER_CHECK([./expect2], 1, [], [syntax error, unexpected '+', expecting A or B @@ -1071,13 +1046,8 @@ start: %printer { fprintf (yyoutput, "PRINTER"); } 'a'; %% - ]AT_YYERROR_DEFINE[ -static int -yylex (void) -{ - return 'a'; -} +]AT_YYLEX_DEFINE(["a"])[ int main (void) @@ -1210,13 +1180,7 @@ sr_conflict: %% ]AT_YYERROR_DEFINE[ -int -yylex (void) -{ - static int const input[] = { 1, 2, 3, 0 }; - static int const *inputp = input; - return *inputp++; -} +]AT_YYLEX_DEFINE([{ 1, 2, 3, 0 }])[ int main (void) @@ -1312,7 +1276,7 @@ syntax_error: /* Induce two syntax error messages (which requires full error recovery by shifting 3 tokens) in order to detect any loss of the reallocated buffer. */ -]AT_YYLEX_DEFINE([abc])[ +]AT_YYLEX_DEFINE(["abc"])[ int main (void) { @@ -1419,7 +1383,7 @@ syntax_error2: ]AT_YYERROR_DEFINE[ /* Induce two syntax error messages (which requires full error recovery by shifting 3 tokens). */ -]AT_YYLEX_DEFINE([abc])[ +]AT_YYLEX_DEFINE(["abc"])[ int main (void) { @@ -1517,17 +1481,17 @@ AT_CHECK([[grep 'syntax error,' stderr.txt]], [[0]], # Check number of default reductions in inconsistent states to be sure # syntax error is detected before unnecessary reductions are performed. -AT_CHECK([[perl -0777 -ne 'print s/inconsistent default reduction//g;' \ +AT_CHECK([[$PERL -0777 -ne 'print s/inconsistent default reduction//g;' \ < stdout.txt || exit 77]], [[0]], [[14]]) # Check number of default reductions in consistent states to be sure # it is performed before the syntax error is detected. -AT_CHECK([[perl -0777 -ne 'print s/\bconsistent default reduction//g;' \ +AT_CHECK([[$PERL -0777 -ne 'print s/\bconsistent default reduction//g;' \ < stdout.txt || exit 77]], [[0]], [[2]]) # Check number of reallocs to be sure reallocated memory isn't somehow # lost between LAC invocations. -AT_CHECK([[perl -0777 -ne 'print s/\(realloc//g;' < stderr.txt \ +AT_CHECK([[$PERL -0777 -ne 'print s/\(realloc//g;' < stderr.txt \ || exit 77]], [[0]], [[3]]) AT_BISON_OPTION_POPDEFS @@ -1569,7 +1533,7 @@ A: /*empty*/ | 'a' ; %% ]AT_YYERROR_DEFINE[ -]AT_YYLEX_DEFINE([$1])[ +]AT_YYLEX_DEFINE(["$1"])[ int main (void) { @@ -1619,3 +1583,87 @@ Stack now 0 m4_popdef([AT_LAC_CHECK]) AT_CLEANUP + + +## ---------------------- ## +## Lex and parse params. ## +## ---------------------- ## + +# AT_TEST(SKELETON) +# ----------------- +# Check that the identifier of the params is properly fetched +# even when there are trailing blanks. + +m4_pushdef([AT_TEST], +[AT_SETUP([[Lex and parse params: $1]]) + +AT_BISON_OPTION_PUSHDEFS([%locations %skeleton $1]) + +## FIXME: Improve parsing of parse-param and use the generated +## yyerror. +AT_DATA_GRAMMAR([input.y], +[[%defines +%locations +%skeleton $1 +%union { int ival; } +%parse-param { int x } +// Spaces, tabs, and new lines. +%parse-param { @&t@ + int y @&t@ + @&t@ + @&t@ +} + +%{ +#include +#include + +]AT_SKEL_CC_IF([], [[ +static +void +yyerror (int x, int y, const char *msg) +{ + fprintf (stderr, "x: %d, y: %d, %s\n", x, y, msg); +}]])[ + + ]AT_YYLEX_DECLARE[ +%} + +%% +exp: 'a' { fprintf (stdout, "x: %d, y: %d\n", x, y); }; +%% +]AT_YYLEX_DEFINE(["a"])[ + +]AT_SKEL_CC_IF( +[AT_YYERROR_DEFINE + +int +yyparse (int x, int y) +{ + yy::parser parser(x, y); + return parser.parse (); +} +])[ + +int +main (void) +{ + return !!yyparse(1, 2); +} +]]) + +AT_FULL_COMPILE([input]) +AT_CHECK([./input], 0, [[x: 1, y: 2 +]]) +AT_BISON_OPTION_POPDEFS + +AT_CLEANUP +]) + +## FIXME: test Java, and iterate over skeletons. +AT_TEST("yacc.c") +AT_TEST("glr.c") +AT_TEST("lalr1.cc") +AT_TEST("glr.cc") + +m4_popdef([AT_TEST])