Point to an official beta.

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index f64cb8aad044837fb6135e99db067ffa5f9c18f0..15861f3525d0ade79bb43c1affcb25522232b171 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -19,7 +19,9 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
+#include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -36,45 +38,55 @@
 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);
+}
+
+
 /* This part will construct the label of nodes. */
 static void
 print_core (state_t *state, struct obstack *node_obstack)
 {
   int i;
-  short *sitems = state->items;
-  int snitems   = state->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
-  closure (sitems, snitems);
-  sitems = itemset;
-  snitems = nitemset;
+  if (trace_flag)
+    {
+      closure (sitems, snritems);
+      sitems = itemset;
+      snritems = nritemset;
+    }
 
-  obstack_fgrow1 (node_obstack, "%2d: ", state->number);
-  for (i = 0; i < snitems; i++)
+  obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
+  for (i = 0; i < snritems; i++)
     {
-      short *sp;
-      short *sp1;
+      item_number_t *sp;
+      item_number_t *sp1;
       int rule;
 
       sp1 = sp = ritem + sitems[i];
 
-      while (*sp > 0)
+      while (*sp >= 0)
        sp++;
 
       rule = -(*sp);
 
       if (i)
-       obstack_sgrow (node_obstack, "\n    ");
+       obstack_1grow (node_obstack, '\n');
       obstack_fgrow1 (node_obstack, " %s -> ",
-                     tags[rule_table[rule].lhs]);
+                     escape (rules[rule].lhs->tag));
 
-      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-       obstack_fgrow1 (node_obstack, "%s ", tags[*sp]);
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+       obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag));
 
       obstack_1grow (node_obstack, '.');
 
-      for (/* Nothing */; *sp > 0; ++sp)
-       obstack_fgrow1 (node_obstack, " %s", tags[*sp]);
+      for (/* Nothing */; *sp >= 0; ++sp)
+       obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag));
     }
 }
 
@@ -91,29 +103,18 @@ print_actions (state_t *state, const char *node_name)
 
   shifts   *shiftp = state->shifts;
   reductions *redp = state->reductions;
-#if 0
-  errs       *errp = state->errs;
-#endif
 
   static char buff[10];
   edge_t edge;
 
   if (!shiftp->nshifts && !redp)
-    {
-#if 0
-      if (final_state == state)
-       obstack_sgrow (node_obstack, "$default: accept");
-      else
-       obstack_sgrow (node_obstack, "NO ACTIONS");
-#endif
-      return;
-    }
+    return;
 
   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];
-       int symbol = state_table[state1]->accessing_symbol;
+       token_number_t symbol = states[state1]->accessing_symbol;
 
        new_edge (&edge);
 
@@ -124,49 +125,15 @@ print_actions (state_t *state, const char *node_name)
        edge.sourcename = node_name;
        sprintf (buff, "%d", state1);
        edge.targetname = buff;
-       /* Shifts are blue, gotos are red. */
-       edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red;
-       edge.label = tags[symbol];
+       /* Shifts are blue, gotos are green, and error is red. */
+       if (SHIFT_IS_ERROR (shiftp, i))
+         edge.color = red;
+       else
+         edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
+       edge.label = escape (symbols[symbol]->tag);
        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }
-
-#if 0
-  if (errp)
-    {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
-       {
-         if (!errp->errs[j])
-           continue;
-         symbol = errp->errs[j];
-         /* If something has been added in the NODE_OBSTACK after
-            the declaration of the label, then we need a `\n'.
-         if (obstack_object_size (node_obstack) > node_output_size)
-           obstack_sgrow (node_obstack, "\n");
-           */
-         obstack_fgrow1 (node_obstack, _("%-4s\terror (nonassociative)"),
-                         tags[symbol]);
-       }
-      if (j > 0)
-       obstack_1grow (node_obstack, '\n');
-    }
-
-  if (state->consistent && redp)
-    {
-      rule = redp->rules[0];
-      symbol = rule_table[rule].lhs;
-      /*
-      if (obstack_object_size (node_obstack) > node_output_size)
-       obstack_sgrow (node_obstack, "\n");
-       */
-      obstack_fgrow2 (node_obstack, _("$default\treduce using rule %d (%s)"),
-                     rule, tags[symbol]);
-    }
-#endif
 }
 
 
@@ -205,7 +172,7 @@ print_state (state_t *state)
 void
 print_graph (void)
 {
-  int i;
+  size_t i;
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");
@@ -233,9 +200,9 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
-  new_closure (nitems);
+  new_closure (nritems);
   for (i = 0; i < nstates; i++)
-    print_state (state_table[i]);
+    print_state (states[i]);
   free_closure ();
 
   /* Close graph. */