* src/output.c (output): Delete call to reader_output_yylsp.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6b07e2097d936f82378d45ba769bf9f6bb77e827..6dfffbebc12fe45436a1cd8ab45b438d2117ede9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* 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.
@@ -32,14 +32,15 @@
 #include "nullable.h"
 #include "print.h"
 #include "LR0.h"
+#include "conflicts.h"
+#include "print_graph.h"
+#include "muscle_tab.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 extern void berror PARAMS((const char *));
 
-extern char *printable_version PARAMS ((int));
-
 int
 main (int argc, char *argv[])
 {
@@ -51,9 +52,7 @@ main (int argc, char *argv[])
   lineno = 0;
   getargs (argc, argv);
 
-  /* Be ready to clean up if we exit. */
-  atexit (done);
-
+  muscle_init ();
   open_files ();
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
@@ -87,6 +86,9 @@ main (int argc, char *argv[])
   /* 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 ();
 
@@ -94,26 +96,12 @@ main (int argc, char *argv[])
   free_nullable ();
   free_derives ();
 
+  if (!complain_message_count)
+    output_files ();
+
   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