* bootstrap: Undo changes to gnulib files that autoreconf made.

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index c92ae3577fdf89cf621484f9f98fc6073f998b2e..9580f3f145ab9d204fc391bf63d0df6ea8382b98 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,6 +1,6 @@
 /* Output a VCG description on generated parser, for Bison,
 
 /* Output a VCG description on generated parser, for Bison,
 

-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

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


@@ -16,12 +16,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to

-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 

+#include <config.h>

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

-#include <obstack.h>

 #include <quotearg.h>
 
 #include "LR0.h"
 #include <quotearg.h>
 
 #include "LR0.h"


@@ -49,9 +49,9 @@ static FILE *fgraph = NULL;
 static void
 print_core (struct obstack *oout, state *s)
 {
 static void
 print_core (struct obstack *oout, state *s)
 {

-  int i;
+  size_t i;

   item_number *sitems = s->items;
   item_number *sitems = s->items;

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

 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)


@@ -88,24 +88,25 @@ print_core (struct obstack *oout, state *s)
       for (/* Nothing */; *sp >= 0; ++sp)
        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 
       for (/* Nothing */; *sp >= 0; ++sp)
        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 

-      /* Experimental feature: display the lookaheads. */
-      if (report_flag & report_lookaheads)
+      /* Experimental feature: display the look-ahead tokens. */
+      if (report_flag & report_look_ahead_tokens)

        {
          /* Find the reduction we are handling.  */
          reductions *reds = s->reductions;
          int redno = state_reduction_find (s, &rules[r]);
 
          /* Print them if there are.  */
        {
          /* 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->lookaheads && redno != -1)
+         if (reds->look_ahead_tokens && redno != -1)

            {
              bitset_iterator biter;
              int k;
            {
              bitset_iterator biter;
              int k;

-             int not_first = 0;
+             char const *sep = "";

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

-             BITSET_FOR_EACH (biter, reds->lookaheads[redno], k, 0)
-               obstack_fgrow2 (oout, "%s%s",
-                               not_first++ ? ", " : "",
-                               symbols[k]->tag);
+             BITSET_FOR_EACH (biter, reds->look_ahead_tokens[redno], k, 0)
+               {
+                 obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
+                 sep = ", ";
+               }

              obstack_sgrow (oout, "]");
            }
        }
              obstack_sgrow (oout, "]");
            }
        }


@@ -201,17 +202,10 @@ print_graph (void)
 
   new_graph (&static_graph);
 
 
   new_graph (&static_graph);
 

-#if 0
-  static_graph.smanhattan_edges = yes;
-  static_graph.manhattan_edges = yes;
-#endif
-

   static_graph.display_edge_labels = yes;
   static_graph.display_edge_labels = yes;

-  static_graph.layoutalgorithm = normal;

 
   static_graph.port_sharing = no;
   static_graph.finetuning = yes;
 
   static_graph.port_sharing = no;
   static_graph.finetuning = yes;

-  static_graph.long_straight_phase = yes;

   static_graph.priority_phase = yes;
   static_graph.splines = yes;
 
   static_graph.priority_phase = yes;
   static_graph.splines = yes;