* data/yacc.c: Guard the declaration of yytoknum also with

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index be7e196ee467fb1c6f60f812ad85d5877fc57512..fe0ee76d9d52b3faa98b54dad40e0c7c223d8ff0 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -86,28 +86,23 @@ print_core (struct obstack *oout, state_t *state)
        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 
       /* Experimental feature: display the lookaheads. */
        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;
-         bitset_iterator biter;
-         int nlookaheads = 0;
+         /* Find the reduction we are handling.  */
+         reductions_t *reds = state->reductions;
+         int redno = state_reduction_find (state, &rules[rule]);

 
 

-         /* Look for lookaheads corresponding to this rule. */
-         for (j = 0; j < state->nlookaheads; ++j)
-           BITSET_FOR_EACH (biter, state->lookaheads[j], k, 0)
-             if (state->lookaheads_rule[j]->number == rule)
-               nlookaheads++;
-
-         if (nlookaheads)
+         /* Print them if there are.  */
+         if (reds->lookaheads && redno != -1)

            {
            {

-             obstack_sgrow (oout, "  [");
-             for (j = 0; j < state->nlookaheads; ++j)
-               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 ? ", " : "");
+             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, "]");
            }
        }
              obstack_sgrow (oout, "]");
            }
        }


@@ -137,17 +132,17 @@ print_actions (state_t *state, const char *node_name)
   for (i = 0; i < transitions->num; i++)
     if (!TRANSITION_IS_DISABLED (transitions, i))
       {
   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);
 
 
        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;
          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))
        edge.targetname = buff;
        /* Shifts are blue, gotos are green, and error is red. */
        if (TRANSITION_IS_ERROR (transitions, i))