* src/output.c (table_size, table_grow): New.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f53228e65148f08752e476a8dfd4004134bb66a0..f5aeb2898634a8cab251213f761df36ee75742c0 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,7 +21,10 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "bitset.h"

 #include "getargs.h"
 #include "getargs.h"

+#include "symtab.h"
+#include "gram.h"

 #include "files.h"
 #include "complain.h"
 #include "derives.h"
 #include "files.h"
 #include "complain.h"
 #include "derives.h"


@@ -35,7 +38,6 @@
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"

-#include "symtab.h"

 #include "lex.h"
 
 /* The name this program was run with, for messages.  */
 #include "lex.h"
 
 /* The name this program was run with, for messages.  */


@@ -49,11 +51,12 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 

+  bitset_stats_init ();
+

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

-  open_files ();

 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in


@@ -87,15 +90,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 ();


@@ -103,20 +106,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 ();
 

-  /* Close the input files. */
-  close_files ();
-
-  /* Free the symbol table data structure.  */
-  free_symtab ();
-
-  lex_free ();
-

   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.  */