* src/conflicts.c (count_rr_conflicts): The previous RR conflicts

patch was improperly applied: fix it.

diff --git a/ChangeLog b/ChangeLog
index f918aacc9450d383dd24bb876a757fda928823d0..6aa84cc7878131553651bed0ee44bfbfa63fa239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-07  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (count_rr_conflicts): The previous RR conflicts
+       patch was improperly applied: fix it.
+

 2002-01-07  Akim Demaille  <akim@epita.fr>
 
        * tests/torture.at (GNU Cim Grammar): Reintroduce their weird
 2002-01-07  Akim Demaille  <akim@epita.fr>
 
        * tests/torture.at (GNU Cim Grammar): Reintroduce their weird

diff --git a/src/conflicts.c b/src/conflicts.c
index 7a93441f3f9185248e3b7275a5bab518e7a85bc8..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++)
       int count = 0;
       int j;
       for (j = m; j < n; j++)

-       if (BITISSET (LA (i), j))
+       if (BITISSET (LA (j), i))

          count++;
 
       if (count >= 2)
          count++;
 
       if (count >= 2)

diff --git a/tests/torture.at b/tests/torture.at
index 5b68e31ab75a2bab9356293e657a743b2bbe2009..4cdabe7ad8dba568684aedc48408be5c302cbd98 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1294,15 +1294,15 @@ AT_CHECK([[bison --verbose --defines input.y]], 0, [],
 ]])
 
 AT_CHECK([[grep '^State.*contains' input.output]], 0,
 ]])
 
 AT_CHECK([[grep '^State.*contains' input.output]], 0,

-[[State 64 contains 14 shift/reduce conflicts.
-State 164 contains 1 shift/reduce conflict.
-State 201 contains 33 shift/reduce conflicts and 4 reduce/reduce conflicts.
-State 206 contains 1 shift/reduce conflict.
-State 240 contains 1 shift/reduce conflict.
-State 335 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
-State 356 contains 1 shift/reduce conflict.
-State 360 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
-State 427 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
+[[State 62 contains 14 shift/reduce conflicts.
+State 162 contains 1 shift/reduce conflict.
+State 199 contains 33 shift/reduce conflicts and 4 reduce/reduce conflicts.
+State 204 contains 1 shift/reduce conflict.
+State 238 contains 1 shift/reduce conflict.
+State 333 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
+State 354 contains 1 shift/reduce conflict.
+State 358 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
+State 425 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP