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

diff --git a/src/print_graph.c b/src/print_graph.c
index 506d2113..416c4fd2 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -21,6 +21,7 @@
 #include "system.h"
 #include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -46,25 +47,25 @@ escape (const char *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.  */
   if (trace_flag)
     {
-      closure (sitems, snitems);
+      closure (sitems, snritems);
       sitems = itemset;
-      snitems = nitemset;
+      snritems = nritemset;
     }
 
-  obstack_fgrow1 (node_obstack, "state %2d\n", 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];
@@ -75,17 +76,43 @@ print_core (state_t *state, struct obstack *node_obstack)
       rule = -(*sp);
 
       if (i)
-	obstack_1grow (node_obstack, '\n');
-      obstack_fgrow1 (node_obstack, " %s -> ",
-		      escape (tags[rule_table[rule].lhs]));
+	obstack_1grow (oout, '\n');
+      obstack_fgrow1 (oout, " %s -> ",
+		      escape (rules[rule].lhs->tag));
 
-      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-	obstack_fgrow1 (node_obstack, "%s ", escape (tags[*sp]));
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+	obstack_fgrow1 (oout, "%s ", escape (symbols[*sp]->tag));
 
-      obstack_1grow (node_obstack, '.');
+      obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-	obstack_fgrow1 (node_obstack, " %s", escape (tags[*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, "]");
+	    }
+	}
     }
 }
 
@@ -113,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);
 
@@ -129,7 +156,7 @@ print_actions (state_t *state, const char *node_name)
 	  edge.color = red;
 	else
 	  edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
-	edge.label = escape (tags[symbol]);
+	edge.label = escape (symbols[symbol]->tag);
 	output_edge (&edge, fgraph);
 	close_edge (fgraph);
       }
@@ -153,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);
 
@@ -171,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");
@@ -201,7 +228,7 @@ print_graph (void)
   /* Output nodes and edges. */
   new_closure (nritems);
   for (i = 0; i < nstates; i++)
-    print_state (state_table[i]);
+    print_state (states[i]);
   free_closure ();
 
   /* Close graph. */