* src/LR0.c (state_list_t, state_list_append): New.

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 416c4fd2bb300bdf6357b072cc6e36c28a146eb6..7d81e2fe0f66a11f87cd5c56fa58b7a55029f985 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -38,14 +38,11 @@
 static graph_t graph;
 static FILE *fgraph = NULL;
 
-static inline const char *
-escape (const char *s)
-{
-  return quotearg_n_style (1, escape_quoting_style, s);
-}
 
+/*----------------------------.
+| Construct the node labels.  |
+`----------------------------*/
 
-/* This part will construct the label of nodes. */
 static void
 print_core (struct obstack *oout, state_t *state)
 {
@@ -78,15 +75,15 @@ print_core (struct obstack *oout, state_t *state)
       if (i)
        obstack_1grow (oout, '\n');
       obstack_fgrow1 (oout, " %s -> ",
-                     escape (rules[rule].lhs->tag));
+                     symbol_tag_get (rules[rule].lhs));
 
       for (sp = rules[rule].rhs; sp < sp1; sp++)
-       obstack_fgrow1 (oout, "%s ", escape (symbols[*sp]->tag));
+       obstack_fgrow1 (oout, "%s ", symbol_tag_get (symbols[*sp]));
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-       obstack_fgrow1 (oout, " %s", escape (symbols[*sp]->tag));
+       obstack_fgrow1 (oout, " %s", symbol_tag_get (symbols[*sp]));
 
       /* Experimental feature: display the lookaheads. */
       if (trace_flag && state->nlookaheads)
@@ -96,19 +93,18 @@ print_core (struct obstack *oout, state_t *state)
          /* Look for lookaheads corresponding to this rule. */
          for (j = 0; j < state->nlookaheads; ++j)
            for (k = 0; k < ntokens; ++k)
-             if (bitset_test (LA[state->lookaheadsp + j], k)
-                 && LArule[state->lookaheadsp + j]->number == rule)
+             if (bitset_test (state->lookaheads[j], k)
+                 && 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 (LA[state->lookaheadsp + j], k)
-                     && LArule[state->lookaheadsp + j]->number == rule)
+                 if (bitset_test (state->lookaheads[j], k)
+                     && state->lookaheads_rule[j]->number == rule)
                    obstack_fgrow2 (oout, "%s%s",
-                                   quotearg_style (escape_quoting_style,
-                                                   symbols[k]->tag),
+                                   symbol_tag_get (symbols[k]),
                                    --nlookaheads ? ", " : "");
              obstack_sgrow (oout, "]");
            }
@@ -127,7 +123,7 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
-  shifts   *shiftp = state->shifts;
+  shifts_t   *shiftp = state->shifts;
   reductions *redp = state->reductions;
 
   static char buff[10];
@@ -139,8 +135,8 @@ print_actions (state_t *state, const char *node_name)
   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
-       int state1 = shiftp->shifts[i];
-       token_number_t symbol = states[state1]->accessing_symbol;
+       state_number_t state1 = shiftp->shifts[i];
+       symbol_number_t symbol = states[state1]->accessing_symbol;
 
        new_edge (&edge);
 
@@ -156,7 +152,7 @@ print_actions (state_t *state, const char *node_name)
          edge.color = red;
        else
          edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
-       edge.label = escape (symbols[symbol]->tag);
+       edge.label = symbol_tag_get (symbols[symbol]);
        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }
@@ -198,7 +194,7 @@ print_state (state_t *state)
 void
 print_graph (void)
 {
-  size_t i;
+  state_number_t i;
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");