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

* src/conflicts.c (set_conflicts): Use arrays instead of pointers

Browse Source 
to clarify.
This commit is contained in:
Akim Demaille
2001-11-19 09:26:30 +00:00
parent e1cb5fb523
commit 65fae038b9
2 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-11-19 Akim Demaille <akim@epita.fr>
* src/conflicts.c (set_conflicts): Use arrays instead of pointers
to clarify.
2001-11-19 Akim Demaille <akim@epita.fr> 2001-11-19 Akim Demaille <akim@epita.fr>
* src/closure.c (closure): Use arrays instead of pointers to clarify. * src/closure.c (closure): Use arrays instead of pointers to clarify.

66
src/conflicts.c
View File

@@ -182,13 +182,8 @@ resolve_sr_conflict (int state, int lookaheadnum)
static void static void
set_conflicts (int state) set_conflicts (int state)
{ {
int i; int i, j;
int k;
shifts *shiftp; shifts *shiftp;
unsigned *fp2;
unsigned *fp3;
unsigned *fp4;
unsigned *fp1;
int symbol; int symbol;
if (state_table[state].consistent) if (state_table[state].consistent)
@@ -199,58 +194,41 @@ set_conflicts (int state)
shiftp = state_table[state].shift_table; shiftp = state_table[state].shift_table;
if (shiftp) if (shiftp)
{ for (i = 0; i < shiftp->nshifts; i++)
k = shiftp->nshifts; {
for (i = 0; i < k; i++) symbol = state_table[shiftp->shifts[i]].accessing_symbol;
{ if (ISVAR (symbol))
symbol = state_table[shiftp->shifts[i]].accessing_symbol; break;
if (ISVAR (symbol)) SETBIT (lookaheadset, symbol);
break; }
SETBIT (lookaheadset, symbol);
}
}
k = state_table[state + 1].lookaheads;
fp4 = lookaheadset + tokensetsize;
/* Loop over all rules which require lookahead in this state. First /* Loop over all rules which require lookahead in this state. First
check for shift-reduce conflict, and try to resolve using check for shift-reduce conflict, and try to resolve using
precedence */ precedence */
for (i = state_table[state].lookaheads; i < k; i++) for (i = state_table[state].lookaheads;
i < state_table[state + 1].lookaheads;
++i)
if (rule_table[LAruleno[i]].prec) if (rule_table[LAruleno[i]].prec)
{ for (j = 0; j < tokensetsize; ++j)
fp1 = LA (i); if (LA (i)[j] & lookaheadset[j])
fp2 = fp1;
fp3 = lookaheadset;
while (fp3 < fp4)
{ {
if (*fp2++ & *fp3++) resolve_sr_conflict (state, i);
{ break;
resolve_sr_conflict (state, i);
break;
}
} }
}
/* Loop over all rules which require lookahead in this state. Check /* Loop over all rules which require lookahead in this state. Check
for conflicts not resolved above. */ for conflicts not resolved above. */
for (i = state_table[state].lookaheads; i < k; i++) for (i = state_table[state].lookaheads;
i < state_table[state + 1].lookaheads;
++i)
{ {
fp1 = LA (i); for (j = 0; j < tokensetsize; ++j)
fp2 = fp1; if (LA (i)[j] & lookaheadset[j])
fp3 = lookaheadset;
while (fp3 < fp4)
if (*fp2++ & *fp3++)
conflicts[state] = 1; conflicts[state] = 1;
fp2 = fp1; for (j = 0; j < tokensetsize; ++j)
fp3 = lookaheadset; lookaheadset[j] |= LA (i)[j];
while (fp3 < fp4)
*fp3++ |= *fp2++;
} }
} }