* src/macrotab.c: New file.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index eaa85596258219aedcadfc7ac37ab775ff4a2e4b..fb62ff2d2b0aeb73fe0e04f58a5e74dbb82bfa82 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.


@@ -33,14 +33,13 @@
 #include "print.h"
 #include "LR0.h"
 #include "conflicts.h"
 #include "print.h"
 #include "LR0.h"
 #include "conflicts.h"

+#include "print_graph.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));
-

 int
 main (int argc, char *argv[])
 {
 int
 main (int argc, char *argv[])
 {


@@ -52,9 +51,6 @@ 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);
-

   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


@@ -88,6 +84,9 @@ main (int argc, char *argv[])
   /* Print information about results, if requested.  */
   print_results ();
 
   /* 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 ();
 


@@ -95,26 +94,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