version 3.6.93

* NEWS: Record release date.

.prev-version

@@ -1 +1 @@
-3.6.91
+3.6.92

NEWS

@@ -1,5 +1,12 @@
 GNU Bison NEWS
 
+* Noteworthy changes in release 3.6.93 (2020-07-20) [beta]
+
+** Bug fixes
+
+  Portability issues.
+
+
 * Noteworthy changes in release 3.6.92 (2020-07-19) [beta]
 
 Changes in the display of counterexamples.

doc/bison.texi

@@ -11015,7 +11015,7 @@ The exit status of @command{bison} is:
 @item 0 (success)
 when there were no errors.  Warnings, which are diagnostics about dubious
 constructs, do not change the exit status, unless they are turned into
-errors (@pxref{-Werror,,@option{-Werror}}).
+errors (@pxref{Werror,,@option{-Werror}}).
 
 @item 1 (failure)
 when there were errors.  No file was generated (except the reports generated
@@ -11252,22 +11252,22 @@ Options controlling the diagnostics.
 Output warnings falling in @var{category}.  @var{category} can be one
 of:
 @table @code
-@item conflicts-sr
+@item @anchor{Wconflicts-sr}conflicts-sr
-@itemx conflicts-rr
+@itemx @anchor{Wconflicts-rr}conflicts-rr
 S/R and R/R conflicts.  These warnings are enabled by default.  However, if
 the @code{%expect} or @code{%expect-rr} directive is specified, an
 unexpected number of conflicts is an error, and an expected number of
 conflicts is not reported, so @option{-W} and @option{--warning} then have
 no effect on the conflict report.
 
-@item counterexamples
+@item @anchor{Wcounterexamples}counterexamples
 @itemx cex
 Provide counterexamples for conflicts.  @xref{Counterexamples}.
 Counterexamples take time to compute.  The option @option{-Wcex} should be
 used by the developer when working on the grammar; it hardly makes sense to
 use it in a CI.
 
-@item dangling-alias
+@item @anchor{Wdangling-alias}dangling-alias
 Report string literals that are not bound to a token symbol.
 
 String literals, which allow for better error messages, are (too) liberally
@@ -11313,16 +11313,16 @@ foo: "baz" @{@}
       |      @dwarning{^~~~~}
 @end example
 
-@item deprecated
+@item @anchor{Wdeprecated}deprecated
 Deprecated constructs whose support will be removed in future versions of
 Bison.
 
-@item empty-rule
+@item @anchor{Wempty-rule}empty-rule
 Empty rules without @code{%empty}.  @xref{Empty Rules}.  Disabled by
 default, but enabled by uses of @code{%empty}, unless
 @option{-Wno-empty-rule} was specified.
 
-@item midrule-values
+@item @anchor{Wmidrule-values}midrule-values
 Warn about midrule values that are set but not used within any of the actions
 of the parent rule.
 For example, warn about unused @code{$2} in:
@@ -11342,7 +11342,7 @@ These warnings are not enabled by default since they sometimes prove to
 be false alarms in existing grammars employing the Yacc constructs
 @code{$0} or @code{$-@var{n}} (where @var{n} is some positive integer).
 
-@item precedence
+@item @anchor{Wprecedence}precedence
 Useless precedence and associativity directives.  Disabled by default.
 
 Consider for instance the following grammar:
@@ -11403,20 +11403,20 @@ One would get the exact same parser with the following directives instead:
 @end group
 @end example
 
-@item yacc
+@item @anchor{Wyacc}yacc
 Incompatibilities with POSIX Yacc.
 
-@item other
+@item @anchor{Wother}other
 All warnings not categorized above.  These warnings are enabled by default.
 
 This category is provided merely for the sake of completeness.  Future
 releases of Bison may move warnings from this category to new, more specific
 categories.
 
-@item all
+@item @anchor{Wall}all
 All the warnings except @code{dangling-alias} and @code{yacc}.
 
-@item none
+@item @anchor{Wnone}none
 Turn off all the warnings.
 
 @item error
@@ -11427,8 +11427,7 @@ A category can be turned off by prefixing its name with @samp{no-}.  For
 instance, @option{-Wno-yacc} will hide the warnings about
 POSIX Yacc incompatibilities.
 
-@item -Werror
+@item @anchor{Werror}-Werror
-@anchor{-Werror}
 Turn enabled warnings for every @var{category} into errors, unless they are
 explicitly disabled by @option{-Wno-error=@var{category}}.
 

src/complain.c

@@ -35,6 +35,13 @@
 #include "getargs.h"
 #include "quote.h"
 
+// The URL of the manual page about diagnostics.  Use the per-node
+// manual, to avoid downloading repeatedly the whole manual over the
+// Internet.
+static const char *diagnostics_url
+  = "https://www.gnu.org/software/bison/manual/html_node/Diagnostics.html";
+
+
 err_status complaint_status = status_none;
 
 bool warnings_are_errors = false;
@@ -96,6 +103,20 @@ end_use_class (const char *s, FILE *out)
     }
 }
 
+static void
+begin_hyperlink (FILE *out, const char *ref)
+{
+  if (out == stderr)
+    styled_ostream_set_hyperlink (errstream, ref, NULL);
+}
+
+static void
+end_hyperlink (FILE *out)
+{
+  if (out == stderr)
+    styled_ostream_set_hyperlink (errstream, NULL, NULL);
+}
+
 void
 flush (FILE *out)
 {
@@ -427,9 +448,20 @@ warnings_print_categories (warnings warn_flags, FILE *out)
         const char* style = severity_style (s);
         fputs (" [", out);
         begin_use_class (style, out);
-        fprintf (out, "-W%s%s",
+        // E.g., "counterexamples".
-                 s == severity_error ? "error=" : "",
+        const char *warning = argmatch_warning_argument (&w);
-                 argmatch_warning_argument (&w));
+        char ref[200];
+        snprintf (ref, sizeof ref,
+                  "%s#W%s", diagnostics_url, warning);
+        begin_hyperlink (out, ref);
+        ostream_printf (errstream,
+                        "-W%s%s",
+                        s == severity_error ? "error=" : "",
+                        warning);
+        end_hyperlink (out);
+        // Because we mix stdio with ostream I/O, we need to flush
+        // here for sake of color == debug.
+        flush (out);
         end_use_class (style, out);
         fputc (']', out);
         /* Display only the first match, the second is "-Wall".  */

src/counterexample.c

@@ -26,6 +26,7 @@
 #include <gl_linked_list.h>
 #include <gl_rbtreehash_list.h>
 #include <hash.h>
+#include <mbswidth.h>
 #include <stdlib.h>
 #include <textstyle.h>
 #include <time.h>
@@ -112,15 +113,37 @@ free_counterexample (counterexample *cex)
   free (cex);
 }
 
+static int max (int a, int b)
+{
+  return a < b ? b : a;
+}
+
 static void
 print_counterexample (const counterexample *cex, FILE *out, const char *prefix)
 {
   const bool flat = getenv ("YYFLAT");
-  fprintf (out, "  %s%-20s ",
+  const char *example1_label
-           prefix, cex->unifying ? _("Example") : _("First example"));
+    = cex->unifying ? _("Example") : _("First example");
-  derivation_print_leaves (cex->d1, out, prefix);
+  const char *example2_label
-  fprintf (out, flat ? "  %s%-20s " : "  %s%s",
+    = cex->unifying ? _("Example") : _("Second example");
-           prefix, cex->shift_reduce ? _("Shift derivation") : _("First derivation"));
+  const char *deriv1_label
+    = cex->shift_reduce ? _("Shift derivation") : _("First reduce derivation");
+  const char *deriv2_label
+    = cex->shift_reduce ? _("Reduce derivation") : _("Second reduce derivation");
+  const int width =
+    max (max (mbswidth (example1_label, 0), mbswidth (example2_label, 0)),
+         max (mbswidth (deriv1_label, 0),   mbswidth (deriv2_label, 0)));
+  if (flat)
+    fprintf (out, "  %s%s%*s ", prefix,
+             example1_label, width - mbswidth (example1_label, 0), "");
+  else
+    fprintf (out, "  %s%s: ", prefix, example1_label);
+  derivation_print_leaves (cex->d1, out);
+  if (flat)
+    fprintf (out, "  %s%s%*s ", prefix,
+             deriv1_label, width - mbswidth (deriv1_label, 0), "");
+  else
+    fprintf (out, "  %s%s", prefix, deriv1_label);
   derivation_print (cex->d1, out, prefix);
 
   // If we output to the terminal (via stderr) and we have color
@@ -128,15 +151,22 @@ print_counterexample (const counterexample *cex, FILE *out, const char *prefix)
   // to see the differences.
   if (!cex->unifying || is_styled (stderr))
     {
-      fprintf (out, "  %s%-20s ",
+      if (flat)
-               prefix, cex->unifying ? _("Example") : _("Second example"));
+        fprintf (out, "  %s%s%*s ", prefix,
-      derivation_print_leaves (cex->d2, out, prefix);
+                 example2_label, width - mbswidth (example2_label, 0), "");
+      else
+        fprintf (out, "  %s%s: ", prefix, example2_label);
+      derivation_print_leaves (cex->d2, out);
     }
-  fprintf (out, flat ? "  %s%-20s " : "  %s%s",
+  if (flat)
-           prefix, cex->shift_reduce ? _("Reduce derivation") : _("Second derivation"));
+    fprintf (out, "  %s%s%*s ", prefix,
+             deriv2_label, width - mbswidth (deriv2_label, 0), "");
+  else
+    fprintf (out, "  %s%s", prefix, deriv2_label);
   derivation_print (cex->d2, out, prefix);
 
-  fputc ('\n', out);
+  if (out != stderr)
+    putc ('\n', out);
 }
 
 /*
@@ -1248,10 +1278,17 @@ counterexample_report_shift_reduce (state_item_number itm1, state_item_number it
                                     symbol_number next_sym,
                                     FILE *out, const char *prefix)
 {
-  fputs (prefix, out);
+  if (out == stderr)
-  fprintf (out, _("Shift/reduce conflict on token %s:\n"), symbols[next_sym]->tag);
+    complain (NULL, Wcounterexamples,
+              _("shift/reduce conflict on token %s"), symbols[next_sym]->tag);
+  else
+    {
+      fputs (prefix, out);
+      fprintf (out, _("shift/reduce conflict on token %s"), symbols[next_sym]->tag);
+      fprintf (out, "%s\n", _(":"));
+    }
   // In the report, print the items.
-  if (*prefix || trace_flag & trace_cex)
+  if (out != stderr || trace_flag & trace_cex)
     {
       print_state_item (&state_items[itm1], out, prefix);
       print_state_item (&state_items[itm2], out, prefix);
@@ -1265,27 +1302,43 @@ counterexample_report_reduce_reduce (state_item_number itm1, state_item_number i
                                      FILE *out, const char *prefix)
 {
   {
-    fputs (prefix, out);
+    struct obstack obstack;
-    fputs (ngettext ("Reduce/reduce conflict on token",
+    obstack_init (&obstack);
-                     "Reduce/reduce conflict on tokens",
-                     bitset_count (conflict_syms)), out);
     bitset_iterator biter;
     state_item_number sym;
-    const char *sep = " ";
+    const char *sep = "";
     BITSET_FOR_EACH (biter, conflict_syms, sym, 0)
       {
-        fprintf (out, "%s%s", sep, symbols[sym]->tag);
+        obstack_printf (&obstack, "%s%s", sep, symbols[sym]->tag);
         sep = ", ";
       }
-    fputs (_(":\n"), out);
+    char *tokens = obstack_finish0 (&obstack);
+    if (out == stderr)
+      complain (NULL, Wcounterexamples,
+                ngettext ("reduce/reduce conflict on token %s",
+                          "reduce/reduce conflict on tokens %s",
+                          bitset_count (conflict_syms)),
+                tokens);
+    else
+      {
+        fputs (prefix, out);
+        fprintf (out,
+                 ngettext ("reduce/reduce conflict on token %s",
+                           "reduce/reduce conflict on tokens %s",
+                           bitset_count (conflict_syms)),
+                 tokens);
+        fprintf (out, "%s\n", _(":"));
+      }
+    obstack_free (&obstack, NULL);
   }
   // In the report, print the items.
-  if (*prefix || trace_flag & trace_cex)
+  if (out != stderr || trace_flag & trace_cex)
     {
       print_state_item (&state_items[itm1], out, prefix);
       print_state_item (&state_items[itm2], out, prefix);
     }
-  counterexample_report (itm1, itm2, bitset_first (conflict_syms), false, out, prefix);
+  counterexample_report (itm1, itm2, bitset_first (conflict_syms),
+                         false, out, prefix);
 }
 
 static state_item_number

src/derivation.c

@@ -428,10 +428,9 @@ derivation_print_flat (const derivation *deriv, FILE *out, const char *prefix)
 }
 
 void
-derivation_print_leaves (const derivation *deriv, FILE *out, const char *prefix)
+derivation_print_leaves (const derivation *deriv, FILE *out)
 {
   int counter = 0;
-  fputs (prefix, out);
   derivation_print_flat_impl ((derivation *)deriv, out, true, &counter, "");
   fputc ('\n', out);
 }

src/derivation.h

@@ -64,7 +64,7 @@ static inline derivation *derivation_new_leaf (symbol_number sym)
 // Number of symbols.
 size_t derivation_size (const derivation *deriv);
 void derivation_print (const derivation *deriv, FILE *out, const char *prefix);
-void derivation_print_leaves (const derivation *deriv, FILE *out, const char *prefix);
+void derivation_print_leaves (const derivation *deriv, FILE *out);
 void derivation_free (derivation *deriv);
 void derivation_retain (derivation *deriv);
 

src/glyphs.c

@@ -28,24 +28,17 @@
 #include <mbswidth.h>
 #include <unicodeio.h>
 
-// In gnulib/lib/unicodeio.h unicode_to_mb uses a buffer of 25 bytes.
-typedef char glyph_buffer_t[26];
 
-
+glyph_buffer_t arrow;
-static glyph_buffer_t arrow_buf;
-const char *arrow;
 int arrow_width;
 
-static glyph_buffer_t down_arrow_buf;
+glyph_buffer_t down_arrow;
-const char *down_arrow;
 int down_arrow_width;
 
-static glyph_buffer_t dot_buf;
+glyph_buffer_t dot;
-const char *dot;
 int dot_width;
 
-static glyph_buffer_t empty_buf;
+glyph_buffer_t empty;
-const char *empty;
 int empty_width;
 
 const char *derivation_separator = " ";
@@ -53,8 +46,7 @@ int derivation_separator_width = 1;
 
 typedef struct
 {
-  const char **glyph;
+  glyph_buffer_t *pbuf;
-  char *buf;
   const char *fallback;
 } callback_arg_t;
 
@@ -63,8 +55,8 @@ static long
 on_success (const char *buf, size_t buflen, void *callback_arg)
 {
   callback_arg_t *arg = (callback_arg_t *) callback_arg;
-  assert (buflen + 1 < sizeof arg->buf);
+  assert (buflen + 1 < sizeof *arg->pbuf);
-  *stpncpy (arg->buf, buf, buflen) = '\0';
+  *stpncpy (*arg->pbuf, buf, buflen) = '\0';
   return 1;
 }
 
@@ -73,19 +65,17 @@ on_failure (unsigned code MAYBE_UNUSED, const char *msg MAYBE_UNUSED,
             void *callback_arg)
 {
   callback_arg_t *arg = (callback_arg_t *) callback_arg;
-  assert (strlen (arg->fallback) + 1 < sizeof arg->buf);
+  assert (strlen (arg->fallback) + 1 < sizeof *arg->pbuf);
-  strcpy (arg->buf, arg->fallback);
+  strcpy (*arg->pbuf, arg->fallback);
   return 0;
 }
 
 static bool
-glyph_set (const char **glyph,
+glyph_set (glyph_buffer_t *glyph, int *width,
-           char buf[26], int *width,
            unsigned code, const char *fallback)
 {
-  callback_arg_t arg = { glyph, buf, fallback };
+  callback_arg_t arg = { glyph, fallback };
   int res = unicode_to_mb (code, on_success, on_failure, &arg);
-  *glyph = buf;
   *width = mbswidth (*glyph, 0);
   return res;
 }
@@ -93,11 +83,11 @@ glyph_set (const char **glyph,
 void
 glyphs_init (void)
 {
-  glyph_set (&arrow,      arrow_buf,      &arrow_width,      0x2192, "->");
+  glyph_set (&arrow,      &arrow_width,      0x2192, "->");
-  glyph_set (&dot,        dot_buf,        &dot_width,        0x2022, ".");
+  glyph_set (&dot,        &dot_width,        0x2022, ".");
-  glyph_set (&down_arrow, down_arrow_buf, &down_arrow_width, 0x21b3, "`->");
+  glyph_set (&down_arrow, &down_arrow_width, 0x21b3, "`->");
-  glyph_set (&empty,      empty_buf,      &empty_width,      0x03b5, "%empty");
+  glyph_set (&empty,      &empty_width,      0x03b5, "%empty");
 
-  strncat (down_arrow_buf, " ", sizeof down_arrow_buf - strlen (down_arrow_buf) - 1);
+  strncat (down_arrow, " ", sizeof down_arrow - strlen (down_arrow) - 1);
   down_arrow_width += 1;
 }

src/glyphs.h

@@ -23,20 +23,24 @@
 /* Initialize the following variables.  */
 void glyphs_init (void);
 
+/* In gnulib/lib/unicodeio.h unicode_to_mb uses a buffer of 25 bytes.
+   In down_arrow, we append one space.  */
+typedef char glyph_buffer_t[26];
+
 /* "→", separates the lhs of a rule from its rhs.  */
-extern const char *arrow;
+extern glyph_buffer_t arrow;
 extern int arrow_width;
 
 /* "•", a point in an item (aka, a dotted rule).  */
-extern const char *dot;
+extern glyph_buffer_t dot;
 extern int dot_width;
 
 /* "↳ ", below an lhs to announce the rhs.  */
-extern const char *down_arrow;
+extern glyph_buffer_t down_arrow;
 extern int down_arrow_width;
 
 /* "ε", an empty rhs.  */
-extern const char *empty;
+extern glyph_buffer_t empty;
 extern int empty_width;
 
 /* " ", separate symbols in the rhs of a derivation.  */

tests/conflicts.at

@@ -861,10 +861,10 @@ State 5
     OP        [reduce using rule 1 (exp)]
     $default  reduce using rule 1 (exp)
 
-    Shift/reduce conflict on token OP:
+    shift/reduce conflict on token OP:
         1 exp: exp OP exp .
         1 exp: exp . OP exp
-      Example                  exp OP exp . OP exp
+      Example: exp OP exp . OP exp
       Shift derivation
         exp
         `-> exp OP exp
@@ -1209,15 +1209,15 @@ State 1
     $end      [reduce using rule 4 (id)]
     $default  reduce using rule 3 (num)
 
-    Reduce/reduce conflict on token $end:
+    reduce/reduce conflict on token $end:
         3 num: '0' .
         4 id: '0' .
-      Example                  '0' .
+      Example: '0' .
-      First derivation
+      First reduce derivation
         exp
         `-> num
             `-> '0' .
-      Second derivation
+      Second reduce derivation
         exp
         `-> id
             `-> '0' .
@@ -1764,29 +1764,29 @@ State 4
 
     reported_conflicts  go to state 6
 
-    Shift/reduce conflict on token 'a':
+    shift/reduce conflict on token 'a':
        10 reported_conflicts: . %empty
         8 reported_conflicts: . 'a'
-      First example            resolved_conflict . 'a' 'a'
+      First example: resolved_conflict . 'a' 'a'
       Shift derivation
         start
         `-> resolved_conflict reported_conflicts 'a'
                               `-> . 'a'
-      Second example           resolved_conflict . 'a'
+      Second example: resolved_conflict . 'a'
       Reduce derivation
         start
         `-> resolved_conflict reported_conflicts 'a'
                               `-> .
 
-    Shift/reduce conflict on token 'a':
+    shift/reduce conflict on token 'a':
        10 reported_conflicts: . %empty
         9 reported_conflicts: . 'a'
-      First example            resolved_conflict . 'a' 'a'
+      First example: resolved_conflict . 'a' 'a'
       Shift derivation
         start
         `-> resolved_conflict reported_conflicts 'a'
                               `-> . 'a'
-      Second example           resolved_conflict . 'a'
+      Second example: resolved_conflict . 'a'
       Reduce derivation
         start
         `-> resolved_conflict reported_conflicts 'a'
@@ -1803,14 +1803,14 @@ State 5
     'a'       [reduce using rule 9 (reported_conflicts)]
     $default  reduce using rule 8 (reported_conflicts)
 
-    Reduce/reduce conflict on token 'a':
+    reduce/reduce conflict on token 'a':
         8 reported_conflicts: 'a' .
         9 reported_conflicts: 'a' .
-      Example                  'a' .
+      Example: 'a' .
-      First derivation
+      First reduce derivation
         reported_conflicts
         `-> 'a' .
-      Second derivation
+      Second reduce derivation
         reported_conflicts
         `-> 'a' .
 
@@ -1993,15 +1993,15 @@ AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
     Conflict between rule 10 and token 'b' resolved as an error (%nonassoc 'b').
     Conflict between rule 11 and token 'c' resolved as an error (%nonassoc 'c').
 
-    Reduce/reduce conflict on token 'c':
+    reduce/reduce conflict on token 'c':
        12 empty_c2: . %empty
        13 empty_c3: . %empty
-      Example                  . 'c'
+      Example: . 'c'
-      First derivation
+      First reduce derivation
         start
         `-> empty_c2 'c'
             `-> .
-      Second derivation
+      Second reduce derivation
         start
         `-> empty_c3 'c'
             `-> .

tests/counterexample.at

@@ -54,8 +54,8 @@ y: A | A B;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B C
+  Example: A . B C
   Shift derivation
     s
     `-> y         c
@@ -64,15 +64,13 @@ Shift/reduce conflict on token B:
     s
     `-> a       x
         `-> A . `-> B C
-
 input.y:4.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B C
+  Example           A . B C
-  Shift derivation     s -> [ y -> [ A . B ] c -> [ C ] ]
+  Shift derivation  s -> [ y -> [ A . B ] c -> [ C ] ]
-  Reduce derivation    s -> [ a -> [ A . ] x -> [ B C ] ]
+  Reduce derivation s -> [ a -> [ A . ] x -> [ B C ] ]
-
 input.y:4.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -96,8 +94,8 @@ bc: B bc C | B C;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B C
+  Example: A . B C
   Shift derivation
     s
     `-> ac
@@ -108,9 +106,8 @@ Shift/reduce conflict on token B:
     s
     `-> a       bc
         `-> A . `-> B C
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  Example: A A . B B C C
-  Example              A A . B B C C
   Shift derivation
     s
     `-> ac
@@ -124,20 +121,17 @@ Shift/reduce conflict on token B:
     `-> a             bc
         `-> A a       `-> B bc      C
               `-> A .       `-> B C
-
 input.y:6.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B C
+  Example           A . B C
-  Shift derivation     s -> [ ac -> [ A ac -> [ b -> [ . B ] ] C ] ]
+  Shift derivation  s -> [ ac -> [ A ac -> [ b -> [ . B ] ] C ] ]
-  Reduce derivation    s -> [ a -> [ A . ] bc -> [ B C ] ]
+  Reduce derivation s -> [ a -> [ A . ] bc -> [ B C ] ]
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  Example           A A . B B C C
-  Example              A A . B B C C
+  Shift derivation  s -> [ ac -> [ A ac -> [ A ac -> [ b -> [ . b -> [ B B ] ] ] C ] C ] ]
-  Shift derivation     s -> [ ac -> [ A ac -> [ A ac -> [ b -> [ . b -> [ B B ] ] ] C ] C ] ]
+  Reduce derivation s -> [ a -> [ A a -> [ A . ] ] bc -> [ B bc -> [ B C ] C ] ]
-  Reduce derivation    s -> [ a -> [ A a -> [ A . ] ] bc -> [ B bc -> [ B C ] C ] ]
-
 input.y:6.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -162,8 +156,8 @@ xby: B | X xby Y;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B
+  Example: A . B
   Shift derivation
     s
     `-> A xby
@@ -173,16 +167,15 @@ Shift/reduce conflict on token B:
     `-> ax          by
         `-> A x     `-> B y
               `-> .       `-> %empty
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  First example: A X . B Y $end
-  First example        A X . B Y $end
   Shift derivation
     $accept
     `-> s                     $end
         `-> A xby
               `-> X xby     Y
                     `-> . B
-  Second example       A X . B y $end
+  Second example: A X . B y $end
   Reduce derivation
     $accept
     `-> s                             $end
@@ -190,21 +183,18 @@ Shift/reduce conflict on token B:
             `-> A x           `-> B y
                   `-> X x
                         `-> .
-
 input.y:5.4-9: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              A . B
+  Example           A . B
-  Shift derivation     s -> [ A xby -> [ . B ] ]
+  Shift derivation  s -> [ A xby -> [ . B ] ]
-  Reduce derivation    s -> [ ax -> [ A x -> [ . ] ] by -> [ B y -> [ ] ] ]
+  Reduce derivation s -> [ ax -> [ A x -> [ . ] ] by -> [ B y -> [ ] ] ]
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  First example     A X . B Y $end
-  First example        A X . B Y $end
+  Shift derivation  $accept -> [ s -> [ A xby -> [ X xby -> [ . B ] Y ] ] $end ]
-  Shift derivation     $accept -> [ s -> [ A xby -> [ X xby -> [ . B ] Y ] ] $end ]
+  Second example    A X . B y $end
-  Second example       A X . B y $end
+  Reduce derivation $accept -> [ s -> [ ax -> [ A x -> [ X x -> [ . ] ] ] by -> [ B y ] ] $end ]
-  Reduce derivation    $accept -> [ s -> [ ax -> [ A x -> [ X x -> [ . ] ] ] by -> [ B y ] ] $end ]
-
 input.y:5.4-9: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -229,31 +219,29 @@ bc: B C;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token C:
+input.y: warning: shift/reduce conflict on token C [-Wcounterexamples]
-  First example        B . C $end
+  First example: B . C $end
   Shift derivation
     $accept
     `-> g                 $end
         `-> x
             `-> bc
                 `-> B . C
-  Second example       B . C D $end
+  Second example: B . C D $end
   Reduce derivation
     $accept
     `-> g                       $end
         `-> x
             `-> b       cd
                 `-> B . `-> C D
-
 input.y:6.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token C:
+input.y: warning: shift/reduce conflict on token C [-Wcounterexamples]
-  First example        B . C $end
+  First example     B . C $end
-  Shift derivation     $accept -> [ g -> [ x -> [ bc -> [ B . C ] ] ] $end ]
+  Shift derivation  $accept -> [ g -> [ x -> [ bc -> [ B . C ] ] ] $end ]
-  Second example       B . C D $end
+  Second example    B . C D $end
-  Reduce derivation    $accept -> [ g -> [ x -> [ b -> [ B . ] cd -> [ C D ] ] ] $end ]
+  Reduce derivation $accept -> [ g -> [ x -> [ b -> [ B . ] cd -> [ C D ] ] ] $end ]
-
 input.y:6.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -276,15 +264,15 @@ y: A A B;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token A:
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-  First example        A . A B $end
+  First example: A . A B $end
   Shift derivation
     $accept
     `-> s                   $end
         `-> t
             `-> y
                 `-> A . A B
-  Second example       A . A $end
+  Second example: A . A $end
   Reduce derivation
     $accept
     `-> s                             $end
@@ -292,15 +280,13 @@ Shift/reduce conflict on token A:
             `-> t           `-> x
                 `-> x           `-> A
                     `-> A .
-
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token A:
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-  First example        A . A B $end
+  First example     A . A B $end
-  Shift derivation     $accept -> [ s -> [ t -> [ y -> [ A . A B ] ] ] $end ]
+  Shift derivation  $accept -> [ s -> [ t -> [ y -> [ A . A B ] ] ] $end ]
-  Second example       A . A $end
+  Second example    A . A $end
-  Reduce derivation    $accept -> [ s -> [ s -> [ t -> [ x -> [ A . ] ] ] t -> [ x -> [ A ] ] ] $end ]
+  Reduce derivation $accept -> [ s -> [ s -> [ t -> [ x -> [ A . ] ] ] t -> [ x -> [ A ] ] ] $end ]
-
 ]])
 
 AT_CLEANUP
@@ -327,8 +313,8 @@ y: Y;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
-Shift/reduce conflict on token A:
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-  Example              b . A X X Y
+  Example: b . A X X Y
   Shift derivation
     a
     `-> s
@@ -339,35 +325,31 @@ Shift/reduce conflict on token A:
     `-> r       t
         `-> b . `-> A x     xy
                       `-> X `-> X Y
-
+input.y: warning: shift/reduce conflict on token X [-Wcounterexamples]
-Shift/reduce conflict on token X:
+  First example: A X . X
-  First example        A X . X
   Shift derivation
     a
     `-> t
         `-> A xx
               `-> X . X
-  Second example       X . X xy
+  Second example: X . X xy
   Reduce derivation
     a
     `-> x       t
         `-> X . `-> X xy
-
 input.y:4.4: warning: rule useless in parser due to conflicts [-Wother]
 input.y:8.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
-Shift/reduce conflict on token A:
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-  Example              b . A X X Y
+  Example           b . A X X Y
-  Shift derivation     a -> [ s -> [ b . xx -> [ A X X ] y -> [ Y ] ] ]
+  Shift derivation  a -> [ s -> [ b . xx -> [ A X X ] y -> [ Y ] ] ]
-  Reduce derivation    a -> [ r -> [ b . ] t -> [ A x -> [ X ] xy -> [ X Y ] ] ]
+  Reduce derivation a -> [ r -> [ b . ] t -> [ A x -> [ X ] xy -> [ X Y ] ] ]
-
+input.y: warning: shift/reduce conflict on token X [-Wcounterexamples]
-Shift/reduce conflict on token X:
+  First example     A X . X
-  First example        A X . X
+  Shift derivation  a -> [ t -> [ A xx -> [ X . X ] ] ]
-  Shift derivation     a -> [ t -> [ A xx -> [ X . X ] ] ]
+  Second example    X . X xy
-  Second example       X . X xy
+  Reduce derivation a -> [ x -> [ X . ] t -> [ X xy ] ]
-  Reduce derivation    a -> [ x -> [ X . ] t -> [ X xy ] ]
-
 input.y:4.4: warning: rule useless in parser due to conflicts [-Wother]
 input.y:8.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
@@ -389,24 +371,22 @@ b : A | b;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
-Reduce/reduce conflict on token $end:
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-  Example              A b .
+  Example: A b .
-  First derivation
+  First reduce derivation
     a
     `-> A b .
-  Second derivation
+  Second reduce derivation
     a
     `-> A b
           `-> b .
-
 input.y:4.9: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
-Reduce/reduce conflict on token $end:
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-  Example              A b .
+  Example                  A b .
-  First derivation     a -> [ A b . ]
+  First reduce derivation  a -> [ A b . ]
-  Second derivation    a -> [ A b -> [ b . ] ]
+  Second reduce derivation a -> [ A b -> [ b . ] ]
-
 input.y:4.9: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -428,29 +408,27 @@ b: D;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on tokens A, C:
+input.y: warning: reduce/reduce conflict on tokens A, C [-Wcounterexamples]
-  First example        D . A $end
+  First example: D . A $end
-  First derivation
+  First reduce derivation
     $accept
     `-> s             $end
         `-> a       A
             `-> D .
-  Second example       B D . A $end
+  Second example: B D . A $end
-  Second derivation
+  Second reduce derivation
     $accept
     `-> s               $end
         `-> B b       A
               `-> D .
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on tokens A, C:
+input.y: warning: reduce/reduce conflict on tokens A, C [-Wcounterexamples]
-  First example        D . A $end
+  First example            D . A $end
-  First derivation     $accept -> [ s -> [ a -> [ D . ] A ] $end ]
+  First reduce derivation  $accept -> [ s -> [ a -> [ D . ] A ] $end ]
-  Second example       B D . A $end
+  Second example           B D . A $end
-  Second derivation    $accept -> [ s -> [ B b -> [ D . ] A ] $end ]
+  Second reduce derivation $accept -> [ s -> [ B b -> [ D . ] A ] $end ]
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -472,31 +450,29 @@ i: X | i J K;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token J:
+input.y: warning: shift/reduce conflict on token J [-Wcounterexamples]
 time limit exceeded: XXX
-  First example        H i . J K $end
+  First example: H i . J K $end
   Shift derivation
     $accept
     `-> a                 $end
         `-> H i
               `-> i . J K
-  Second example       H i . J $end
+  Second example: H i . J $end
   Reduce derivation
     $accept
     `-> s               $end
         `-> a         J
             `-> H i .
-
 input.y:4.4-6: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token J:
+input.y: warning: shift/reduce conflict on token J [-Wcounterexamples]
 time limit exceeded: XXX
-  First example        H i . J K $end
+  First example     H i . J K $end
-  Shift derivation     $accept -> [ a -> [ H i -> [ i . J K ] ] $end ]
+  Shift derivation  $accept -> [ a -> [ H i -> [ i . J K ] ] $end ]
-  Second example       H i . J $end
+  Second example    H i . J $end
-  Reduce derivation    $accept -> [ s -> [ a -> [ H i . ] J ] $end ]
+  Reduce derivation $accept -> [ s -> [ a -> [ H i . ] J ] $end ]
-
 input.y:4.4-6: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -522,8 +498,8 @@ b: A B C | A B D;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              N A . B C
+  Example: N A . B C
   Shift derivation
     s
     `-> n
@@ -534,9 +510,8 @@ Shift/reduce conflict on token B:
     `-> n               C
         `-> N a       B
               `-> A .
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  Example: N N A . B D C
-  Example              N N A . B D C
   Shift derivation
     s
     `-> n
@@ -549,20 +524,17 @@ Shift/reduce conflict on token B:
         `-> N n               D
               `-> N a       B
                     `-> A .
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token B:
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-  Example              N A . B C
+  Example           N A . B C
-  Shift derivation     s -> [ n -> [ N b -> [ A . B C ] ] ]
+  Shift derivation  s -> [ n -> [ N b -> [ A . B C ] ] ]
-  Reduce derivation    s -> [ n -> [ N a -> [ A . ] B ] C ]
+  Reduce derivation s -> [ n -> [ N a -> [ A . ] B ] C ]
-
+input.y: warning: shift/reduce conflict on token B [-Wcounterexamples]
-Shift/reduce conflict on token B:
+  Example           N N A . B D C
-  Example              N N A . B D C
+  Shift derivation  s -> [ n -> [ N n -> [ N b -> [ A . B D ] ] C ] ]
-  Shift derivation     s -> [ n -> [ N n -> [ N b -> [ A . B D ] ] C ] ]
+  Reduce derivation s -> [ n -> [ N n -> [ N a -> [ A . ] B ] D ] C ]
-  Reduce derivation    s -> [ n -> [ N n -> [ N a -> [ A . ] B ] D ] C ]
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -589,48 +561,44 @@ C : A c A;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 4 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on tokens b, c:
+input.y: warning: reduce/reduce conflict on tokens b, c [-Wcounterexamples]
-  Example              B . b c
+  Example: B . b c
-  First derivation
+  First reduce derivation
     S
     `-> B                        C
         `-> A       b A          `-> A          c A
             `-> B .   `-> %empty     `-> %empty   `-> %empty
-  Second derivation
+  Second reduce derivation
     S
     `-> B C
           `-> A                          c A
               `-> B                        `-> %empty
                   `-> A     b A
                       `-> .   `-> %empty
-
+input.y: warning: reduce/reduce conflict on tokens b, c [-Wcounterexamples]
-Reduce/reduce conflict on tokens b, c:
+  Example: C . c b
-  Example              C . c b
+  First reduce derivation
-  First derivation
     S
     `-> C                        B
         `-> A       c A          `-> A          b A
             `-> C .   `-> %empty     `-> %empty   `-> %empty
-  Second derivation
+  Second reduce derivation
     S
     `-> C B
           `-> A                          b A
               `-> C                        `-> %empty
                   `-> A     c A
                       `-> .   `-> %empty
-
 ]],
 [[input.y: warning: 4 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on tokens b, c:
+input.y: warning: reduce/reduce conflict on tokens b, c [-Wcounterexamples]
-  Example              B . b c
+  Example                  B . b c
-  First derivation     S -> [ B -> [ A -> [ B . ] b A -> [ ] ] C -> [ A -> [ ] c A -> [ ] ] ]
+  First reduce derivation  S -> [ B -> [ A -> [ B . ] b A -> [ ] ] C -> [ A -> [ ] c A -> [ ] ] ]
-  Second derivation    S -> [ B C -> [ A -> [ B -> [ A -> [ . ] b A -> [ ] ] ] c A -> [ ] ] ]
+  Second reduce derivation S -> [ B C -> [ A -> [ B -> [ A -> [ . ] b A -> [ ] ] ] c A -> [ ] ] ]
-
+input.y: warning: reduce/reduce conflict on tokens b, c [-Wcounterexamples]
-Reduce/reduce conflict on tokens b, c:
+  Example                  C . c b
-  Example              C . c b
+  First reduce derivation  S -> [ C -> [ A -> [ C . ] c A -> [ ] ] B -> [ A -> [ ] b A -> [ ] ] ]
-  First derivation     S -> [ C -> [ A -> [ C . ] c A -> [ ] ] B -> [ A -> [ ] b A -> [ ] ] ]
+  Second reduce derivation S -> [ C B -> [ A -> [ C -> [ A -> [ . ] c A -> [ ] ] ] b A -> [ ] ] ]
-  Second derivation    S -> [ C B -> [ A -> [ C -> [ A -> [ . ] c A -> [ ] ] ] b A -> [ ] ] ]
-
 ]])
 
 AT_CLEANUP
@@ -653,64 +621,61 @@ d : a | c A | d;
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
 input.y: warning: 6 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on token A:
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-  First example        . c A A $end
+  First example: . c A A $end
-  First derivation
+  First reduce derivation
     $accept
     `-> a                   $end
         `-> b     d
             `-> . `-> c A A
-  Second example       . c A A $end
+  Second example: . c A A $end
-  Second derivation
+  Second reduce derivation
     $accept
     `-> a                   $end
         `-> c     d
             `-> . `-> c A A
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        b . c A A $end
+  First example: b . c A A $end
-  First derivation
+  First reduce derivation
     $accept
     `-> a                             $end
         `-> b d
               `-> a
                   `-> b     d
                       `-> . `-> c A A
-  Second example       b . A $end
+  Second example: b . A $end
-  Second derivation
+  Second reduce derivation
     $accept
     `-> a                 $end
         `-> b d
               `-> c     A
                   `-> .
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        c . c A A $end
+  First example: c . c A A $end
-  First derivation
+  First reduce derivation
     $accept
     `-> a                             $end
         `-> c d
               `-> a
                   `-> b     d
                       `-> . `-> c A A
-  Second example       c . A $end
+  Second example: c . A $end
-  Second derivation
+  Second reduce derivation
     $accept
     `-> a                 $end
         `-> c d
               `-> c     A
                   `-> .
-
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-Shift/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        b c . A
+  First example: b c . A
   Shift derivation
     a
     `-> b d
           `-> c . A
-  Second example       b c . c A A $end
+  Second example: b c . c A A $end
   Reduce derivation
     $accept
     `-> a                                       $end
@@ -720,10 +685,9 @@ time limit exceeded: XXX
                         `-> a
                             `-> b     d
                                 `-> . `-> c A A
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
+  First example: b c . c A A $end
-  First example        b c . c A A $end
+  First reduce derivation
-  First derivation
     $accept
     `-> a                                       $end
         `-> b d
@@ -732,8 +696,8 @@ Reduce/reduce conflict on token A:
                         `-> a
                             `-> b     d
                                 `-> . `-> c A A
-  Second example       b c . A $end
+  Second example: b c . A $end
-  Second derivation
+  Second reduce derivation
     $accept
     `-> a                           $end
         `-> b d
@@ -741,14 +705,13 @@ Reduce/reduce conflict on token A:
                   `-> c d
                         `-> c     A
                             `-> .
-
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-Shift/reduce conflict on token A:
+  First example: b c . A
-  First example        b c . A
   Shift derivation
     a
     `-> b d
           `-> c . A
-  Second example       b c . A $end
+  Second example: b c . A $end
   Reduce derivation
     $accept
     `-> a                           $end
@@ -757,81 +720,70 @@ Shift/reduce conflict on token A:
                   `-> c d
                         `-> c     A
                             `-> .
-
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-Reduce/reduce conflict on token $end:
+  Example: b d .
-  Example              b d .
+  First reduce derivation
-  First derivation
     a
     `-> b d .
-  Second derivation
+  Second reduce derivation
     a
     `-> b d
           `-> d .
-
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-Reduce/reduce conflict on token $end:
+  Example: c d .
-  Example              c d .
+  First reduce derivation
-  First derivation
     a
     `-> c d .
-  Second derivation
+  Second reduce derivation
     a
     `-> c d
           `-> d .
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 input.y:6.15: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
 input.y: warning: 6 reduce/reduce conflicts [-Wconflicts-rr]
-Reduce/reduce conflict on token A:
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-  First example        . c A A $end
+  First example            . c A A $end
-  First derivation     $accept -> [ a -> [ b -> [ . ] d -> [ c A A ] ] $end ]
+  First reduce derivation  $accept -> [ a -> [ b -> [ . ] d -> [ c A A ] ] $end ]
-  Second example       . c A A $end
+  Second example           . c A A $end
-  Second derivation    $accept -> [ a -> [ c -> [ . ] d -> [ c A A ] ] $end ]
+  Second reduce derivation $accept -> [ a -> [ c -> [ . ] d -> [ c A A ] ] $end ]
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        b . c A A $end
+  First example            b . c A A $end
-  First derivation     $accept -> [ a -> [ b d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] $end ]
+  First reduce derivation  $accept -> [ a -> [ b d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] $end ]
-  Second example       b . A $end
+  Second example           b . A $end
-  Second derivation    $accept -> [ a -> [ b d -> [ c -> [ . ] A ] ] $end ]
+  Second reduce derivation $accept -> [ a -> [ b d -> [ c -> [ . ] A ] ] $end ]
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        c . c A A $end
+  First example            c . c A A $end
-  First derivation     $accept -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] $end ]
+  First reduce derivation  $accept -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] $end ]
-  Second example       c . A $end
+  Second example           c . A $end
-  Second derivation    $accept -> [ a -> [ c d -> [ c -> [ . ] A ] ] $end ]
+  Second reduce derivation $accept -> [ a -> [ c d -> [ c -> [ . ] A ] ] $end ]
-
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-Shift/reduce conflict on token A:
 time limit exceeded: XXX
-  First example        b c . A
+  First example     b c . A
-  Shift derivation     a -> [ b d -> [ c . A ] ]
+  Shift derivation  a -> [ b d -> [ c . A ] ]
-  Second example       b c . c A A $end
+  Second example    b c . c A A $end
-  Reduce derivation    $accept -> [ a -> [ b d -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] ] ] $end ]
+  Reduce derivation $accept -> [ a -> [ b d -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] ] ] $end ]
-
+input.y: warning: reduce/reduce conflict on token A [-Wcounterexamples]
-Reduce/reduce conflict on token A:
+  First example            b c . c A A $end
-  First example        b c . c A A $end
+  First reduce derivation  $accept -> [ a -> [ b d -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] ] ] $end ]
-  First derivation     $accept -> [ a -> [ b d -> [ a -> [ c d -> [ a -> [ b -> [ . ] d -> [ c A A ] ] ] ] ] ] $end ]
+  Second example           b c . A $end
-  Second example       b c . A $end
+  Second reduce derivation $accept -> [ a -> [ b d -> [ a -> [ c d -> [ c -> [ . ] A ] ] ] ] $end ]
-  Second derivation    $accept -> [ a -> [ b d -> [ a -> [ c d -> [ c -> [ . ] A ] ] ] ] $end ]
+input.y: warning: shift/reduce conflict on token A [-Wcounterexamples]
-
+  First example     b c . A
-Shift/reduce conflict on token A:
+  Shift derivation  a -> [ b d -> [ c . A ] ]
-  First example        b c . A
+  Second example    b c . A $end
-  Shift derivation     a -> [ b d -> [ c . A ] ]
+  Reduce derivation $accept -> [ a -> [ b d -> [ a -> [ c d -> [ c -> [ . ] A ] ] ] ] $end ]
-  Second example       b c . A $end
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-  Reduce derivation    $accept -> [ a -> [ b d -> [ a -> [ c d -> [ c -> [ . ] A ] ] ] ] $end ]
+  Example                  b d .
-
+  First reduce derivation  a -> [ b d . ]
-Reduce/reduce conflict on token $end:
+  Second reduce derivation a -> [ b d -> [ d . ] ]
-  Example              b d .
+input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples]
-  First derivation     a -> [ b d . ]
+  Example                  c d .
-  Second derivation    a -> [ b d -> [ d . ] ]
+  First reduce derivation  a -> [ c d . ]
-
+  Second reduce derivation a -> [ c d -> [ d . ] ]
-Reduce/reduce conflict on token $end:
-  Example              c d .
-  First derivation     a -> [ c d . ]
-  Second derivation    a -> [ c d -> [ d . ] ]
-
 input.y:5.4: warning: rule useless in parser due to conflicts [-Wother]
 input.y:6.15: warning: rule useless in parser due to conflicts [-Wother]
 ]])
@@ -857,8 +809,8 @@ i: %empty | i J;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token J:
+input.y: warning: shift/reduce conflict on token J [-Wcounterexamples]
-  Example              H i J . J J
+  Example: H i J . J J
   Shift derivation
     s
     `-> a             J
@@ -868,15 +820,13 @@ Shift/reduce conflict on token J:
     `-> a
         `-> H i         J J
               `-> i J .
-
 input.y:5.13-15: warning: rule useless in parser due to conflicts [-Wother]
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token J:
+input.y: warning: shift/reduce conflict on token J [-Wcounterexamples]
-  Example              H i J . J J
+  Example           H i J . J J
-  Shift derivation     s -> [ a -> [ H i J . J ] J ]
+  Shift derivation  s -> [ a -> [ H i J . J ] J ]
-  Reduce derivation    s -> [ a -> [ H i -> [ i J . ] J J ] ]
+  Reduce derivation s -> [ a -> [ H i -> [ i J . ] J J ] ]
-
 input.y:5.13-15: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -903,8 +853,8 @@ d: D;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token D:
+input.y: warning: shift/reduce conflict on token D [-Wcounterexamples]
-  Example              A a . D
+  Example: A a . D
   Shift derivation
     s
     `-> A a d
@@ -915,14 +865,12 @@ Shift/reduce conflict on token D:
             `-> b         `-> D
                 `-> c
                     `-> .
-
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token D:
+input.y: warning: shift/reduce conflict on token D [-Wcounterexamples]
-  Example              A a . D
+  Example           A a . D
-  Shift derivation     s -> [ A a d -> [ . D ] ]
+  Shift derivation  s -> [ A a d -> [ . D ] ]
-  Reduce derivation    s -> [ A a a -> [ b -> [ c -> [ . ] ] ] d -> [ D ] ]
+  Reduce derivation s -> [ A a a -> [ b -> [ c -> [ . ] ] ] d -> [ D ] ]
-
 ]])
 
 AT_CLEANUP
@@ -947,14 +895,14 @@ d: D;
 
 AT_BISON_CHECK_CEX(
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token D:
+input.y: warning: shift/reduce conflict on token D [-Wcounterexamples]
-  First example        A a . D $end
+  First example: A a . D $end
   Shift derivation
     $accept
     `-> s               $end
         `-> A a d
                 `-> . D
-  Second example       A a . D E $end
+  Second example: A a . D E $end
   Reduce derivation
     $accept
     `-> s                             $end
@@ -962,15 +910,13 @@ Shift/reduce conflict on token D:
                 `-> b         `-> D
                     `-> c
                         `-> .
-
 ]],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-Shift/reduce conflict on token D:
+input.y: warning: shift/reduce conflict on token D [-Wcounterexamples]
-  First example        A a . D $end
+  First example     A a . D $end
-  Shift derivation     $accept -> [ s -> [ A a d -> [ . D ] ] $end ]
+  Shift derivation  $accept -> [ s -> [ A a d -> [ . D ] ] $end ]
-  Second example       A a . D E $end
+  Second example    A a . D E $end
-  Reduce derivation    $accept -> [ s -> [ A a a -> [ b -> [ c -> [ . ] ] ] d -> [ D ] E ] $end ]
+  Reduce derivation $accept -> [ s -> [ A a a -> [ b -> [ c -> [ . ] ] ] d -> [ D ] E ] $end ]
-
 ]])
 
 AT_CLEANUP

tests/diagnostics.at

@@ -51,7 +51,7 @@ if $EGREP ['\^M|\\[0-9][0-9][0-9]'] input.y experr >/dev/null; then
   AT_PERL_REQUIRE([-pi -e 's{\^M}{\r}g;s{\\(\d{3}|.)}{$v = $[]1; $v =~ /\A\d+\z/ ? chr($v) : $v}ge' input.y experr])
 fi
 
-AT_CHECK([LC_ALL="$locale" $5 bison -fcaret --color=debug -Wall,cex input.y], [$3], [], [experr])
+AT_CHECK(AT_SET_ENV [LC_ALL="$locale" $5 bison -fcaret --color=debug -Wall,cex input.y], [$3], [], [experr])
 
 # When no style, same messages, but without style.
 # Except for the second display of the counterexample,
@@ -68,7 +68,7 @@ AT_PERL_REQUIRE([-pi -e '
 # Cannot use AT_BISON_CHECK easily as we need to change the
 # environment.
 # FIXME: Enhance AT_BISON_CHECK.
-AT_CHECK([LC_ALL="$locale" $5 bison -fcaret -Wall,cex input.y], [$3], [], [experr])
+AT_CHECK(AT_SET_ENV [LC_ALL="$locale" $5 bison -fcaret -Wall,cex input.y], [$3], [], [experr])
 
 
 AT_BISON_OPTION_POPDEFS
@@ -535,54 +535,50 @@ exp
 ]],
 [1],
 [[input.y: <error>error:</error> shift/reduce conflicts: 4 found, 0 expected
-Shift/reduce conflict on token "+":
+input.y: <warning>warning:</warning> shift/reduce conflict on token "+" [<warning>-Wcounterexamples</warning>]
-  Example              <cex-0><cex-leaf>exp</cex-leaf> <cex-leaf>"+"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
+  Example: <cex-0><cex-leaf>exp</cex-leaf> <cex-leaf>"+"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
   Shift derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-leaf>exp</cex-leaf><cex-leaf> "+"</cex-leaf><cex-1><cex-step> exp</cex-step></cex-1></cex-step></cex-0>
     <cex-1><cex-step>          ↳ <cex-leaf>exp</cex-leaf><cex-dot> •</cex-dot><cex-leaf> "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-1>
-  Example              <cex-0><cex-1><cex-leaf>exp</cex-leaf> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
+  Example: <cex-0><cex-1><cex-leaf>exp</cex-leaf> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
   Reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-1><cex-step>exp</cex-step></cex-1><cex-leaf>             "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-0>
     <cex-1><cex-step>  ↳ <cex-leaf>exp</cex-leaf><cex-leaf> "+"</cex-leaf><cex-leaf> exp</cex-leaf><cex-dot> •</cex-dot></cex-step></cex-1>
-
+input.y: <warning>warning:</warning> shift/reduce conflict on token "else" [<warning>-Wcounterexamples</warning>]
-Shift/reduce conflict on token "else":
+  Example: <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
-  Example              <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
   Shift derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-1><cex-step> exp</cex-step></cex-1></cex-step></cex-0>
     <cex-1><cex-step>                  ↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-leaf> exp</cex-leaf><cex-dot> •</cex-dot><cex-leaf> "else"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-1>
-  Example              <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
+  Example: <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
   Reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-1><cex-step> exp</cex-step></cex-1><cex-leaf>                     "else"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-0>
     <cex-1><cex-step>                  ↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-leaf> exp</cex-leaf><cex-dot> •</cex-dot></cex-step></cex-1>
-
+input.y: <warning>warning:</warning> shift/reduce conflict on token "+" [<warning>-Wcounterexamples</warning>]
-Shift/reduce conflict on token "+":
+  Example: <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
-  Example              <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
   Shift derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-1><cex-step> exp</cex-step></cex-1></cex-step></cex-0>
     <cex-1><cex-step>                  ↳ <cex-leaf>exp</cex-leaf><cex-dot> •</cex-dot><cex-leaf> "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-1>
-  Example              <cex-0><cex-1><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
+  Example: <cex-0><cex-1><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
   Reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-1><cex-step>exp</cex-step></cex-1><cex-leaf>                     "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-0>
     <cex-1><cex-step>  ↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-leaf> exp</cex-leaf><cex-dot> •</cex-dot></cex-step></cex-1>
-
+input.y: <warning>warning:</warning> shift/reduce conflict on token "+" [<warning>-Wcounterexamples</warning>]
-Shift/reduce conflict on token "+":
+  Example: <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"else"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
-  Example              <cex-0><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"else"</cex-leaf><cex-1> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-1></cex-0>
   Shift derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "else"</cex-leaf><cex-1><cex-step> exp</cex-step></cex-1></cex-step></cex-0>
     <cex-1><cex-step>                             ↳ <cex-leaf>exp</cex-leaf><cex-dot> •</cex-dot><cex-leaf> "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-1>
-  Example              <cex-0><cex-1><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
+  Example: <cex-0><cex-1><cex-leaf>"if"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"then"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-leaf>"else"</cex-leaf> <cex-leaf>exp</cex-leaf> <cex-dot>•</cex-dot></cex-1> <cex-leaf>"+"</cex-leaf> <cex-leaf>exp</cex-leaf></cex-0>
   Reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-1><cex-step>exp</cex-step></cex-1><cex-leaf>                                "+"</cex-leaf><cex-leaf> exp</cex-leaf></cex-step></cex-0>
     <cex-1><cex-step>  ↳ <cex-leaf>"if"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "then"</cex-leaf><cex-leaf> exp</cex-leaf><cex-leaf> "else"</cex-leaf><cex-leaf> exp</cex-leaf><cex-dot> •</cex-dot></cex-step></cex-1>
-
 ]])
 
 
@@ -621,9 +617,9 @@ input.y:31.4: <warning>warning:</warning> empty rule without %empty [<warning>-W
       |    <warning>^</warning>
       |    <fixit-insert>%empty</fixit-insert>
 input.y: <error>error:</error> reduce/reduce conflicts: 1 found, 0 expected
-Reduce/reduce conflict on token "X":
+input.y: <warning>warning:</warning> reduce/reduce conflict on token "X" [<warning>-Wcounterexamples</warning>]
-  Example              <cex-0><cex-1><cex-2><cex-3><cex-leaf>"X"</cex-leaf> <cex-dot>•</cex-dot></cex-3></cex-2></cex-1><cex-4></cex-4><cex-5><cex-6><cex-7><cex-8><cex-9><cex-10> <cex-leaf>"X"</cex-leaf></cex-10></cex-9></cex-8><cex-11> <cex-leaf>"quuux"</cex-leaf></cex-11></cex-7></cex-6></cex-5><cex-12><cex-13><cex-14> <cex-leaf>"X"</cex-leaf></cex-14></cex-13></cex-12></cex-0>
+  Example: <cex-0><cex-1><cex-2><cex-3><cex-leaf>"X"</cex-leaf> <cex-dot>•</cex-dot></cex-3></cex-2></cex-1><cex-4></cex-4><cex-5><cex-6><cex-7><cex-8><cex-9><cex-10> <cex-leaf>"X"</cex-leaf></cex-10></cex-9></cex-8><cex-11> <cex-leaf>"quuux"</cex-leaf></cex-11></cex-7></cex-6></cex-5><cex-12><cex-13><cex-14> <cex-leaf>"X"</cex-leaf></cex-14></cex-13></cex-12></cex-0>
-  First derivation
+  First reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-1><cex-step>x1</cex-step></cex-1><cex-4><cex-step>          e1</cex-step></cex-4><cex-5><cex-step>  foo1</cex-step></cex-5><cex-12><cex-step>                      x1</cex-step></cex-12></cex-step></cex-0>
     <cex-1><cex-step>  ↳ <cex-2><cex-step>x2</cex-step></cex-2></cex-step></cex-1><cex-4><cex-step>        ↳ ε</cex-step></cex-4><cex-5><cex-step> ↳ <cex-6><cex-step>foo2</cex-step></cex-6></cex-step></cex-5><cex-12><cex-step>                    ↳ <cex-13><cex-step>x2</cex-step></cex-13></cex-step></cex-12>
@@ -632,8 +628,8 @@ Reduce/reduce conflict on token "X":
     <cex-8><cex-step>                        ↳ <cex-9><cex-step>x2</cex-step></cex-9></cex-step></cex-8><cex-11><cex-step>      ↳ <cex-leaf>"quuux"</cex-leaf></cex-step></cex-11>
     <cex-9><cex-step>                          ↳ <cex-10><cex-step>x3</cex-step></cex-10></cex-step></cex-9>
     <cex-10><cex-step>                            ↳ <cex-leaf>"X"</cex-leaf></cex-step></cex-10>
-  Example              <cex-0><cex-1><cex-2><cex-3><cex-leaf>"X"</cex-leaf> <cex-dot>•</cex-dot></cex-3></cex-2></cex-1><cex-4></cex-4><cex-5><cex-6><cex-7><cex-8><cex-9><cex-10> <cex-leaf>"X"</cex-leaf></cex-10></cex-9></cex-8><cex-11> <cex-leaf>"quuux"</cex-leaf></cex-11></cex-7></cex-6></cex-5><cex-12><cex-13><cex-14> <cex-leaf>"X"</cex-leaf></cex-14></cex-13></cex-12></cex-0>
+  Example: <cex-0><cex-1><cex-2><cex-3><cex-leaf>"X"</cex-leaf> <cex-dot>•</cex-dot></cex-3></cex-2></cex-1><cex-4></cex-4><cex-5><cex-6><cex-7><cex-8><cex-9><cex-10> <cex-leaf>"X"</cex-leaf></cex-10></cex-9></cex-8><cex-11> <cex-leaf>"quuux"</cex-leaf></cex-11></cex-7></cex-6></cex-5><cex-12><cex-13><cex-14> <cex-leaf>"X"</cex-leaf></cex-14></cex-13></cex-12></cex-0>
-  Second derivation
+  Second reduce derivation
     <cex-0><cex-step>exp</cex-step></cex-0>
     <cex-0><cex-step>↳ <cex-1><cex-step>y1</cex-step></cex-1><cex-4><cex-step>          e2</cex-step></cex-4><cex-5><cex-step>  bar1</cex-step></cex-5><cex-12><cex-step>                      y1</cex-step></cex-12></cex-step></cex-0>
     <cex-1><cex-step>  ↳ <cex-2><cex-step>y2</cex-step></cex-2></cex-step></cex-1><cex-4><cex-step>        ↳ ε</cex-step></cex-4><cex-5><cex-step> ↳ <cex-6><cex-step>bar2</cex-step></cex-6></cex-step></cex-5><cex-12><cex-step>                    ↳ <cex-13><cex-step>y2</cex-step></cex-13></cex-step></cex-12>
@@ -642,7 +638,6 @@ Reduce/reduce conflict on token "X":
     <cex-8><cex-step>                        ↳ <cex-9><cex-step>y2</cex-step></cex-9></cex-step></cex-8><cex-11><cex-step>      ↳ <cex-leaf>"quuux"</cex-leaf></cex-step></cex-11>
     <cex-9><cex-step>                          ↳ <cex-10><cex-step>y3</cex-step></cex-10></cex-step></cex-9>
     <cex-10><cex-step>                            ↳ <cex-leaf>"X"</cex-leaf></cex-step></cex-10>
-
 input.y: <warning>warning:</warning> fix-its can be applied.  Rerun with option '--update'. [<warning>-Wother</warning>]
 ]])
 

tests/local.at

@@ -1199,7 +1199,7 @@ m4_define([AT_BISON_CHECK_XML],
 # The testsuite verbose output, at least, will be incorrect, but nothing may
 # fail to make sure you notice.
 m4_define([AT_SET_ENV_IF],
-[[[COLUMNS=1000; export COLUMNS;]] m4_null_if($1, [], [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS; ]]])])
+[[[COLUMNS=1000; export COLUMNS; NO_TERM_HYPERLINKS=1; export NO_TERM_HYPERLINKS;]] m4_null_if($1, [], [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS; ]]])])
 
 
 # AT_SET_ENV

tests/report.at

@@ -1537,8 +1537,8 @@ exp
 AT_CHECK([LC_ALL="$locale" bison -fno-caret -o input.cc -rall -Wcex --graph=input.gv --xml input.y], [], [],
 [[input.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
 input.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr]
-Shift/reduce conflict on token "⊕":
+input.y: warning: shift/reduce conflict on token "⊕" [-Wcounterexamples]
-  Example              exp "+" exp • "⊕" exp
+  Example: exp "+" exp • "⊕" exp
   Shift derivation
     exp
     ↳ exp "+" exp
@@ -1547,18 +1547,16 @@ Shift/reduce conflict on token "⊕":
     exp
     ↳ exp             "⊕" exp
       ↳ exp "+" exp •
-
+input.y: warning: reduce/reduce conflict on tokens $end, "+", "⊕" [-Wcounterexamples]
-Reduce/reduce conflict on tokens $end, "+", "⊕":
+  Example: exp "+" exp •
-  Example              exp "+" exp •
+  First reduce derivation
-  First derivation
     exp
     ↳ exp "+" exp •
-  Second derivation
+  Second reduce derivation
     exp
     ↳ exp "+" exp •
-
+input.y: warning: shift/reduce conflict on token "⊕" [-Wcounterexamples]
-Shift/reduce conflict on token "⊕":
+  Example: exp "+" exp • "⊕" exp
-  Example              exp "+" exp • "⊕" exp
   Shift derivation
     exp
     ↳ exp "+" exp
@@ -1567,9 +1565,8 @@ Shift/reduce conflict on token "⊕":
     exp
     ↳ exp             "⊕" exp
       ↳ exp "+" exp •
-
+input.y: warning: shift/reduce conflict on token "⊕" [-Wcounterexamples]
-Shift/reduce conflict on token "⊕":
+  Example: exp "⊕" exp • "⊕" exp
-  Example              exp "⊕" exp • "⊕" exp
   Shift derivation
     exp
     ↳ exp "⊕" exp
@@ -1578,9 +1575,8 @@ Shift/reduce conflict on token "⊕":
     exp
     ↳ exp             "⊕" exp
       ↳ exp "⊕" exp •
-
+input.y: warning: shift/reduce conflict on token "+" [-Wcounterexamples]
-Shift/reduce conflict on token "+":
+  Example: exp "⊕" exp • "+" exp
-  Example              exp "⊕" exp • "+" exp
   Shift derivation
     exp
     ↳ exp "⊕" exp
@@ -1589,9 +1585,8 @@ Shift/reduce conflict on token "+":
     exp
     ↳ exp             "+" exp
       ↳ exp "⊕" exp •
-
+input.y: warning: shift/reduce conflict on token "+" [-Wcounterexamples]
-Shift/reduce conflict on token "+":
+  Example: exp "⊕" exp • "+" exp
-  Example              exp "⊕" exp • "+" exp
   Shift derivation
     exp
     ↳ exp "⊕" exp
@@ -1600,7 +1595,6 @@ Shift/reduce conflict on token "+":
     exp
     ↳ exp             "+" exp
       ↳ exp "⊕" exp •
-
 input.y:6.3-13: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
@@ -1745,10 +1739,10 @@ State 7
 
     Conflict between rule 2 and token "+" resolved as reduce (%left "+").
 
-    Shift/reduce conflict on token "⊕":
+    shift/reduce conflict on token "⊕":
         2 exp: exp "+" exp •
         1 exp: exp • "⊕" exp
-      Example                  exp "+" exp • "⊕" exp
+      Example: exp "+" exp • "⊕" exp
       Shift derivation
         exp
         ↳ exp "+" exp
@@ -1758,21 +1752,21 @@ State 7
         ↳ exp             "⊕" exp
           ↳ exp "+" exp •
 
-    Reduce/reduce conflict on tokens $end, "+", "⊕":
+    reduce/reduce conflict on tokens $end, "+", "⊕":
         2 exp: exp "+" exp •
         3 exp: exp "+" exp •
-      Example                  exp "+" exp •
+      Example: exp "+" exp •
-      First derivation
+      First reduce derivation
         exp
         ↳ exp "+" exp •
-      Second derivation
+      Second reduce derivation
         exp
         ↳ exp "+" exp •
 
-    Shift/reduce conflict on token "⊕":
+    shift/reduce conflict on token "⊕":
         3 exp: exp "+" exp •
         1 exp: exp • "⊕" exp
-      Example                  exp "+" exp • "⊕" exp
+      Example: exp "+" exp • "⊕" exp
       Shift derivation
         exp
         ↳ exp "+" exp
@@ -1798,10 +1792,10 @@ State 8
     "⊕"       [reduce using rule 1 (exp)]
     $default  reduce using rule 1 (exp)
 
-    Shift/reduce conflict on token "⊕":
+    shift/reduce conflict on token "⊕":
         1 exp: exp "⊕" exp •
         1 exp: exp • "⊕" exp
-      Example                  exp "⊕" exp • "⊕" exp
+      Example: exp "⊕" exp • "⊕" exp
       Shift derivation
         exp
         ↳ exp "⊕" exp
@@ -1811,10 +1805,10 @@ State 8
         ↳ exp             "⊕" exp
           ↳ exp "⊕" exp •
 
-    Shift/reduce conflict on token "+":
+    shift/reduce conflict on token "+":
         1 exp: exp "⊕" exp •
         2 exp: exp • "+" exp
-      Example                  exp "⊕" exp • "+" exp
+      Example: exp "⊕" exp • "+" exp
       Shift derivation
         exp
         ↳ exp "⊕" exp
@@ -1824,10 +1818,10 @@ State 8
         ↳ exp             "+" exp
           ↳ exp "⊕" exp •
 
-    Shift/reduce conflict on token "+":
+    shift/reduce conflict on token "+":
         1 exp: exp "⊕" exp •
         3 exp: exp • "+" exp
-      Example                  exp "⊕" exp • "+" exp
+      Example: exp "⊕" exp • "+" exp
       Shift derivation
         exp
         ↳ exp "⊕" exp