X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6255b435119f729b0a7d27d581b75b9e71a0b89c..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 4d95a587..15861f35 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"
@@ -28,6 +30,7 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
+#include "closure.h"
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
@@ -35,42 +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 (int state, struct obstack *node_obstack)
+print_core (state_t *state, struct obstack *node_obstack)
 {
   int i;
-  core *statep = state_table[state].state;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;
 
-  if (!statep->nitems)
-    return;
+  /* Output all the items of a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snritems);
+      sitems = itemset;
+      snritems = nritemset;
+    }
 
-  for (i = 0; i < statep->nitems; 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 + statep->items[i];
+      sp1 = sp = ritem + sitems[i];
 
-      while (*sp > 0)
+      while (*sp >= 0)
 	sp++;
 
       rule = -(*sp);
 
       if (i)
 	obstack_1grow (node_obstack, '\n');
-      obstack_fgrow1 (node_obstack, "%d: ", rule);
-      obstack_fgrow1 (node_obstack, " %s  ->  ",
-		      tags[rule_table[rule].lhs]);
+      obstack_fgrow1 (node_obstack, " %s -> ",
+		      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));
     }
 }
 
@@ -81,127 +97,43 @@ print_core (int state, struct obstack *node_obstack)
 `---------------------------------------------------------------*/
 
 static void
-print_actions (int state, const char *node_name)
+print_actions (state_t *state, const char *node_name)
 {
   int i;
-  int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
-  static char buff[10];
-  edge_t edge;
 
-  shiftp = state_table[state].shift_table;
-  redp = state_table[state].reduction_table;
-  errp = err_table[state];
-
-  if (!shiftp && !redp)
-    {
-#if 0
-      if (final_state == state)
-	obstack_sgrow (node_obstack, "$default: accept");
-      else
-	obstack_sgrow (node_obstack, "NO ACTIONS");
-#endif
-      return;
-    }
-
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; i++)
-	{
-	  if (!shiftp->shifts[i])
-	    continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = state_table[state1].accessing_symbol;
-
-	  if (ISVAR (symbol))
-	    break;
-
-	  {
-	    new_edge (&edge);
-
-	    if (state > state1)
-	      edge.type = back_edge;
-	    open_edge (&edge, fgraph);
-	    /* The edge source is the current node.  */
-	    edge.sourcename = node_name;
-	    sprintf (buff, "%d", state1);
-	    edge.targetname = buff;
-	    edge.color = (symbol == 0) ? red : blue;
-	    edge.label = tags[symbol];
-	    output_edge (&edge, fgraph);
-	    close_edge (fgraph);
-	  }
-	}
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  shifts   *shiftp = state->shifts;
+  reductions *redp = state->reductions;
 
-#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');
-    }
+  static char buff[10];
+  edge_t edge;
 
-  if (state_table[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
+  if (!shiftp->nshifts && !redp)
+    return;
 
-  if (i < k)
-    {
-      for (; i < k; i++)
-	{
-	  if (!shiftp->shifts[i])
-	    continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = state_table[state1].accessing_symbol;
-
-	  new_edge (&edge);
-	  open_edge (&edge, fgraph);
-	  edge.sourcename = node_name;
-	  sprintf (buff, "%d", state1);
-	  edge.targetname = buff;
+  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;
+
+	new_edge (&edge);
+
+	if (state->number > state1)
+	  edge.type = back_edge;
+	open_edge (&edge, fgraph);
+	/* The edge source is the current node.  */
+	edge.sourcename = 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))
 	  edge.color = red;
-	  edge.label = tags[symbol];
-	  output_edge (&edge, fgraph);
-	  close_edge (fgraph);
-	}
-    }
+	else
+	  edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
+	edge.label = escape (symbols[symbol]->tag);
+	output_edge (&edge, fgraph);
+	close_edge (fgraph);
+      }
 }
 
 
@@ -211,7 +143,7 @@ print_actions (int state, const char *node_name)
 `-------------------------------------------------------------*/
 
 static void
-print_state (int state)
+print_state (state_t *state)
 {
   static char name[10];
   struct obstack node_obstack;
@@ -220,7 +152,7 @@ print_state (int state)
   /* The labels of the nodes are their the items.  */
   obstack_init (&node_obstack);
   new_node (&node);
-  sprintf (name, "%d", state);
+  sprintf (name, "%d", state->number);
   node.title = name;
   print_core (state, &node_obstack);
   obstack_1grow (&node_obstack, '\0');
@@ -240,10 +172,7 @@ print_state (int state)
 void
 print_graph (void)
 {
-  int i;
-
-  if (!graph_flag)
-    return;
+  size_t i;
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");
@@ -271,8 +200,10 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
+  new_closure (nritems);
   for (i = 0; i < nstates; i++)
-    print_state (i);
+    print_state (states[i]);
+  free_closure ();
 
   /* Close graph. */
   close_graph (&graph, fgraph);