* src/state.h, src/state.c (shift_t, SHIFT_SYMBOL, SHIFT_IS_SHIFT)

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 6cd92ec9f58ab5792c93a2a8b89d6a184a354f7a..8e6cdb3df9cda93e4db79a343c6a943feef02350 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)
 {
@@ -54,7 +51,7 @@ print_core (struct obstack *oout, state_t *state)
   int snritems   = state->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
-  if (trace_flag)
+  if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
       sitems = itemset;
@@ -66,50 +63,53 @@ print_core (struct obstack *oout, state_t *state)
     {
       item_number_t *sp;
       item_number_t *sp1;
-      int rule;
+      rule_number_t rule;
 
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
        sp++;
 
-      rule = -(*sp);
+      rule = rule_number_of_item_number (*sp);
 
       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)
+      if ((report_flag & report_lookaheads)
+         && state->nlookaheads)
        {
          int j, k;
          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 (LA[state->lookaheadsp + j], k)
-                 && LArule[state->lookaheadsp + 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 (LA[state->lookaheadsp + j], k)
-                     && LArule[state->lookaheadsp + j]->number == rule)
+               BITSET_EXECUTE (state->lookaheads[j], 0, k,
+               {
+                 if (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,19 +127,19 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
-  shifts   *shiftp = state->shifts;
-  reductions *redp = state->reductions;
+  transitions_t     *transitions = state->shifts;
+  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))
       {
-       int state1 = shiftp->shifts[i];
+       state_number_t state1 = transitions->states[i];
        symbol_number_t symbol = states[state1]->accessing_symbol;
 
        new_edge (&edge);
@@ -152,11 +152,11 @@ print_actions (state_t *state, const char *node_name)
        sprintf (buff, "%d", state1);
        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 = escape (symbols[symbol]->tag);
+         edge.color = TRANSITION_IS_SHIFT(transitions, i) ? blue : green;
+       edge.label = symbol_tag_get (symbols[symbol]);
        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }
@@ -198,7 +198,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");