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

* src/conflicts.c (count_sr_conflicts, count_rr_conflicts)

Browse Source 
(print_reductions): De-obfuscate using the good o' techniques:
arrays not pointers, variable locality, BITISSET.
This commit is contained in:
Akim Demaille
2001-12-05 09:20:22 +00:00
parent b5c15946a1
commit 7b106ce5f0
2 changed files with 26 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (count_sr_conflicts, count_rr_conflicts)
(print_reductions): De-obfuscate using the good o' techniques:
arrays not pointers, variable locality, BITISSET.
2001-12-05 Akim Demaille <akim@epita.fr> 2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (print_reductions): Arrays, not pointers. * src/conflicts.c (print_reductions): Arrays, not pointers.

91
src/conflicts.c
View File

@@ -255,18 +255,10 @@ solve_conflicts (void)
static int static int
count_sr_conflicts (int state) count_sr_conflicts (int state)
{ {
int i; int i, k;
int k;
int mask;
shifts *shiftp;
unsigned *fp1;
unsigned *fp2;
unsigned *fp3;
int symbol;
int src_count = 0; int src_count = 0;
shifts *shiftp = state_table[state].shift_table;
shiftp = state_table[state].shift_table;
if (!shiftp) if (!shiftp)
return 0; return 0;
@@ -276,49 +268,24 @@ count_sr_conflicts (int state)
lookaheadset[i] = 0; lookaheadset[i] = 0;
} }
k = shiftp->nshifts; for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
for (i = 0; i < k; i++)
{ {
if (!shiftp->shifts[i]) int symbol = state_table[shiftp->shifts[i]].accessing_symbol;
continue;
symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
SETBIT (shiftset, symbol); SETBIT (shiftset, symbol);
} }
k = state_table[state + 1].lookaheads; for (i = state_table[state].lookaheads;
fp3 = lookaheadset + tokensetsize; i < state_table[state + 1].lookaheads;
++i)
for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] |= LA (i)[k];
for (i = state_table[state].lookaheads; i < k; i++) for (k = 0; k < tokensetsize; ++k)
{ lookaheadset[k] &= shiftset[k];
fp1 = LA (i);
fp2 = lookaheadset;
while (fp2 < fp3)
*fp2++ |= *fp1++;
}
fp1 = shiftset;
fp2 = lookaheadset;
while (fp2 < fp3)
*fp2++ &= *fp1++;
mask = 1;
fp2 = lookaheadset;
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
{ if (BITISSET (lookaheadset, i))
if (mask & *fp2) src_count++;
src_count++;
mask <<= 1;
if (mask == 0)
{
mask = 1;
fp2++;
}
}
return src_count; return src_count;
} }
@@ -332,9 +299,6 @@ static int
count_rr_conflicts (int state) count_rr_conflicts (int state)
{ {
int i; int i;
unsigned mask;
unsigned *baseword;
int rrc_count = 0; int rrc_count = 0;
int m = state_table[state].lookaheads; int m = state_table[state].lookaheads;
@@ -343,31 +307,16 @@ count_rr_conflicts (int state)
if (n - m < 2) if (n - m < 2)
return 0; return 0;
mask = 1;
baseword = LA (m);
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
{ {
unsigned *wordp = baseword;
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 (m), j))
if (mask & *wordp) count++;
count++;
wordp += tokensetsize;
}
if (count >= 2) if (count >= 2)
rrc_count++; rrc_count++;
mask <<= 1;
if (mask == 0)
{
mask = 1;
baseword++;
}
} }
return rrc_count; return rrc_count;
@@ -505,9 +454,6 @@ print_reductions (FILE *out, int state)
int symbol; int symbol;
int m; int m;
int n; int n;
int default_LA;
int default_rule = 0;
int cmax;
shifts *shiftp; shifts *shiftp;
errs *errp; errs *errp;
int nodefault = 0; int nodefault = 0;
@@ -543,7 +489,7 @@ print_reductions (FILE *out, int state)
if (n - m == 1 && !nodefault) if (n - m == 1 && !nodefault)
{ {
int k; int k;
default_rule = LAruleno[m]; int default_rule = LAruleno[m];
for (k = 0; k < tokensetsize; ++k) for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] = LA (m)[k] & shiftset[k]; lookaheadset[k] = LA (m)[k] & shiftset[k];
@@ -561,8 +507,9 @@ print_reductions (FILE *out, int state)
{ {
int k; int k;
cmax = 0; int cmax = 0;
default_LA = -1; int default_LA = -1;
int default_rule = 0;
if (!nodefault) if (!nodefault)
for (i = m; i < n; i++) for (i = m; i < n; i++)