Normalize conflict related messages.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 43b37dfcdf848d963e488129922d5fa1347a34e9..6a9ef9bd454ff8f5d727d66194bfc2095b5cbfb9 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -37,7 +37,9 @@ exp: e 'e';
 e: 'e' | /* Nothing. */;
 ]])
 
 e: 'e' | /* Nothing. */;
 ]])
 

-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison input.y -o input.c], 0, [],
+[[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */
+]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


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

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

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


@@ -150,7 +152,7 @@ AT_CHECK([cat input.output], [],
 
 Grammar
 
 
 Grammar
 

-    0 $axiom: exp $
+    0 $accept: exp $end

 
     1 exp: exp OP exp
     2    | NUM
 
     1 exp: exp OP exp
     2    | NUM


@@ -158,7 +160,7 @@ Grammar
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear
 

-$ (0) 0
+$end (0) 0

 error (256)
 NUM (258) 2
 OP (259) 1
 error (256)
 NUM (258) 2
 OP (259) 1


@@ -166,7 +168,7 @@ OP (259) 1
 
 Nonterminals, with rules where they appear
 
 
 Nonterminals, with rules where they appear
 

-$axiom (5)
+$accept (5)

     on left: 0
 exp (6)
     on left: 1 2, on right: 0 1
     on left: 0
 exp (6)
     on left: 1 2, on right: 0 1


@@ -174,7 +176,7 @@ exp (6)
 
 state 0
 
 
 state 0
 

-    0 $axiom: . exp $
+    0 $accept: . exp $end

     1 exp: . exp OP exp
     2    | . NUM
 
     1 exp: . exp OP exp
     2    | . NUM
 


@@ -192,18 +194,18 @@ state 1
 
 state 2
 
 
 state 2
 

-    0 $axiom: exp . $
+    0 $accept: exp . $end

     1 exp: exp . OP exp
 
     1 exp: exp . OP exp
 

-    $   shift, and go to state 3
-    OP  shift, and go to state 4
+    $end  shift, and go to state 3
+    OP    shift, and go to state 4

 
 
 state 3
 
 
 
 state 3
 

-    0 $axiom: exp $ .
+    0 $accept: exp $end .

 
 

-    $default   accept
+    $default  accept

 
 
 state 4
 
 
 state 4


@@ -219,8 +221,8 @@ state 4
 
 state 5
 
 
 state 5
 

-    1 exp: exp . OP exp  [$, OP]
-    1    | exp OP exp .  [$, OP]
+    1 exp: exp . OP exp  [$end, OP]
+    1    | exp OP exp .  [$end, OP]

 
     OP  shift, and go to state 4
 
 
     OP  shift, and go to state 4
 


@@ -253,7 +255,7 @@ AT_CHECK([bison input.y -o input.c --report=all])
 AT_CHECK([cat input.output], [],
 [[Grammar
 
 AT_CHECK([cat input.output], [],
 [[Grammar
 

-    0 $axiom: exp $
+    0 $accept: exp $end

 
     1 exp: exp OP exp
     2    | NUM
 
     1 exp: exp OP exp
     2    | NUM


@@ -261,7 +263,7 @@ AT_CHECK([cat input.output], [],
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear
 

-$ (0) 0
+$end (0) 0

 error (256)
 NUM (258) 2
 OP (259) 1
 error (256)
 NUM (258) 2
 OP (259) 1


@@ -269,7 +271,7 @@ OP (259) 1
 
 Nonterminals, with rules where they appear
 
 
 Nonterminals, with rules where they appear
 

-$axiom (5)
+$accept (5)

     on left: 0
 exp (6)
     on left: 1 2, on right: 0 1
     on left: 0
 exp (6)
     on left: 1 2, on right: 0 1


@@ -277,7 +279,7 @@ exp (6)
 
 state 0
 
 
 state 0
 

-    0 $axiom: . exp $
+    0 $accept: . exp $end

     1 exp: . exp OP exp
     2    | . NUM
 
     1 exp: . exp OP exp
     2    | . NUM
 


@@ -295,18 +297,18 @@ state 1
 
 state 2
 
 
 state 2
 

-    0 $axiom: exp . $
+    0 $accept: exp . $end

     1 exp: exp . OP exp
 
     1 exp: exp . OP exp
 

-    $   shift, and go to state 3
-    OP  shift, and go to state 4
+    $end  shift, and go to state 3
+    OP    shift, and go to state 4

 
 
 state 3
 
 
 
 state 3
 

-    0 $axiom: exp $ .
+    0 $accept: exp $end .

 
 

-    $default   accept
+    $default  accept

 
 
 state 4
 
 
 state 4


@@ -322,8 +324,8 @@ state 4
 
 state 5
 
 
 state 5
 

-    1 exp: exp . OP exp  [$, OP]
-    1    | exp OP exp .  [$, OP]
+    1 exp: exp . OP exp  [$end, OP]
+    1    | exp OP exp .  [$end, OP]

 
     $default  reduce using rule 1 (exp)
     Conflict between rule 1 and token OP resolved as reduce (%left OP).
 
     $default  reduce using rule 1 (exp)
     Conflict between rule 1 and token OP resolved as reduce (%left OP).


@@ -339,19 +341,19 @@ AT_CLEANUP
 # When there are RR conflicts, some rules are disabled.  Usually it is
 # simply displayed as:
 #
 # When there are RR conflicts, some rules are disabled.  Usually it is
 # simply displayed as:
 #

-#    $           reduce using rule 3 (num)
-#    $           [reduce using rule 4 (id)]
+#    $end           reduce using rule 3 (num)
+#    $end           [reduce using rule 4 (id)]

 #
 # But when `reduce 3' is the default action, we'd produce:
 #
 #
 # But when `reduce 3' is the default action, we'd produce:
 #

-#    $           [reduce using rule 4 (id)]
+#    $end           [reduce using rule 4 (id)]

 #    $default    reduce using rule 3 (num)
 #
 # In this precise case (a reduction is masked by the default
 # reduction), we make the `reduce 3' explicit:
 #
 #    $default    reduce using rule 3 (num)
 #
 # In this precise case (a reduction is masked by the default
 # reduction), we make the `reduce 3' explicit:
 #

-#    $           reduce using rule 3 (num)
-#    $           [reduce using rule 4 (id)]
+#    $end           reduce using rule 3 (num)
+#    $end           [reduce using rule 4 (id)]

 #    $default    reduce using rule 3 (num)
 #
 # Maybe that's not the best display, but then, please propose something
 #    $default    reduce using rule 3 (num)
 #
 # Maybe that's not the best display, but then, please propose something


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

-[input.y contains 1 reduce/reduce conflict.
-])
+[[input.y: warning: 1 reduce/reduce conflict
+input.y:4.4-8: warning: rule never reduced because of conflicts: id: '0'
+]])

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


@@ -379,7 +382,7 @@ AT_CHECK([cat input.output], [],
 
 Grammar
 
 
 Grammar
 

-    0 $axiom: exp $
+    0 $accept: exp $end

 
     1 exp: num
     2    | id
 
     1 exp: num
     2    | id


@@ -391,14 +394,14 @@ Grammar
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear
 

-$ (0) 0
+$end (0) 0

 '0' (48) 3 4
 error (256)
 
 
 Nonterminals, with rules where they appear
 
 '0' (48) 3 4
 error (256)
 
 
 Nonterminals, with rules where they appear
 

-$axiom (4)
+$accept (4)

     on left: 0
 exp (5)
     on left: 1 2, on right: 0
     on left: 0
 exp (5)
     on left: 1 2, on right: 0


@@ -410,7 +413,7 @@ id (7)
 
 state 0
 
 
 state 0
 

-    0 $axiom: . exp $
+    0 $accept: . exp $end

     1 exp: . num
     2    | . id
     3 num: . '0'
     1 exp: . num
     2    | . id
     3 num: . '0'


@@ -425,19 +428,19 @@ state 0
 
 state 1
 
 
 state 1
 

-    3 num: '0' .  [$]
-    4 id: '0' .  [$]
+    3 num: '0' .  [$end]
+    4 id: '0' .  [$end]

 
 

-    $         reduce using rule 3 (num)
-    $         [reduce using rule 4 (id)]
+    $end      reduce using rule 3 (num)
+    $end      [reduce using rule 4 (id)]

     $default  reduce using rule 3 (num)
 
 
 state 2
 
     $default  reduce using rule 3 (num)
 
 
 state 2
 

-    0 $axiom: exp . $
+    0 $accept: exp . $end

 
 

-    $  shift, and go to state 5
+    $end  shift, and go to state 5

 
 
 state 3
 
 
 state 3


@@ -456,9 +459,9 @@ state 4
 
 state 5
 
 
 state 5
 

-    0 $axiom: exp $ .
+    0 $accept: exp $end .

 
 

-    $default   accept
+    $default  accept

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -480,8 +483,8 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],

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

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP
 


@@ -517,7 +520,7 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],

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

 ])
 AT_CLEANUP
 ])
 AT_CLEANUP