* src/reader.c (readgram): CleanUp.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4dff4de5d8617e752ddb160e2a62c475c0b559ba..8592b29487d59efe491d4322c5d6f3df2454bae6 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 (C) 1984, 1986, 1989, 1992, 1995, 2000
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000

    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.


@@ -30,28 +30,17 @@
 #include "lalr.h"
 #include "reduce.h"
 #include "nullable.h"
 #include "lalr.h"
 #include "reduce.h"
 #include "nullable.h"

-
-#if 0                          /* XXX currently unused.  */
-/* Nonzero means failure has been detected; don't write a parser file.  */
-static int failure;
-#endif
+#include "print.h"
+#include "LR0.h"
+#include "conflicts.h"
+#include "print_graph.h"
+#include "macrotab.h"

 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 extern void berror PARAMS((const char *));
 
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 extern void berror PARAMS((const char *));
 

-extern char *printable_version PARAMS ((int));
-
-extern void generate_states 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[])
 {
 int
 main (int argc, char *argv[])
 {


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

-  /* Be ready to clean up if we exit. */
-  atexit (done);
-
+  macro_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


@@ -96,12 +83,11 @@ main (int argc, char *argv[])
      declarations.  */
   initialize_conflicts ();
 
      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 VCG graph. */
+  print_graph ();

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


@@ -110,26 +96,12 @@ main (int argc, char *argv[])
   free_nullable ();
   free_derives ();
 
   free_nullable ();
   free_derives ();
 

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

   exit (complain_message_count ? 1 : 0);
 }
 \f
   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
 /* Abort for an internal error denoted by string S.  */
 
 void