Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index c4515e8c9a0269a1ae3f540e7e638f09ed1b7e85..c7ed2fe42a8990ddbe67494a50f09aa637b34997 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -40,6 +40,12 @@ AT_BISON_CHECK([-o input.c input.y], 0, [],
 [[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */ [-Wother]
 ]])
 
 [[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */ [-Wother]
 ]])
 

+AT_BISON_CHECK([-fcaret -o input.c input.y], 0, [],
+[[input.y:4.9: warning: rule useless in parser due to conflicts [-Wother]
+ e: 'e' | /* Nothing. */;
+         ^
+]])
+

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -117,10 +123,10 @@ AT_NONASSOC_AND_EOF_CHECK([], [[incorrect]])
 
 # We must disable default reductions in inconsistent states in order to
 # have an explicit list of all expected tokens.
 
 # We must disable default reductions in inconsistent states in order to
 # have an explicit list of all expected tokens.

-AT_NONASSOC_AND_EOF_CHECK([[-Dlr.default-reductions=consistent]],
+AT_NONASSOC_AND_EOF_CHECK([[-Dlr.default-reduction=consistent]],

                           [[correct]])
 
                           [[correct]])
 

-# lr.default-reductions=consistent happens to work for this test case.
+# lr.default-reduction=consistent happens to work for this test case.

 # However, for other grammars, lookahead sets can be merged for
 # different left contexts, so it is still possible to have an incorrect
 # expected list.  Canonical LR is almost a general solution (that is, it
 # However, for other grammars, lookahead sets can be merged for
 # different left contexts, so it is still possible to have an incorrect
 # expected list.  Canonical LR is almost a general solution (that is, it


@@ -310,12 +316,12 @@ AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr
 
 # Even canonical LR doesn't foresee the error for 'a'!
 AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr
 
 # Even canonical LR doesn't foresee the error for 'a'!
 AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr

-                             %define lr.default-reductions consistent]],
+                             %define lr.default-reduction consistent]],

                            [AT_PREVIOUS_STATE_GRAMMAR],
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])
 AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr
                            [AT_PREVIOUS_STATE_GRAMMAR],
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])
 AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr

-                             %define lr.default-reductions accepting]],
+                             %define lr.default-reduction accepting]],

                            [AT_PREVIOUS_STATE_GRAMMAR],
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])
                            [AT_PREVIOUS_STATE_GRAMMAR],
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])


@@ -396,13 +402,13 @@ AT_CONSISTENT_ERRORS_CHECK([[%glr-parser]],
                            [['b']], [[none]])
 # No C++ or Java test because yychar cannot be manipulated by users.
 
                            [['b']], [[none]])
 # No C++ or Java test because yychar cannot be manipulated by users.
 

-AT_CONSISTENT_ERRORS_CHECK([[%define lr.default-reductions consistent]],
+AT_CONSISTENT_ERRORS_CHECK([[%define lr.default-reduction consistent]],

                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])
 
 # Canonical LR doesn't foresee the error for 'a'!
                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])
 
 # Canonical LR doesn't foresee the error for 'a'!

-AT_CONSISTENT_ERRORS_CHECK([[%define lr.default-reductions accepting]],
+AT_CONSISTENT_ERRORS_CHECK([[%define lr.default-reduction accepting]],

                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[a]])
                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[a]])


@@ -416,7 +422,7 @@ AT_CONSISTENT_ERRORS_CHECK([[%define parse.lac full]],
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])
 AT_CONSISTENT_ERRORS_CHECK([[%define parse.lac full
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])
 AT_CONSISTENT_ERRORS_CHECK([[%define parse.lac full

-                             %define lr.default-reductions accepting]],
+                             %define lr.default-reduction accepting]],

                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[none]])
                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[none]])


@@ -498,7 +504,7 @@ AT_BISON_OPTION_POPDEFS
 # Show canonical LR's failure.
 AT_BISON_CHECK([[-Dlr.type=canonical-lr -o input.c input.y]],
                [[0]], [[]],
 # Show canonical LR's failure.
 AT_BISON_CHECK([[-Dlr.type=canonical-lr -o input.c input.y]],
                [[0]], [[]],

-[[input.y: conflicts: 2 shift/reduce
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],


@@ -508,7 +514,7 @@ AT_PARSER_CHECK([[./input]], [[1]], [[]],
 # It's corrected by LAC.
 AT_BISON_CHECK([[-Dlr.type=canonical-lr -Dparse.lac=full \
                  -o input.c input.y]], [[0]], [[]],
 # It's corrected by LAC.
 AT_BISON_CHECK([[-Dlr.type=canonical-lr -Dparse.lac=full \
                  -o input.c input.y]], [[0]], [[]],

-[[input.y: conflicts: 2 shift/reduce
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],


@@ -518,7 +524,7 @@ AT_PARSER_CHECK([[./input]], [[1]], [[]],
 # IELR is sufficient when LAC is used.
 AT_BISON_CHECK([[-Dlr.type=ielr -Dparse.lac=full -o input.c input.y]],
                [[0]], [[]],
 # IELR is sufficient when LAC is used.
 AT_BISON_CHECK([[-Dlr.type=ielr -Dparse.lac=full -o input.c input.y]],
                [[0]], [[]],

-[[input.y: conflicts: 2 shift/reduce
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]], [[1]], [[]],


@@ -542,8 +548,8 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_BISON_CHECK([-o input.c --report=all input.y], 0, [],
 ]])
 
 AT_BISON_CHECK([-o input.c --report=all input.y], 0, [],

-[input.y: conflicts: 1 shift/reduce
-])
+[[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+]])

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


@@ -574,7 +580,7 @@ exp (6)
     on left: 1 2, on right: 0 1
 
 
     on left: 1 2, on right: 0 1
 
 

-state 0
+State 0

 
     0 $accept: . exp $end
     1 exp: . exp OP exp
 
     0 $accept: . exp $end
     1 exp: . exp OP exp


@@ -585,14 +591,14 @@ state 0
     exp  go to state 2
 
 
     exp  go to state 2
 
 

-state 1
+State 1

 
     2 exp: NUM .
 
     $default  reduce using rule 2 (exp)
 
 
 
     2 exp: NUM .
 
     $default  reduce using rule 2 (exp)
 
 

-state 2
+State 2

 
     0 $accept: exp . $end
     1 exp: exp . OP exp
 
     0 $accept: exp . $end
     1 exp: exp . OP exp


@@ -601,14 +607,14 @@ state 2
     OP    shift, and go to state 4
 
 
     OP    shift, and go to state 4
 
 

-state 3
+State 3

 
     0 $accept: exp $end .
 
     $default  accept
 
 
 
     0 $accept: exp $end .
 
     $default  accept
 
 

-state 4
+State 4

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


@@ -619,7 +625,7 @@ state 4
     exp  go to state 5
 
 
     exp  go to state 5
 
 

-state 5
+State 5

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


@@ -677,7 +683,7 @@ exp (6)
     on left: 1 2, on right: 0 1
 
 
     on left: 1 2, on right: 0 1
 
 

-state 0
+State 0

 
     0 $accept: . exp $end
     1 exp: . exp OP exp
 
     0 $accept: . exp $end
     1 exp: . exp OP exp


@@ -688,14 +694,14 @@ state 0
     exp  go to state 2
 
 
     exp  go to state 2
 
 

-state 1
+State 1

 
     2 exp: NUM .
 
     $default  reduce using rule 2 (exp)
 
 
 
     2 exp: NUM .
 
     $default  reduce using rule 2 (exp)
 
 

-state 2
+State 2

 
     0 $accept: exp . $end
     1 exp: exp . OP exp
 
     0 $accept: exp . $end
     1 exp: exp . OP exp


@@ -704,14 +710,14 @@ state 2
     OP    shift, and go to state 4
 
 
     OP    shift, and go to state 4
 
 

-state 3
+State 3

 
     0 $accept: exp $end .
 
     $default  accept
 
 
 
     0 $accept: exp $end .
 
     $default  accept
 
 

-state 4
+State 4

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


@@ -722,7 +728,7 @@ state 4
     exp  go to state 5
 
 
     exp  go to state 5
 
 

-state 5
+State 5

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


@@ -784,7 +790,7 @@ cond:
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],

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

 input.y:12.3-18: warning: rule useless in parser due to conflicts: cond: cond "then" cond [-Wother]
 ]])
 
 input.y:12.3-18: warning: rule useless in parser due to conflicts: cond: cond "then" cond [-Wother]
 ]])
 


@@ -828,7 +834,7 @@ id : '0';
 ]])
 
 AT_BISON_CHECK([-o input.c --report=all input.y], 0, [],
 ]])
 
 AT_BISON_CHECK([-o input.c --report=all input.y], 0, [],

-[[input.y: conflicts: 1 reduce/reduce
+[[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]

 input.y:4.6-8: warning: rule useless in parser due to conflicts: id: '0' [-Wother]
 ]])
 
 input.y:4.6-8: warning: rule useless in parser due to conflicts: id: '0' [-Wother]
 ]])
 


@@ -873,7 +879,7 @@ id (7)
     on left: 4, on right: 2
 
 
     on left: 4, on right: 2
 
 

-state 0
+State 0

 
     0 $accept: . exp $end
     1 exp: . num
 
     0 $accept: . exp $end
     1 exp: . num


@@ -888,7 +894,7 @@ state 0
     id   go to state 4
 
 
     id   go to state 4
 
 

-state 1
+State 1

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


@@ -898,28 +904,28 @@ state 1
     $default  reduce using rule 3 (num)
 
 
     $default  reduce using rule 3 (num)
 
 

-state 2
+State 2

 
     0 $accept: exp . $end
 
     $end  shift, and go to state 5
 
 
 
     0 $accept: exp . $end
 
     $end  shift, and go to state 5
 
 

-state 3
+State 3

 
     1 exp: num .
 
     $default  reduce using rule 1 (exp)
 
 
 
     1 exp: num .
 
     $default  reduce using rule 1 (exp)
 
 

-state 4
+State 4

 
     2 exp: id .
 
     $default  reduce using rule 2 (exp)
 
 
 
     2 exp: id .
 
     $default  reduce using rule 2 (exp)
 
 

-state 5
+State 5

 
     0 $accept: exp $end .
 
 
     0 $accept: exp $end .
 


@@ -945,9 +951,8 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],

-[input.y: conflicts: 1 shift/reduce
-input.y: expected 0 shift/reduce conflicts
-])
+[[input.y: error: shift/reduce conflicts: 1 found, 0 expected
+]])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -982,9 +987,8 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],

-[input.y: conflicts: 1 shift/reduce
-input.y: expected 2 shift/reduce conflicts
-])
+[[input.y: error: shift/reduce conflicts: 1 found, 2 expected
+]])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -1002,9 +1006,8 @@ a: 'a';
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],

-[input.y: conflicts: 1 reduce/reduce
-input.y: expected 0 reduce/reduce conflicts
-])
+[[input.y: error: reduce/reduce conflicts: 1 found, 0 expected
+]])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -1046,7 +1049,7 @@ e:   e '+' e
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],

-[[input.y: conflicts: 4 shift/reduce
+[[input.y: warning: 4 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -1148,7 +1151,8 @@ reported_conflicts:
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]], 0, [],
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]], 0, [],

-[[input.y: conflicts: 1 shift/reduce, 1 reduce/reduce
+[[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]

 input.y:12.5-20: warning: rule useless in parser due to conflicts: resolved_conflict: 'a' unreachable1 [-Wother]
 input.y:20.5-20: warning: rule useless in parser due to conflicts: unreachable1: 'a' unreachable2 [-Wother]
 input.y:21.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]
 input.y:12.5-20: warning: rule useless in parser due to conflicts: resolved_conflict: 'a' unreachable1 [-Wother]
 input.y:20.5-20: warning: rule useless in parser due to conflicts: unreachable1: 'a' unreachable2 [-Wother]
 input.y:21.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]


@@ -1220,7 +1224,7 @@ reported_conflicts (9)
     on left: 8 9 10, on right: 1
 
 
     on left: 8 9 10, on right: 1
 
 

-state 0
+State 0

 
     0 $accept: . start $end
     1 start: . resolved_conflict 'a' reported_conflicts 'a'
 
     0 $accept: . start $end
     1 start: . resolved_conflict 'a' reported_conflicts 'a'


@@ -1235,28 +1239,28 @@ state 0
     Conflict between rule 3 and token 'a' resolved as reduce (%left 'a').
 
 
     Conflict between rule 3 and token 'a' resolved as reduce (%left 'a').
 
 

-state 1
+State 1

 
     0 $accept: start . $end
 
     $end  shift, and go to state 3
 
 
 
     0 $accept: start . $end
 
     $end  shift, and go to state 3
 
 

-state 2
+State 2

 
     1 start: resolved_conflict . 'a' reported_conflicts 'a'
 
     'a'  shift, and go to state 4
 
 
 
     1 start: resolved_conflict . 'a' reported_conflicts 'a'
 
     'a'  shift, and go to state 4
 
 

-state 3
+State 3

 
     0 $accept: start $end .
 
     $default  accept
 
 
 
     0 $accept: start $end .
 
     $default  accept
 
 

-state 4
+State 4

 
     1 start: resolved_conflict 'a' . reported_conflicts 'a'
     8 reported_conflicts: . 'a'
 
     1 start: resolved_conflict 'a' . reported_conflicts 'a'
     8 reported_conflicts: . 'a'


@@ -1270,7 +1274,7 @@ state 4
     reported_conflicts  go to state 6
 
 
     reported_conflicts  go to state 6
 
 

-state 5
+State 5

 
     8 reported_conflicts: 'a' .  ['a']
     9                   | 'a' .  ['a']
 
     8 reported_conflicts: 'a' .  ['a']
     9                   | 'a' .  ['a']


@@ -1280,14 +1284,14 @@ state 5
     $default  reduce using rule 8 (reported_conflicts)
 
 
     $default  reduce using rule 8 (reported_conflicts)
 
 

-state 6
+State 6

 
     1 start: resolved_conflict 'a' reported_conflicts . 'a'
 
     'a'  shift, and go to state 7
 
 
 
     1 start: resolved_conflict 'a' reported_conflicts . 'a'
 
     'a'  shift, and go to state 7
 
 

-state 7
+State 7

 
     1 start: resolved_conflict 'a' reported_conflicts 'a' .
 
 
     1 start: resolved_conflict 'a' reported_conflicts 'a' .
 


@@ -1295,12 +1299,13 @@ state 7
 ]])
 
 AT_DATA([[input-keep.y]],
 ]])
 
 AT_DATA([[input-keep.y]],

-[[%define lr.keep-unreachable-states
+[[%define lr.keep-unreachable-state

 ]])
 AT_CHECK([[cat input.y >> input-keep.y]])
 
 AT_BISON_CHECK([[input-keep.y]], 0, [],
 ]])
 AT_CHECK([[cat input.y >> input-keep.y]])
 
 AT_BISON_CHECK([[input-keep.y]], 0, [],

-[[input-keep.y: conflicts: 2 shift/reduce, 2 reduce/reduce
+[[input-keep.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
+input-keep.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]

 input-keep.y:22.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]
 input-keep.y:26.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
 input-keep.y:32.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' [-Wother]
 input-keep.y:22.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]
 input-keep.y:26.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
 input-keep.y:32.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' [-Wother]


@@ -1341,8 +1346,8 @@ empty_c2: %prec 'c' ;
 empty_c3: %prec 'd' ;
 ]])
 AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])
 empty_c3: %prec 'd' ;
 ]])
 AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])

-AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
-[[state 0
+AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
+[[State 0

 
     0 $accept: . start $end
     1 start: . 'a'
 
     0 $accept: . start $end
     1 start: . 'a'


@@ -1378,7 +1383,7 @@ AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
     Conflict between rule 13 and token 'c' resolved as reduce ('c' < 'd').
 
 
     Conflict between rule 13 and token 'c' resolved as reduce ('c' < 'd').
 
 

-state 1
+State 1

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1417,8 +1422,8 @@ empty_c3: %prec 'c' ;
 ]])
 
 AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])
 ]])
 
 AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])

-AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
-[[state 0
+AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
+[[State 0

 
     0 $accept: . start $end
     1 start: . 'a'
 
     0 $accept: . start $end
     1 start: . 'a'


@@ -1454,14 +1459,45 @@ AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
     Conflict between rule 11 and token 'c' resolved as an error (%nonassoc 'c').
 
 
     Conflict between rule 11 and token 'c' resolved as an error (%nonassoc 'c').
 
 

-state 1
+State 1
+]])
+AT_CLEANUP
+
+
+## -------------------- ##
+## %expect-rr non GLR.  ##
+## -------------------- ##
+
+AT_SETUP([[%expect-rr non GLR]])
+
+AT_DATA([[1.y]],
+[[%expect-rr 0
+%%
+exp: 'a'
+]])
+
+AT_BISON_CHECK([[1.y]], [[0]], [],
+[[1.y: warning: %expect-rr applies only to GLR parsers [-Wother]

 ]])
 ]])

+
+AT_DATA([[2.y]],
+[[%expect-rr 1
+%%
+exp: 'a' | 'a';
+]])
+
+AT_BISON_CHECK([[2.y]], [[0]], [],
+[[2.y: warning: %expect-rr applies only to GLR parsers [-Wother]
+2.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+2.y:3.12-14: warning: rule useless in parser due to conflicts: exp: 'a' [-Wother]
+]])
+

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

-## --------------------------------- ##
-## -W versus %expect and %expect-rr  ##
-## --------------------------------- ##
+## ---------------------------------- ##
+## -W versus %expect and %expect-rr.  ##
+## ---------------------------------- ##

 
 AT_SETUP([[-W versus %expect and %expect-rr]])
 
 
 AT_SETUP([[-W versus %expect and %expect-rr]])
 


@@ -1487,17 +1523,27 @@ B: ;
 ]])
 
 AT_BISON_CHECK([[sr-rr.y]], [[0]], [[]],
 ]])
 
 AT_BISON_CHECK([[sr-rr.y]], [[0]], [[]],

-[[sr-rr.y: conflicts: 1 shift/reduce, 1 reduce/reduce
+[[sr-rr.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+sr-rr.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]

 ]])
 AT_BISON_CHECK([[-Wno-conflicts-sr sr-rr.y]], [[0]], [[]],
 ]])
 AT_BISON_CHECK([[-Wno-conflicts-sr sr-rr.y]], [[0]], [[]],

-[[sr-rr.y: conflicts: 1 reduce/reduce
+[[sr-rr.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]

 ]])
 AT_BISON_CHECK([[-Wno-conflicts-rr sr-rr.y]], [[0]], [[]],
 ]])
 AT_BISON_CHECK([[-Wno-conflicts-rr sr-rr.y]], [[0]], [[]],

-[[sr-rr.y: conflicts: 1 shift/reduce
+[[sr-rr.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]

 ]])
 
 ]])
 

-[for gram in sr-rr sr rr; do
+[
+# This is piece of code is rather complex for a simple task: try every
+# combinaison of (0 or 1 real SR) x (0 or 1 real RR) x (don't %expect
+# or %expect 0, 1, or 2 SR) x (don't %expect-rr or %expect-rr 0, 1, or 2
+# RR).
+
+# Number and types of genuine conflicts in the grammar.
+for gram in sr-rr sr rr; do
+  # Number of expected s/r conflicts.

   for sr_exp_i in '' 0 1 2; do
   for sr_exp_i in '' 0 1 2; do

+    # Number of expected r/r conflicts.

     for rr_exp_i in '' 0 1 2; do
       test -z "$sr_exp_i" && test -z "$rr_exp_i" && continue
 
     for rr_exp_i in '' 0 1 2; do
       test -z "$sr_exp_i" && test -z "$rr_exp_i" && continue
 


@@ -1520,36 +1566,38 @@ AT_BISON_CHECK([[-Wno-conflicts-rr sr-rr.y]], [[0]], [[]],
       echo "$directives" > $file
       cat $gram.y >> $file
 
       echo "$directives" > $file
       cat $gram.y >> $file
 

-      # Count actual conflicts.
-      conflicts=
-      sr_count=0
-      rr_count=0
-      if test $gram = sr || test $gram = sr-rr; then
-        conflicts="1 shift/reduce"
-        sr_count=1
-      fi
-      if test $gram = rr || test $gram = sr-rr; then
-        if test -n "$conflicts"; then
-          conflicts="$conflicts, "
-        fi
-        conflicts="${conflicts}1 reduce/reduce"
-        rr_count=1
-      fi
+      # Number of found conflicts.
+      case $gram in
+        (sr)    sr_count=1; rr_count=0;;
+        (rr)    sr_count=0; rr_count=1;;
+        (sr-rr) sr_count=1; rr_count=1;;
+      esac
+
+      # Update number of expected conflicts: if %expect is given then
+      # %expect-rr defaults to 0, and vice-versa.  Leave empty if
+      # nothing expected.
+      case $sr_exp_i:$rr_exp_i in
+        ?:) rr_exp_i=0;;
+        :?) sr_exp_i=0;;
+      esac

 
       # Run tests.
       if test $sr_count -eq $sr_exp && test $rr_count -eq $rr_exp; then
         ]AT_BISON_CHECK([[-Wnone $file]])[
         ]AT_BISON_CHECK([[-Werror $file]])[
       else
 
       # Run tests.
       if test $sr_count -eq $sr_exp && test $rr_count -eq $rr_exp; then
         ]AT_BISON_CHECK([[-Wnone $file]])[
         ]AT_BISON_CHECK([[-Werror $file]])[
       else

-        echo "$file: conflicts: $conflicts" > experr
-        if test $sr_count -ne $sr_exp; then
-          if test $sr_exp -ne 1; then s=s; else s= ; fi
-          echo "$file: expected $sr_exp shift/reduce conflict$s" >> experr
-        fi
-        if test $rr_count -ne $rr_exp; then
-          if test $rr_exp -ne 1; then s=s; else s= ; fi
-          echo "$file: expected $rr_exp reduce/reduce conflict$s" >> experr
-        fi
+        {
+          if test -z "$sr_exp_i" && test "$sr_count" -ne 0; then
+            echo "warning: $sr_count shift/reduce conflicts"
+          elif test "$sr_exp_i" -ne "$sr_count"; then
+            echo "error: shift/reduce conflicts: $sr_count found, $sr_exp_i expected"
+          fi
+          if test -z "$rr_exp_i" && test "$rr_count" -ne 0; then
+            echo "warning: $rr_count reduce/reduce conflicts"
+          elif test "$rr_exp_i" -ne "$rr_count"; then
+            echo "error: reduce/reduce conflicts: $rr_count found, $rr_exp_i expected"
+          fi
+        } | sed -e "s/^/$file: /" > experr

         ]AT_BISON_CHECK([[-Wnone $file]], [[1]], [[]], [[experr]])[
         ]AT_BISON_CHECK([[-Werror $file]], [[1]], [[]], [[experr]])[
       fi
         ]AT_BISON_CHECK([[-Wnone $file]], [[1]], [[]], [[experr]])[
         ]AT_BISON_CHECK([[-Werror $file]], [[1]], [[]], [[experr]])[
       fi