X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9d774affbae6fe069f68ea20ec0401dda019e6b6..deef2a0a4d97b580fe45a02da328b94ce32538b1:/tests/conflicts.at diff --git a/tests/conflicts.at b/tests/conflicts.at index 2bf750f0..866b9441 100644 --- a/tests/conflicts.at +++ b/tests/conflicts.at @@ -2,20 +2,18 @@ # Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . AT_BANNER([[Conflicts.]]) @@ -38,8 +36,8 @@ exp: e 'e'; e: 'e' | /* Nothing. */; ]]) -AT_CHECK([bison -o input.c input.y], 0, [], -[[input.y:4.9: warning: rule never reduced because of conflicts: e: /* empty */ +AT_BISON_CHECK([-o input.c input.y], 0, [], +[[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */ ]]) AT_CLEANUP @@ -96,7 +94,7 @@ main (int argc, const char *argv[]) ]]) # Specify the output files to avoid problems on different file systems. -AT_CHECK([bison -o input.c input.y]) +AT_BISON_CHECK([-o input.c input.y]) AT_COMPILE([input]) AT_PARSER_CHECK([./input '0<0']) @@ -134,7 +132,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison -o input.c --report=all input.y], 0, [], +AT_BISON_CHECK([-o input.c --report=all input.y], 0, [], [input.y: conflicts: 1 shift/reduce ]) @@ -214,7 +212,7 @@ state 4 state 5 - 1 exp: exp . OP exp [$end, OP] + 1 exp: exp . OP exp 1 | exp OP exp . [$end, OP] OP shift, and go to state 4 @@ -242,7 +240,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison -o input.c --report=all input.y]) +AT_BISON_CHECK([-o input.c --report=all input.y]) # Check the contents of the report. AT_CHECK([cat input.output], [], @@ -317,7 +315,7 @@ state 4 state 5 - 1 exp: exp . OP exp [$end, OP] + 1 exp: exp . OP exp 1 | exp OP exp . [$end, OP] $default reduce using rule 1 (exp) @@ -364,14 +362,14 @@ id : '0'; %% ]]) -AT_CHECK([bison -o input.c --report=all input.y], 0, [], +AT_BISON_CHECK([-o input.c --report=all input.y], 0, [], [[input.y: conflicts: 1 reduce/reduce -input.y:4.6-8: warning: rule never reduced because of conflicts: id: '0' +input.y:4.6-8: warning: rule useless in parser due to conflicts: id: '0' ]]) # Check the contents of the report. AT_CHECK([cat input.output], [], -[[Rules never reduced +[[Rules useless in parser due to conflicts 4 id: '0' @@ -481,7 +479,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison -o input.c input.y], 1, [], +AT_BISON_CHECK([-o input.c input.y], 1, [], [input.y: conflicts: 1 shift/reduce input.y: expected 0 shift/reduce conflicts ]) @@ -501,7 +499,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison -o input.c input.y]) +AT_BISON_CHECK([-o input.c input.y]) AT_CLEANUP @@ -518,7 +516,7 @@ AT_DATA([input.y], exp: exp OP exp | NUM; ]]) -AT_CHECK([bison -o input.c input.y], 1, [], +AT_BISON_CHECK([-o input.c input.y], 1, [], [input.y: conflicts: 1 shift/reduce input.y: expected 2 shift/reduce conflicts ]) @@ -538,7 +536,7 @@ program: a 'a' | a a; a: 'a'; ]]) -AT_CHECK([bison -o input.c input.y], 1, [], +AT_BISON_CHECK([-o input.c input.y], 1, [], [input.y: conflicts: 1 reduce/reduce input.y: expected 0 reduce/reduce conflicts ]) @@ -565,7 +563,7 @@ e: e '+' e ; ]]) -AT_CHECK([bison -o input.c input.y], 0, [], +AT_BISON_CHECK([-o input.c input.y], 0, [], [[input.y: conflicts: 4 shift/reduce ]]) AT_CLEANUP @@ -591,7 +589,7 @@ e: e '+' e %prec '+' ; ]]) -AT_CHECK([bison -o input.c input.y]) +AT_BISON_CHECK([-o input.c input.y]) AT_CLEANUP @@ -615,7 +613,7 @@ e: e '+' e ; ]]) -AT_CHECK([bison -o input.c input.y]) +AT_BISON_CHECK([-o input.c input.y]) AT_CLEANUP @@ -638,7 +636,7 @@ AT_DATA([[input.y]], start: resolved_conflict 'a' reported_conflicts 'a' ; -/* S/R conflict resolved as shift, so the state with item +/* S/R conflict resolved as reduce, so the state with item * (resolved_conflict: 'a' . unreachable1) and all it transition successors are * unreachable, and the associated production is useless. */ resolved_conflict: @@ -667,19 +665,19 @@ reported_conflicts: ]]) -AT_CHECK([[bison --report=all input.y]], 0, [], +AT_BISON_CHECK([[--report=all input.y]], 0, [], [[input.y: conflicts: 1 shift/reduce, 1 reduce/reduce -input.y:12.5-20: warning: rule never reduced because of conflicts: resolved_conflict: 'a' unreachable1 -input.y:20.5-20: warning: rule never reduced because of conflicts: unreachable1: 'a' unreachable2 -input.y:21.4: warning: rule never reduced because of conflicts: unreachable1: /* empty */ -input.y:25.13: warning: rule never reduced because of conflicts: unreachable2: /* empty */ -input.y:25.16: warning: rule never reduced because of conflicts: unreachable2: /* empty */ -input.y:31.5-7: warning: rule never reduced because of conflicts: reported_conflicts: 'a' -input.y:32.4: warning: rule never reduced because of conflicts: reported_conflicts: /* empty */ +input.y:12.5-20: warning: rule useless in parser due to conflicts: resolved_conflict: 'a' unreachable1 +input.y:20.5-20: warning: rule useless in parser due to conflicts: unreachable1: 'a' unreachable2 +input.y:21.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ +input.y:25.13: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ +input.y:25.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ +input.y:31.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' +input.y:32.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ ]]) AT_CHECK([[cat input.output]], 0, -[[Rules never reduced +[[Rules useless in parser due to conflicts 2 resolved_conflict: 'a' unreachable1 @@ -814,6 +812,19 @@ state 7 $default reduce using rule 1 (start) ]]) +AT_DATA([[input-keep.y]], +[[%define lr.keep_unreachable_states +]]) +AT_CHECK([[cat input.y >> input-keep.y]]) + +AT_BISON_CHECK([[input-keep.y]], 0, [], +[[input-keep.y: conflicts: 2 shift/reduce, 2 reduce/reduce +input-keep.y:22.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ +input-keep.y:26.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ +input-keep.y:32.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' +input-keep.y:33.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ +]]) + AT_CLEANUP @@ -847,7 +858,7 @@ empty_c1: %prec 'c' ; empty_c2: %prec 'c' ; empty_c3: %prec 'd' ; ]]) -AT_CHECK([[bison --report=all -o input.c input.y]], 0, [], [ignore]) +AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore]) AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0, [[state 0 @@ -923,7 +934,7 @@ empty_c2: %prec 'c' ; empty_c3: %prec 'c' ; ]]) -AT_CHECK([[bison --report=all -o input.c input.y]], 0, [], [ignore]) +AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore]) AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0, [[state 0