X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9534d2be80292c1a2f52997964cb4436039781c0..aedcb6c095347f71206ed9410ad27907b4be903e:/tests/actions.at diff --git a/tests/actions.at b/tests/actions.at index 120c4012..75e5d16c 100644 --- a/tests/actions.at +++ b/tests/actions.at @@ -1,6 +1,6 @@ e# Executing Actions. -*- Autotest -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -52,11 +52,7 @@ exp: { putchar ('0'); } %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["123456789"])[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -69,6 +65,187 @@ AT_PARSER_CHECK([./input], 0, AT_CLEANUP +## ------------------ ## +## Initial location. ## +## ------------------ ## + +# AT_TEST(SKELETON-NAME, DIRECTIVES, [MORE-DIRECTIVES], [LOCATION = 1.1]) +# ----------------------------------------------------------------------- +# Check that the initial location is correct. +m4_pushdef([AT_TEST], +[AT_SETUP([Initial location: $1 $2]) + +AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2]) +AT_DATA_GRAMMAR([[input.y]], +[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */ +%locations +%debug +%skeleton "$1" +]$2[ +]$3[ +%code +{ +# include +# include /* getenv */ +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ +} +%% +exp: { ]AT_SKEL_CC_IF([[std::cerr << @$ << std::endl]], + [[YY_LOCATION_PRINT(stderr, @$); fputc ('\n', stderr)]])[; } +%% +]AT_YYERROR_DEFINE[ + +]AT_YYLEX_PROTOTYPE[ +{]AT_PURE_IF([ + YYUSE(lvalp); + YYUSE(llocp);], [AT_SKEL_CC_IF([ + YYUSE(lvalp); + YYUSE(llocp);])])[ + return 'x'; +} + +int +main (void) +{]AT_SKEL_CC_IF([[ + yy::parser p; + p.set_debug_level (!!getenv("YYDEBUG")); + return p.parse ();]], [[ + yydebug = !!getenv("YYDEBUG"); + return !!yyparse (]AT_PARAM_IF([0])[);]])[ +} +]]) + +AT_FULL_COMPILE([input]) +AT_PARSER_CHECK([./input], 1, [], +[m4_default([$4], [1.1]) +m4_default([$4], [1.1])[: syntax error +]]) +AT_BISON_OPTION_POPDEFS +AT_CLEANUP +]) + +## FIXME: test Java, and iterate over skeletons. +AT_TEST([yacc.c]) +AT_TEST([yacc.c], [%define api.pure full]) +AT_TEST([yacc.c], [%define api.pure %parse-param { int x }]) +AT_TEST([yacc.c], [%define api.push-pull both]) +AT_TEST([yacc.c], [%define api.push-pull both %define api.pure full]) +AT_TEST([glr.c]) +AT_TEST([glr.c], [%define api.pure]) +AT_TEST([lalr1.cc]) +AT_TEST([glr.cc]) + +## A very different test, based on PostgreSQL's implementation of the +## locations. See +## http://lists.gnu.org/archive/html/bug-bison/2012-11/msg00023.html +## +## Weirdly enough, to trigger the warning with GCC 4.7, we must not +## use fprintf, so run the test twice: once to check the warning +## (absence thereof), and another time to check the value. +AT_TEST([yacc.c], [%define api.pure full], +[[%{ +# define YYLTYPE int +# define YY_LOCATION_PRINT(Stream, Loc) \ + (void) (Loc) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + (Current) = ((Rhs)[N ? 1 : 0]) +%} +]], +[@&t@]) + +AT_TEST([yacc.c], [%define api.pure full], +[[%{ +# define YYLTYPE int +# define YY_LOCATION_PRINT(Stream, Loc) \ + fprintf ((Stream), "%d", (Loc)) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + (Current) = ((Rhs)[N ? 1 : 0]) +%} +]], +[0]) + + +m4_popdef([AT_TEST]) + + + +## ---------------- ## +## Location Print. ## +## ---------------- ## + +# AT_TEST(SKELETON-NAME, DIRECTIVES, [MORE-DIRECTIVES], [LOCATION = 1.1]) +# ----------------------------------------------------------------------- +# Check that the initial location is correct. +m4_pushdef([AT_TEST], +[AT_SETUP([Location print: $1 $2]) + +AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2]) +AT_DATA_GRAMMAR([[input.y]], +[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */ +%locations +%debug +%skeleton "$1" +]$2[ +]$3[ +%code +{ +# include +# include /* getenv */ +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ +} +%% +exp: /* empty */; +%% +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ + +int +main (void) +{ + ]AT_YYLTYPE[ loc; +]AT_GLR_CC_IF([loc.initialize();])[ +#define TEST(L1, C1, L2, C2) \ + loc.]AT_FIRST_LINE[ = L1; \ + loc.]AT_FIRST_COLUMN[ = C1; \ + loc.]AT_LAST_LINE[ = L2; \ + loc.]AT_LAST_COLUMN[ = C2; \ + ]AT_SKEL_CC_IF([std::cout << loc], + [YY_LOCATION_PRINT(stdout, loc)])[;\ + putchar ('\n'); + + TEST(1, 1, 1, 1); + TEST(2, 1, 2, 10); + TEST(3, 1, 4, 1); + TEST(5, 1, 6, 10); + + TEST(7, 2, 0, 2); + TEST(8, 0, 8, 0); + return 0; +} +]]) + +AT_FULL_COMPILE([input]) +AT_PARSER_CHECK([./input], 0, +[[1.1 +2.1-9 +3.1-4.0 +5.1-6.9 +7.2 +8.0 +]]) +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]) @@ -117,11 +294,7 @@ sum_of_the_five_previous_values: %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_CHECK([-d -v -o input.c input.y], 0) @@ -152,15 +325,10 @@ sum: { printf ("%d\n", $0.val + $-1.val + $-2.val); } ; %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) -AT_BISON_CHECK([[-o input.c input.y]]) -AT_COMPILE([[input]]) +AT_FULL_COMPILE([input]) AT_PARSER_CHECK([[./input]], [[0]], [[6 ]]) @@ -557,7 +725,7 @@ AT_BISON_OPTION_POPDEFS # AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS], [UNION-FLAG], [SKIP_FLAG]) # --------------------------------------------------------------------------- m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR], -[AT_SETUP([Printers and Destructors $2: $1]) +[AT_SETUP([Printers and Destructors$2]m4_ifval([$1], [[: $1]])) $3 _AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4], @@ -590,15 +758,11 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union]) # called for $end, and that $$ and @$ work correctly. AT_SETUP([Default tagless %printer and %destructor]) -AT_BISON_OPTION_PUSHDEFS([%locations]) +AT_BISON_OPTION_PUSHDEFS([%locations %debug]) AT_DATA_GRAMMAR([[input.y]], [[%define parse.error verbose %debug %locations -%initial-action { - @$.first_line = @$.last_line = 1; - @$.first_column = @$.last_column = 1; -} %{ # include @@ -637,21 +801,15 @@ start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ; %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["abcd"], [[yylval = res]])[ - -int -main (void) -{ - yydebug = 1; - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_CHECK([-o input.c input.y], [], [], -[[input.y:27.3-5: warning: useless %destructor for type <*> [-Wother] -input.y:27.3-5: warning: useless %printer for type <*> [-Wother] +[[input.y:23.3-5: warning: useless %destructor for type <*> [-Wother] +input.y:23.3-5: warning: useless %printer for type <*> [-Wother] ]]) AT_COMPILE([input]) -AT_PARSER_CHECK([./input], 1, +AT_PARSER_CHECK([./input --debug], 1, [[<> destructor for 'd' @ 4. 'b'/'c' destructor for 'c' @ 3. 'b'/'c' destructor for 'b' @ 2. @@ -659,29 +817,29 @@ AT_PARSER_CHECK([./input], 1, ]], [[Starting parse Entering state 0 -Reading a token: Next token is token 'a' (1.1-1.1: <> printer for 'a' @ 1) -Shifting token 'a' (1.1-1.1: <> printer for 'a' @ 1) +Reading a token: Next token is token 'a' (1.1: <> printer for 'a' @ 1) +Shifting token 'a' (1.1: <> printer for 'a' @ 1) Entering state 1 -Reading a token: Next token is token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2) -Shifting token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2) +Reading a token: Next token is token 'b' (1.2: 'b'/'c' printer for 'b' @ 2) +Shifting token 'b' (1.2: 'b'/'c' printer for 'b' @ 2) Entering state 3 -Reading a token: Next token is token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3) -Shifting token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3) +Reading a token: Next token is token 'c' (1.3: 'b'/'c' printer for 'c' @ 3) +Shifting token 'c' (1.3: 'b'/'c' printer for 'c' @ 3) Entering state 5 -Reading a token: Next token is token 'd' (1.4-1.4: <> printer for 'd' @ 4) -Shifting token 'd' (1.4-1.4: <> printer for 'd' @ 4) +Reading a token: Next token is token 'd' (1.4: <> printer for 'd' @ 4) +Shifting token 'd' (1.4: <> printer for 'd' @ 4) Entering state 6 Reading a token: Now at end of input. -1.5-4: syntax error, unexpected $end, expecting 'e' -Error: popping token 'd' (1.4-1.4: <> printer for 'd' @ 4) +1.5: syntax error, unexpected $end, expecting 'e' +Error: popping token 'd' (1.4: <> printer for 'd' @ 4) Stack now 0 1 3 5 -Error: popping token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3) +Error: popping token 'c' (1.3: 'b'/'c' printer for 'c' @ 3) Stack now 0 1 3 -Error: popping token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2) +Error: popping token 'b' (1.2: 'b'/'c' printer for 'b' @ 2) Stack now 0 1 -Error: popping token 'a' (1.1-1.1: <> printer for 'a' @ 1) +Error: popping token 'a' (1.1: <> printer for 'a' @ 1) Stack now 0 -Cleanup: discarding lookahead token $end (1.5-1.5: ) +Cleanup: discarding lookahead token $end (1.5: ) Stack now 0 ]]) @@ -695,7 +853,7 @@ AT_CLEANUP ## ------------------------------------------------------ ## AT_SETUP([Default tagged and per-type %printer and %destructor]) -AT_BISON_OPTION_PUSHDEFS +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([[input.y]], [[%define parse.error verbose %debug @@ -752,13 +910,7 @@ start: %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["abcdef"])[ - -int -main (void) -{ - yydebug = 1; - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_CHECK([-o input.c input.y], [], [], @@ -766,7 +918,7 @@ AT_BISON_CHECK([-o input.c input.y], [], [], input.y:22.3-4: warning: useless %printer for type <> [-Wother] ]]) AT_COMPILE([input]) -AT_PARSER_CHECK([./input], 1, +AT_PARSER_CHECK([./input --debug], 1, [[<*>//e destructor. <*>//e destructor. 'd' destructor. @@ -830,15 +982,11 @@ m4_pushdef([AT_TEST], [m4_pushdef([kind], []) m4_pushdef([not_kind], [*])], [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])]) -AT_BISON_OPTION_PUSHDEFS([%locations]) +AT_BISON_OPTION_PUSHDEFS([%locations %debug]) AT_DATA_GRAMMAR([[input]]$1[[.y]], [[%define parse.error verbose %debug %locations -%initial-action { - @$.first_line = @$.last_line = 1; - @$.first_column = @$.last_column = 1; -} %{ # include @@ -887,43 +1035,37 @@ yylex (void) return 0; } ]AT_YYERROR_DEFINE[ - -int -main (void) -{ - yydebug = 1; - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input$1.c input$1.y], [], [], [m4_if([$1], [0], -[[input0.y:27.3-5: warning: useless %destructor for type <*> [-Wother] -input0.y:27.3-5: warning: useless %printer for type <*> [-Wother] +[[input0.y:23.3-5: warning: useless %destructor for type <*> [-Wother] +input0.y:23.3-5: warning: useless %printer for type <*> [-Wother] ]], -[[input1.y:27.3-4: warning: useless %destructor for type <> [-Wother] -input1.y:27.3-4: warning: useless %printer for type <> [-Wother] +[[input1.y:23.3-4: warning: useless %destructor for type <> [-Wother] +input1.y:23.3-4: warning: useless %printer for type <> [-Wother] ]])]) AT_COMPILE([input$1]) -AT_PARSER_CHECK([./input$1], 0, +AT_PARSER_CHECK([./input$1 --debug], 0, [[<]]kind[[> for 'E' @ 1. <]]kind[[> for 'S' @ 1. ]], [[Starting parse Entering state 0 -Reducing stack by rule 1 (line 46): --> $$ = nterm start (1.1-1.1: <]]kind[[> for 'S' @ 1) +Reducing stack by rule 1 (line 42): +-> $$ = nterm start (1.1: <]]kind[[> for 'S' @ 1) Stack now 0 Entering state 1 Reading a token: Now at end of input. -Shifting token END (1.1-1.1: <]]kind[[> for 'E' @ 1) +Shifting token END (1.1: <]]kind[[> for 'E' @ 1) Entering state 2 Stack now 0 1 2 -Cleanup: popping token END (1.1-1.1: <]]kind[[> for 'E' @ 1) -Cleanup: popping nterm start (1.1-1.1: <]]kind[[> for 'S' @ 1) +Cleanup: popping token END (1.1: <]]kind[[> for 'E' @ 1) +Cleanup: popping nterm start (1.1: <]]kind[[> for 'S' @ 1) ]]) m4_popdef([kind]) @@ -953,7 +1095,7 @@ AT_SETUP([Default %printer and %destructor are not for error or $undefined]) # semantic value, which would be initialized from the lookahead, which # would be destroyed separately. # - For $undefined, who knows what the semantic value would be. -AT_BISON_OPTION_PUSHDEFS +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([[input.y]], [[%debug @@ -984,12 +1126,7 @@ start: %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["abd"], [yylval = res])[ -int -main (void) -{ - yydebug = 1; - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -998,7 +1135,7 @@ AT_BISON_CHECK([-o input.c input.y], [], [], input.y:21.6-8: warning: useless %printer for type <*> [-Wother] ]]) AT_COMPILE([input]) -AT_PARSER_CHECK([./input], [1], [], +AT_PARSER_CHECK([./input --debug], [1], [], [[Starting parse Entering state 0 Reading a token: Next token is token 'a' ('a') @@ -1056,7 +1193,7 @@ AT_SETUP([Default %printer and %destructor are not for $accept]) # true for $undefined and the error token, so there are three warnings for # %printer and three for %destructor.) -AT_BISON_OPTION_PUSHDEFS +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([[input.y]], [[%debug /* So that %printer is actually compiled. */ @@ -1087,11 +1224,7 @@ start: { USE($$); } ; %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -1111,7 +1244,7 @@ AT_CLEANUP AT_SETUP([Default %printer and %destructor for mid-rule values]) -AT_BISON_OPTION_PUSHDEFS +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([[input.y]], [[%debug /* So that %printer is actually compiled. */ @@ -1145,12 +1278,7 @@ start: %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE[ -int -main (void) -{ - yydebug = 1; - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -1158,11 +1286,26 @@ AT_BISON_CHECK([-o input.c input.y], 0,, [[input.y:24.70-72: warning: useless %destructor for type <*> [-Wother] input.y:24.70-72: warning: useless %printer for type <*> [-Wother] input.y:33.3-23: warning: unset value: $$ [-Wother] -input.y:30.3-35.37: warning: unused value: $3 [-Wother] +input.y:32.3-23: warning: unused value: $3 [-Wother] +]]) + +AT_BISON_CHECK([-fcaret -o input.c input.y], 0,, +[[input.y:24.70-72: warning: useless %destructor for type <*> [-Wother] + %printer { fprintf (yyoutput, "<*> printer should not be called"); } <*> + ^^^ +input.y:24.70-72: warning: useless %printer for type <*> [-Wother] + %printer { fprintf (yyoutput, "<*> printer should not be called"); } <*> + ^^^ +input.y:33.3-23: warning: unset value: $$ [-Wother] + { @$ = 4; } // Only used. + ^^^^^^^^^^^^^^^^^^^^^ +input.y:32.3-23: warning: unused value: $3 [-Wother] + { USE ($$); @$ = 3; } // Only set. + ^^^^^^^^^^^^^^^^^^^^^ ]]) AT_COMPILE([input]) -AT_PARSER_CHECK([./input], 1,, +AT_PARSER_CHECK([./input --debug], 1,, [[Starting parse Entering state 0 Reducing stack by rule 1 (line 30): @@ -1211,7 +1354,7 @@ AT_CLEANUP # ------------------------------------------- m4_define([AT_CHECK_ACTION_LOCATIONS], [AT_SETUP([[@$ in ]$1[ implies %locations]]) -AT_BISON_OPTION_PUSHDEFS +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([[input.y]], [[%code { #include @@ -1238,11 +1381,7 @@ yylex (void) } ]AT_YYERROR_DEFINE[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_CHECK([[-o input.c input.y]]) @@ -1255,6 +1394,119 @@ AT_CHECK_ACTION_LOCATIONS([[%destructor]]) AT_CHECK_ACTION_LOCATIONS([[%printer]]) +## ------------------------- ## +## Qualified $$ in actions. ## +## ------------------------- ## + +# Check that we can use qualified $$ (v.g., $$) not only in rule +# actions, but also where $$ is valid: %destructor/%printer and +# %initial-action. +# +# FIXME: Not actually checking %destructor, but it's the same code as +# %printer... +# +# To do that, use a semantic value that has two fields (sem_type), +# declare symbols to have only one of these types (INT, float), and +# use $$ to get the other one. Including for symbols that are +# not typed (UNTYPED). + +m4_pushdef([AT_TEST], +[AT_SETUP([[Qualified $$ in actions: $1]]) + +AT_BISON_OPTION_PUSHDEFS([%skeleton "$1" %debug]) + +AT_DATA_GRAMMAR([[input.y]], +[[%skeleton "$1" +%debug +%code requires +{ + typedef struct sem_type + { + int ival; + float fval; + } sem_type; + +# define YYSTYPE sem_type + +]AT_SKEL_CC_IF([[ +# include + static void + report (std::ostream& yyo, int ival, float fval) + { + yyo << "ival: " << ival << ", fval: " << fval; + } +]], [[ +# include + static void + report (FILE* yyo, int ival, float fval) + { + fprintf (yyo, "ival: %d, fval: %1.1f", ival, fval); + } +]])[ +} + +%code +{ + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ +} + +%token UNTYPED +%token INT +%type float +%printer { report (yyo, $$, $$); } ; +%printer { report (yyo, $$, $$ ); } ; +%printer { report (yyo, $$, $$); } <>; + +%initial-action +{ + $$ = 42; + $$ = 4.2; +} + +%% +float: UNTYPED INT +{ + $$ = $1 + $2; + $$ = $1 + $][2; +}; +%% +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(AT_SKEL_CC_IF([[{yy::parser::token::UNTYPED, + yy::parser::token::INT, + EOF}]], + [[{UNTYPED, INT, EOF}]]), + [AT_VAL.ival = toknum * 10; AT_VAL.fval = toknum / 10.0;])[ +]AT_MAIN_DEFINE[ +]]) + +AT_FULL_COMPILE([[input]]) +AT_PARSER_CHECK([./input --debug], 0, [], [stderr]) +# Don't be too picky on the traces, GLR is not exactly the same. Keep +# only the lines from the printer. +AT_CHECK([[sed -ne '/ival:/p' stderr]], 0, +[[Reading a token: Next token is token UNTYPED (ival: 10, fval: 0.1) +Shifting token UNTYPED (ival: 10, fval: 0.1) +Reading a token: Next token is token INT (ival: 20, fval: 0.2) +Shifting token INT (ival: 20, fval: 0.2) + $][1 = token UNTYPED (ival: 10, fval: 0.1) + $][2 = token INT (ival: 20, fval: 0.2) +-> $$ = nterm float (ival: 30, fval: 0.3) +Cleanup: popping nterm float (ival: 30, fval: 0.3) +]]) + +AT_BISON_OPTION_POPDEFS + +AT_CLEANUP +]) + +AT_TEST([yacc.c]) +AT_TEST([glr.c]) +AT_TEST([lalr1.cc]) +AT_TEST([glr.cc]) + +m4_popdef([AT_TEST]) + ## ----------------------------------------------- ## ## Fix user actions without a trailing semicolon. ## ## ----------------------------------------------- ## @@ -1317,42 +1569,42 @@ string;"} AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o input.c input.y]], [0], [], -[[input.y:8.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:8.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:9.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:9.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:10.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:10.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:11.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:11.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:12.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:12.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:13.48: warning: a ';' might be needed at the end of action code [-Wother] -input.y:13.48: warning: future versions of Bison will not add the ';' [-Wother] -input.y:20.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:20.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:21.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:21.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:22.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:22.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:23.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:23.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:24.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:24.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:25.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:25.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:31.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:31.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:32.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:32.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:33.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:33.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:34.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:34.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:35.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:35.1: warning: future versions of Bison will not add the ';' [-Wother] -input.y:36.1: warning: a ';' might be needed at the end of action code [-Wother] -input.y:36.1: warning: future versions of Bison will not add the ';' [-Wother] +[[input.y:8.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:8.48: future versions of Bison will not add the ';' +input.y:9.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:9.48: future versions of Bison will not add the ';' +input.y:10.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:10.48: future versions of Bison will not add the ';' +input.y:11.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:11.48: future versions of Bison will not add the ';' +input.y:12.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:12.48: future versions of Bison will not add the ';' +input.y:13.48: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:13.48: future versions of Bison will not add the ';' +input.y:20.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:20.1: future versions of Bison will not add the ';' +input.y:21.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:21.1: future versions of Bison will not add the ';' +input.y:22.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:22.1: future versions of Bison will not add the ';' +input.y:23.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:23.1: future versions of Bison will not add the ';' +input.y:24.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:24.1: future versions of Bison will not add the ';' +input.y:25.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:25.1: future versions of Bison will not add the ';' +input.y:31.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:31.1: future versions of Bison will not add the ';' +input.y:32.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:32.1: future versions of Bison will not add the ';' +input.y:33.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:33.1: future versions of Bison will not add the ';' +input.y:34.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:34.1: future versions of Bison will not add the ';' +input.y:35.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:35.1: future versions of Bison will not add the ';' +input.y:36.1: warning: a ';' might be needed at the end of action code [-Wdeprecated] +input.y:36.1: future versions of Bison will not add the ';' ]]) AT_MATCHES_CHECK([input.c], [[/\* TEST:N:2 \*/ \}$]], [[3]]) @@ -1407,11 +1659,7 @@ accept: /*empty*/ { %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["a"])[ -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o input.c input.y]]) @@ -1429,7 +1677,7 @@ AT_CLEANUP AT_SETUP([[YYBACKUP]]) -AT_BISON_OPTION_PUSHDEFS([%pure-parser]) +AT_BISON_OPTION_PUSHDEFS([%pure-parser %debug]) AT_DATA_GRAMMAR([input.y], [[ @@ -1458,13 +1706,7 @@ exp: %% ]AT_YYERROR_DEFINE[ ]AT_YYLEX_DEFINE(["bcd"], [*lvalp = (toknum + 1) * 10])[ - -int -main (void) -{ - yydebug = !!getenv("YYDEBUG"); - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS