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

* src/conflicts.c (print_reductions): Improve variable locality.

Browse Source
This commit is contained in:
Akim Demaille
2001-12-05 09:30:13 +00:00
parent aa2aab3c16
commit c8ea038e69
2 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (print_reductions): Improve variable locality.
2001-12-05 Akim Demaille <akim@epita.fr>
* src/state.h (SHIFT_IS_ERROR, SHIFT_IS_GOTO, SHIFT_IS_SHIFT): New.

52
src/conflicts.c
View File

@@ -502,11 +502,6 @@ print_reductions (FILE *out, int state)
{
int i;
int j;
int k;
unsigned *fp1;
unsigned *fp2;
unsigned *fp3;
unsigned *fp4;
int rule;
int symbol;
unsigned mask;
@@ -525,28 +520,24 @@ print_reductions (FILE *out, int state)
shiftp = state_table[state].shift_table;
if (shiftp)
{
k = shiftp->nshifts;
for (i = 0; i < k; i++)
{
if (!shiftp->shifts[i])
continue;
symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
/* if this state has a shift for the error token,
don't use a default rule. */
if (symbol == error_token_number)
nodefault = 1;
SETBIT (shiftset, symbol);
}
}
for (i = 0; i < shiftp->nshifts; i++)
{
if (!shiftp->shifts[i])
continue;
symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
/* if this state has a shift for the error token,
don't use a default rule. */
if (symbol == error_token_number)
nodefault = 1;
SETBIT (shiftset, symbol);
}
errp = err_table[state];
if (errp)
{
k = errp->nerrs;
for (i = 0; i < k; i++)
for (i = 0; i < errp->nerrs; i++)
{
if (!errp->errs[i])
continue;
@@ -560,12 +551,12 @@ print_reductions (FILE *out, int state)
if (n - m == 1 && !nodefault)
{
default_rule = LAruleno[m];
unsigned *fp1 = LA (m);
unsigned *fp2 = shiftset;
unsigned *fp3 = lookaheadset;
unsigned *fp4 = lookaheadset + tokensetsize;
fp1 = LA (m);
fp2 = shiftset;
fp3 = lookaheadset;
fp4 = lookaheadset + tokensetsize;
default_rule = LAruleno[m];
while (fp3 < fp4)
*fp3++ = *fp1++ & *fp2++;
@@ -593,6 +584,8 @@ print_reductions (FILE *out, int state)
}
else if (n - m >= 1)
{
unsigned *fp1, *fp2, *fp3, *fp4;
cmax = 0;
default_LA = -1;
fp4 = lookaheadset + tokensetsize;
@@ -642,8 +635,7 @@ print_reductions (FILE *out, int state)
if (shiftp)
{
k = shiftp->nshifts;
for (i = 0; i < k; i++)
for (i = 0; i < shiftp->nshifts; i++)
{
if (!shiftp->shifts[i])
continue;