warnings: use the regular interface for s/r and r/r conflicts

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index 3d3cf98e07d0bd33656bea577271268dd112d9c9..056e57852ba922edc5d8f182d68deb533b9c4583 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -271,16 +271,16 @@ input.y:5.10-24: previous declaration
 
 AT_CLEANUP
 
-## ----------------------------------------------------- ##
-## Undeclared symbols used for a printer or destructor.  ##
-## ----------------------------------------------------- ##
+## ------------------- ##
+## Undefined symbols.  ##
+## ------------------- ##
 
-AT_SETUP([Undeclared symbols used for a printer or destructor])
+AT_SETUP([Undefined symbols])
 
 AT_DATA([[input.y]],
 [[%printer {} foo baz
 %destructor {} bar
-
+%type <foo> qux
 %%
 exp: bar;
 ]])
@@ -289,6 +289,7 @@ AT_BISON_CHECK([input.y], [1], [],
 [[input.y:2.16-18: symbol bar is used, but is not defined as a token and has no rules
 input.y:1.17-19: warning: symbol baz is used, but is not defined as a token and has no rules [-Wother]
 input.y:1.13-15: warning: symbol foo is used, but is not defined as a token and has no rules [-Wother]
+input.y:3.13-15: warning: symbol qux is used, but is not defined as a token and has no rules [-Wother]
 ]])
 
 AT_CLEANUP
@@ -1179,7 +1180,8 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
+[[input.y:1.9-21: warning: deprecated %define variable name: 'api.push_pull', use 'api.push-pull' [-Wdeprecated]
+input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
 input.y:1.9-21: accepted value: 'pull'
 input.y:1.9-21: accepted value: 'push'
 input.y:1.9-21: accepted value: 'both'
@@ -1191,7 +1193,8 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
+[[input.y:1.9-34: warning: deprecated %define variable name: 'lr.keep_unreachable_states', use 'lr.keep-unreachable-states' [-Wdeprecated]
+input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
 ]])
 
 AT_DATA([[input.y]],
@@ -1201,7 +1204,8 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:2.9-21: %define variable 'api.namespace' redefined
+[[input.y:1.9-17: warning: deprecated %define variable name: 'namespace', use 'api.namespace' [-Wdeprecated]
+input.y:2.9-21: %define variable 'api.namespace' redefined
 input.y:1.9-17: previous definition
 ]])