Update.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8592b29487d59efe491d4322c5d6f3df2454bae6..10d5e0a8457b00e0205ddd06afe1b743ef3a7b78 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
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001

    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.


@@ -34,7 +34,9 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"

-#include "macrotab.h"
+#include "muscle_tab.h"
+#include "symtab.h"
+#include "lex.h"

 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 /* The name this program was run with, for messages.  */
 char *program_name;


@@ -52,7 +54,7 @@ main (int argc, char *argv[])
   lineno = 0;
   getargs (argc, argv);
 
   lineno = 0;
   getargs (argc, argv);
 

-  macro_init ();
+  muscle_init ();

   open_files ();
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
   open_files ();
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE


@@ -62,15 +64,16 @@ main (int argc, char *argv[])
   if (complain_message_count)
     exit (1);
 
   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.
+     In file reduce.c.  */

   reduce_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 ();
 
   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 ();
 
      See state.h for more info.  */
   generate_states ();
 


@@ -81,25 +84,42 @@ 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.  */
      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 ();

 
 

-  /* Print information about results, if requested.  */
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* 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 ();
 
   print_results ();
 

-  /* Output the VCG graph. */
+  /* Output the VCG graph.  */

   print_graph ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
   print_graph ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

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

   free_nullable ();
   free_derives ();
 
   free_nullable ();
   free_derives ();
 

-  if (!complain_message_count)
-    output_files ();
+  output_files ();

 
 

-  exit (complain_message_count ? 1 : 0);
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 \f
 /* Abort for an internal error denoted by string S.  */
 }
 \f
 /* Abort for an internal error denoted by string S.  */