X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7ba81a101f5df0036f9d88a8c72d021a8d3ec69f..f0451dba71a80adebe53a11db00c00bac7c70ba7:/src/main.c

diff --git a/src/main.c b/src/main.c
index 60322cf3..62436a80 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,7 @@
 #include "conflicts.h"
 #include "print_graph.h"
 #include "symtab.h"
+#include "lex.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -61,15 +62,16 @@ 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.
+     In file reduce.c.  */
   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 ();
 
@@ -81,6 +83,7 @@ main (int argc, char *argv[])
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
   solve_conflicts ();
+  conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
@@ -90,7 +93,7 @@ main (int argc, char *argv[])
   if (complain_message_count)
     exit (1);
 
-  /* Print information about results, if requested.  */
+  /* Output the detailed report on the grammar.  */
   print_results ();
 
   /* Output the VCG graph. */
@@ -99,21 +102,22 @@ main (int argc, char *argv[])
   /* 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 ();
 
-  /* Close the input files. */
-  close_files ();
-
+  reduce_free ();
   free_conflicts ();
   free_nullable ();
   free_derives ();
 
   output_files ();
 
-  exit (complain_message_count ? 1 : 0);
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 /* Abort for an internal error denoted by string S.  */