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 155ffaf592427747ea217c94c3e8de2764dcf1c1..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-2011 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.
 


@@ -20,8 +20,6 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

-#include <quotearg.h>
-

 #include "LR0.h"
 #include "closure.h"
 #include "complain.h"
 #include "LR0.h"
 #include "closure.h"
 #include "complain.h"


@@ -41,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);


@@ -56,53 +58,63 @@ 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++)
     {
   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)
-       sp++;
+      while (0 <= *sp)
+        sp++;

 
 

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

 
 

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

 
       obstack_1grow (oout, '.');
 
 
       obstack_1grow (oout, '.');
 

-      for (/* Nothing */; *sp >= 0; ++sp)
-       obstack_fgrow1 (oout, " %s", 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
           && item_number_is_rule_number (*sp1))
 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens
           && item_number_is_rule_number (*sp1))

-       {
-         /* Find the reduction we are handling.  */
-         reductions *reds = s->reductions;
-         int redno = state_reduction_find (s, &rules[r]);
-
-         /* Print them if there are.  */
-         if (reds->lookahead_tokens && redno != -1)
-           {
-             bitset_iterator biter;
-             int k;
-             char const *sep = "";
-             obstack_sgrow (oout, "[");
-             BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
-               {
-                 obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
-                 sep = ", ";
-               }
-             obstack_sgrow (oout, "]");
-           }
-       }
+        {
+          /* Find the reduction we are handling.  */
+          reductions *reds = s->reductions;
+          int redno = state_reduction_find (s, r);
+
+          /* Print them if there are.  */
+          if (reds->lookahead_tokens && redno != -1)
+            {
+              bitset_iterator biter;
+              int k;
+              char const *sep = "";
+              obstack_sgrow (oout, "  [");
+              BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
+                {
+                  obstack_sgrow (oout, sep);
+                  obstack_sgrow (oout, escape (symbols[k]->tag));
+                  sep = ", ";
+                }
+              obstack_1grow (oout, ']');
+            }
+        }
+      obstack_sgrow (oout, "\\l");

     }
 }
 
     }
 }
 


@@ -115,9 +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;

+  int i;

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


@@ -125,22 +136,24 @@ print_actions (state const *s, FILE *fgraph)
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i))
       {
   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);

 }
 
 
 }
 
 


@@ -157,8 +170,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.  */