remove duplicate definitions

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index d5ec5fb4212497fe2ddd865786e4951f23fcc581..31e0e382d5378450d974ae7013bdfa3a85b5c521 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
-#include <quotearg.h>
 #include "system.h"
 
 #include "LR0.h"
@@ -58,6 +57,7 @@ print_lhs (struct obstack *oout, rule *previous_rule, rule *r)
       obstack_sgrow (oout, escape (r->lhs->tag));
       obstack_1grow (oout, ':');
     }
+  obstack_1grow (oout, ' ');
 }
 
 static void
@@ -77,7 +77,7 @@ print_core (struct obstack *oout, state *s)
     }
 
   obstack_printf (oout, _("State %d"), s->number);
-  obstack_sgrow (oout, "\\n");
+  obstack_sgrow (oout, "\\n\\l");
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
@@ -96,9 +96,9 @@ print_core (struct obstack *oout, state *s)
       previous_rule = &rules[r];
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
-        obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
+        obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
 
-      obstack_sgrow (oout, " .");
+      obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
         obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
@@ -143,31 +143,30 @@ print_actions (state const *s, FILE *fgraph)
   transitions const *trans = s->transitions;
   int i;
 
-  /* Display reductions. */
-  output_red (s, s->reductions, fgraph);
-
   if (!trans->num && !s->reductions)
     return;
 
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i))
       {
-       state *s1 = trans->states[i];
-       symbol_number sym = s1->accessing_symbol;
-
-       /* Shifts are solid, gotos are dashed, and error is dotted.  */
-       char const *style =
-         (TRANSITION_IS_ERROR (trans, i) ? "dotted"
-          : TRANSITION_IS_SHIFT (trans, i) ? "solid"
-          : "dashed");
-
-       if (TRANSITION_IS_ERROR (trans, i)
-           && strcmp (symbols[sym]->tag, "error") != 0)
-         abort ();
-       output_edge (s->number, s1->number,
-                    TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
-                    style, fgraph);
+        state *s1 = trans->states[i];
+        symbol_number sym = s1->accessing_symbol;
+
+        /* Shifts are solid, gotos are dashed, and error is dotted.  */
+        char const *style =
+          (TRANSITION_IS_ERROR (trans, i) ? "dotted"
+           : TRANSITION_IS_SHIFT (trans, i) ? "solid"
+           : "dashed");
+
+        if (TRANSITION_IS_ERROR (trans, i)
+            && STRNEQ (symbols[sym]->tag, "error"))
+          abort ();
+        output_edge (s->number, s1->number,
+                     TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
+                     style, fgraph);
       }
+  /* Display reductions. */
+  output_red (s, s->reductions, fgraph);
 }
 
 
@@ -184,8 +183,7 @@ print_state (state *s, FILE *fgraph)
   /* A node's label contains its items.  */
   obstack_init (&node_obstack);
   print_core (&node_obstack, s);
-  obstack_1grow (&node_obstack, '\0');
-  output_node (s->number, obstack_finish (&node_obstack), fgraph);
+  output_node (s->number, obstack_finish0 (&node_obstack), fgraph);
   obstack_free (&node_obstack, 0);
 
   /* Output the edges.  */