X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/dc3b81cd67ba1a6843904b422dacbe03feb763f5..b59b91bb6e46b51bfc7960bacd654ca7b710f3c7:/src/print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index ced951b0..76dc1833 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -40,22 +40,16 @@ static void
 print_core (int state, struct obstack *node_obstack)
 {
   int i;
-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
+  core *statep = state_table[state].state;
 
-  statep = state_table[state].state;
-  k = statep->nitems;
-
-  if (k == 0)
+  if (!statep->nitems)
     return;
 
-  for (i = 0; i < k; i++)
+  for (i = 0; i < statep->nitems; i++)
     {
-      if (i)
-	obstack_1grow (node_obstack, '\n');
+      short *sp;
+      short *sp1;
+      int rule;
 
       sp1 = sp = ritem + statep->items[i];
 
@@ -64,6 +58,8 @@ print_core (int state, struct obstack *node_obstack)
 
       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]);
@@ -73,8 +69,8 @@ print_core (int state, struct obstack *node_obstack)
 
       obstack_1grow (node_obstack, '.');
 
-      while (*sp > 0)
-	obstack_fgrow1 (node_obstack, " %s", tags[*sp++]);
+      for (/* Nothing */; *sp > 0; ++sp)
+	obstack_fgrow1 (node_obstack, " %s", tags[*sp]);
     }
 }
 
@@ -88,21 +84,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;
-  int rule;
+
+  shifts   *shiftp = state_table[state].shifts;
+  reductions *redp = state_table[state].reductions;
+#if 0
+  errs       *errp = err_table[state];
+#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)
@@ -113,42 +105,26 @@ 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;
+	edge.color = (symbol == 0) ? red : blue;
+	edge.label = tags[symbol];
+	output_edge (&edge, fgraph);
+	close_edge (fgraph);
+      }
 
 #if 0
   if (errp)
@@ -187,14 +163,12 @@ print_actions (int state, const char *node_name)
     }
 #endif
 
-  if (i < k)
-    {
-      for (; i < k; i++)
+  if (i < shiftp->nshifts)
+    for (; i < shiftp->nshifts; i++)
+      if (!SHIFT_IS_DISABLED (shiftp, i))
 	{
-	  if (!shiftp->shifts[i])
-	    continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = state_table[state1].accessing_symbol;
+	  int state1 = shiftp->shifts[i];
+	  int symbol = state_table[state1].accessing_symbol;
 
 	  new_edge (&edge);
 	  open_edge (&edge, fgraph);
@@ -206,7 +180,6 @@ print_actions (int state, const char *node_name)
 	  output_edge (&edge, fgraph);
 	  close_edge (fgraph);
 	}
-    }
 }