Add.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 5d70fa48b976b47fad7ca8dc3728dcb7a0306d72..c0faa97ab4db2214bffb2b85175f8eaab4dac83d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,8 @@
 #include "system.h"
 #include "bitset.h"
 #include "getargs.h"
 #include "system.h"
 #include "bitset.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"


@@ -36,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.  */


@@ -83,14 +84,14 @@ 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.  */

-  solve_conflicts ();
+  conflicts_solve ();

   conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
 
   /* Output the detailed report on the grammar.  */
   conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
 
   /* Output the detailed report on the grammar.  */

-  if (verbose_flag)
+  if (report_flag)

     print_results ();
 
   /* Stop if there were errors, to avoid trashing previous output
     print_results ();
 
   /* Stop if there were errors, to avoid trashing previous output


@@ -106,7 +107,7 @@ main (int argc, char *argv[])
   output ();
 
   reduce_free ();
   output ();
 
   reduce_free ();

-  free_conflicts ();
+  conflicts_free ();

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