X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a6b2f4fc020fe6e464f4a445a7851825d3d57e4d..064e42b0aca1db0ca84b06b01cac5a40f3016591:/tests/glr-regression.at diff --git a/tests/glr-regression.at b/tests/glr-regression.at index bc32c901..a826a5e3 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -24,6 +24,7 @@ AT_BANNER([[GLR Regression Tests]]) 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 = 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 @@ -119,6 +111,7 @@ AT_CLEANUP 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,43 +185,53 @@ 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) { input = stdin; - if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - return yyparse (); + if (argc == 2 && !(input = fopen (argv[1], "r"))) + return 3; + int 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 @@ -238,6 +242,7 @@ AT_CLEANUP 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 +251,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,15 +296,14 @@ 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; } +]AT_YYERROR_DEFINE[ -static void yyerror(char const * s) { - fprintf(stderr,"error: %s\n",s); -} - -FILE *input = NULL; +FILE *input = YY_NULL; int P[] = { P1, P2 }; int O[] = { O1, O2 }; @@ -307,8 +312,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 +324,45 @@ int yylex (void) return BAD_CHAR; } -int main(int argc, char* argv[]) { +int +main(int argc, char* argv[]) +{ input = stdin; - if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - return yyparse (); + if (argc == 2 && !(input = fopen (argv[1], "r"))) + return 3; + int 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 +375,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 +400,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 +431,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, @@ -444,19 +447,20 @@ 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,33 +484,19 @@ 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); -} - +]AT_YYLEX_DEFINE(["a"])[ +]AT_YYERROR_DEFINE[ int main (void) { return yyparse () != 1; } ]]) +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, [], @@ -517,19 +507,20 @@ 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,33 +536,19 @@ 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); -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ int main (void) { return yyparse () != 1; } ]]) +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, @@ -584,19 +561,20 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## -## Duplicated user destructor for lookahead. See ## +## Duplicated user destructor for lookahead. See ## ## . ## ## ------------------------------------------------------------------------- ## 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 +619,7 @@ yylex (void) return 'a'; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int main (void) { @@ -660,10 +633,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, [], @@ -675,21 +649,21 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## ## Incorrect default location for empty right-hand sides. Adapted from bug ## -## report by Claudia Hermann. ## +## report by Claudia Hermann. ## ## See http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00069.html and ## ## http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00072.html ## ## ------------------------------------------------------------------------- ## 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 @@ -701,34 +675,29 @@ AT_DATA_GRAMMAR([glr-regr8.y], %% -PortClause : T_PORT InterfaceDeclaration T_PORT - { printf("%d/%d - %d/%d - %d/%d\n", - @1.first_column, @1.last_column, - @2.first_column, @2.last_column, - @3.first_column, @3.last_column); } - ; +PortClause : T_PORT InterfaceDeclaration T_PORT + { printf("%d/%d - %d/%d - %d/%d\n", + @1.first_column, @1.last_column, + @2.first_column, @2.last_column, + @3.first_column, @3.last_column); } + ; -InterfaceDeclaration : OptConstantWord %dprec 1 - | OptSignalWord %dprec 2 - ; +InterfaceDeclaration : OptConstantWord %dprec 1 + | OptSignalWord %dprec 2 + ; -OptConstantWord : /* empty */ - | T_CONSTANT - ; +OptConstantWord : /* empty */ + | T_CONSTANT + ; -OptSignalWord : /* empty */ - { printf("empty: %d/%d\n", @$.first_column, @$.last_column); } - | T_SIGNAL - ; +OptSignalWord : /* empty */ + { printf("empty: %d/%d\n", @$.first_column, @$.last_column); } + | T_SIGNAL + ; %% -void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ static int lexIndex; int yylex (void) @@ -758,10 +727,11 @@ main (void) return 0; } ]]) +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, @@ -774,19 +744,20 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## -## No users destructors if stack 0 deleted. See ## +## No users destructors if stack 0 deleted. See ## ## . ## ## ------------------------------------------------------------------------- ## 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 +793,7 @@ yylex (void) return 'a'; } -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int main (void) { @@ -841,10 +807,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, [], @@ -855,18 +822,19 @@ 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 +851,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 +863,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, [], []) @@ -920,17 +876,18 @@ 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 +906,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 +921,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, [], []) @@ -989,11 +934,12 @@ 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 +952,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 +1015,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) @@ -1108,10 +1042,12 @@ main (void) 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, [], []) @@ -1120,13 +1056,14 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## -## Incorrect lookahead during deterministic GLR. See ## +## Incorrect lookahead during deterministic GLR. See ## ## and ## ## . ## ## ------------------------------------------------------------------------- ## AT_SETUP([Incorrect lookahead during deterministic GLR]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([glr-regr13.y], [[ /* Tests: @@ -1138,8 +1075,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 +1128,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) @@ -1221,10 +1144,10 @@ print_lookahead (char const *reduction) { printf ("'%c', yylval='", yychar); if (yylval.value > ' ') - printf ("%c", yylval.value); + printf ("%c", yylval.value); printf ("', yylloc=(%d,%d),(%d,%d)", - yylloc.first_line, yylloc.first_column, - yylloc.last_line, yylloc.last_column); + yylloc.first_line, yylloc.first_column, + yylloc.last_line, yylloc.last_column); } printf ("\n"); } @@ -1237,6 +1160,7 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr13.c glr-regr13.y]], 0, [], []) AT_COMPILE([glr-regr13]) @@ -1258,11 +1182,12 @@ 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 +1214,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) @@ -1318,7 +1244,7 @@ merge: | conflict defstate_look 'a' nonconflict2 'b' defstate_shift %dprec 2 { USE ($3); USE ($5); print_lookahead ("merge <- conflict defstate_look 'a' nonconflict2 'b'" - " defstate_shift"); + " defstate_shift"); } ; @@ -1365,7 +1291,7 @@ alt1: USE ($1); if (yychar != 'd' && yychar != YYEOF) { - fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); + fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); } } ; @@ -1374,7 +1300,7 @@ alt2: USE ($1); if (yychar != 'd' && yychar != YYEOF) { - fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); + fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); } } ; @@ -1383,7 +1309,7 @@ alt3: USE ($1); if (yychar != 'd' && yychar != YYEOF) { - fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); + fprintf (stderr, "Incorrect lookahead during stack explosion.\n"); } } ; @@ -1391,27 +1317,21 @@ no_look: { if (yychar != YYEMPTY) { - fprintf (stderr, - "Found lookahead where shouldn't during stack explosion.\n"); + fprintf (stderr, + "Found lookahead where shouldn't during stack explosion.\n"); } } ; %% -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'; @@ -1430,10 +1350,10 @@ print_lookahead (char const *reduction) { printf ("'%c', yylval='", yychar); if (yylval.value > ' ') - printf ("%c", yylval.value); + printf ("%c", yylval.value); printf ("', yylloc=(%d,%d),(%d,%d)", - yylloc.first_line, yylloc.first_column, - yylloc.last_line, yylloc.last_column); + yylloc.first_line, yylloc.first_column, + yylloc.last_line, yylloc.last_column); } printf ("\n"); } @@ -1453,10 +1373,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, @@ -1478,11 +1399,12 @@ 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 +1412,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 +1451,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) @@ -1557,10 +1466,11 @@ main (void) 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, [], @@ -1571,10 +1481,12 @@ 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 +1494,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 +1509,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 +1526,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, [], @@ -1640,10 +1541,13 @@ 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 +1558,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 +1582,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; @@ -1713,14 +1604,15 @@ main (void) return yyparse () != 1; } ]]) +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. +[1.1-2.2: syntax is ambiguous ]) AT_CLEANUP @@ -1731,13 +1623,15 @@ AT_CLEANUP ## -------------------------------------------------------------## 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 +1651,22 @@ 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; -} - +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ int main (void) { return yyparse (); } ]]) +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:26.18-24: error: result type clash on merge function 'merge': != +glr-regr18.y:25.18-24: previous declaration +glr-regr18.y:27.13-19: error: result type clash on merge function 'merge': != +glr-regr18.y:26.18-24: previous declaration +]]) AT_CLEANUP @@ -1796,13 +1677,14 @@ AT_CLEANUP AT_SETUP([Ambiguity reports]) +AT_BISON_OPTION_PUSHDEFS AT_DATA_GRAMMAR([input.y], [[ %{ #include #include - static void yyerror (char const *); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ %} %debug @@ -1816,23 +1698,8 @@ 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); -} - +]AT_YYLEX_DEFINE(["abc"])[ +]AT_YYERROR_DEFINE[ int main (void) { @@ -1840,10 +1707,11 @@ main (void) return !!yyparse (); } ]]) +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, [],