X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bb3f671805dbe5cab15923997d56e24b6051f369..bb92250c78de62973527486051533f6dec9afeee:/tests/conflicts.at diff --git a/tests/conflicts.at b/tests/conflicts.at index 46940149..f3fe7821 100644 --- a/tests/conflicts.at +++ b/tests/conflicts.at @@ -37,7 +37,9 @@ exp: e 'e'; e: 'e' | /* Nothing. */; ]]) -AT_CHECK([bison input.y -o input.c]) +AT_CHECK([bison -o input.c input.y], 0, [], +[[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */ +]]) AT_CLEANUP @@ -48,12 +50,9 @@ AT_CLEANUP AT_SETUP([%nonassoc and eof]) -AT_DATA([input.y], +AT_DATA_GRAMMAR([input.y], [[ %{ -#include -/* We don't need a perfect malloc for these tests. */ -#undef malloc #include #if STDC_HEADERS @@ -101,7 +100,7 @@ main (int argc, const char *argv[]) ]]) # Specify the output files to avoid problems on different file systems. -AT_CHECK([bison input.y -o input.c]) +AT_CHECK([bison -o input.c input.y]) AT_COMPILE([input]) AT_PARSER_CHECK([./input '0<0']) @@ -109,16 +108,16 @@ AT_PARSER_CHECK([./input '0<0']) # no one has ever spotted it! The messages are *wrong*: there should # be nothing there, it should be expected eof. AT_PARSER_CHECK([./input '0<0<0'], [1], [], - [parse error, unexpected '<', expecting '<' or '>' + [syntax error, unexpected '<', expecting '<' or '>' ]) AT_PARSER_CHECK([./input '0>0']) AT_PARSER_CHECK([./input '0>0>0'], [1], [], - [parse error, unexpected '>', expecting '<' or '>' + [syntax error, unexpected '>', expecting '<' or '>' ]) AT_PARSER_CHECK([./input '0<0>0'], [1], [], - [parse error, unexpected '>', expecting '<' or '>' + [syntax error, unexpected '>', expecting '<' or '>' ]) AT_CLEANUP @@ -139,8 +138,8 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison input.y -o input.c --report=all], 0, [], -[input.y contains 1 shift/reduce conflict. +AT_CHECK([bison -o input.c --report=all input.y], 0, [], +[input.y: warning: 1 shift/reduce conflict ]) # Check the contents of the report. @@ -150,7 +149,7 @@ AT_CHECK([cat input.output], [], Grammar - 0 $axiom: exp $ + 0 $accept: exp $end 1 exp: exp OP exp 2 | NUM @@ -158,7 +157,7 @@ Grammar Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 error (256) NUM (258) 2 OP (259) 1 @@ -166,7 +165,7 @@ OP (259) 1 Nonterminals, with rules where they appear -$axiom (5) +$accept (5) on left: 0 exp (6) on left: 1 2, on right: 0 1 @@ -174,7 +173,7 @@ exp (6) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . exp OP exp 2 | . NUM @@ -192,18 +191,18 @@ state 1 state 2 - 0 $axiom: exp . $ + 0 $accept: exp . $end 1 exp: exp . OP exp - $ shift, and go to state 3 - OP shift, and go to state 4 + $end shift, and go to state 3 + OP shift, and go to state 4 state 3 - 0 $axiom: exp $ . + 0 $accept: exp $end . - $default accept + $default accept state 4 @@ -219,8 +218,8 @@ state 4 state 5 - 1 exp: exp . OP exp [$, OP] - 1 | exp OP exp . [$, OP] + 1 exp: exp . OP exp [$end, OP] + 1 | exp OP exp . [$end, OP] OP shift, and go to state 4 @@ -247,13 +246,13 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison input.y -o input.c --report=all]) +AT_CHECK([bison -o input.c --report=all input.y]) # Check the contents of the report. AT_CHECK([cat input.output], [], [[Grammar - 0 $axiom: exp $ + 0 $accept: exp $end 1 exp: exp OP exp 2 | NUM @@ -261,7 +260,7 @@ AT_CHECK([cat input.output], [], Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 error (256) NUM (258) 2 OP (259) 1 @@ -269,7 +268,7 @@ OP (259) 1 Nonterminals, with rules where they appear -$axiom (5) +$accept (5) on left: 0 exp (6) on left: 1 2, on right: 0 1 @@ -277,7 +276,7 @@ exp (6) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . exp OP exp 2 | . NUM @@ -295,18 +294,18 @@ state 1 state 2 - 0 $axiom: exp . $ + 0 $accept: exp . $end 1 exp: exp . OP exp - $ shift, and go to state 3 - OP shift, and go to state 4 + $end shift, and go to state 3 + OP shift, and go to state 4 state 3 - 0 $axiom: exp $ . + 0 $accept: exp $end . - $default accept + $default accept state 4 @@ -322,11 +321,12 @@ state 4 state 5 - 1 exp: exp . OP exp [$, OP] - 1 | exp OP exp . [$, OP] + 1 exp: exp . OP exp [$end, OP] + 1 | exp OP exp . [$end, OP] $default reduce using rule 1 (exp) - Conflict between rule 2 and token OP resolved as shift (%left OP). + + Conflict between rule 1 and token OP resolved as reduce (%left OP). ]]) AT_CLEANUP @@ -339,19 +339,19 @@ AT_CLEANUP # When there are RR conflicts, some rules are disabled. Usually it is # simply displayed as: # -# $ reduce using rule 3 (num) -# $ [reduce using rule 4 (id)] +# $end reduce using rule 3 (num) +# $end [reduce using rule 4 (id)] # # But when `reduce 3' is the default action, we'd produce: # -# $ [reduce using rule 4 (id)] +# $end [reduce using rule 4 (id)] # $default reduce using rule 3 (num) # # In this precise case (a reduction is masked by the default # reduction), we make the `reduce 3' explicit: # -# $ reduce using rule 3 (num) -# $ [reduce using rule 4 (id)] +# $end reduce using rule 3 (num) +# $end [reduce using rule 4 (id)] # $default reduce using rule 3 (num) # # Maybe that's not the best display, but then, please propose something @@ -368,18 +368,24 @@ id : '0'; %% ]]) -AT_CHECK([bison input.y -o input.c --report=all], 0, [], -[input.y contains 1 reduce/reduce conflict. -]) +AT_CHECK([bison -o input.c --report=all input.y], 0, [], +[[input.y: warning: 1 reduce/reduce conflict +input.y:4.4-8: warning: rule never reduced because of conflicts: id: '0' +]]) # Check the contents of the report. AT_CHECK([cat input.output], [], -[[State 1 contains 1 reduce/reduce conflict. +[[Rules never reduced + + 4 id: '0' + + +State 1 contains 1 reduce/reduce conflict. Grammar - 0 $axiom: exp $ + 0 $accept: exp $end 1 exp: num 2 | id @@ -391,14 +397,14 @@ Grammar Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 '0' (48) 3 4 error (256) Nonterminals, with rules where they appear -$axiom (4) +$accept (4) on left: 0 exp (5) on left: 1 2, on right: 0 @@ -410,7 +416,7 @@ id (7) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . num 2 | . id 3 num: . '0' @@ -425,19 +431,19 @@ state 0 state 1 - 3 num: '0' . [$] - 4 id: '0' . [$] + 3 num: '0' . [$end] + 4 id: '0' . [$end] - $ reduce using rule 3 (num) - $ [reduce using rule 4 (id)] + $end reduce using rule 3 (num) + $end [reduce using rule 4 (id)] $default reduce using rule 3 (num) state 2 - 0 $axiom: exp . $ + 0 $accept: exp . $end - $ shift, and go to state 5 + $end shift, and go to state 5 state 3 @@ -456,9 +462,9 @@ state 4 state 5 - 0 $axiom: exp $ . + 0 $accept: exp $end . - $default accept + $default accept ]]) AT_CLEANUP @@ -479,9 +485,9 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison input.y -o input.c], 1, [], -[input.y contains 1 shift/reduce conflict. -expected 0 shift/reduce conflicts +AT_CHECK([bison -o input.c input.y], 1, [], +[input.y: warning: 1 shift/reduce conflict +input.y: expected 0 shift/reduce conflicts ]) AT_CLEANUP @@ -499,7 +505,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison input.y -o input.c]) +AT_CHECK([bison -o input.c input.y]) AT_CLEANUP @@ -516,8 +522,8 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison input.y -o input.c], 1, [], -[input.y contains 1 shift/reduce conflict. -expected 2 shift/reduce conflicts +AT_CHECK([bison -o input.c input.y], 1, [], +[input.y: warning: 1 shift/reduce conflict +input.y: expected 2 shift/reduce conflicts ]) AT_CLEANUP