Also pass --install to the second invocation of autoreconf, to let automake install...

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 6cab7234a9c7bff2eb20da328f5647d7e0f7a485..15861f3525d0ade79bb43c1affcb25522232b171 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -19,8 +19,9 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"

-#include "xalloc.h"
+#include "quotearg.h"

 #include "files.h"
 #include "files.h"

+#include "symtab.h"

 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"


@@ -29,196 +30,162 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"

+#include "closure.h"

 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
 
 static graph_t graph;
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
 
 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);
+}
+

 
 /* This part will construct the label of nodes. */
 static void
 
 /* This part will construct the label of nodes. */
 static void

-print_core (int state)
+print_core (state_t *state, struct obstack *node_obstack)

 {
   int i;
 {
   int i;

-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
-
-  statep = state_table[state];
-  k = statep->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;

 
 

-  if (k == 0)
-    return;
-
-  obstack_sgrow(&graph_obstack, "\t\tlabel:\t\"");
+  /* Output all the items of a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snritems);
+      sitems = itemset;
+      snritems = nritemset;
+    }

 
 

-  for (i = 0; i < k; i++)
+  obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
+  for (i = 0; i < snritems; i++)

     {
     {

-      sp1 = sp = ritem + statep->items[i];
+      item_number_t *sp;
+      item_number_t *sp1;
+      int rule;
+
+      sp1 = sp = ritem + sitems[i];

 
 

-      while (*sp > 0)
+      while (*sp >= 0)

        sp++;
 
       rule = -(*sp);
 
        sp++;
 
       rule = -(*sp);
 

-      obstack_fgrow1(&graph_obstack, _("%d: "), rule);
-      obstack_fgrow1(&graph_obstack, " %s  ->  ", tags[rlhs[rule]]);
+      if (i)
+       obstack_1grow (node_obstack, '\n');
+      obstack_fgrow1 (node_obstack, " %s -> ",
+                     escape (rules[rule].lhs->tag));

 
 

-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-       obstack_fgrow1(&graph_obstack, "%s ", tags[*sp]);
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+       obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag));

 
 

-      obstack_1grow(&graph_obstack, '.');
+      obstack_1grow (node_obstack, '.');

 
 

-      while (*sp > 0)
-       obstack_fgrow1(&graph_obstack, " %s", tags[*sp++]);
-
-      obstack_sgrow(&graph_obstack, "\\n");
+      for (/* Nothing */; *sp >= 0; ++sp)
+       obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag));

     }
     }

-  obstack_sgrow(&graph_obstack, "\"\n");

 }
 
 }
 

+
+/*---------------------------------------------------------------.
+| Output in graph_obstack edges specifications in incidence with |
+| current node.                                                  |
+`---------------------------------------------------------------*/
+

 static void
 static void

-print_actions (int state, node_t *node)
+print_actions (state_t *state, const char *node_name)

 {
   int i;
 {
   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];
+  shifts   *shiftp = state->shifts;
+  reductions *redp = state->reductions;

 
 

-  if (!shiftp && !redp)
-    {
-      if (final_state == state)
-       ;//fprintf(f, "    $default\taccept\n");
-      else
-       ;//fprintf(f, "    NO ACTIONS\n");
-      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);
-           edge.sourcename = node->title;
-           edge.targetname = buff;
-           sprintf (edge.targetname, "%d", state1);
-           edge.color = (symbol == 0) ? blue : red;
-           edge.label = tags[symbol];
-           output_edge (&edge, &graph_obstack);
-           close_edge (&graph_obstack);
-         }
-       }
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
-
-  if (errp)
-    {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
-       {
-         if (!errp->errs[j])
-           continue;
-         symbol = errp->errs[j];
-       }
-    }
+  static char buff[10];
+  edge_t edge;

 
 

-  if (consistent[state] && redp)
-    {
-      rule = redp->rules[0];
-      symbol = rlhs[rule];
-    }
+  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->title;
-         edge.targetname = buff;
+  for (i = 0; i < shiftp->nshifts; i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      {
+       int state1 = shiftp->shifts[i];
+       token_number_t 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.color = red;

-         sprintf (edge.targetname, "%d", state1);
-         edge.label = tags[symbol];
-         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 FGRAPH the current node specifications and exiting |
+| edges.                                                       |
+`-------------------------------------------------------------*/
+

 static void
 static void

-print_state (int state)
+print_state (state_t *state)

 {
   static char name[10];
 {
   static char name[10];

+  struct obstack node_obstack;

   node_t node;
 
   node_t node;
 

+  /* The labels of the nodes are their the items.  */
+  obstack_init (&node_obstack);

   new_node (&node);
   new_node (&node);

-  open_node (&graph_obstack);
-
-  sprintf(name, "%d", state);
+  sprintf (name, "%d", state->number);

   node.title = name;
   node.title = name;

-  output_node (&node, &graph_obstack);
+  print_core (state, &node_obstack);
+  obstack_1grow (&node_obstack, '\0');
+  node.label = obstack_finish (&node_obstack);

 
 

-  print_core (state);   /* node label */
+  open_node (fgraph);
+  output_node (&node, fgraph);
+  close_node (fgraph);

 
 

-  close_node (&graph_obstack);
+  /* Output the edges.  */
+  print_actions (state, name);

 
 

-  print_actions (state, &node);        /* edges */
+  obstack_free (&node_obstack, 0);

 }
 \f
 
 void
 print_graph (void)
 {
 }
 \f
 
 void
 print_graph (void)
 {

-  int i;
+  size_t i;
+
+  /* Output file.  */
+  fgraph = xfopen (spec_graph_file, "w");

 
 

-  if (!graph_flag)
-    return ;

   new_graph (&graph);
 
   new_graph (&graph);
 

-  /* graph.smanhattan_edges = yes;
-     graph.manhattan_edges = yes; */
+#if 0
+  graph.smanhattan_edges = yes;
+  graph.manhattan_edges = yes;
+#endif

 
   graph.display_edge_labels = yes;
 
   graph.display_edge_labels = yes;

-  graph.layoutalgorithm = 0;
+  graph.layoutalgorithm = normal;

 
   graph.port_sharing = no;
   graph.finetuning = yes;
 
   graph.port_sharing = no;
   graph.finetuning = yes;


@@ -229,13 +196,16 @@ print_graph (void)
   graph.crossing_weight = median;
 
   /* Output graph options. */
   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++)
   for (i = 0; i < nstates; i++)

-      /* Output nodes & edges. */
-      print_state (i);
+    print_state (states[i]);
+  free_closure ();

 
   /* Close graph. */
 
   /* Close graph. */

-  close_graph (&graph, &graph_obstack);
+  close_graph (&graph, fgraph);
+  xfclose (fgraph);

 }
 }