X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ce4ccb4b11bb3d19681055cc2b732493603d3508..f1886bb2808a471b18e1416e0f821d08850d116e:/tests/conflicts.at diff --git a/tests/conflicts.at b/tests/conflicts.at index 63e494d0..ee5fd026 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 @@ -52,8 +54,10 @@ AT_DATA([input.y], [[ %{ #include -/* We don't need a perfect malloc for these tests. */ +/* We don't need perfect functions for these tests. */ #undef malloc +#undef memcmp +#undef realloc #include #if STDC_HEADERS @@ -101,23 +105,23 @@ 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([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore]) +AT_CHECK([bison -o input.c input.y]) +AT_COMPILE([input]) -AT_CHECK([./input '0<0']) +AT_PARSER_CHECK([./input '0<0']) # FIXME: This is an actual bug, but a new one, in the sense that # no one has ever spotted it! The messages are *wrong*: there should # be nothing there, it should be expected eof. -AT_CHECK([./input '0<0<0'], [1], [], +AT_PARSER_CHECK([./input '0<0<0'], [1], [], [parse error, unexpected '<', expecting '<' or '>' ]) -AT_CHECK([./input '0>0']) -AT_CHECK([./input '0>0>0'], [1], [], +AT_PARSER_CHECK([./input '0>0']) +AT_PARSER_CHECK([./input '0>0>0'], [1], [], [parse error, unexpected '>', expecting '<' or '>' ]) -AT_CHECK([./input '0<0>0'], [1], [], +AT_PARSER_CHECK([./input '0<0>0'], [1], [], [parse error, unexpected '>', expecting '<' or '>' ]) @@ -139,8 +143,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 +154,7 @@ AT_CHECK([cat input.output], [], Grammar - 0 $axiom: exp $ + 0 $accept: exp $end 1 exp: exp OP exp 2 | NUM @@ -158,7 +162,7 @@ Grammar Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 error (256) NUM (258) 2 OP (259) 1 @@ -166,7 +170,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,39 +178,36 @@ exp (6) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . exp OP exp 2 | . NUM - NUM shift, and go to state 1 - - exp go to state 2 + NUM shift, and go to state 1 + exp go to state 2 state 1 2 exp: NUM . - $default reduce using rule 2 (exp) - + $default reduce using rule 2 (exp) 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 @@ -215,24 +216,20 @@ state 4 1 | exp OP . exp 2 | . NUM - NUM shift, and go to state 1 - - exp go to state 5 + NUM shift, and go to state 1 + exp go to state 5 state 5 - 1 exp: exp . OP exp [$, OP] - 1 | exp OP exp . [$, OP] - - OP shift, and go to state 4 - - OP [reduce using rule 1 (exp)] - $default reduce using rule 1 (exp) - + 1 exp: exp . OP exp [$end, OP] + 1 | exp OP exp . [$end, OP] + OP shift, and go to state 4 + OP [reduce using rule 1 (exp)] + $default reduce using rule 1 (exp) ]]) AT_CLEANUP @@ -254,13 +251,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 @@ -268,7 +265,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 @@ -276,7 +273,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 @@ -284,39 +281,36 @@ exp (6) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . exp OP exp 2 | . NUM - NUM shift, and go to state 1 - - exp go to state 2 + NUM shift, and go to state 1 + exp go to state 2 state 1 2 exp: NUM . - $default reduce using rule 2 (exp) - + $default reduce using rule 2 (exp) 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 @@ -325,23 +319,19 @@ state 4 1 | exp OP . exp 2 | . NUM - NUM shift, and go to state 1 - - exp go to state 5 + NUM shift, and go to state 1 + exp go to state 5 state 5 - 1 exp: exp . OP exp [$, OP] - 1 | exp OP exp . [$, OP] - - - $default reduce using rule 1 (exp) - - Conflict between rule 2 and token OP resolved as shift (%left OP). + 1 exp: exp . OP exp [$end, OP] + 1 | exp OP exp . [$end, OP] + $default reduce using rule 1 (exp) + Conflict between rule 1 and token OP resolved as reduce (%left OP). ]]) AT_CLEANUP @@ -354,19 +344,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 @@ -383,18 +373,24 @@ id : '0'; %% ]]) -AT_CHECK([bison input.y -o input.c --report=all], 1, [], -[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 @@ -406,14 +402,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 @@ -425,62 +421,55 @@ id (7) state 0 - 0 $axiom: . exp $ + 0 $accept: . exp $end 1 exp: . num 2 | . id 3 num: . '0' 4 id: . '0' - '0' shift, and go to state 1 - - exp go to state 2 - num go to state 3 - id go to state 4 + '0' shift, and go to state 1 + exp go to state 2 + num go to state 3 + id go to state 4 state 1 - 3 num: '0' . [$] - 4 id: '0' . [$] - - $ reduce using rule 3 (num) - $ [reduce using rule 4 (id)] - $default reduce using rule 3 (num) + 3 num: '0' . [$end] + 4 id: '0' . [$end] + $end reduce using rule 3 (num) + $end [reduce using rule 4 (id)] + $default reduce using rule 3 (num) state 2 - 0 $axiom: exp . $ - - $ shift, and go to state 5 + 0 $accept: exp . $end + $end shift, and go to state 5 state 3 1 exp: num . - $default reduce using rule 1 (exp) - + $default reduce using rule 1 (exp) state 4 2 exp: id . - $default reduce using rule 2 (exp) - + $default reduce using rule 2 (exp) state 5 - 0 $axiom: exp $ . - - $default accept - + 0 $accept: exp $end . + $default accept ]]) AT_CLEANUP @@ -501,9 +490,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 @@ -521,7 +510,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 @@ -538,8 +527,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