X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/05c93b7d844e59ecaa5dec3bd6d9091f5aa5d1b0..50977317cd10df482c3b35f61e9ee4522eee3c3b:/tests/glr-regression.at?ds=sidebyside diff --git a/tests/glr-regression.at b/tests/glr-regression.at index 6ca021f9..41fc7bc7 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -18,9 +18,9 @@ AT_BANNER([[GLR Regression Tests]]) -## --------------------------- ## -## Badly Collapsed GLR States. ## -## --------------------------- ## +## ---------------------------- ## +## Badly Collapsed GLR States. ## +## ---------------------------- ## AT_SETUP([Badly Collapsed GLR States]) @@ -67,7 +67,7 @@ static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1) return 0; } -const char *input = NULL; +const char *input = YY_NULL; int main (int argc, const char* argv[]) @@ -88,8 +88,8 @@ yylex (void) 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([[./glr-regr1 BPBPB]], 0, [[E -> 'B' @@ -105,9 +105,9 @@ 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]) @@ -195,10 +195,11 @@ yylex (void) int main (int argc, char **argv) { + int res; input = stdin; if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - int res = yyparse (); + res = yyparse (); if (argc == 2 && fclose (input)) return 4; return res; @@ -207,8 +208,8 @@ main (int argc, char **argv) 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_DATA([input1.txt], @@ -236,9 +237,9 @@ AT_PARSER_CHECK([[./glr-regr2a input3.txt]], 0, 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]) @@ -327,10 +328,11 @@ int yylex (void) int main(int argc, char* argv[]) { + int res; input = stdin; if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3; - int res = yyparse (); + res = yyparse (); if (argc == 2 && fclose (input)) return 4; return res; @@ -339,8 +341,9 @@ main(int argc, char* argv[]) 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_DATA([input.txt], @@ -354,10 +357,10 @@ AT_PARSER_CHECK([[./glr-regr3 input.txt]], AT_CLEANUP -## ------------------------------------------------------------------------- ## -## Duplicate representation of merged trees. See ## -## . ## -## ------------------------------------------------------------------------- ## +## ---------------------------------------------------------------------- ## +## Duplicate representation of merged trees. See ## +## . ## +## ---------------------------------------------------------------------- ## AT_SETUP([Duplicate representation of merged trees]) @@ -434,8 +437,8 @@ merge (YYSTYPE s1, YYSTYPE s2) 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, @@ -445,10 +448,10 @@ 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]) @@ -494,8 +497,8 @@ main (void) 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, [], @@ -505,10 +508,10 @@ AT_PARSER_CHECK([[./glr-regr5]], 0, [], 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]) @@ -546,8 +549,8 @@ main (void) 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, @@ -560,7 +563,7 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## -## Duplicated user destructor for lookahead. See ## +## Duplicated user destructor for lookahead. See ## ## . ## ## ------------------------------------------------------------------------- ## @@ -635,8 +638,8 @@ main (void) 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, [], @@ -729,8 +732,8 @@ main (void) 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, @@ -743,7 +746,7 @@ AT_CLEANUP ## ------------------------------------------------------------------------- ## -## No users destructors if stack 0 deleted. See ## +## No users destructors if stack 0 deleted. See ## ## . ## ## ------------------------------------------------------------------------- ## @@ -809,8 +812,8 @@ main (void) 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, [], @@ -820,9 +823,9 @@ 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]) @@ -865,8 +868,8 @@ main (void) 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, [], []) @@ -874,9 +877,9 @@ 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]) @@ -923,8 +926,8 @@ main (void) 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, [], []) @@ -932,9 +935,9 @@ 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]) @@ -1044,8 +1047,9 @@ main (void) 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, [], []) @@ -1179,9 +1183,9 @@ 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]) @@ -1374,8 +1378,8 @@ main (void) 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, @@ -1396,9 +1400,9 @@ 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]) @@ -1467,8 +1471,8 @@ main (void) 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, [], @@ -1478,9 +1482,9 @@ 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]) @@ -1527,8 +1531,8 @@ main (void) 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, [], @@ -1538,9 +1542,9 @@ 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]) @@ -1605,8 +1609,8 @@ main (void) 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, [], @@ -1616,9 +1620,9 @@ AT_PARSER_CHECK([[./glr-regr17]], 0, [], 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]) @@ -1660,11 +1664,11 @@ main (void) AT_BISON_OPTION_POPDEFS AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [], -[glr-regr18.y:26.18-24: error: result type clash on merge function 'merge': != +[[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 @@ -1708,8 +1712,8 @@ main (void) 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, [],