(yy_reduce_print): yylineno -> yylno.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index ec9847aaf583636f5fe4d1a3fefb2289a9c05dec..3b51d6f0d51b0f37aeecb33abcbb12211475a822 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,5 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 # Exercising Bison on conflicts.                         -*- Autotest -*-

-# Copyright (C) 2002 Free Software Foundation, Inc.
+
+# Copyright (C) 2002, 2003 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


@@ -139,12 +140,12 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],

-[input.y: warning: 1 shift/reduce conflict
+[input.y: conflicts: 1 shift/reduce

 ])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
 ])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],

-[[State 5 contains 1 shift/reduce conflict.
+[[State 5 conflicts: 1 shift/reduce

 
 
 Grammar
 
 
 Grammar


@@ -369,7 +370,7 @@ id : '0';
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],

-[[input.y: warning: 1 reduce/reduce conflict
+[[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 never reduced because of conflicts: id: '0'
 ]])
 


@@ -380,7 +381,7 @@ AT_CHECK([cat input.output], [],
     4 id: '0'
 
 
     4 id: '0'
 
 

-State 1 contains 1 reduce/reduce conflict.
+State 1 conflicts: 1 reduce/reduce

 
 
 Grammar
 
 
 Grammar


@@ -485,9 +486,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 1, [],
-[input.y: warning: 1 shift/reduce conflict
-input.y: expected 0 shift/reduce conflicts
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 shift/reduce
+input.y: warning: expected 0 shift/reduce conflicts

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP
 


@@ -522,9 +523,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 1, [],
-[input.y: warning: 1 shift/reduce conflict
-input.y: expected 2 shift/reduce conflicts
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 shift/reduce
+input.y: warning: expected 2 shift/reduce conflicts

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP
 


@@ -542,8 +543,8 @@ program: a 'a' | a a;
 a: 'a';
 ]])
 
 a: 'a';
 ]])
 

-AT_CHECK([bison -o input.c input.y], 1, [],
-[input.y: warning: 1 reduce/reduce conflict
-input.y: expected 0 reduce/reduce conflicts
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 reduce/reduce
+input.y: warning: expected 0 reduce/reduce conflicts

 ])
 AT_CLEANUP
 ])
 AT_CLEANUP