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

* src/conflicts.c (set_conflicts): Use bitset_disjoint_p.

Browse Source 
(count_sr_conflicts): Use bitset_count.
* src/reduce.c (inaccessable_symbols): Ditto.
(bits_size): Remove.
* src/warshall.h, src/warshall.c: Convert to bitsetv.
This commit is contained in:
Akim Demaille
2002-03-04 13:58:05 +00:00
parent f0250de62e
commit 914feea9d0
9 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/conflicts.c
View File

@@ -155,7 +155,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
static void
set_conflicts (state_t *state)
{
int i, j;
int i;
shifts *shiftp;
if (state->consistent)
@@ -172,25 +172,19 @@ set_conflicts (state_t *state)
check for shift-reduce conflict, and try to resolve using
precedence */
for (i = 0; i < state->nlookaheads; ++i)
if (rules[LAruleno[state->lookaheadsp + i]].prec)
for (j = 0; j < ntokens; ++j)
if (bitset_test (LA[state->lookaheadsp + i], j)
&& bitset_test (lookaheadset, j))
{
resolve_sr_conflict (state, state->lookaheadsp + i);
break;
}
if (rules[LAruleno[state->lookaheadsp + i]].prec
&& !bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
{
resolve_sr_conflict (state, state->lookaheadsp + i);
break;
}
/* Loop over all rules which require lookahead in this state. Check
for conflicts not resolved above. */
for (i = 0; i < state->nlookaheads; ++i)
{
/* FIXME: Here, I need something like `bitset_disjoint_p'. */
for (j = 0; j < ntokens; ++j)
if (bitset_test (LA[state->lookaheadsp + i], j)
&& bitset_test (lookaheadset, j))
conflicts[state->number] = 1;
if (!bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
conflicts[state->number] = 1;
bitset_or (lookaheadset, lookaheadset, LA[state->lookaheadsp + i]);
}
@@ -236,9 +230,7 @@ count_sr_conflicts (state_t *state)
bitset_and (lookaheadset, lookaheadset, shiftset);
for (i = 0; i < ntokens; i++)
if (bitset_test (lookaheadset, i))
src_count++;
src_count = bitset_count (lookaheadset);
return src_count;
}