* src/complain.h, src/complain.c (warn, complain): Remove, unused.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1a3911d2ce63f3de91bedc43287e889ee51a382c..40566e9cc1bb09b08e9fe22a9d68a1f624b47050 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* 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.
@@ -21,7 +21,11 @@
 
 
 #include "system.h"
+#include "bitset_stats.h"
+#include "bitset.h"
 #include "getargs.h"
+#include "symtab.h"
+#include "gram.h"
 #include "files.h"
 #include "complain.h"
 #include "derives.h"
@@ -35,8 +39,6 @@
 #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.  */
 char *program_name;
@@ -49,11 +51,12 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  lineno = 0;
   getargs (argc, argv);
 
+  if (trace_flag)
+    bitset_stats_enable ();
+
   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
@@ -81,46 +84,47 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
-  solve_conflicts ();
+  conflicts_solve ();
   conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
 
+  /* Output the detailed report on the grammar.  */
+  if (report_flag)
+    print_results ();
+
   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 
-  /* Output the detailed report on the grammar.  */
-  print_results ();
-
   /* Output the VCG graph.  */
-  print_graph ();
+  if (graph_flag)
+    print_graph ();
 
   /* 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 ();
-
+  states_free ();
   reduce_free ();
-  free_conflicts ();
+  conflicts_free ();
   free_nullable ();
   free_derives ();
+  grammar_free ();
 
-  output_files ();
-
+  /* The scanner memory cannot be released right after parsing, as it
+     contains things such as user actions, prologue, epilogue etc.  */
+  scanner_free ();
+  muscle_free ();
   /* If using alloca.c, flush the alloca'ed memory for the benefit of
      people running Bison as a library in IDEs.  */
 #if C_ALLOCA
     alloca (0);
 #endif
 
+    if (trace_flag)
+      bitset_stats_dump (stderr);
+
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }