Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index f455d1f5627cdd13446a8cdb7ec30e0013231c1d..c7ed2fe42a8990ddbe67494a50f09aa637b34997 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,7 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 

-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2005, 2007-2012 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


@@ -38,7 +37,13 @@ e: 'e' | /* Nothing. */;
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],

-[[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */
+[[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


@@ -50,20 +55,17 @@ AT_CLEANUP
 
 AT_SETUP([%nonassoc and eof])
 
 
 AT_SETUP([%nonassoc and eof])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([input.y],
 [[
 %{
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 AT_DATA_GRAMMAR([input.y],
 [[
 %{
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <assert.h>

 
 #define YYERROR_VERBOSE 1
 
 #define YYERROR_VERBOSE 1

-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 /* The current argument. */
 static const char *input;
 
 /* The current argument. */
 static const char *input;
 


@@ -71,8 +73,7 @@ static int
 yylex (void)
 {
   static size_t toknum;
 yylex (void)
 {
   static size_t toknum;

-  if (! (toknum <= strlen (input)))
-    abort ();
+  assert (toknum <= strlen (input));

   return input[toknum++];
 }
 
   return input[toknum++];
 }
 


@@ -93,57 +94,64 @@ main (int argc, const char *argv[])
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 

-# Specify the output files to avoid problems on different file systems.
-AT_BISON_CHECK([-o input.c input.y])
+m4_pushdef([AT_NONASSOC_AND_EOF_CHECK],
+[AT_BISON_CHECK([$1[ -o input.c input.y]])

 AT_COMPILE([input])
 
 AT_COMPILE([input])
 

+m4_pushdef([AT_EXPECTING], [m4_if($2, [correct], [[, expecting $end]])])
+

 AT_PARSER_CHECK([./input '0<0'])
 AT_PARSER_CHECK([./input '0<0<0'], [1], [],
 AT_PARSER_CHECK([./input '0<0'])
 AT_PARSER_CHECK([./input '0<0<0'], [1], [],

-         [syntax error, unexpected '<'
+         [syntax error, unexpected '<'AT_EXPECTING

 ])
 
 AT_PARSER_CHECK([./input '0>0'])
 AT_PARSER_CHECK([./input '0>0>0'], [1], [],
 ])
 
 AT_PARSER_CHECK([./input '0>0'])
 AT_PARSER_CHECK([./input '0>0>0'], [1], [],

-         [syntax error, unexpected '>'
+         [syntax error, unexpected '>'AT_EXPECTING

 ])
 
 AT_PARSER_CHECK([./input '0<0>0'], [1], [],
 ])
 
 AT_PARSER_CHECK([./input '0<0>0'], [1], [],

-         [syntax error, unexpected '>'
+         [syntax error, unexpected '>'AT_EXPECTING

 ])
 
 ])
 

-# We must disable default reductions in inconsistent states in order to
-# have an explicit list of all expected tokens.  (However, unless we use
-# canonical LR, lookahead sets are merged for different left contexts,
-# so it is still possible to have extra incorrect tokens in the expected
-# list.  That just doesn't happen to be a problem for this test case.)
-
-AT_BISON_CHECK([-Dlr.default-reductions=consistent -o input.c input.y])
-AT_COMPILE([input])
-
-AT_PARSER_CHECK([./input '0<0'])
-AT_PARSER_CHECK([./input '0<0<0'], [1], [],
-         [syntax error, unexpected '<', expecting $end
-])
+m4_popdef([AT_EXPECTING])])

 
 

-AT_PARSER_CHECK([./input '0>0'])
-AT_PARSER_CHECK([./input '0>0>0'], [1], [],
-         [syntax error, unexpected '>', expecting $end
-])
+# Expected token list is missing.
+AT_NONASSOC_AND_EOF_CHECK([], [[incorrect]])

 
 

-AT_PARSER_CHECK([./input '0<0>0'], [1], [],
-         [syntax error, unexpected '>', expecting $end
-])
+# 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-reduction=consistent]],
+                          [[correct]])
+
+# 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
+# can fail only when %nonassoc is used), so make sure it gives the same
+# result as above.
+AT_NONASSOC_AND_EOF_CHECK([[-Dlr.type=canonical-lr]], [[correct]])
+
+# parse.lac=full is a completely general solution that does not require
+# any of the above sacrifices.  Of course, it does not extend the
+# language-recognition power of LALR to (IE)LR, but it does ensure that
+# the reported list of expected tokens matches what the given parser
+# would have accepted in place of the unexpected token.
+AT_NONASSOC_AND_EOF_CHECK([[-Dparse.lac=full]], [[correct]])
+
+m4_popdef([AT_NONASSOC_AND_EOF_CHECK])

 
 AT_CLEANUP
 
 
 
 
 AT_CLEANUP
 
 
 

-## -------------------------------------- ##
-## %error-verbose and consistent errors.  ##
-## -------------------------------------- ##
+## ------------------------------------------- ##
+## parse.error=verbose and consistent errors.  ##
+## ------------------------------------------- ##

 
 

-AT_SETUP([[%error-verbose and consistent errors]])
+AT_SETUP([[parse.error=verbose and consistent errors]])

 
 m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [
 
 
 m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [
 


@@ -161,11 +169,10 @@ AT_SKEL_JAVA_IF([AT_DATA], [AT_DATA_GRAMMAR])([input.y],
 }]], [[
 
 %code {]AT_SKEL_CC_IF([[
 }]], [[
 
 %code {]AT_SKEL_CC_IF([[

-  #include <cassert>

   #include <string>]], [[
   #include <assert.h>
   #include <stdio.h>
   #include <string>]], [[
   #include <assert.h>
   #include <stdio.h>

-  void yyerror (char const *msg);]])[
+  ]AT_YYERROR_DECLARE])[

   ]AT_YYLEX_PROTOTYPE[;
   #define USE(Var)
 }
   ]AT_YYLEX_PROTOTYPE[;
   #define USE(Var)
 }


@@ -174,7 +181,7 @@ AT_SKEL_JAVA_IF([AT_DATA], [AT_DATA_GRAMMAR])([input.y],
 
 ]$1[
 
 
 ]$1[
 

-%error-verbose
+%define parse.error verbose

 
 %%
 
 
 %%
 


@@ -206,31 +213,11 @@ public Object getLVal ()
   *lvalp = 1;
   return *input++;
 }]])[
   *lvalp = 1;
   return *input++;
 }]])[

-
-/*----------.
-| yyerror.  |
-`----------*/]AT_SKEL_JAVA_IF([[
-
-public void yyerror (String msg)
-{
-  System.err.println (msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_SKEL_JAVA_IF([[

 };
 
 };
 

-%%]], [AT_SKEL_CC_IF([[
-
-void
-yy::parser::error (const yy::location &, std::string const &msg)
-{
-  std::cerr << msg << std::endl;
-}]], [[
-
-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}]])])[
+%%]])[

 
 /*-------.
 | main.  |
 
 /*-------.
 | main.  |


@@ -329,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]])


@@ -343,6 +330,18 @@ AT_CONSISTENT_ERRORS_CHECK([[%define lr.type canonical-lr]],
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])
 
                            [AT_PREVIOUS_STATE_INPUT],
                            [[$end]], [[ab]])
 

+# Only LAC gets it right.
+AT_CONSISTENT_ERRORS_CHECK([[%define lr.type canonical-lr
+                             %define parse.lac full]],
+                           [AT_PREVIOUS_STATE_GRAMMAR],
+                           [AT_PREVIOUS_STATE_INPUT],
+                           [[$end]], [[b]])
+AT_CONSISTENT_ERRORS_CHECK([[%define lr.type ielr
+                             %define parse.lac full]],
+                           [AT_PREVIOUS_STATE_GRAMMAR],
+                           [AT_PREVIOUS_STATE_INPUT],
+                           [[$end]], [[b]])
+

 m4_popdef([AT_PREVIOUS_STATE_GRAMMAR])
 m4_popdef([AT_PREVIOUS_STATE_INPUT])
 
 m4_popdef([AT_PREVIOUS_STATE_GRAMMAR])
 m4_popdef([AT_PREVIOUS_STATE_INPUT])
 


@@ -377,7 +376,7 @@ error-reduce:
 ;
 
 consistent-reduction: /*empty*/ {
 ;
 
 consistent-reduction: /*empty*/ {

-  assert (yychar == ]AT_SKEL_CC_IF([[yyempty_]], [[YYEMPTY]])[);
+  assert (yychar == YYEMPTY);

   yylval = 0;
   yychar = 'b';
 } ;
   yylval = 0;
   yychar = 'b';
 } ;


@@ -401,19 +400,15 @@ AT_CONSISTENT_ERRORS_CHECK([[%glr-parser]],
                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])
                            [AT_USER_ACTION_GRAMMAR],
                            [AT_USER_ACTION_INPUT],
                            [['b']], [[none]])

-AT_CONSISTENT_ERRORS_CHECK([[%language "c++"]],
-                           [AT_USER_ACTION_GRAMMAR],
-                           [AT_USER_ACTION_INPUT],
-                           [['b']], [[none]])
-# No Java test because yychar cannot be manipulated by users.
+# 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]])


@@ -422,6 +417,16 @@ AT_CONSISTENT_ERRORS_CHECK([[%define lr.type canonical-lr]],
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[a]])
 
                            [AT_USER_ACTION_INPUT],
                            [[$end]], [[a]])
 

+AT_CONSISTENT_ERRORS_CHECK([[%define parse.lac full]],
+                           [AT_USER_ACTION_GRAMMAR],
+                           [AT_USER_ACTION_INPUT],
+                           [['b']], [[none]])
+AT_CONSISTENT_ERRORS_CHECK([[%define parse.lac full
+                             %define lr.default-reduction accepting]],
+                           [AT_USER_ACTION_GRAMMAR],
+                           [AT_USER_ACTION_INPUT],
+                           [[$end]], [[none]])
+

 m4_popdef([AT_USER_ACTION_GRAMMAR])
 m4_popdef([AT_USER_ACTION_INPUT])
 
 m4_popdef([AT_USER_ACTION_GRAMMAR])
 m4_popdef([AT_USER_ACTION_INPUT])
 


@@ -431,6 +436,103 @@ AT_CLEANUP
 
 
 
 
 
 

+## ------------------------------------------------------- ##
+## LAC: %nonassoc requires splitting canonical LR states.  ##
+## ------------------------------------------------------- ##
+
+# This test case demonstrates that, when %nonassoc is used, canonical
+# LR(1) parser table construction followed by conflict resolution
+# without further state splitting is not always sufficient to produce a
+# parser that can detect all syntax errors as soon as possible on one
+# token of lookahead.  However, LAC solves the problem completely even
+# with minimal LR parser tables.
+
+AT_SETUP([[LAC: %nonassoc requires splitting canonical LR states]])
+AT_BISON_OPTION_PUSHDEFS
+AT_DATA_GRAMMAR([[input.y]],
+[[%code {
+  #include <stdio.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+}
+
+%error-verbose
+%nonassoc 'a'
+
+%%
+
+start:
+  'a' problem 'a' // First context.
+| 'b' problem 'b' // Second context.
+| 'c' reduce-nonassoc // Just makes reduce-nonassoc useful.
+;
+
+problem:
+  look reduce-nonassoc
+| look 'a'
+| look 'b'
+;
+
+// For the state reached after shifting the 'a' in these productions,
+// lookahead sets are the same in both the first and second contexts.
+// Thus, canonical LR reuses the same state for both contexts.  However,
+// the lookahead 'a' for the reduction "look: 'a'" later becomes an
+// error action only in the first context.  In order to immediately
+// detect the syntax error on 'a' here for only the first context, this
+// canonical LR state would have to be split into two states, and the
+// 'a' lookahead would have to be removed from only one of the states.
+look:
+  'a' // Reduction lookahead set is always ['a', 'b'].
+| 'a' 'b'
+| 'a' 'c' // 'c' is forgotten as an expected token.
+;
+
+reduce-nonassoc: %prec 'a';
+
+%%
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["aaa"])[
+
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+AT_BISON_OPTION_POPDEFS
+
+# Show canonical LR's failure.
+AT_BISON_CHECK([[-Dlr.type=canonical-lr -o input.c input.y]],
+               [[0]], [[]],
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
+]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[1]], [[]],
+[[syntax error, unexpected 'a', expecting 'b'
+]])
+
+# It's corrected by LAC.
+AT_BISON_CHECK([[-Dlr.type=canonical-lr -Dparse.lac=full \
+                 -o input.c input.y]], [[0]], [[]],
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
+]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[1]], [[]],
+[[syntax error, unexpected 'a', expecting 'b' or 'c'
+]])
+
+# IELR is sufficient when LAC is used.
+AT_BISON_CHECK([[-Dlr.type=ielr -Dparse.lac=full -o input.c input.y]],
+               [[0]], [[]],
+[[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
+]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[1]], [[]],
+[[syntax error, unexpected 'a', expecting 'b' or 'c'
+]])
+
+AT_CLEANUP
+

 ## ------------------------- ##
 ## Unresolved SR Conflicts.  ##
 ## ------------------------- ##
 ## ------------------------- ##
 ## Unresolved SR Conflicts.  ##
 ## ------------------------- ##


@@ -446,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], [],


@@ -478,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


@@ -489,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


@@ -505,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


@@ -523,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]


@@ -581,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


@@ -592,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


@@ -608,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


@@ -626,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]


@@ -639,6 +741,62 @@ state 5
 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

+## ---------------------- ##
+## %precedence suffices.  ##
+## ---------------------- ##
+
+AT_SETUP([%precedence suffices])
+
+AT_DATA([input.y],
+[[%precedence "then"
+%precedence "else"
+%%
+stmt:
+  "if" cond "then" stmt
+| "if" cond "then" stmt "else" stmt
+| "stmt"
+;
+
+cond:
+  "exp"
+;
+]])
+
+AT_BISON_CHECK([-o input.c input.y])
+
+AT_CLEANUP
+
+
+## ------------------------------ ##
+## %precedence does not suffice.  ##
+## ------------------------------ ##
+
+AT_SETUP([%precedence does not suffice])
+
+AT_DATA([input.y],
+[[%precedence "then"
+%precedence "else"
+%%
+stmt:
+  "if" cond "then" stmt
+| "if" cond "then" stmt "else" stmt
+| "stmt"
+;
+
+cond:
+  "exp"
+| cond "then" cond
+;
+]])
+
+AT_BISON_CHECK([-o input.c input.y], 0, [],
+[[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]
+]])
+
+AT_CLEANUP
+
+

 ## -------------------------------- ##
 ## Defaulted Conflicted Reduction.  ##
 ## -------------------------------- ##
 ## -------------------------------- ##
 ## Defaulted Conflicted Reduction.  ##
 ## -------------------------------- ##


@@ -676,8 +834,8 @@ 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:4.6-8: warning: rule useless in parser due to conflicts: id: '0'
+[[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]

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


@@ -721,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


@@ -736,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]


@@ -746,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 .
 


@@ -793,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
 
 


@@ -830,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
 
 


@@ -850,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
 
 


@@ -894,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
 


@@ -996,14 +1151,15 @@ 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:12.5-20: warning: rule useless in parser due to conflicts: resolved_conflict: 'a' unreachable1
-input.y:20.5-20: warning: rule useless in parser due to conflicts: unreachable1: 'a' unreachable2
-input.y:21.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */
-input.y:25.13: warning: rule useless in parser due to conflicts: unreachable2: /* empty */
-input.y:25.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */
-input.y:31.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a'
-input.y:32.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */
+[[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:25.13: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
+input.y:25.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
+input.y:31.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' [-Wother]
+input.y:32.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ [-Wother]

 ]])
 
 AT_CHECK([[cat input.output]], 0,
 ]])
 
 AT_CHECK([[cat input.output]], 0,


@@ -1068,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'


@@ -1083,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'


@@ -1118,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']


@@ -1128,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' .
 


@@ -1143,16 +1299,17 @@ 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:22.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */
-input-keep.y:26.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */
-input-keep.y:32.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a'
-input-keep.y:33.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */
+[[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:33.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1189,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'


@@ -1208,7 +1365,7 @@ AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
    13 empty_c3: .  ['c']
 
     'b'  shift, and go to state 1
    13 empty_c3: .  ['c']
 
     'b'  shift, and go to state 1

- 
+

     'c'       reduce using rule 13 (empty_c3)
     $default  reduce using rule 9 (empty_a)
 
     'c'       reduce using rule 13 (empty_c3)
     $default  reduce using rule 9 (empty_a)
 


@@ -1226,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


@@ -1265,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'


@@ -1302,6 +1459,150 @@ 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
+
+
+## ---------------------------------- ##
+## -W versus %expect and %expect-rr.  ##
+## ---------------------------------- ##
+
+AT_SETUP([[-W versus %expect and %expect-rr]])
+
+AT_DATA([[sr-rr.y]],
+[[%glr-parser
+%%
+start: 'a' | A 'a' | B 'a' ;
+A: ;
+B: ;
+]])
+AT_DATA([[sr.y]],
+[[%glr-parser
+%%
+start: 'a' | A 'a' ;
+A: ;
+]])
+AT_DATA([[rr.y]],
+[[%glr-parser
+%%
+start: A | B ;
+A: ;
+B: ;
+]])
+
+AT_BISON_CHECK([[sr-rr.y]], [[0]], [[]],
+[[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]], [[]],
+[[sr-rr.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])
+AT_BISON_CHECK([[-Wno-conflicts-rr sr-rr.y]], [[0]], [[]],
+[[sr-rr.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+]])
+
+[
+# 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
+    # 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
+
+      # Build grammar file.
+      sr_exp=0
+      rr_exp=0
+      file=$gram
+      directives=
+      if test -n "$sr_exp_i"; then
+        sr_exp=$sr_exp_i
+        file=$file-expect-$sr_exp
+        directives="%expect $sr_exp"
+      fi
+      if test -n "$rr_exp_i"; then
+        rr_exp=$rr_exp_i
+        file=$file-expect-rr-$rr_exp
+        directives="$directives %expect-rr $rr_exp"
+      fi
+      file=$file.y
+      echo "$directives" > $file
+      cat $gram.y >> $file
+
+      # 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
+        {
+          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
+    done
+  done
+done]
+

 AT_CLEANUP
 AT_CLEANUP