X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5092aba5a75e23dc8bca281a5ea240a7e155eff3..ec3bc39:/src/print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index f19769ac..416c4fd2 100644
--- 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,81 @@
 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)
+print_core (struct obstack *oout, state_t *state)
 {
   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 (oout, "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_fgrow1 (node_obstack, " %s -> ",
-		      tags[rule_table[rule].lhs]);
-
-      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-	obstack_fgrow1 (node_obstack, "%s ", tags[*sp]);
-
-      obstack_1grow (node_obstack, '.');
-
-      for (/* Nothing */; *sp > 0; ++sp)
-	obstack_fgrow1 (node_obstack, " %s", tags[*sp]);
+	obstack_1grow (oout, '\n');
+      obstack_fgrow1 (oout, " %s -> ",
+		      escape (rules[rule].lhs->tag));
+
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+	obstack_fgrow1 (oout, "%s ", escape (symbols[*sp]->tag));
+
+      obstack_1grow (oout, '.');
+
+      for (/* Nothing */; *sp >= 0; ++sp)
+	obstack_fgrow1 (oout, " %s", escape (symbols[*sp]->tag));
+
+      /* Experimental feature: display the lookaheads. */
+      if (trace_flag && 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)
+		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)
+		    obstack_fgrow2 (oout, "%s%s",
+				    quotearg_style (escape_quoting_style,
+						    symbols[k]->tag),
+				    --nlookaheads ? ", " : "");
+	      obstack_sgrow (oout, "]");
+	    }
+	}
     }
 }
 
@@ -102,7 +140,7 @@ print_actions (state_t *state, const char *node_name)
     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);
 
@@ -113,9 +151,12 @@ 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);
       }
@@ -139,7 +180,7 @@ print_state (state_t *state)
   new_node (&node);
   sprintf (name, "%d", state->number);
   node.title = name;
-  print_core (state, &node_obstack);
+  print_core (&node_obstack, state);
   obstack_1grow (&node_obstack, '\0');
   node.label = obstack_finish (&node_obstack);
 
@@ -157,7 +198,7 @@ print_state (state_t *state)
 void
 print_graph (void)
 {
-  int i;
+  size_t i;
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");
@@ -185,9 +226,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. */