* src/closure.c (print_firsts, print_fderives, closure):

Use BITSET_EXECUTE.
* src/lalr.c (lookaheads_print): Likewise.
* src/state.c (state_rule_lookaheads_print): Likewise.
* src/print_graph.c (print_core): Likewise.
* src/print.c (print_reductions): Likewise.
* src/output.c (action_row): Likewise.
Use SHIFT_IS_DISABLED, SHIFT_IS_SHIFT and SHIFT_SYMBOL.
This commit is contained in:
Akim Demaille
2002-06-30 17:32:17 +00:00
parent 05811fd755
commit 574fb2d568
7 changed files with 85 additions and 79 deletions

View File

@@ -93,20 +93,23 @@ print_core (struct obstack *oout, state_t *state)
int nlookaheads = 0;
/* Look for lookaheads corresponding to this rule. */
for (j = 0; j < state->nlookaheads; ++j)
for (k = 0; k < ntokens; ++k)
if (bitset_test (state->lookaheads[j], k)
&& state->lookaheads_rule[j]->number == rule)
BITSET_EXECUTE (state->lookaheads[j], 0, k,
{
if (state->lookaheads_rule[j]->number == rule)
nlookaheads++;
});
if (nlookaheads)
{
obstack_sgrow (oout, " [");
for (j = 0; j < state->nlookaheads; ++j)
for (k = 0; k < ntokens; ++k)
if (bitset_test (state->lookaheads[j], k)
&& state->lookaheads_rule[j]->number == rule)
BITSET_EXECUTE (state->lookaheads[j], 0, k,
{
if (state->lookaheads_rule[j]->number == rule)
obstack_fgrow2 (oout, "%s%s",
symbol_tag_get (symbols[k]),
--nlookaheads ? ", " : "");
});
obstack_sgrow (oout, "]");
}
}