From: Akim Demaille <akim@epita.fr>
Date: Mon, 7 Jan 2002 08:42:59 +0000 (+0000)
Subject: * src/conflicts.c (count_rr_conflicts): The previous RR conflicts
X-Git-Tag: BISON-1_30j~5
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/25a46077dece917065e07832c1349484aadc7178

* src/conflicts.c (count_rr_conflicts): The previous RR conflicts
patch was improperly applied: fix it.
---

diff --git a/ChangeLog b/ChangeLog
index f918aacc..6aa84cc7 100644
--- 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
diff --git a/src/conflicts.c b/src/conflicts.c
index 7a93441f..6f6ea882 100644
--- 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 (i), j))
+	if (BITISSET (LA (j), i))
 	  count++;
 
       if (count >= 2)
diff --git a/tests/torture.at b/tests/torture.at
index 5b68e31a..4cdabe7a 100644
--- 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,
-[[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