local.at: improvements

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 61aa1e3cc29a6ca2029af328ce5bb9513522c64e..f4742b165876ccfe9fc45cd9136b0b7456337006 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"
@@ -40,11 +39,32 @@
 | Construct the node labels.  |
 `----------------------------*/
 
+/* Print the lhs of a rule in such a manner that there is no vertical
+   repetition, like in *.output files. */
+
+static void
+print_lhs (struct obstack *oout, rule *previous_rule, rule *r)
+{
+  if (previous_rule && STREQ (previous_rule->lhs->tag, r->lhs->tag))
+    {
+      int i;
+      for (i = 0; i < strlen (r->lhs->tag); ++i)
+        obstack_1grow (oout, ' ');
+      obstack_1grow (oout, '|');
+    }
+  else
+    {
+      obstack_sgrow (oout, escape (r->lhs->tag));
+      obstack_1grow (oout, ':');
+    }
+}
+
 static void
 print_core (struct obstack *oout, state *s)
 {
-  size_t i;
   item_number *sitems = s->items;
+  rule *previous_rule = NULL;
+  size_t i;
   size_t snritems = s->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
@@ -56,7 +76,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;
@@ -70,7 +90,9 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
-      obstack_printf (oout, "%d: %s ->", r, escape (rules[r].lhs->tag));
+      obstack_printf (oout, "%3d ", r);
+      print_lhs (oout, previous_rule, &rules[r]);
+      previous_rule = &rules[r];
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
         obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
@@ -120,9 +142,6 @@ 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;
 
@@ -145,6 +164,8 @@ print_actions (state const *s, FILE *fgraph)
                     TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
                     style, fgraph);
       }
+  /* Display reductions. */
+  output_red (s, s->reductions, fgraph);
 }