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

* src/conflicts.c (shiftset, lookaheadset): Now bitset.

Browse Source 
Adjust all dependencies.
This commit is contained in:
Akim Demaille
2002-03-04 12:04:33 +00:00
parent 602bbf31c1
commit b86796bf87
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2002-03-04 Akim Demaille <akim@epita.fr>
* src/conflicts.c (shiftset, lookaheadset): Now bitset.
Adjust all dependencies.
2002-03-04 Akim Demaille <akim@epita.fr> 2002-03-04 Akim Demaille <akim@epita.fr>
* src/L0.c, src/LR0.h (nstates): Be size_t. * src/L0.c, src/LR0.h (nstates): Be size_t.

45
src/conflicts.c
View File

@@ -35,8 +35,8 @@
int expected_conflicts = -1; int expected_conflicts = -1;
static char *conflicts = NULL; static char *conflicts = NULL;
static unsigned *shiftset = NULL; static bitset shiftset;
static unsigned *lookaheadset = NULL; static bitset lookaheadset;
static inline void static inline void
@@ -63,7 +63,7 @@ flush_shift (state_t *state, int token)
shifts *shiftp = state->shifts; shifts *shiftp = state->shifts;
int i; int i;
RESETBIT (lookaheadset, token); bitset_reset (lookaheadset, token);
for (i = 0; i < shiftp->nshifts; i++) for (i = 0; i < shiftp->nshifts; i++)
if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token) if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
SHIFT_DISABLE (shiftp, i); SHIFT_DISABLE (shiftp, i);
@@ -101,7 +101,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
if (bitset_test (LA[lookahead], i) if (bitset_test (LA[lookahead], i)
&& BITISSET (lookaheadset, i) && bitset_test (lookaheadset, i)
&& symbols[i]->prec) && symbols[i]->prec)
{ {
/* Shift-reduce conflict occurs for token number i /* Shift-reduce conflict occurs for token number i
@@ -161,13 +161,12 @@ set_conflicts (state_t *state)
if (state->consistent) if (state->consistent)
return; return;
for (i = 0; i < tokensetsize; i++) bitset_zero (lookaheadset);
lookaheadset[i] = 0;
shiftp = state->shifts; shiftp = state->shifts;
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
if (!SHIFT_IS_DISABLED (shiftp, i)) if (!SHIFT_IS_DISABLED (shiftp, i))
SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i)); bitset_set (lookaheadset, SHIFT_SYMBOL (shiftp, i));
/* 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
@@ -176,7 +175,7 @@ set_conflicts (state_t *state)
if (rules[LAruleno[state->lookaheadsp + i]].prec) if (rules[LAruleno[state->lookaheadsp + i]].prec)
for (j = 0; j < ntokens; ++j) for (j = 0; j < ntokens; ++j)
if (bitset_test (LA[state->lookaheadsp + i], j) if (bitset_test (LA[state->lookaheadsp + i], j)
&& BITISSET (lookaheadset, j)) && bitset_test (lookaheadset, j))
{ {
resolve_sr_conflict (state, state->lookaheadsp + i); resolve_sr_conflict (state, state->lookaheadsp + i);
break; break;
@@ -189,12 +188,12 @@ set_conflicts (state_t *state)
{ {
for (j = 0; j < ntokens; ++j) for (j = 0; j < ntokens; ++j)
if (bitset_test (LA[state->lookaheadsp + i], j) if (bitset_test (LA[state->lookaheadsp + i], j)
&& BITISSET (lookaheadset, j)) && bitset_test (lookaheadset, j))
conflicts[state->number] = 1; conflicts[state->number] = 1;
for (j = 0; j < ntokens; ++j) for (j = 0; j < ntokens; ++j)
if (bitset_test (LA[state->lookaheadsp + i], j)) if (bitset_test (LA[state->lookaheadsp + i], j))
SETBIT (lookaheadset, j); bitset_set (lookaheadset, j);
} }
} }
@@ -204,8 +203,10 @@ solve_conflicts (void)
size_t i; size_t i;
conflicts = XCALLOC (char, nstates); conflicts = XCALLOC (char, nstates);
shiftset = XCALLOC (unsigned, tokensetsize); shiftset = bitset_create (ntokens, BITSET_FIXED);
lookaheadset = XCALLOC (unsigned, tokensetsize); bitset_zero (shiftset);
lookaheadset = bitset_create (ntokens, BITSET_FIXED);
bitset_zero (lookaheadset);
for (i = 0; i < nstates; i++) for (i = 0; i < nstates; i++)
set_conflicts (states[i]); set_conflicts (states[i]);
@@ -226,26 +227,22 @@ count_sr_conflicts (state_t *state)
if (!shiftp) if (!shiftp)
return 0; return 0;
for (i = 0; i < tokensetsize; i++) bitset_zero (lookaheadset);
{ bitset_zero (shiftset);
shiftset[i] = 0;
lookaheadset[i] = 0;
}
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
if (!SHIFT_IS_DISABLED (shiftp, i)) if (!SHIFT_IS_DISABLED (shiftp, i))
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i)); bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
for (i = 0; i < state->nlookaheads; ++i) for (i = 0; i < state->nlookaheads; ++i)
for (k = 0; k < ntokens; ++k) for (k = 0; k < ntokens; ++k)
if (bitset_test (LA[state->lookaheadsp + i], k)) if (bitset_test (LA[state->lookaheadsp + i], k))
SETBIT (lookaheadset, k); bitset_set (lookaheadset, k);
for (k = 0; k < tokensetsize; ++k) bitset_and (lookaheadset, lookaheadset, shiftset);
lookaheadset[k] &= shiftset[k];
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
if (BITISSET (lookaheadset, i)) if (bitset_test (lookaheadset, i))
src_count++; src_count++;
return src_count; return src_count;
@@ -408,6 +405,6 @@ void
free_conflicts (void) free_conflicts (void)
{ {
XFREE (conflicts); XFREE (conflicts);
XFREE (shiftset); bitset_free (shiftset);
XFREE (lookaheadset); bitset_free (lookaheadset);
} }