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

diff --git a/src/print_graph.c b/src/print_graph.c
index 4d95a587..5045ed0f 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -28,6 +28,7 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
+#include "closure.h"
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
@@ -40,18 +41,22 @@ static void
 print_core (int state, struct obstack *node_obstack)
 {
   int i;
-  core *statep = state_table[state].state;
+  short *sitems = state_table[state]->items;
+  int snitems   = state_table[state]->nitems;
 
-  if (!statep->nitems)
-    return;
+  /* Output all the items of a state, not only its kernel.  */
+  closure (sitems, snitems);
+  sitems = itemset;
+  snitems = nitemset;
 
-  for (i = 0; i < statep->nitems; i++)
+  obstack_fgrow1 (node_obstack, "%2d: ", state);
+  for (i = 0; i < snitems; i++)
     {
       short *sp;
       short *sp1;
       int rule;
 
-      sp1 = sp = ritem + statep->items[i];
+      sp1 = sp = ritem + sitems[i];
 
       while (*sp > 0)
 	sp++;
@@ -59,8 +64,7 @@ print_core (int state, struct obstack *node_obstack)
       rule = -(*sp);
 
       if (i)
-	obstack_1grow (node_obstack, '\n');
-      obstack_fgrow1 (node_obstack, "%d: ", rule);
+	obstack_sgrow (node_obstack, "\n    ");
       obstack_fgrow1 (node_obstack, " %s  ->  ",
 		      tags[rule_table[rule].lhs]);
 
@@ -84,20 +88,17 @@ static void
 print_actions (int state, const char *node_name)
 {
   int i;
-  int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
+
+  shifts   *shiftp = state_table[state]->shifts;
+  reductions *redp = state_table[state]->reductions;
+#if 0
+  errs       *errp = state_table[state]->errs;
+#endif
+
   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 (!shiftp->nshifts && !redp)
     {
 #if 0
       if (final_state == state)
@@ -108,42 +109,27 @@ print_actions (int state, const char *node_name)
       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;
-    }
+  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;
+
+	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;
+	/* Shifts are blue, gotos are red. */
+	edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red;
+	edge.label = tags[symbol];
+	output_edge (&edge, fgraph);
+	close_edge (fgraph);
+      }
 
 #if 0
   if (errp)
@@ -169,7 +155,7 @@ print_actions (int state, const char *node_name)
 	obstack_1grow (node_obstack, '\n');
     }
 
-  if (state_table[state].consistent && redp)
+  if (state_table[state]->consistent && redp)
     {
       rule = redp->rules[0];
       symbol = rule_table[rule].lhs;
@@ -181,27 +167,6 @@ print_actions (int state, const char *node_name)
 		      rule, tags[symbol]);
     }
 #endif
-
-  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;
-	  edge.color = red;
-	  edge.label = tags[symbol];
-	  output_edge (&edge, fgraph);
-	  close_edge (fgraph);
-	}
-    }
 }
 
 
@@ -271,8 +236,10 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
+  new_closure (nitems);
   for (i = 0; i < nstates; i++)
     print_state (i);
+  free_closure ();
 
   /* Close graph. */
   close_graph (&graph, fgraph);