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

Don't depend on C99 features.

Browse Source 
* src/conflicts.c (conflicts_update_state_numbers): Fix for-loop.
* src/lalr.c (lalr_update_state_numbers): Fix for-loop.
* src/reader.c (check_and_convert_grammar): Fix for-loop.
* src/state.c (state_mark_reachable_states): Fix for-loop.
(state_remove_unreachable_states): Fix for-loop.

Don't widen struct state with member reachable just to temporarily
record reachability.  Instead, use a local bitset.
* src/state.h (struct state): Remove member.
* src/state.c (state_new): Don't initialize it.
(state_mark_reachable_states): Rename to...
(state_record_reachable_states): ... this, and use bitset.
(state_remove_unreachable_states): Use bitset.
This commit is contained in:
Joel E. Denny
2007-05-28 01:09:11 +00:00
parent efa02545e0
commit 14462c2b1b
6 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/state.c
View File

@@ -145,7 +145,6 @@ state_new (symbol_number accessing_symbol,
res->errs = NULL;
res->consistent = 0;
res->solved_conflicts = NULL;
res->reachable = false;
res->nitems = nitems;
memcpy (res->items, core, items_size);
@@ -354,41 +353,49 @@ state_hash_lookup (size_t nitems, item_number *core)
}
/*------------------------------------------------------.
| Mark S and all states reachable from S as reachable. |
`------------------------------------------------------*/
/*--------------------------------------------------------.
| Record S and all states reachable from S in REACHABLE. |
`--------------------------------------------------------*/
static void
state_mark_reachable_states (state *s)
state_record_reachable_states (state *s, bitset reachable)
{
if (s->reachable)
if (bitset_test (reachable, s->number))
return;
s->reachable = true;
for (int i = 0; i < s->transitions->num; ++i)
if (!TRANSITION_IS_DISABLED (s->transitions, i))
state_mark_reachable_states (s->transitions->states[i]);
bitset_set (reachable, s->number);
{
int i;
for (i = 0; i < s->transitions->num; ++i)
if (!TRANSITION_IS_DISABLED (s->transitions, i))
state_record_reachable_states (s->transitions->states[i], reachable);
}
}
void
state_remove_unreachable_states (state_number old_to_new[])
{
state_number nstates_reachable = 0;
state_mark_reachable_states (states[0]);
for (state_number i = 0; i < nstates; ++i)
{
if (states[i]->reachable)
{
states[nstates_reachable] = states[i];
states[nstates_reachable]->number = nstates_reachable;
old_to_new[i] = nstates_reachable++;
}
else
{
state_free (states[i]);
old_to_new[i] = nstates;
}
}
bitset reachable = bitset_create (nstates, BITSET_FIXED);
state_record_reachable_states (states[0], reachable);
{
state_number i;
for (i = 0; i < nstates; ++i)
{
if (bitset_test (reachable, states[i]->number))
{
states[nstates_reachable] = states[i];
states[nstates_reachable]->number = nstates_reachable;
old_to_new[i] = nstates_reachable++;
}
else
{
state_free (states[i]);
old_to_new[i] = nstates;
}
}
}
nstates = nstates_reachable;
bitset_free (reachable);
}
/* All the decorated states, indexed by the state number. */