X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/602bbf31c1fbb83a0e1703e35e33e1e8dc9b0fd2..5b7f88c7f24c3ca04bbb00860f5c429096ee8ce7:/src/print_graph.c?ds=sidebyside

diff --git a/src/print_graph.c b/src/print_graph.c
index 116a98c2..fe0ee76d 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -38,55 +38,74 @@
 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);
-}
 
+/*----------------------------.
+| Construct the node labels.  |
+`----------------------------*/
 
-/* 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)
+  if (report_flag & report_itemsets)
     {
-      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;
-      int rule;
+      item_number_t *sp;
+      item_number_t *sp1;
+      rule_number_t rule;
 
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
 	sp++;
 
-      rule = -(*sp);
+      rule = item_number_as_rule_number (*sp);
 
       if (i)
-	obstack_1grow (node_obstack, '\n');
-      obstack_fgrow1 (node_obstack, " %s -> ",
-		      escape (symbols[rules[rule].lhs]->tag));
+	obstack_1grow (oout, '\n');
+      obstack_fgrow1 (oout, " %s -> ",
+		      rules[rule].lhs->tag);
 
-      for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
-	obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag));
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+	obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
 
-      obstack_1grow (node_obstack, '.');
+      obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-	obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag));
+	obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
+
+      /* Experimental feature: display the lookaheads. */
+      if (report_flag & report_lookaheads)
+	{
+	  /* Find the reduction we are handling.  */
+	  reductions_t *reds = state->reductions;
+	  int redno = state_reduction_find (state, &rules[rule]);
+
+	  /* Print them if there are.  */
+	  if (reds->lookaheads && redno != -1)
+	    {
+	      bitset_iterator biter;
+	      int k;
+	      int not_first = 0;
+	      obstack_sgrow (oout, "[");
+	      BITSET_FOR_EACH (biter, reds->lookaheads[redno], k, 0)
+		obstack_fgrow2 (oout, "%s%s",
+				not_first++ ? ", " : "",
+				symbols[k]->tag);
+	      obstack_sgrow (oout, "]");
+	    }
+	}
     }
 }
 
@@ -101,36 +120,36 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
-  shifts   *shiftp = state->shifts;
-  reductions *redp = state->reductions;
+  transitions_t     *transitions = state->transitions;
+  reductions_t *redp = state->reductions;
 
   static char buff[10];
   edge_t edge;
 
-  if (!shiftp->nshifts && !redp)
+  if (!transitions->num && !redp)
     return;
 
-  for (i = 0; i < shiftp->nshifts; i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
+  for (i = 0; i < transitions->num; i++)
+    if (!TRANSITION_IS_DISABLED (transitions, i))
       {
-	int state1 = shiftp->shifts[i];
-	int symbol = states[state1]->accessing_symbol;
+	state_t *state1 = transitions->states[i];
+	symbol_number_t symbol = state1->accessing_symbol;
 
 	new_edge (&edge);
 
-	if (state->number > state1)
+	if (state->number > state1->number)
 	  edge.type = back_edge;
 	open_edge (&edge, fgraph);
 	/* The edge source is the current node.  */
 	edge.sourcename = node_name;
-	sprintf (buff, "%d", state1);
+	sprintf (buff, "%d", state1->number);
 	edge.targetname = buff;
 	/* Shifts are blue, gotos are green, and error is red. */
-	if (SHIFT_IS_ERROR (shiftp, i))
+	if (TRANSITION_IS_ERROR (transitions, i))
 	  edge.color = red;
 	else
-	  edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
-	edge.label = escape (symbols[symbol]->tag);
+	  edge.color = TRANSITION_IS_SHIFT(transitions, i) ? blue : green;
+	edge.label = symbols[symbol]->tag;
 	output_edge (&edge, fgraph);
 	close_edge (fgraph);
       }
@@ -154,7 +173,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);
 
@@ -172,7 +191,7 @@ print_state (state_t *state)
 void
 print_graph (void)
 {
-  size_t i;
+  state_number_t i;
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");