X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/94556574b56eed6d42395bf8264f1ee9eec08eac..235892350f6547e5c6a350b85561eda14409a0b5:/tests/actions.at diff --git a/tests/actions.at b/tests/actions.at index 2da52941..17d9193f 100644 --- a/tests/actions.at +++ b/tests/actions.at @@ -28,14 +28,13 @@ AT_SETUP([Mid-rule actions]) # instead of being attached to the empty rule dedicated to this # action. +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([[input.y]], [[%error-verbose %debug %{ -# include -# include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ %} %% exp: { putchar ('0'); } @@ -51,38 +50,202 @@ exp: { putchar ('0'); } { putchar ('\n'); } ; %% -static int -yylex (void) +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["123456789"])[ +int +main (void) { - static char const input[] = "123456789"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; + return yyparse (); } +]]) +AT_BISON_OPTION_POPDEFS + +AT_BISON_CHECK([-d -v -o input.c input.y]) +AT_COMPILE([input]) +AT_PARSER_CHECK([./input], 0, +[[0123456789 +]]) + +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]) -static void -yyerror (const char *msg) +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 { - fprintf (stderr, "%s\n", msg); +# 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 { - return yyparse (); +# include +# include // getenv +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ +} +%% +exp:; +%% +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ + +int +main (void) +{ +#define TEST(L1, C1, L2, C2) \ + ]AT_LOC_FIRST_LINE[ = L1; \ + ]AT_LOC_FIRST_COLUMN[ = C1; \ + ]AT_LOC_LAST_LINE[ = L2; \ + ]AT_LOC_LAST_COLUMN[ = C2; \ + ]YY_LOCATION_PRINT(stdout, AT_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); } ]]) -AT_BISON_CHECK([-d -v -o input.c input.y]) -AT_COMPILE([input]) +AT_FULL_COMPILE([input]) AT_PARSER_CHECK([./input], 0, -[[0123456789 +[[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]) @@ -92,14 +255,13 @@ AT_CLEANUP AT_SETUP([Exotic Dollars]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([[input.y]], [[%error-verbose %debug %{ -# include -# include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(Var) %} @@ -130,21 +292,8 @@ sum_of_the_five_previous_values: ; %% -static int -yylex (void) -{ - static int called; - if (called++) - abort (); - return EOF; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) { @@ -164,9 +313,9 @@ AT_PARSER_CHECK([./input], 0, AT_DATA_GRAMMAR([[input.y]], [[ %{ -# include - static int yylex (void); - static void yyerror (char const *msg); +#include +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ typedef struct { int val; } stype; # define YYSTYPE stype %} @@ -178,19 +327,8 @@ two: { $$.val = 2; } ; sum: { printf ("%d\n", $0.val + $-1.val + $-2.val); } ; %% - -static int -yylex (void) -{ - return 0; -} - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) { @@ -198,12 +336,12 @@ main (void) } ]]) -AT_BISON_CHECK([[-o input.c input.y]]) -AT_COMPILE([[input]]) +AT_FULL_COMPILE([input]) AT_PARSER_CHECK([[./input]], [[0]], [[6 ]]) +AT_BISON_OPTION_POPDEFS AT_CLEANUP @@ -212,11 +350,12 @@ AT_CLEANUP ## Printers and Destructors. ## ## -------------------------- ## -# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE, UNION-FLAG) -# ----------------------------------------------------------------------------- +# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, +# BISON-DIRECTIVE, UNION-FLAG) +# ------------------------------------------------------------- m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR], [# Make sure complex $n work. -m4_if([$1$2$3], $[1]$[2]$[3], [], +m4_if([$1$2$3$4], $[1]$[2]$[3]$[4], [], [m4_fatal([$0: Invalid arguments: $@])])dnl # Be sure to pass all the %directives to this macro to have correct @@ -231,21 +370,24 @@ AT_DATA_GRAMMAR([[input.y]], #define YYINITDEPTH 10 #define YYMAXDEPTH 10 -]AT_LALR1_CC_IF( - [#define RANGE(Location) (Location).begin.line, (Location).end.line], - [#define RANGE(Location) (Location).first_line, (Location).last_line]) -[} +#define RANGE(Location) ]AT_LALR1_CC_IF([(Location).begin.line, (Location).end.line], + [(Location).first_line, (Location).last_line])[ + +/* Display the symbol type Symbol. */ +#define V(Symbol, Value, Location, Sep) \ + fprintf (stderr, #Symbol " (%d@%d-%d)" Sep, Value, RANGE(Location)) +} -$5] -m4_ifval([$6], [%union +$5 +]m4_ifval([$6], [%union { int ival; }]) AT_LALR1_CC_IF([%define global_tokens_and_yystype]) m4_ifval([$6], [[%code provides {]], [[%code {]]) -AT_LALR1_CC_IF([typedef yy::location YYLTYPE;]) -[static int yylex (]AT_LEX_FORMALS[); -]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);]) +AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])[ +]AT_YYLEX_DECLARE[ +]AT_LALR1_CC_IF([], [AT_YYERROR_DECLARE]) [} ]m4_ifval([$6], [%type '(' 'x' 'y' ')' ';' thing line input END])[ @@ -259,28 +401,28 @@ AT_LALR1_CC_IF([typedef yy::location YYLTYPE;]) input line thing 'x' 'y' %destructor - { printf ("Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); } input %destructor - { printf ("Freeing nterm line (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing nterm line (%d@%d-%d)\n", $$, RANGE (@$)); } line %destructor - { printf ("Freeing nterm thing (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing nterm thing (%d@%d-%d)\n", $$, RANGE (@$)); } thing %destructor - { printf ("Freeing token 'x' (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing token 'x' (%d@%d-%d)\n", $$, RANGE (@$)); } 'x' %destructor - { printf ("Freeing token 'y' (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing token 'y' (%d@%d-%d)\n", $$, RANGE (@$)); } 'y' %token END 0 %destructor - { printf ("Freeing token END (%d@%d-%d)\n", $$, RANGE (@$)); } + { fprintf (stderr, "Freeing token END (%d@%d-%d)\n", $$, RANGE (@$)); } END %% @@ -295,14 +437,15 @@ input: /* Nothing. */ { $$ = 0; - printf ("input (%d@%d-%d): /* Nothing */\n", $$, RANGE (@$)); + V(input, $$, @$, ": /* Nothing */\n"); } | line input /* Right recursive to load the stack so that popping at - END can be exercised. */ + END can be exercised. */ { $$ = 2; - printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2)); + V(input, $$, @$, ": "); + V(line, $1, @1, " "); + V(input, $2, @2, "\n"); } ; @@ -310,28 +453,36 @@ line: thing thing thing ';' { $$ = $1; - printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';' (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), - $3, RANGE (@3), $4, RANGE (@4)); + V(line, $$, @$, ": "); + V(thing, $1, @1, " "); + V(thing, $2, @2, " "); + V(thing, $3, @3, " "); + V(;, $4, @4, "\n"); } | '(' thing thing ')' { $$ = $1; - printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), - $3, RANGE (@3), $4, RANGE (@4)); + V(line, $$, @$, ": "); + V('(', $1, @1, " "); + V(thing, $2, @2, " "); + V(thing, $3, @3, " "); + V(')', $4, @4, "\n"); } | '(' thing ')' { $$ = $1; - printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), $3, RANGE (@3)); + V(line, $$, @$, ": "); + V('(', $1, @1, " "); + V(thing, $2, @2, " "); + V(')', $3, @3, "\n"); } | '(' error ')' { $$ = -1; - printf ("line (%d@%d-%d): '(' (%d@%d-%d) error (@%d-%d) ')' (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1), RANGE (@2), $3, RANGE (@3)); + V(line, $$, @$, ": "); + V('(', $1, @1, " "); + fprintf (stderr, "error (@%d-%d) ", RANGE (@2)); + V(')', $3, @3, "\n"); } ; @@ -339,48 +490,35 @@ thing: 'x' { $$ = $1; - printf ("thing (%d@%d-%d): 'x' (%d@%d-%d)\n", - $$, RANGE (@$), $1, RANGE (@1)); + V(thing, $$, @$, ": "); + V('x', $1, @1, "\n"); } ; %% /* Alias to ARGV[1]. */ -const char *source = 0; +const char *source = YY_NULL; -static int -yylex (]AT_LEX_FORMALS[) +]AT_YYERROR_DEFINE[ + +static +]AT_YYLEX_PROTOTYPE[ { static unsigned int counter = 0; int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++; /* As in BASIC, line numbers go from 10 to 10. */ -]AT_LALR1_CC_IF( -[ AT_LOC.begin.line = AT_LOC.begin.column = 10 * c; - AT_LOC.end.line = AT_LOC.end.column = AT_LOC.begin.line + 9; -], -[ AT_LOC.first_line = AT_LOC.first_column = 10 * c; - AT_LOC.last_line = AT_LOC.last_column = AT_LOC.first_line + 9; -])[ - - if (! (0 <= c && c <= strlen (source))) - abort (); + ]AT_LOC_FIRST_LINE[ = ]AT_LOC_FIRST_COLUMN[ = 10 * c; + ]AT_LOC_LAST_LINE[ = ]AT_LOC_LAST_COLUMN[ = ]AT_LOC_FIRST_LINE[ + 9; + assert (0 <= c && c <= strlen (source)); if (source[c]) - printf ("sending: '%c'", source[c]); + fprintf (stderr, "sending: '%c'", source[c]); else - printf ("sending: END"); - printf (" (%d@%d-%d)\n", c, RANGE (]AT_LOC[)); + fprintf (stderr, "sending: END"); + fprintf (stderr, " (%d@%d-%d)\n", c, RANGE (]AT_LOC[)); return source[c]; } - ]AT_LALR1_CC_IF( -[/* A C++ error reporting function. */ -void -yy::parser::error (const location& l, const std::string& m) -{ - printf ("%d-%d: %s\n", RANGE (l), m.c_str()); -} - -static bool yydebug; +[static bool yydebug; int yyparse () { @@ -388,12 +526,7 @@ yyparse () parser.set_debug_level (yydebug); return parser.parse (); } -], -[static void -yyerror (const char *msg) -{ - printf ("%d-%d: %s\n", RANGE (yylloc), msg); -}])[ +])[ int main (int argc, const char *argv[]) @@ -405,9 +538,9 @@ main (int argc, const char *argv[]) status = yyparse (); switch (status) { - case 0: printf ("Successful parse.\n"); break; - case 1: printf ("Parsing FAILED.\n"); break; - default: printf ("Parsing FAILED (status %d).\n", status); break; + case 0: fprintf (stderr, "Successful parse.\n"); break; + case 1: fprintf (stderr, "Parsing FAILED.\n"); break; + default: fprintf (stderr, "Parsing FAILED (status %d).\n", status); break; } return status; } @@ -421,7 +554,7 @@ AT_FULL_COMPILE([input]) # I.e., epsilon-reductions, as in "(x)" which ends by reducing # an empty "line" nterm. # FIXME: This location is not satisfying. Depend on the lookahead? -AT_PARSER_CHECK([./input '(x)'], 0, +AT_PARSER_CHECK([./input '(x)'], 0, [], [[sending: '(' (0@0-9) sending: 'x' (1@10-19) thing (1@10-19): 'x' (1@10-19) @@ -440,10 +573,10 @@ Successful parse. # --------------------------------- # '(y)' is an error, but can be recovered from. But what's the location # of the error itself ('y'), and of the resulting reduction ('(error)'). -AT_PARSER_CHECK([./input '(y)'], 0, +AT_PARSER_CHECK([./input '(y)'], 0, [], [[sending: '(' (0@0-9) sending: 'y' (1@10-19) -10-19: syntax error, unexpected 'y', expecting 'x' +10.10-19.18: syntax error, unexpected 'y', expecting 'x' Freeing token 'y' (1@10-19) sending: ')' (2@20-29) line (-1@0-29): '(' (0@0-9) error (@10-19) ')' (2@20-29) @@ -470,14 +603,14 @@ Successful parse. # '(', 'x', ')', # '(', 'x', ')', # 'y' -AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1, +AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1, [], [[sending: '(' (0@0-9) sending: 'x' (1@10-19) thing (1@10-19): 'x' (1@10-19) sending: 'x' (2@20-29) thing (2@20-29): 'x' (2@20-29) sending: 'x' (3@30-39) -30-39: syntax error, unexpected 'x', expecting ')' +30.30-39.38: syntax error, unexpected 'x', expecting ')' Freeing nterm thing (2@20-29) Freeing nterm thing (1@10-19) Freeing token 'x' (3@30-39) @@ -502,7 +635,7 @@ input (0@129-129): /* Nothing */ input (2@100-129): line (10@100-129) input (0@129-129) input (2@70-129): line (7@70-99) input (2@100-129) input (2@0-129): line (-1@0-69) input (2@70-129) -130-139: syntax error, unexpected 'y', expecting END +130.130-139.138: syntax error, unexpected 'y', expecting END Freeing nterm input (2@0-129) Freeing token 'y' (13@130-139) Parsing FAILED. @@ -518,7 +651,7 @@ Parsing FAILED. # '(', 'x', ')', # '(', 'x', ')', # 'x' -AT_PARSER_CHECK([./input '(x)(x)x'], 1, +AT_PARSER_CHECK([./input '(x)(x)x'], 1, [], [[sending: '(' (0@0-9) sending: 'x' (1@10-19) thing (1@10-19): 'x' (1@10-19) @@ -532,7 +665,7 @@ line (3@30-59): '(' (3@30-39) thing (4@40-49) ')' (5@50-59) sending: 'x' (6@60-69) thing (6@60-69): 'x' (6@60-69) sending: END (7@70-79) -70-79: syntax error, unexpected END, expecting 'x' +70.70-79.78: syntax error, unexpected END, expecting 'x' Freeing nterm thing (6@60-69) Freeing nterm line (3@30-59) Freeing nterm line (0@0-29) @@ -546,7 +679,7 @@ Parsing FAILED. # Upon stack overflow, all symbols on the stack should be destroyed. # Only check for yacc.c. AT_YACC_IF([ -AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2, +AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2, [], [[sending: '(' (0@0-9) sending: 'x' (1@10-19) thing (1@10-19): 'x' (1@10-19) @@ -581,7 +714,7 @@ sending: '(' (18@180-189) sending: 'x' (19@190-199) thing (19@190-199): 'x' (19@190-199) sending: ')' (20@200-209) -200-209: memory exhausted +200.200-209.208: memory exhausted Freeing nterm thing (19@190-199) Freeing nterm line (15@150-179) Freeing nterm line (12@120-149) @@ -593,13 +726,14 @@ Parsing FAILED (status 2). ]]) ]) -]) +AT_BISON_OPTION_POPDEFS +])# _AT_CHECK_PRINTER_AND_DESTRUCTOR # 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], @@ -614,13 +748,13 @@ AT_CLEANUP AT_CHECK_PRINTER_AND_DESTRUCTOR([]) -AT_CHECK_PRINTER_AND_DESTRUCTOR([], [with union]) +AT_CHECK_PRINTER_AND_DESTRUCTOR([], [ with union]) AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"]) -AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union]) +AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [ with union]) AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser]) -AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union]) +AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [ with union]) @@ -632,21 +766,17 @@ 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_DATA_GRAMMAR([[input.y]], [[%error-verbose %debug %locations -%initial-action { - @$.first_line = @$.last_line = 1; - @$.first_column = @$.last_column = 1; -} %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYLEX_DECLARE[ +]AT_YYERROR_DECLARE[ # define USE(SYM) %} @@ -677,25 +807,8 @@ AT_DATA_GRAMMAR([[input.y]], start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ; %% - -static int -yylex (void) -{ - static char const input[] = "abcd"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - yylval = input[toknum++]; - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = toknum; - return yylval; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["abcd"], [[yylval = res]])[ int main (void) @@ -715,32 +828,33 @@ 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. -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 ]]) +AT_BISON_OPTION_POPDEFS AT_CLEANUP @@ -750,7 +864,7 @@ AT_CLEANUP ## ------------------------------------------------------ ## AT_SETUP([Default tagged and per-type %printer and %destructor]) - +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([[input.y]], [[%error-verbose %debug @@ -758,8 +872,8 @@ AT_DATA_GRAMMAR([[input.y]], %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(SYM) %} @@ -805,22 +919,8 @@ start: ; %% - -static int -yylex (void) -{ - static char const input[] = "abcdef"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["abcdef"])[ int main (void) @@ -878,6 +978,7 @@ Cleanup: discarding lookahead token $end () Stack now 0 ]]) +AT_BISON_OPTION_POPDEFS AT_CLEANUP @@ -889,26 +990,23 @@ AT_CLEANUP AT_SETUP([Default %printer and %destructor for user-defined end token]) # _AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(TYPED) -# ----------------------------------------------------------------------------- +# ------------------------------------------------------------- m4_define([_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN], [m4_if($1, 0, [m4_pushdef([kind], []) m4_pushdef([not_kind], [*])], [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])]) +AT_BISON_OPTION_PUSHDEFS([%locations]) AT_DATA_GRAMMAR([[input]]$1[[.y]], [[%error-verbose %debug %locations -%initial-action { - @$.first_line = @$.last_line = 1; - @$.first_column = @$.last_column = 1; -} %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(SYM) %} @@ -950,12 +1048,7 @@ yylex (void) yylloc.first_column = yylloc.last_column = 1; return 0; } - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} +]AT_YYERROR_DEFINE[ int main (void) @@ -964,6 +1057,7 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input$1.c input$1.y]) AT_COMPILE([input$1]) @@ -973,16 +1067,16 @@ AT_PARSER_CHECK([./input$1], 0, ]], [[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]) @@ -1010,15 +1104,15 @@ 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_DATA_GRAMMAR([[input.y]], [[%debug %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(SYM) %} @@ -1039,24 +1133,8 @@ start: ; %% - -static int -yylex (void) -{ - static char const input[] = "abd"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - yylval = input[toknum++]; - return yylval; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["abd"], [yylval = res])[ int main (void) { @@ -1064,6 +1142,7 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) AT_COMPILE([input]) @@ -1125,14 +1204,15 @@ 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_DATA_GRAMMAR([[input.y]], [[%debug /* So that %printer is actually compiled. */ %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(SYM) %} @@ -1153,28 +1233,15 @@ AT_DATA_GRAMMAR([[input.y]], start: { USE($$); } ; %% - -static int -yylex (void) -{ - static int called; - if (called++) - abort (); - return 0; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) { return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y]) AT_COMPILE([input]) @@ -1189,14 +1256,15 @@ AT_CLEANUP AT_SETUP([Default %printer and %destructor for mid-rule values]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([[input.y]], [[%debug /* So that %printer is actually compiled. */ %{ # include # include - static void yyerror (const char *msg); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ # define USE(SYM) # define YYLTYPE int # define YYLLOC_DEFAULT(Current, Rhs, N) (void)(Rhs) @@ -1220,22 +1288,8 @@ start: ; %% - -static int -yylex (void) -{ - static int called; - if (called++) - abort (); - return 0; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) { @@ -1243,10 +1297,20 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([-o input.c input.y], 0,, [[input.y:33.3-23: warning: unset value: $$ -input.y:30.3-35.37: warning: unused value: $3 +input.y:32.3-23: warning: unused value: $3 +]]) + +AT_BISON_CHECK([-fcaret -o input.c input.y], 0,, +[[input.y:33.3-23: warning: unset value: $$ + { @$ = 4; } // Only used. + ^^^^^^^^^^^^^^^^^^^^^ +input.y:32.3-23: warning: unused value: $3 + { USE ($$); @$ = 3; } // Only set. + ^^^^^^^^^^^^^^^^^^^^^ ]]) AT_COMPILE([input]) @@ -1296,21 +1360,21 @@ AT_CLEANUP # Bison once forgot to check for @$ in actions other than semantic actions. # AT_CHECK_ACTION_LOCATIONS(ACTION-DIRECTIVE) -# ------------------------------------------------------- +# ------------------------------------------- m4_define([AT_CHECK_ACTION_LOCATIONS], [AT_SETUP([[@$ in ]$1[ implies %locations]]) - +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([[input.y]], [[%code { #include - static int yylex (void); - static void yyerror (char const *msg); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ } %debug ]$1[ { - printf ("%d\n", @$.first_line); + fprintf (stderr, "%d\n", @$.first_line); } ]m4_if($1, [%initial-action], [], [[start]])[ %% @@ -1325,12 +1389,7 @@ yylex (void) return 0; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int main (void) { @@ -1340,7 +1399,7 @@ main (void) AT_BISON_CHECK([[-o input.c input.y]]) AT_COMPILE([[input]]) - +AT_BISON_OPTION_POPDEFS AT_CLEANUP]) AT_CHECK_ACTION_LOCATIONS([[%initial-action]]) @@ -1348,6 +1407,131 @@ AT_CHECK_ACTION_LOCATIONS([[%destructor]]) AT_CHECK_ACTION_LOCATIONS([[%printer]]) +## ------------------------- ## +## Qualified $$ in actions. ## +## ------------------------- ## + +# Check that we can used qualified $$ (v.g., $$) not only in +# rule actions, but also where $$ is valid: %printer and %destructor. +# +# 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([%locations %skeleton "$1"]) + +AT_DATA_GRAMMAR([[input.y]], +[[%skeleton "$1" +%defines // FIXME: Mandated by lalr1.cc in Bison 2.6. +%locations // FIXME: Mandated by lalr1.cc in Bison 2.6. +%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;])[ +int +main (void) +{]AT_SKEL_CC_IF([[ + yy::parser p; + p.set_debug_level(1); + return p.parse ();]], [[ + yydebug = 1; + return yyparse ();]])[ +} +]]) + +AT_FULL_COMPILE([[input]]) +AT_PARSER_CHECK([./input], 0, [], [stderr]) +# Don't be too picky on the traces, GLR is not exactly the same. Keep +# only the lines from the printer. +# +# Don't care about locations. FIXME: remove their removal when Bison +# supports C++ without locations. +AT_CHECK([[sed -ne 's/([-0-9.]*: /(/;/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. ## ## ----------------------------------------------- ## @@ -1357,7 +1541,7 @@ AT_SETUP([[Fix user actions without a trailing semicolon]]) # This feature is undocumented, but we accidentally broke it in 2.3a, # and there was a complaint at: # . - +AT_BISON_OPTION_PUSHDEFS AT_DATA([input.y], [[%% start: test2 test1 test0 testc; @@ -1407,44 +1591,45 @@ no_semi []"broken\" $ @ $$ @$ [];\ 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 -input.y:8.48: warning: future versions of Bison will not add the ';' +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 -input.y:9.48: warning: future versions of Bison will not add the ';' +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 -input.y:10.48: warning: future versions of Bison will not add the ';' +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 -input.y:11.48: warning: future versions of Bison will not add the ';' +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 -input.y:12.48: warning: future versions of Bison will not add the ';' +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 -input.y:13.48: warning: future versions of Bison will not add the ';' +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 -input.y:20.1: warning: future versions of Bison will not add the ';' +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 -input.y:21.1: warning: future versions of Bison will not add the ';' +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 -input.y:22.1: warning: future versions of Bison will not add the ';' +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 -input.y:23.1: warning: future versions of Bison will not add the ';' +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 -input.y:24.1: warning: future versions of Bison will not add the ';' +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 -input.y:25.1: warning: future versions of Bison will not add the ';' +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 -input.y:31.1: warning: future versions of Bison will not add the ';' +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 -input.y:32.1: warning: future versions of Bison will not add the ';' +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 -input.y:33.1: warning: future versions of Bison will not add the ';' +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 -input.y:34.1: warning: future versions of Bison will not add the ';' +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 -input.y:35.1: warning: future versions of Bison will not add the ';' +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 -input.y:36.1: warning: future versions of Bison will not add the ';' +input.y:36.1: future versions of Bison will not add the ';' ]]) AT_MATCHES_CHECK([input.c], [[/\* TEST:N:2 \*/ \}$]], [[3]]) @@ -1462,13 +1647,14 @@ AT_CLEANUP AT_SETUP([[Destroying lookahead assigned by semantic action]]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[ %code { #include #include - static void yyerror (char const *); - static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ #define USE(Var) } @@ -1496,27 +1682,15 @@ accept: /*empty*/ { } ; %% - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static char const *input = "a"; - return *input++; -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ int main (void) { return yyparse (); } ]]) - +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o input.c input.y]]) AT_COMPILE([[input]]) AT_PARSER_CHECK([[./input]], [[0]], [], @@ -1532,6 +1706,8 @@ AT_CLEANUP AT_SETUP([[YYBACKUP]]) +AT_BISON_OPTION_PUSHDEFS([%pure-parser]) + AT_DATA_GRAMMAR([input.y], [[ %error-verbose @@ -1542,8 +1718,8 @@ AT_DATA_GRAMMAR([input.y], # include # include - static void yyerror (const char *msg); - static int yylex (YYSTYPE *yylval); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ } %% input: @@ -1557,21 +1733,8 @@ exp: ; %% -static int -yylex (YYSTYPE *yylval) -{ - static char const input[] = "bcd"; - static size_t toknum; - assert (toknum < sizeof input); - *yylval = (toknum + 1) * 10; - return input[toknum++]; -} - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["bcd"], [*lvalp = (toknum + 1) * 10])[ int main (void) @@ -1580,13 +1743,13 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o input.c input.y]]) AT_COMPILE([[input]]) AT_PARSER_CHECK([[./input]], [[0]], [[a: 123 a: 456 -a: 789 ]]) AT_CLEANUP