X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d019d65507d0bfff77bbc3fa34326bd859fd24e1..403b315bb1f3b9b61630cf123f348cb19070dd6c:/src/main.c

diff --git a/src/main.c b/src/main.c
index 309e7fc5..6b07e209 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,11 +26,12 @@
 #include "complain.h"
 #include "derives.h"
 #include "output.h"
-
-#if 0				/* XXX currently unused.  */
-/* Nonzero means failure has been detected; don't write a parser file.  */
-static int failure;
-#endif
+#include "reader.h"
+#include "lalr.h"
+#include "reduce.h"
+#include "nullable.h"
+#include "print.h"
+#include "LR0.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -39,21 +40,6 @@ extern void berror PARAMS((const char *));
 
 extern char *printable_version PARAMS ((int));
 
-extern void openfiles PARAMS ((void));
-extern void reader PARAMS ((void));
-extern void reduce_grammar PARAMS ((void));
-extern void set_nullable PARAMS ((void));
-extern void free_nullable PARAMS ((void));
-extern void generate_states PARAMS ((void));
-extern void lalr PARAMS ((void));
-extern void initialize_conflicts PARAMS ((void));
-extern void finalize_conflicts PARAMS ((void));
-extern void verbose PARAMS ((void));
-extern void terse PARAMS ((void));
-
-
-/* VMS complained about using `int'.  */
-
 int
 main (int argc, char *argv[])
 {
@@ -68,7 +54,7 @@ main (int argc, char *argv[])
   /* Be ready to clean up if we exit. */
   atexit (done);
 
-  openfiles ();
+  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
@@ -98,12 +84,8 @@ main (int argc, char *argv[])
      declarations.  */
   initialize_conflicts ();
 
-  /* Print information about results, if requested.  In file print.
-     */
-  if (verboseflag)
-    verbose ();
-  else
-    terse ();
+  /* Print information about results, if requested.  */
+  print_results ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();