Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-22 18:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
patch was improperly applied: fix it.
This commit is contained in:
Akim Demaille
2002-01-07 08:42:59 +00:00
parent 62d3162c4c
commit 25a46077de
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

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

2
src/conflicts.c
View File

@@ -276,7 +276,7 @@ count_rr_conflicts (int state)
int count = 0; int count = 0;
int j; int j;
for (j = m; j < n; j++) for (j = m; j < n; j++)
if (BITISSET (LA (i), j)) if (BITISSET (LA (j), i))
count++; count++;
if (count >= 2) if (count >= 2)

18
tests/torture.at
View File

@@ -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 62 contains 14 shift/reduce conflicts.
State 164 contains 1 shift/reduce conflict. State 162 contains 1 shift/reduce conflict.
State 201 contains 33 shift/reduce conflicts and 4 reduce/reduce conflicts. State 199 contains 33 shift/reduce conflicts and 4 reduce/reduce conflicts.
State 206 contains 1 shift/reduce conflict. State 204 contains 1 shift/reduce conflict.
State 240 contains 1 shift/reduce conflict. State 238 contains 1 shift/reduce conflict.
State 335 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts. State 333 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
State 356 contains 1 shift/reduce conflict. State 354 contains 1 shift/reduce conflict.
State 360 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts. State 358 contains 9 shift/reduce conflicts and 2 reduce/reduce conflicts.
State 427 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