(AUTOMAKE_OPTIONS): 1.6.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6deec48a1f2d4d1d62c570e4bce37b5d7a6cd6ef..5d70fa48b976b47fad7ca8dc3728dcb7a0306d72 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* Top level entry point of bison,
 /* Top level entry point of bison,

-   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -21,6 +21,7 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "bitset.h"

 #include "getargs.h"
 #include "files.h"
 #include "complain.h"
 #include "getargs.h"
 #include "files.h"
 #include "complain.h"


@@ -49,6 +50,8 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 

+  bitset_stats_init ();
+

   lineno = 0;
   getargs (argc, argv);
 
   lineno = 0;
   getargs (argc, argv);
 


@@ -86,15 +89,15 @@ main (int argc, char *argv[])
   /* Output file names. */
   compute_output_file_names ();
 
   /* Output file names. */
   compute_output_file_names ();
 

+  /* Output the detailed report on the grammar.  */
+  if (verbose_flag)
+    print_results ();
+

   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 
   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 

-  /* Output the detailed report on the grammar.  */
-  if (verbose_flag)
-    print_results ();
-

   /* Output the VCG graph.  */
   if (graph_flag)
     print_graph ();
   /* Output the VCG graph.  */
   if (graph_flag)
     print_graph ();


@@ -102,15 +105,11 @@ main (int argc, char *argv[])
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

-  /* Free the symbol table data structure.  */
-  free_symtab ();
-

   reduce_free ();
   free_conflicts ();
   free_nullable ();
   free_derives ();
   reduce_free ();
   free_conflicts ();
   free_nullable ();
   free_derives ();

-
-  output_files ();
+  grammar_free ();

 
   /* If using alloca.c, flush the alloca'ed memory for the benefit of
      people running Bison as a library in IDEs.  */
 
   /* If using alloca.c, flush the alloca'ed memory for the benefit of
      people running Bison as a library in IDEs.  */