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

* src/conflicts.c (print_reductions): Arrays, not pointers.

Browse Source 
Use BITISSET.
This commit is contained in:
Akim Demaille
2001-12-05 09:20:07 +00:00
parent 980929ba0b
commit b5c15946a1
2 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (print_reductions): Arrays, not pointers.
Use BITISSET.
2001-12-05 Akim Demaille <akim@epita.fr> 2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (print_reductions): Pessimize, but clarify. * src/conflicts.c (print_reductions): Pessimize, but clarify.

49
src/conflicts.c
View File

@@ -503,13 +503,11 @@ print_reductions (FILE *out, int state)
int i; int i;
int j; int j;
int symbol; int symbol;
unsigned mask;
int m; int m;
int n; int n;
int default_LA; int default_LA;
int default_rule = 0; int default_rule = 0;
int cmax; int cmax;
int count;
shifts *shiftp; shifts *shiftp;
errs *errp; errs *errp;
int nodefault = 0; int nodefault = 0;
@@ -535,14 +533,9 @@ print_reductions (FILE *out, int state)
errp = err_table[state]; errp = err_table[state];
if (errp) if (errp)
{ for (i = 0; i < errp->nerrs; i++)
for (i = 0; i < errp->nerrs; i++) if (errp->errs[i])
{ SETBIT (shiftset, errp->errs[i]);
if (!errp->errs[i])
continue;
SETBIT (shiftset, errp->errs[i]);
}
}
m = state_table[state].lookaheads; m = state_table[state].lookaheads;
n = state_table[state + 1].lookaheads; n = state_table[state + 1].lookaheads;
@@ -566,20 +559,19 @@ print_reductions (FILE *out, int state)
} }
else if (n - m >= 1) else if (n - m >= 1)
{ {
unsigned *fp1, *fp2, *fp3, *fp4;
int k; int k;
cmax = 0; cmax = 0;
default_LA = -1; default_LA = -1;
fp4 = lookaheadset + tokensetsize;
if (!nodefault) if (!nodefault)
for (i = m; i < n; i++) for (i = m; i < n; i++)
{ {
int count = 0;
for (k = 0; k < tokensetsize; ++k) for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] = LA (i)[k] & ~shiftset[k]; lookaheadset[k] = LA (i)[k] & ~shiftset[k];
count = 0;
for (j = 0; j < ntokens; j++) for (j = 0; j < ntokens; j++)
if (BITISSET (lookaheadset, j)) if (BITISSET (lookaheadset, j))
count++; count++;
@@ -591,11 +583,8 @@ print_reductions (FILE *out, int state)
default_rule = LAruleno[i]; default_rule = LAruleno[i];
} }
fp2 = shiftset; for (k = 0; k < tokensetsize; ++k)
fp3 = lookaheadset; shiftset[k] |= lookaheadset[k];
while (fp3 < fp4)
*fp2++ |= *fp3++;
} }
for (i = 0; i < tokensetsize; i++) for (i = 0; i < tokensetsize; i++)
@@ -612,22 +601,14 @@ print_reductions (FILE *out, int state)
SETBIT (shiftset, symbol); SETBIT (shiftset, symbol);
} }
mask = 1;
fp1 = LA (m);
fp2 = shiftset;
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
{ {
int defaulted = 0; int defaulted = 0;
int count = BITISSET (shiftset, i);
if (mask & *fp2)
count = 1;
else
count = 0;
fp3 = fp1;
for (j = m; j < n; j++) for (j = m; j < n; j++)
{ {
if (mask & *fp3) if (BITISSET (LA (m), j))
{ {
if (count == 0) if (count == 0)
{ {
@@ -658,18 +639,6 @@ print_reductions (FILE *out, int state)
tags[rule_table[LAruleno[j]].lhs]); tags[rule_table[LAruleno[j]].lhs]);
} }
} }
fp3 += tokensetsize;
}
mask <<= 1;
if (mask == 0)
{
mask = 1;
/* We tried incrementing just fp1, and just fp2; both seem wrong.
It seems necessary to increment both in sync. */
fp1++;
fp2++;
} }
} }