X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bbb5bcc6f85b9ae3f951ab062455767318b827ad..d4e7d3a1919c20a6dbf5eb4cfa62cb6228a0e48d:/src/main.c?ds=sidebyside

diff --git a/src/main.c b/src/main.c
index fb62ff2d..f5aeb289 100644
--- 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
+   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,10 @@
 
 
 #include "system.h"
+#include "bitset.h"
 #include "getargs.h"
+#include "symtab.h"
+#include "gram.h"
 #include "files.h"
 #include "complain.h"
 #include "derives.h"
@@ -34,12 +37,12 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
+#include "muscle_tab.h"
+#include "lex.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
-extern void berror PARAMS((const char *));
-
 int
 main (int argc, char *argv[])
 {
@@ -48,10 +51,12 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
+  bitset_stats_init ();
+
   lineno = 0;
   getargs (argc, argv);
 
-  open_files ();
+  muscle_init ();
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in
@@ -60,15 +65,15 @@ main (int argc, char *argv[])
   if (complain_message_count)
     exit (1);
 
-  /* find useless nonterminals and productions and reduce the grammar.  In
-     file reduce.c */
+  /* Find useless nonterminals and productions and reduce the grammar. */
   reduce_grammar ();
 
-  /* record other info about the grammar.  In files derives and nullable.  */
+  /* Record other info about the grammar.  In files derives and
+     nullable.  */
   set_derives ();
   set_nullable ();
 
-  /* convert to nondeterministic finite state machine.  In file LR0.
+  /* Convert to nondeterministic finite state machine.  In file LR0.
      See state.h for more info.  */
   generate_states ();
 
@@ -79,32 +84,39 @@ 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.  */
-  initialize_conflicts ();
+  solve_conflicts ();
+  conflicts_print ();
+
+  /* Output file names. */
+  compute_output_file_names ();
 
-  /* Print information about results, if requested.  */
-  print_results ();
+  /* Output the detailed report on the grammar.  */
+  if (verbose_flag)
+    print_results ();
 
-  /* Output the VCG graph. */
-  print_graph ();
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);
+
+  /* Output the VCG graph.  */
+  if (graph_flag)
+    print_graph ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
-  finalize_conflicts ();
+  reduce_free ();
+  free_conflicts ();
   free_nullable ();
   free_derives ();
+  grammar_free ();
 
-  if (!complain_message_count)
-    output_files ();
-
-  exit (complain_message_count ? 1 : 0);
-}
-
-/* Abort for an internal error denoted by string S.  */
+  /* 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
 
-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }