X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/520144aadc34f57ac0572ded66ab62fc32cb3069..5407fc7d76bc0c1d15b0e281ba12ea20c77751e7:/tests/glr-regression.at diff --git a/tests/glr-regression.at b/tests/glr-regression.at index 4ac48611..064b37b2 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -1,6 +1,6 @@ # Checking GLR Parsing: Regression Tests -*- Autotest -*- -# Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software +# Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -18,12 +18,13 @@ AT_BANNER([[GLR Regression Tests]]) -## --------------------------- ## -## Badly Collapsed GLR States. ## -## --------------------------- ## +## ---------------------------- ## +## Badly Collapsed GLR States. ## +## ---------------------------- ## AT_SETUP([Badly Collapsed GLR States]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr1.y], [[/* Regression Test: Improper state compression */ /* Reported by Scott McPeak */ @@ -31,11 +32,12 @@ AT_DATA_GRAMMAR([glr-regr1.y], %{ #include #include +#include #define YYSTYPE int static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1); -int yylex (void); -void yyerror (char const *msg); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ %} @@ -65,41 +67,31 @@ static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1) return 0; } +const char *input = YY_NULL; + int -main (void) +main (int argc, const char* argv[]) { + assert (argc == 2); + input = argv[1]; return yyparse (); } -void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int yylex (void) { - for (;;) - { - int ch; - if (feof (stdin)) - abort (); - ch = getchar (); - if (ch == EOF) - return 0; - else if (ch == 'B' || ch == 'P') - return ch; - } + return *input++; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [], -[glr-regr1.y: conflicts: 1 shift/reduce -]) +[[glr-regr1.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] +]]) AT_COMPILE([glr-regr1]) -AT_PARSER_CHECK([[echo BPBPB | ./glr-regr1]], 0, +AT_PARSER_CHECK([[./glr-regr1 BPBPB]], 0, [[E -> 'B' E -> 'B' E -> E 'P' E @@ -113,12 +105,13 @@ E -> E 'P' E AT_CLEANUP -## ------------------------------------------------------------ ## -## Improper handling of embedded actions and $-N in GLR parsers ## -## ------------------------------------------------------------ ## +## -------------------------------------------------------------- ## +## Improper handling of embedded actions and $-N in GLR parsers. ## +## -------------------------------------------------------------- ## AT_SETUP([Improper handling of embedded actions and dollar(-N) in GLR parsers]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr2a.y], [[/* Regression Test: Improper handling of embedded actions and $-N */ /* Reported by S. Eken */ @@ -130,8 +123,9 @@ AT_DATA_GRAMMAR([glr-regr2a.y], #include #include #include - int yylex (void); - void yyerror (char const *); + #include + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %glr-parser @@ -171,7 +165,7 @@ var_printer: 'v' { printf ("Variable: '%s'\n", $-1); } %% - +]AT_YYERROR_DEFINE[ FILE *input; int @@ -179,9 +173,9 @@ yylex (void) { char buf[50]; char *s; - if (feof (stdin)) - abort (); - switch (fscanf (input, " %1[a-z,]", buf)) { + assert (!feof (stdin)); + switch (fscanf (input, " %1[a-z,]", buf)) + { case 1: return buf[0]; case EOF: @@ -191,53 +185,65 @@ yylex (void) } if (fscanf (input, "%49s", buf) != 1) return 0; - if (sizeof buf - 1 <= strlen (buf)) - abort (); + assert (strlen (buf) < sizeof buf - 1); s = (char *) malloc (strlen (buf) + 1); strcpy (s, buf); yylval = s; return 'V'; } -void -yyerror (char const *s) -{ printf ("%s\n", s); -} - int main (int argc, char **argv) { + int res; input = stdin; - if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - return yyparse (); + if (argc == 2 && !(input = fopen (argv[1], "r"))) + return 3; + res = yyparse (); + if (argc == 2 && fclose (input)) + return 4; + return res; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [], -[glr-regr2a.y: conflicts: 2 shift/reduce -]) +[[glr-regr2a.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] +]]) AT_COMPILE([glr-regr2a]) -AT_PARSER_CHECK([[echo s VARIABLE_1 t v x q | ./glr-regr2a]], 0, +AT_DATA([input1.txt], +[[s VARIABLE_1 t v x q +]]) +AT_PARSER_CHECK([[./glr-regr2a input1.txt]], 0, [[Variable: 'VARIABLE_1' -]], []) -AT_PARSER_CHECK([[echo s VARIABLE_1 , ANOTHER_VARIABLE_2 t e | ./glr-regr2a]], +]]) + +AT_DATA([input2.txt], +[[s VARIABLE_1 , ANOTHER_VARIABLE_2 t e +]]) +AT_PARSER_CHECK([[./glr-regr2a input2.txt]], 0, [[Varlist: 'VARIABLE_1,ANOTHER_VARIABLE_2' ]]) -AT_PARSER_CHECK([[echo s VARIABLE_3 t v x | ./glr-regr2a]], 0, + +AT_DATA([input3.txt], +[[s VARIABLE_3 t v x +]]) +AT_PARSER_CHECK([[./glr-regr2a input3.txt]], 0, [[Variable: 'VARIABLE_3' -]], []) +]]) AT_CLEANUP -## ------------------------------------------------------------ ## -## Improper merging of GLR delayed action sets ## -## ------------------------------------------------------------ ## +## --------------------------------------------- ## +## Improper merging of GLR delayed action sets. ## +## --------------------------------------------- ## AT_SETUP([Improper merging of GLR delayed action sets]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr3.y], [[/* Regression Test: Improper merging of GLR delayed action sets. */ /* Reported by M. Rosien */ @@ -246,10 +252,11 @@ AT_DATA_GRAMMAR([glr-regr3.y], #include #include #include +#include static int MergeRule (int x0, int x1); -static void yyerror (char const * s); -int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ #define RULE(x) (1 << (x)) @@ -290,13 +297,12 @@ NT6 : P1 NT1 O1 T3 P2 { $$ = RULE(11) | $2; } %merge %% -static int MergeRule (int x0, int x1) { +static int +MergeRule (int x0, int x1) +{ return x0 | x1; } - -static void yyerror(char const * s) { - fprintf(stderr,"error: %s\n",s); -} +]AT_YYERROR_DEFINE[ FILE *input = YY_NULL; @@ -307,8 +313,7 @@ int T[] = { T1, T2, T3, T4 }; int yylex (void) { char inp[3]; - if (feof (stdin)) - abort (); + assert (!feof (stdin)); if (fscanf (input, "%2s", inp) == EOF) return 0; switch (inp[0]) @@ -320,33 +325,46 @@ int yylex (void) return BAD_CHAR; } -int main(int argc, char* argv[]) { +int +main (int argc, char* argv[]) +{ + int res; input = stdin; - if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - return yyparse (); + if (argc == 2 && !(input = fopen (argv[1], "r"))) + return 3; + res = yyparse (); + if (argc == 2 && fclose (input)) + return 4; + return res; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [], -[glr-regr3.y: conflicts: 1 shift/reduce, 1 reduce/reduce -]) +[[glr-regr3.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] +glr-regr3.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr3]) -AT_PARSER_CHECK([[echo p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 | ./glr-regr3]], +AT_DATA([input.txt], +[[p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 +]]) +AT_PARSER_CHECK([[./glr-regr3 input.txt]], 0, [[Result: 1c04 -]], []) +]]) AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Duplicate representation of merged trees. See ## -## . ## -## ------------------------------------------------------------------------- ## +## ---------------------------------------------------------------------- ## +## Duplicate representation of merged trees. See ## +## . ## +## ---------------------------------------------------------------------- ## AT_SETUP([Duplicate representation of merged trees]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr4.y], [[ %union { char *ptr; } @@ -359,8 +377,8 @@ AT_DATA_GRAMMAR([glr-regr4.y], #include static char *merge (YYSTYPE, YYSTYPE); static char *make_value (char const *, char const *); - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static char *ptrs[100]; static char **ptrs_next = ptrs; %} @@ -384,16 +402,8 @@ A2: 'a' { $$ = make_value ("A2", "'a'"); } ; B: 'a' { $$ = make_value ("B", "'a'"); } ; %% - -static int -yylex (void) -{ - static char const input[] = "a"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ int main (void) @@ -423,17 +433,12 @@ merge (YYSTYPE s1, YYSTYPE s2) sprintf (value, format, s1.ptr, s2.ptr); return value; } - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [], -[glr-regr4.y: conflicts: 1 reduce/reduce -]) +[[glr-regr4.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr4]) AT_PARSER_CHECK([[./glr-regr4]], 0, @@ -443,20 +448,21 @@ AT_PARSER_CHECK([[./glr-regr4]], 0, AT_CLEANUP -## -------------------------------------------------------------------------- ## -## User destructor for unresolved GLR semantic value. See ## -## . ## -## -------------------------------------------------------------------------- ## +## ------------------------------------------------------------------------- ## +## User destructor for unresolved GLR semantic value. See ## +## . ## +## ------------------------------------------------------------------------- ## AT_SETUP([User destructor for unresolved GLR semantic value]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr5.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ enum { MAGIC_VALUE = -1057808125 }; /* originally chosen at random */ %} @@ -480,56 +486,39 @@ start: ; %% - -static int -yylex (void) -{ - static char const input[] = "a"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -int -main (void) -{ - return yyparse () != 1; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [], -[glr-regr5.y: conflicts: 1 reduce/reduce -]) +[[glr-regr5.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr5]) -AT_PARSER_CHECK([[./glr-regr5]], 0, [], +AT_PARSER_CHECK([[./glr-regr5]], 1, [], [syntax is ambiguous ]) AT_CLEANUP -## -------------------------------------------------------------------------- ## -## User destructor after an error during a split parse. See ## -## . ## -## -------------------------------------------------------------------------- ## +## ------------------------------------------------------------------------- ## +## User destructor after an error during a split parse. See ## +## . ## +## ------------------------------------------------------------------------- ## AT_SETUP([User destructor after an error during a split parse]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr6.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %glr-parser @@ -545,36 +534,18 @@ AT_DATA_GRAMMAR([glr-regr6.y], start: 'a' | 'a' ; %% - -static int -yylex (void) -{ - static char const input[] = "a"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -int -main (void) -{ - return yyparse () != 1; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [], -[glr-regr6.y: conflicts: 1 reduce/reduce -]) +[[glr-regr6.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr6]) -AT_PARSER_CHECK([[./glr-regr6]], 0, +AT_PARSER_CHECK([[./glr-regr6]], 1, [Destructor called. ], [syntax is ambiguous @@ -590,13 +561,14 @@ AT_CLEANUP AT_SETUP([Duplicated user destructor for lookahead]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr7.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ #define YYSTACKEXPANDABLE 0 typedef struct count_node { int count; @@ -641,12 +613,7 @@ yylex (void) return 'a'; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int main (void) { @@ -660,10 +627,11 @@ main (void) return status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [], -[glr-regr7.y: conflicts: 2 reduce/reduce -]) +[[glr-regr7.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr7]) AT_PARSER_CHECK([[./glr-regr7]], 2, [], @@ -682,14 +650,14 @@ AT_CLEANUP AT_SETUP([Incorrectly initialized location for empty right-hand side in GLR]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr8.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); - static void yyerror (char const *msg); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %token T_CONSTANT @@ -723,12 +691,7 @@ OptSignalWord : /* empty */ %% -void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ static int lexIndex; int yylex (void) @@ -751,17 +714,13 @@ int yylex (void) } } -int -main (void) -{ - yyparse(); - return 0; -} +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [], -[glr-regr8.y: conflicts: 1 reduce/reduce -]) +[[glr-regr8.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr8]) AT_PARSER_CHECK([[./glr-regr8]], 0, @@ -780,13 +739,14 @@ AT_CLEANUP AT_SETUP([No users destructors if stack 0 deleted]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr9.y], [[ %{ # include # include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ # define YYSTACKEXPANDABLE 0 static int tokens = 0; static int destructors = 0; @@ -822,12 +782,7 @@ yylex (void) return 'a'; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int main (void) { @@ -841,10 +796,11 @@ main (void) return !exit_status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [], -[glr-regr9.y: conflicts: 1 reduce/reduce -]) +[[glr-regr9.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr9]) AT_PARSER_CHECK([[./glr-regr9]], 0, [], @@ -854,19 +810,20 @@ AT_PARSER_CHECK([[./glr-regr9]], 0, [], AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Corrupted semantic options if user action cuts parse. ## -## ------------------------------------------------------------------------- ## +## ------------------------------------------------------ ## +## Corrupted semantic options if user action cuts parse. ## +## ------------------------------------------------------ ## AT_SETUP([Corrupted semantic options if user action cuts parse]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr10.y], [[ %{ # include # include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ #define GARBAGE_SIZE 50 static char garbage[GARBAGE_SIZE]; %} @@ -883,21 +840,8 @@ start: ; %% - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static int called; - if (called++) - abort (); - return 0; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) @@ -908,10 +852,11 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [], -[glr-regr10.y: conflicts: 1 reduce/reduce -]) +[[glr-regr10.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr10]) AT_PARSER_CHECK([[./glr-regr10]], 0, [], []) @@ -919,18 +864,19 @@ AT_PARSER_CHECK([[./glr-regr10]], 0, [], []) AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Undesirable destructors if user action cuts parse. ## -## ------------------------------------------------------------------------- ## +## --------------------------------------------------- ## +## Undesirable destructors if user action cuts parse. ## +## --------------------------------------------------- ## AT_SETUP([Undesirable destructors if user action cuts parse]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr11.y], [[ %{ # include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static int destructors = 0; # define USE(val) %} @@ -949,21 +895,8 @@ start: %% -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static char const input[] = "a"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ int main (void) @@ -977,10 +910,11 @@ main (void) return exit_status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [], -[glr-regr11.y: conflicts: 1 reduce/reduce -]) +[[glr-regr11.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr11]) AT_PARSER_CHECK([[./glr-regr11]], 0, [], []) @@ -988,12 +922,13 @@ AT_PARSER_CHECK([[./glr-regr11]], 0, [], []) AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Leaked semantic values if user action cuts parse. ## -## ------------------------------------------------------------------------- ## +## -------------------------------------------------- ## +## Leaked semantic values if user action cuts parse. ## +## -------------------------------------------------- ## AT_SETUP([Leaked semantic values if user action cuts parse]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr12.y], [[ %glr-parser @@ -1006,9 +941,10 @@ AT_DATA_GRAMMAR([glr-regr12.y], %{ # include +# include static int merge (YYSTYPE, YYSTYPE); - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static int parent_rhs_before_value = 0; static int merged_value = 0; static int parent_rhs_after_value = 0; @@ -1068,23 +1004,10 @@ merge (YYSTYPE s1, YYSTYPE s2) return dummy; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static int const input[] = { PARENT_RHS_AFTER, 0 }; - static size_t toknum; - if (! (toknum < sizeof input / sizeof *input)) - abort (); - if (input[toknum] == PARENT_RHS_AFTER) - parent_rhs_after_value = 1; - return input[toknum++]; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE([{ PARENT_RHS_AFTER, 0 }], + [if (res == PARENT_RHS_AFTER) + parent_rhs_after_value = 1;])[ int main (void) @@ -1092,26 +1015,28 @@ main (void) int exit_status = yyparse (); if (parent_rhs_before_value) { - fprintf (stderr, "`parent_rhs_before' destructor not called.\n"); + fprintf (stderr, "'parent_rhs_before' destructor not called.\n"); exit_status = 1; } if (merged_value) { - fprintf (stderr, "`merged' destructor not called.\n"); + fprintf (stderr, "'merged' destructor not called.\n"); exit_status = 1; } if (parent_rhs_after_value) { - fprintf (stderr, "`PARENT_RHS_AFTER' destructor not called.\n"); + fprintf (stderr, "'PARENT_RHS_AFTER' destructor not called.\n"); exit_status = 1; } return exit_status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr12.c glr-regr12.y]], 0, [], -[glr-regr12.y: conflicts: 1 shift/reduce, 1 reduce/reduce -]) +[[glr-regr12.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] +glr-regr12.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr12]) AT_PARSER_CHECK([[./glr-regr12]], 0, [], []) @@ -1127,6 +1052,7 @@ AT_CLEANUP AT_SETUP([Incorrect lookahead during deterministic GLR]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr13.y], [[ /* Tests: @@ -1138,8 +1064,9 @@ AT_DATA_GRAMMAR([glr-regr13.y], %{ #include - static void yyerror (char const *); - static int yylex (void); + #include + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static void print_lookahead (char const *); #define USE(value) %} @@ -1190,24 +1117,9 @@ change_lookahead: %% -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static char const input[] = "ab"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = toknum + 1; - yylval.value = input[toknum] + 'A' - 'a'; - return input[toknum++]; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["ab"], + [yylval.value = res + 'A' - 'a'])[ static void print_lookahead (char const *reduction) @@ -1237,6 +1149,7 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr13.c glr-regr13.y]], 0, [], []) AT_COMPILE([glr-regr13]) @@ -1257,12 +1170,13 @@ start <- defstate_init defstate_shift 'b': AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Incorrect lookahead during nondeterministic GLR. ## -## ------------------------------------------------------------------------- ## +## ------------------------------------------------- ## +## Incorrect lookahead during nondeterministic GLR. ## +## ------------------------------------------------- ## AT_SETUP([Incorrect lookahead during nondeterministic GLR]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr14.y], [[ /* Tests: @@ -1289,8 +1203,9 @@ AT_DATA_GRAMMAR([glr-regr14.y], %{ #include #include - static void yyerror (char const *); - static int yylex (void); + #include + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static void print_lookahead (char const *); static char merge (union YYSTYPE, union YYSTYPE); #define USE(value) @@ -1399,19 +1314,13 @@ no_look: %% -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ static int yylex (void) { static char const input[] = "abcdddd"; static size_t toknum; - if (! (toknum < sizeof input)) - abort (); + assert (toknum < sizeof input); yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = toknum + 1; yylval.value = input[toknum] + 'A' - 'a'; @@ -1453,10 +1362,11 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [], -[glr-regr14.y: conflicts: 3 reduce/reduce -]) +[[glr-regr14.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr14]) AT_PARSER_CHECK([[./glr-regr14]], 0, @@ -1477,12 +1387,13 @@ start <- merge 'c' stack_explosion: AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Leaked semantic values when reporting ambiguity. ## -## ------------------------------------------------------------------------- ## +## ------------------------------------------------- ## +## Leaked semantic values when reporting ambiguity. ## +## ------------------------------------------------- ## AT_SETUP([Leaked semantic values when reporting ambiguity]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr15.y], [[ %glr-parser @@ -1490,8 +1401,8 @@ AT_DATA_GRAMMAR([glr-regr15.y], %{ # include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static int parent_rhs_before_value = 0; # define USE(val) %} @@ -1529,21 +1440,8 @@ ambiguity1: ; ambiguity2: ; %% - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static int called; - if (called++) - abort (); - return 0; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) @@ -1551,16 +1449,17 @@ main (void) int exit_status = yyparse () != 1; if (parent_rhs_before_value) { - fprintf (stderr, "`parent_rhs_before' destructor not called.\n"); + fprintf (stderr, "'parent_rhs_before' destructor not called.\n"); exit_status = 1; } return exit_status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [], -[glr-regr15.y: conflicts: 2 reduce/reduce -]) +[[glr-regr15.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr15]) AT_PARSER_CHECK([[./glr-regr15]], 0, [], @@ -1570,11 +1469,13 @@ AT_PARSER_CHECK([[./glr-regr15]], 0, [], AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Leaked lookahead after nondeterministic parse syntax error. ## -## ------------------------------------------------------------------------- ## +## ------------------------------------------------------------ ## +## Leaked lookahead after nondeterministic parse syntax error. ## +## ------------------------------------------------------------ ## AT_SETUP([Leaked lookahead after nondeterministic parse syntax error]) + +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr16.y], [[ %glr-parser @@ -1582,8 +1483,9 @@ AT_DATA_GRAMMAR([glr-regr16.y], %{ # include - static void yyerror (char const *); - static int yylex (void); +# include + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ static int lookahead_value = 0; # define USE(val) %} @@ -1596,23 +1498,10 @@ alt2: ; %% -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex (void) -{ - static char const input[] = "ab"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - if (input[toknum] == 'b') - lookahead_value = 1; - return input[toknum++]; -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["ab"], + [if (res == 'b') + lookahead_value = 1])[ int main (void) @@ -1626,10 +1515,11 @@ main (void) return exit_status; } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [], -[glr-regr16.y: conflicts: 1 reduce/reduce -]) +[[glr-regr16.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr16]) AT_PARSER_CHECK([[./glr-regr16]], 0, [], @@ -1639,11 +1529,14 @@ AT_PARSER_CHECK([[./glr-regr16]], 0, [], AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Uninitialized location when reporting ambiguity. ## -## ------------------------------------------------------------------------- ## +## ------------------------------------------------- ## +## Uninitialized location when reporting ambiguity. ## +## ------------------------------------------------- ## AT_SETUP([Uninitialized location when reporting ambiguity]) + +AT_BISON_OPTION_PUSHDEFS([%glr-parser %locations %define api.pure]) + AT_DATA_GRAMMAR([glr-regr17.y], [[ %glr-parser @@ -1654,17 +1547,10 @@ AT_DATA_GRAMMAR([glr-regr17.y], %union { int dummy; } %{ - static void yyerror (YYLTYPE *, char const *); - static int yylex (YYSTYPE *, YYLTYPE *); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} -%initial-action { - @$.first_line = 1; - @$.first_column = 1; - @$.last_line = 1; - @$.last_column = 1; -} - %% /* Tests the case of an empty RHS that has inherited the location of the @@ -1685,21 +1571,15 @@ empty1: ; empty2: ; %% +# include -static void -yyerror (YYLTYPE *locp, char const *msg) -{ - fprintf (stderr, "%d.%d-%d.%d: %s.\n", locp->first_line, - locp->first_column, locp->last_line, locp->last_column, msg); -} - +]AT_YYERROR_DEFINE[ static int yylex (YYSTYPE *lvalp, YYLTYPE *llocp) { static char const input[] = "ab"; static size_t toknum; - if (! (toknum < sizeof input)) - abort (); + assert (toknum < sizeof input); lvalp->dummy = 0; llocp->first_line = llocp->last_line = 2; llocp->first_column = toknum + 1; @@ -1707,37 +1587,36 @@ yylex (YYSTYPE *lvalp, YYLTYPE *llocp) return input[toknum++]; } -int -main (void) -{ - return yyparse () != 1; -} +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [], -[glr-regr17.y: conflicts: 3 reduce/reduce -]) +[[glr-regr17.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr] +]]) AT_COMPILE([glr-regr17]) -AT_PARSER_CHECK([[./glr-regr17]], 0, [], -[1.1-2.3: syntax is ambiguous. +AT_PARSER_CHECK([[./glr-regr17]], 1, [], +[1.1-2.2: syntax is ambiguous ]) AT_CLEANUP -## -------------------------------------------------------------## -## Missed %merge type warnings when LHS type is declared later. ## -## -------------------------------------------------------------## +## ------------------------------------------------------------- ## +## Missed %merge type warnings when LHS type is declared later. ## +## ------------------------------------------------------------- ## AT_SETUP([Missed %merge type warnings when LHS type is declared later]) + +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr18.y], [[%glr-parser %{ #include - static void yyerror (char const *); - static int yylex (); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %union { @@ -1757,35 +1636,18 @@ sym3: %merge { $$ = 0; } ; %type sym3; %% - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -static int -yylex () -{ - static int called; - if (called++) - abort (); - return 0; -} - -int -main (void) -{ - return yyparse (); -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [], -[glr-regr18.y:26.18-24: result type clash on merge function 'merge': != -glr-regr18.y:25.18-24: previous declaration -glr-regr18.y:27.13-19: result type clash on merge function 'merge': != -glr-regr18.y:26.18-24: previous declaration -]) +[[glr-regr18.y:28.18-24: error: result type clash on merge function 'merge': != +glr-regr18.y:27.18-24: previous declaration +glr-regr18.y:29.13-19: error: result type clash on merge function 'merge': != +glr-regr18.y:28.18-24: previous declaration +]]) AT_CLEANUP @@ -1796,13 +1658,14 @@ AT_CLEANUP AT_SETUP([Ambiguity reports]) +AT_BISON_OPTION_PUSHDEFS([%debug]) AT_DATA_GRAMMAR([input.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %debug @@ -1816,37 +1679,18 @@ start: b: 'b'; d: /* nada. */; %% - -static int -yylex (void) -{ - static char const input[] = "abc"; - static size_t toknum; - if (! (toknum < sizeof input)) - abort (); - return input[toknum++]; -} - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - -int -main (void) -{ - yydebug = 1; - return !!yyparse (); -} +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["abc"])[ +]AT_MAIN_DEFINE[ ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o input.c input.y]], 0, [], -[input.y: conflicts: 1 reduce/reduce -]) +[[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] +]]) 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' () @@ -1855,14 +1699,14 @@ Entering state 1 Reading a token: Next token is token 'b' () Shifting token 'b' () Entering state 3 -Reducing stack 0 by rule 3 (line 25): +Reducing stack 0 by rule 3 (line 27): $1 = token 'b' () -> $$ = nterm b () Entering state 4 Reading a token: Next token is token 'c' () Shifting token 'c' () Entering state 6 -Reducing stack 0 by rule 4 (line 26): +Reducing stack 0 by rule 4 (line 28): -> $$ = nterm d () Entering state 7 Reading a token: Now at end of input. @@ -1905,3 +1749,33 @@ Cleanup: popping token 'a' () ]) AT_CLEANUP + + +## ----------------------------------------------------------------- ## +## Predicates. ## +## ## +## http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00004.html ## +## ----------------------------------------------------------------- ## + +AT_SETUP([Predicates]) + +# FIXME: We need genuine test cases with uses of %?. + +AT_DATA_GRAMMAR([input.y], +[[%glr-parser +%expect-rr 1 +%% +// Exercise "%?{...}" and "%? {...}". +widget: + %? {new_syntax} "widget" id new_args { $$ = f($3, $4); } +| %?{!new_syntax} "widget" id old_args { $$ = f($3, $4); } +; +id:; +new_args:; +old_args:; +%% +]]) + +AT_BISON_CHECK([[input.y]]) + +AT_CLEANUP