(Useless Rules, Reduced Automaton, Underivable Rules): Adjust reported

locations to match the more-precise results now expected.

diff --git a/tests/reduce.at b/tests/reduce.at
index e475cb04a8d2ffa3cd9cf70988b9d4a2336888e4..c6e501fa9ae36fd656a77c948683eca5bac7c755 100644 (file)
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,5 +1,5 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-

-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.

 
 # 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
 
 # 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


@@ -154,15 +154,15 @@ input.y:11.1-8: warning: useless nonterminal: useless6
 input.y:12.1-8: warning: useless nonterminal: useless7
 input.y:13.1-8: warning: useless nonterminal: useless8
 input.y:14.1-8: warning: useless nonterminal: useless9
 input.y:12.1-8: warning: useless nonterminal: useless7
 input.y:13.1-8: warning: useless nonterminal: useless8
 input.y:14.1-8: warning: useless nonterminal: useless9

-input.y:6.9-13: warning: useless rule: useless1: '1'
-input.y:7.9-13: warning: useless rule: useless2: '2'
-input.y:8.9-13: warning: useless rule: useless3: '3'
-input.y:9.9-13: warning: useless rule: useless4: '4'
-input.y:10.9-13: warning: useless rule: useless5: '5'
-input.y:11.9-13: warning: useless rule: useless6: '6'
-input.y:12.9-13: warning: useless rule: useless7: '7'
-input.y:13.9-13: warning: useless rule: useless8: '8'
-input.y:14.9-13: warning: useless rule: useless9: '9'
+input.y:6.11-13: warning: useless rule: useless1: '1'
+input.y:7.11-13: warning: useless rule: useless2: '2'
+input.y:8.11-13: warning: useless rule: useless3: '3'
+input.y:9.11-13: warning: useless rule: useless4: '4'
+input.y:10.11-13: warning: useless rule: useless5: '5'
+input.y:11.11-13: warning: useless rule: useless6: '6'
+input.y:12.11-13: warning: useless rule: useless7: '7'
+input.y:13.11-13: warning: useless rule: useless8: '8'
+input.y:14.11-13: warning: useless rule: useless9: '9'

 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' input.output]], 0,
 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' input.output]], 0,


@@ -242,9 +242,9 @@ AT_CHECK([[bison not-reduced.y]], 0, [],
 [[not-reduced.y: warning: 2 useless nonterminals and 3 useless rules
 not-reduced.y:14.1-13: warning: useless nonterminal: not_reachable
 not-reduced.y:11.6-19: warning: useless nonterminal: non_productive
 [[not-reduced.y: warning: 2 useless nonterminals and 3 useless rules
 not-reduced.y:14.1-13: warning: useless nonterminal: not_reachable
 not-reduced.y:11.6-19: warning: useless nonterminal: non_productive

-not-reduced.y:11.4-57: warning: useless rule: exp: non_productive
-not-reduced.y:14.14-56: warning: useless rule: not_reachable: useful
-not-reduced.y:17.15-18.63: warning: useless rule: non_productive: non_productive useless_token
+not-reduced.y:11.6-57: warning: useless rule: exp: non_productive
+not-reduced.y:14.16-56: warning: useless rule: not_reachable: useful
+not-reduced.y:17.17-18.63: warning: useless rule: non_productive: non_productive useless_token

 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' not-reduced.output]], 0,
 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' not-reduced.output]], 0,


@@ -316,9 +316,9 @@ AT_CHECK([[bison input.y]], 0, [],
 [[input.y: warning: 2 useless nonterminals and 3 useless rules
 input.y:5.15-25: warning: useless nonterminal: underivable
 input.y:6.14-24: warning: useless nonterminal: indirection
 [[input.y: warning: 2 useless nonterminals and 3 useless rules
 input.y:5.15-25: warning: useless nonterminal: underivable
 input.y:6.14-24: warning: useless nonterminal: indirection

-input.y:5.13-25: warning: useless rule: exp: underivable
-input.y:6.12-24: warning: useless rule: underivable: indirection
-input.y:7.12-24: warning: useless rule: indirection: underivable
+input.y:5.15-25: warning: useless rule: exp: underivable
+input.y:6.14-24: warning: useless rule: underivable: indirection
+input.y:7.14-24: warning: useless rule: indirection: underivable

 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' input.output]], 0,
 ]])
 
 AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' input.output]], 0,