* src/state.h, src/state.c (transitions_t): Holds state_t*'s, not

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 2cd54701f4383273503bee55a447a7231cd4b7a6..272ffc53ff007df4f0164830c1198c3b4969610c 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -70,7 +70,7 @@ 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');
@@ -90,26 +90,24 @@ print_core (struct obstack *oout, state_t *state)
          && state->nlookaheads)
        {
          int j, k;
+         bitset_iterator biter;
          int nlookaheads = 0;
+
          /* Look for lookaheads corresponding to this rule. */
          for (j = 0; j < state->nlookaheads; ++j)
-           BITSET_EXECUTE (state->lookaheads[j], 0, k,
-           {
+           BITSET_FOR_EACH (biter, state->lookaheads[j], k, 0)
              if (state->lookaheads_rule[j]->number == rule)
                nlookaheads++;
-           });
 
          if (nlookaheads)
            {
              obstack_sgrow (oout, "  [");
              for (j = 0; j < state->nlookaheads; ++j)
-               BITSET_EXECUTE (state->lookaheads[j], 0, k,
-               {
+               BITSET_FOR_EACH (biter, state->lookaheads[j], k, 0)
                  if (state->lookaheads_rule[j]->number == rule)
                    obstack_fgrow2 (oout, "%s%s",
                                    symbols[k]->tag,
                                    --nlookaheads ? ", " : "");
-               });
              obstack_sgrow (oout, "]");
            }
        }
@@ -127,7 +125,7 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
-  transitions_t     *transitions = state->shifts;
+  transitions_t     *transitions = state->transitions;
   reductions_t *redp = state->reductions;
 
   static char buff[10];
@@ -139,17 +137,17 @@ print_actions (state_t *state, const char *node_name)
   for (i = 0; i < transitions->num; i++)
     if (!TRANSITION_IS_DISABLED (transitions, i))
       {
-       state_number_t state1 = transitions->states[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 (TRANSITION_IS_ERROR (transitions, i))