(S/R in initial, Defaulted Conflicted Reduction):

Adjust reported locations to match the more-precise
results now expected.

diff --git a/tests/conflicts.at b/tests/conflicts.at
index f3fe782135792d0af74282746cb627f609006d45..58838e7e2986184d99ac12da3aea879bec96dd17 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -38,7 +38,7 @@ e: 'e' | /* Nothing. */;
 ]])
 
 AT_CHECK([bison -o input.c input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c input.y], 0, [],

-[[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */
+[[input.y:4.9: warning: rule never reduced because of conflicts: e: /* empty */

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -370,7 +370,7 @@ id : '0';
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 [[input.y: warning: 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'
+input.y:4.6-8: warning: rule never reduced because of conflicts: id: '0'

 ]])
 
 # Check the contents of the report.
 ]])
 
 # Check the contents of the report.