X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/600cad3b84d52923ef08f0265e0f76670b36e1d9..e9f87b5b7df2e328d2e4196d276c0d96594c906b:/src/print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 5dca0920..f9bec77d 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -19,8 +19,9 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
-#include "xalloc.h"
+#include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -29,227 +30,142 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
+#include "closure.h"
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
-#include "quotearg.h"
 
 static graph_t graph;
+static FILE *fgraph = NULL;
 
-static unsigned node_output_size = 0;
-
-/* Return an unambiguous printable representated, allocated in slot 0,
-   for NAME, suitable for C strings.  */
-static char const *
-quote (char const *name)
+static inline const char *
+escape (const char *s)
 {
-  return quotearg_n_style (0, escape_quoting_style, name);
+  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;
-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
-
-  statep = state_table[state];
-  k = statep->nitems;
+  short *sitems = state->items;
+  int snitems   = state->nitems;
 
-  if (k == 0)
-    return;
+  /* Output all the items of a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snitems);
+      sitems = itemset;
+      snitems = nitemset;
+    }
 
-  for (i = 0; i < k; i++)
+  obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
+  for (i = 0; i < snitems; i++)
     {
-      if (i)
-	obstack_sgrow (node_obstack, "\\n");
+      short *sp;
+      short *sp1;
+      int rule;
 
-      sp1 = sp = ritem + statep->items[i];
+      sp1 = sp = ritem + sitems[i];
 
-      while (*sp > 0)
+      while (*sp >= 0)
 	sp++;
 
       rule = -(*sp);
 
-      obstack_fgrow1 (node_obstack, "%d: ", rule);
-      obstack_fgrow1 (node_obstack, " %s  ->  ", quote (tags[rlhs[rule]]));
+      if (i)
+	obstack_1grow (node_obstack, '\n');
+      obstack_fgrow1 (node_obstack, " %s -> ",
+		      escape (symbols[rules[rule].lhs]->tag));
 
-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-	obstack_fgrow1 (node_obstack, "%s ", quote (tags[*sp]));
+      for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+	obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag));
 
       obstack_1grow (node_obstack, '.');
 
-      while (*sp > 0)
-	obstack_fgrow1 (node_obstack, " %s", quote (tags[*sp++]));
+      for (/* Nothing */; *sp >= 0; ++sp)
+	obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag));
     }
 }
 
-/* Output in graph_obstack edges specifications in incidence with current 
-   node.  */
+
+/*---------------------------------------------------------------.
+| Output in graph_obstack edges specifications in incidence with |
+| current node.                                                  |
+`---------------------------------------------------------------*/
+
 static void
-print_actions (int state, const char *node_name, struct obstack *node_obstack)
+print_actions (state_t *state, const char *node_name)
 {
   int i;
-  int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
-  int rule;
-  static char buff[10];
-  edge_t edge;
-
-  shiftp = shift_table[state];
-  redp = reduction_table[state];
-  errp = err_table[state];
 
-  if (!shiftp && !redp)
-    {
-      if (final_state == state)
-	obstack_sgrow (node_obstack, "$default: accept");
-      else
-	obstack_sgrow (node_obstack, "NO ACTIONS");
-      return;
-    }
-
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; i++)
-	{
-	  if (!shiftp->shifts[i])
-	    continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = accessing_symbol[state1];
-
-	  if (ISVAR (symbol))
-	    break;
-
-	  {
-	    new_edge (&edge);
-
-	    if (state > state1)
-	      edge.type = back_edge;
-	    open_edge (&edge, &graph_obstack);
-	    /* The edge source is the current node.  */
-	    edge.sourcename = node_name;
-	    sprintf (buff, "%d", state1);
-	    edge.targetname = buff;
-	    edge.color = (symbol == 0) ? red : blue;
-	    /* FIXME: Be aware that quote uses static memory.  The string
-	       must be output immediately (which is the case here). */
-	    edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
-	    output_edge (&edge, &graph_obstack);
-	    close_edge (&graph_obstack);
-	  }
-	}
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  shifts   *shiftp = state->shifts;
+  reductions *redp = state->reductions;
 
-  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_sgrow (node_obstack, "\\n");
-    }
+  static char buff[10];
+  edge_t edge;
 
-  if (consistent[state] && redp)
-    {
-      rule = redp->rules[0];
-      symbol = rlhs[rule];
-      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]);
-    }
+  if (!shiftp->nshifts && !redp)
+    return;
 
-  if (i < k)
-    {
-      for (; i < k; i++)
-	{
-	  if (!shiftp->shifts[i])
-	    continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = accessing_symbol[state1];
-
-	  new_edge (&edge);
-	  open_edge (&edge, &graph_obstack);
-	  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];
+	int 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] ? quote (tags[symbol]) : NULL;
-	  output_edge (&edge, &graph_obstack);
-	  close_edge (&graph_obstack);
-	}
-    }
+	else
+	  edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
+	edge.label = escape (symbols[symbol]->tag);
+	output_edge (&edge, fgraph);
+	close_edge (fgraph);
+      }
 }
 
-/* Output in GRAPH_OBSTACK the current node specifications and edges 
-   which go out from that node.  */
+
+/*-------------------------------------------------------------.
+| Output in FGRAPH the current node specifications and exiting |
+| edges.                                                       |
+`-------------------------------------------------------------*/
+
 static void
-print_state (int state)
+print_state (state_t *state)
 {
   static char name[10];
   struct obstack node_obstack;
   node_t node;
 
+  /* The labels of the nodes are their the items.  */
   obstack_init (&node_obstack);
-  new_node (&node);	/* Set node attributs default value.  */
-  sprintf (name, "%d", state);
-  node.title = name;	/* Give a name to the node.  */
-  open_node (&node_obstack);
-  /* Output a VCG formatted attributs list.  */
-  output_node (&node, &node_obstack);
-  
-  { 
-    /* Here we begin to compute the node label. */  
-    obstack_sgrow (&node_obstack, "\t\tlabel:\t\"");	/* Open Label  */
-    
-    /* Keep the size of NODE_OBSTACK before computing the label. It is 
-       useful to format the label.  */
-    node_output_size = obstack_object_size (&node_obstack);
-    
-    /* Compute the labels of nodes on the fly.  */
-    print_core (state, &node_obstack);
-    /* Compute edges and additionnal parts of node label.  */
-    print_actions (state, node.title, &node_obstack);
-    
-    obstack_sgrow (&node_obstack, "\"\n");		/* Close Label.  */
-    
-    close_node (&node_obstack);
-  }
-  
-  /* `obstack_cat' NODE_OBSTACK to GRAPH_OBSTACK.  */
-  obstack_grow (&graph_obstack, 
-		obstack_base (&node_obstack), 
-		obstack_object_size (&node_obstack));
-  obstack_finish (&node_obstack);
+  new_node (&node);
+  sprintf (name, "%d", state->number);
+  node.title = name;
+  print_core (state, &node_obstack);
+  obstack_1grow (&node_obstack, '\0');
+  node.label = obstack_finish (&node_obstack);
+
+  open_node (fgraph);
+  output_node (&node, fgraph);
+  close_node (fgraph);
+
+  /* Output the edges.  */
+  print_actions (state, name);
+
+  obstack_free (&node_obstack, 0);
 }
 
 
@@ -258,17 +174,18 @@ print_graph (void)
 {
   int i;
 
-  if (!graph_flag)
-    return;
+  /* Output file.  */
+  fgraph = xfopen (spec_graph_file, "w");
+
   new_graph (&graph);
 
 #if 0
   graph.smanhattan_edges = yes;
-  graph.manhattan_edges = yes; 
+  graph.manhattan_edges = yes;
 #endif
 
   graph.display_edge_labels = yes;
-  graph.layoutalgorithm = 0;
+  graph.layoutalgorithm = normal;
 
   graph.port_sharing = no;
   graph.finetuning = yes;
@@ -279,13 +196,16 @@ print_graph (void)
   graph.crossing_weight = median;
 
   /* Output graph options. */
-  open_graph (&graph_obstack);
-  output_graph (&graph, &graph_obstack);
+  open_graph (fgraph);
+  output_graph (&graph, fgraph);
 
+  /* Output nodes and edges. */
+  new_closure (nritems);
   for (i = 0; i < nstates; i++)
-    /* Output nodes & edges. */
-    print_state (i);
+    print_state (states[i]);
+  free_closure ();
 
   /* Close graph. */
-  close_graph (&graph, &graph_obstack);
+  close_graph (&graph, fgraph);
+  xfclose (fgraph);
 }