* src/files.c [VMS]: No longer include `ssdef.h', no longer define

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d53d105fd776e99379345c010eabd29aa6d72160..d14657a14b32948dd33b7a1ca94ce03f0add4553 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,33 +25,19 @@
 #include "files.h"
 #include "complain.h"
 #include "derives.h"
-
-#if 0                          /* XXX currently unused.  */
-/* Nonzero means failure has been detected; don't write a parser file.  */
-static int failure;
-#endif
+#include "output.h"
+#include "reader.h"
+#include "lalr.h"
+#include "reduce.h"
+#include "nullable.h"
+#include "print.h"
+#include "LR0.h"
+#include "conflicts.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
-extern char *printable_version PARAMS ((int));
-extern void berror PARAMS ((const char *));
-
-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));
-extern void output PARAMS ((void));
-
-
-/* VMS complained about using `int'.  */
+extern void berror PARAMS((const char *));
 
 int
 main (int argc, char *argv[])
@@ -67,7 +53,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
@@ -97,12 +83,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 ();
@@ -114,23 +96,6 @@ main (int argc, char *argv[])
   exit (complain_message_count ? 1 : 0);
 }
 \f
-/* Return a string containing a printable version of C:
-   either C itself, or the corresponding \DDD code.  */
-
-char *
-printable_version (int c)
-{
-  static char buf[10];
-  if (c < ' ' || c >= '\177')
-    sprintf (buf, "\\%o", c);
-  else
-    {
-      buf[0] = c;
-      buf[1] = '\0';
-    }
-  return buf;
-}
-
 /* Abort for an internal error denoted by string S.  */
 
 void