* tests/regression.at, tests/torture.at, tests/calc.at: Adjust to

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 21c1f11c73ad7a30320bf141974b98680daa90c4..6f6ea882d3cba5013a8ca0ab3a8312f2151ea1de 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -276,7 +276,7 @@ count_rr_conflicts (int state)
       int count = 0;
       int j;
       for (j = m; j < n; j++)
-       if (BITISSET (LA (m), j))
+       if (BITISSET (LA (j), i))
          count++;
 
       if (count >= 2)
@@ -401,7 +401,14 @@ conflicts_print (void)
 
   if (expected_conflicts != -1 && !src_ok)
     {
-      complain_message_count++;
+      /* FIXME: BIG ATTROCIOUS HACK.  For flames, complaints and so
+        on, see Bruno Haible.  GNU Gettext's plural.y's %expect is
+        wrong, and newer Bison reject it.  But then, Bruno will be
+        overwhelmed by bug reports, until a fixed Gettext is
+        released.  So for the 1.3x generation only, we leave a puke
+        puke hack.  */
+      if (!strsuffix (infile, "plural.y"))
+       complain_message_count++;
       fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
                                 "expected %d shift/reduce conflicts\n",
                                 expected_conflicts),