Merge remote-tracking branch 'origin/maint'

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 61d3651297342ef40bdd1d69a5fc5297f2dbe0ae..31e0e382d5378450d974ae7013bdfa3a85b5c521 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -39,11 +39,33 @@
 | Construct the node labels.  |
 `----------------------------*/
 
 | 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, ':');
+    }
+  obstack_1grow (oout, ' ');
+}
+

 static void
 print_core (struct obstack *oout, state *s)
 {
 static void
 print_core (struct obstack *oout, state *s)
 {

-  size_t i;

   item_number *sitems = s->items;
   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.  */
   size_t snritems = s->nitems;
 
   /* Output all the items of a state, not only its kernel.  */


@@ -54,7 +76,8 @@ print_core (struct obstack *oout, state *s)
       snritems = nitemset;
     }
 
       snritems = nitemset;
     }
 

-  obstack_fgrow1 (oout, "%d", s->number);
+  obstack_printf (oout, _("State %d"), s->number);
+  obstack_sgrow (oout, "\\n\\l");

   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;


@@ -68,15 +91,17 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
 
       r = item_number_as_rule_number (*sp);
 

-      obstack_fgrow1 (oout, "\n%s -> ", 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++)
 
       for (sp = rules[r].rhs; sp < sp1; sp++)

-        obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
+        obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));

 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)

-        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
+        obstack_printf (oout, " %s", escape (symbols[*sp]->tag));

 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens
 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens


@@ -92,15 +117,17 @@ print_core (struct obstack *oout, state *s)
               bitset_iterator biter;
               int k;
               char const *sep = "";
               bitset_iterator biter;
               int k;
               char const *sep = "";

-              obstack_sgrow (oout, "[");
+              obstack_sgrow (oout, "  [");

               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {
               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {

-                  obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
+                  obstack_sgrow (oout, sep);
+                  obstack_sgrow (oout, escape (symbols[k]->tag));

                   sep = ", ";
                 }
                   sep = ", ";
                 }

-              obstack_sgrow (oout, "]");
+              obstack_1grow (oout, ']');

             }
         }
             }
         }

+      obstack_sgrow (oout, "\\l");

     }
 }
 
     }
 }
 


@@ -113,9 +140,8 @@ print_core (struct obstack *oout, state *s)
 static void
 print_actions (state const *s, FILE *fgraph)
 {
 static void
 print_actions (state const *s, FILE *fgraph)
 {

-  int i;
-

   transitions const *trans = s->transitions;
   transitions const *trans = s->transitions;

+  int i;

 
   if (!trans->num && !s->reductions)
     return;
 
   if (!trans->num && !s->reductions)
     return;


@@ -139,6 +165,8 @@ print_actions (state const *s, FILE *fgraph)
                      TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
                      style, fgraph);
       }
                      TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
                      style, fgraph);
       }

+  /* Display reductions. */
+  output_red (s, s->reductions, fgraph);

 }
 
 
 }
 
 


@@ -155,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);
   /* 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.  */
   obstack_free (&node_obstack, 0);
 
   /* Output the edges.  */