doc: improve html and pdf rendering

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index ca1dc24ea54a89713b3426219d50d7dd457be73e..76d8b3fe5f0a451c361271fe2891e0e2eb6466fa 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
 /* Output a graph of the generated parser, for Bison.
 

-   Copyright (C) 2001-2007, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>

-#include <quotearg.h>

 #include "system.h"
 
 #include "LR0.h"
 #include "system.h"
 
 #include "LR0.h"


@@ -40,14 +39,18 @@
 | 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_core (struct obstack *oout, state *s)
 {
 static void
 print_core (struct obstack *oout, state *s)
 {

+  item_number const *sitems = s->items;
+  symbol *previous_lhs = NULL;

   size_t i;
   size_t i;

-  item_number *sitems = s->items;

   size_t snritems = s->nitems;
 
   size_t snritems = s->nitems;
 

-  /* Output all the items of a state, not only its kernel.  */
+  /* Output all the items of a state, not just its kernel.  */

   if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
   if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);


@@ -55,29 +58,37 @@ print_core (struct obstack *oout, state *s)
       snritems = nitemset;
     }
 
       snritems = nitemset;
     }
 

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

   for (i = 0; i < snritems; i++)
     {
   for (i = 0; i < snritems; i++)
     {

-      item_number *sp;
-      item_number *sp1;
-      rule_number r;
-
-      sp1 = sp = ritem + sitems[i];
+      item_number const *sp1 = ritem + sitems[i];
+      item_number const *sp = sp1;
+      rule *r;

 
 

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

         sp++;
 
         sp++;
 

-      r = item_number_as_rule_number (*sp);
+      r = &rules[item_number_as_rule_number (*sp)];

 
 

-      obstack_printf (oout, "%d: %s -> ", r, escape (rules[r].lhs->tag));
+      obstack_printf (oout, "%3d ", r->number);
+      if (previous_lhs && UNIQSTR_EQ (previous_lhs->tag, r->lhs->tag))
+        obstack_printf (oout, "%*s| ",
+                        (int) strlen (previous_lhs->tag), "");
+      else
+        obstack_printf (oout, "%s: ", escape (r->lhs->tag));
+      previous_lhs = r->lhs;

 
 

-      for (sp = rules[r].rhs; sp < sp1; sp++)
+      for (sp = r->rhs; sp < sp1; sp++)

         obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
 
       obstack_1grow (oout, '.');
 
         obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
 
       obstack_1grow (oout, '.');
 

-      for (/* Nothing */; *sp >= 0; ++sp)
-        obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
+      if (0 <= *r->rhs)
+        for (/* Nothing */; *sp >= 0; ++sp)
+          obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
+      else
+        obstack_printf (oout, " %%empty");

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


@@ -85,7 +96,7 @@ print_core (struct obstack *oout, state *s)
         {
           /* Find the reduction we are handling.  */
           reductions *reds = s->reductions;
         {
           /* Find the reduction we are handling.  */
           reductions *reds = s->reductions;

-          int redno = state_reduction_find (s, &rules[r]);
+          int redno = state_reduction_find (s, r);

 
           /* Print them if there are.  */
           if (reds->lookahead_tokens && redno != -1)
 
           /* Print them if there are.  */
           if (reds->lookahead_tokens && redno != -1)


@@ -93,7 +104,7 @@ print_core (struct obstack *oout, state *s)
               bitset_iterator biter;
               int k;
               char const *sep = "";
               bitset_iterator biter;
               int k;
               char const *sep = "";

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

               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {
                   obstack_sgrow (oout, sep);
               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {
                   obstack_sgrow (oout, sep);


@@ -116,12 +127,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;

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

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


@@ -145,6 +152,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);

 }
 
 
 }