diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/conflicts.c | 2 | ||||
| -rw-r--r-- | tests/torture.at | 18 |
3 files changed, 15 insertions, 10 deletions
@@ -1,5 +1,10 @@ 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 'switch' without a following semicolon. * tests/regression.at (braces parsing): New. 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 |