X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/574fb2d5682af3cf6917e414b4240879d3e7f008..5b7f88c7f24c3ca04bbb00860f5c429096ee8ce7:/src/print_graph.c?ds=sidebyside diff --git a/src/print_graph.c b/src/print_graph.c index 34e34ee9..fe0ee76d 100644 --- a/src/print_graph.c +++ b/src/print_graph.c @@ -70,46 +70,39 @@ print_core (struct obstack *oout, state_t *state) while (*sp >= 0) sp++; - rule = rule_number_of_item_number (*sp); + rule = item_number_as_rule_number (*sp); if (i) obstack_1grow (oout, '\n'); obstack_fgrow1 (oout, " %s -> ", - symbol_tag_get (rules[rule].lhs)); + rules[rule].lhs->tag); for (sp = rules[rule].rhs; sp < sp1; sp++) - obstack_fgrow1 (oout, "%s ", symbol_tag_get (symbols[*sp])); + obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag); obstack_1grow (oout, '.'); for (/* Nothing */; *sp >= 0; ++sp) - obstack_fgrow1 (oout, " %s", symbol_tag_get (symbols[*sp])); + obstack_fgrow1 (oout, " %s", symbols[*sp]->tag); /* Experimental feature: display the lookaheads. */ - if ((report_flag & report_lookaheads) - && state->nlookaheads) + if (report_flag & report_lookaheads) { - int j, k; - int nlookaheads = 0; - /* Look for lookaheads corresponding to this rule. */ - for (j = 0; j < state->nlookaheads; ++j) - BITSET_EXECUTE (state->lookaheads[j], 0, k, - { - if (state->lookaheads_rule[j]->number == rule) - nlookaheads++; - }); + /* Find the reduction we are handling. */ + reductions_t *reds = state->reductions; + int redno = state_reduction_find (state, &rules[rule]); - if (nlookaheads) + /* Print them if there are. */ + if (reds->lookaheads && redno != -1) { - obstack_sgrow (oout, " ["); - for (j = 0; j < state->nlookaheads; ++j) - 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 ? ", " : ""); - }); + bitset_iterator biter; + int k; + int not_first = 0; + obstack_sgrow (oout, "["); + BITSET_FOR_EACH (biter, reds->lookaheads[redno], k, 0) + obstack_fgrow2 (oout, "%s%s", + not_first++ ? ", " : "", + symbols[k]->tag); obstack_sgrow (oout, "]"); } } @@ -127,36 +120,36 @@ print_actions (state_t *state, const char *node_name) { int i; - shifts_t *shiftp = state->shifts; + transitions_t *transitions = state->transitions; reductions_t *redp = state->reductions; static char buff[10]; edge_t edge; - if (!shiftp->nshifts && !redp) + if (!transitions->num && !redp) return; - for (i = 0; i < shiftp->nshifts; i++) - if (!SHIFT_IS_DISABLED (shiftp, i)) + for (i = 0; i < transitions->num; i++) + if (!TRANSITION_IS_DISABLED (transitions, i)) { - state_number_t state1 = shiftp->shifts[i]; - symbol_number_t symbol = states[state1]->accessing_symbol; + state_t *state1 = transitions->states[i]; + symbol_number_t symbol = state1->accessing_symbol; new_edge (&edge); - if (state->number > state1) + if (state->number > state1->number) edge.type = back_edge; open_edge (&edge, fgraph); /* The edge source is the current node. */ edge.sourcename = node_name; - sprintf (buff, "%d", state1); + sprintf (buff, "%d", state1->number); edge.targetname = buff; /* Shifts are blue, gotos are green, and error is red. */ - if (SHIFT_IS_ERROR (shiftp, i)) + if (TRANSITION_IS_ERROR (transitions, i)) edge.color = red; else - edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green; - edge.label = symbol_tag_get (symbols[symbol]); + edge.color = TRANSITION_IS_SHIFT(transitions, i) ? blue : green; + edge.label = symbols[symbol]->tag; output_edge (&edge, fgraph); close_edge (fgraph); }