* src/closure.c, src/derives.c, src/nullable.c: Adjust various

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1c581c8e8d57abc3cb4a5a148d64583945ddbbfd..10d5e0a8457b00e0205ddd06afe1b743ef3a7b78 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, 2001

    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.


@@ -26,31 +26,22 @@
 #include "complain.h"
 #include "derives.h"
 #include "output.h"
 #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"
+#include "conflicts.h"
+#include "print_graph.h"
+#include "muscle_tab.h"
+#include "symtab.h"
+#include "lex.h"

 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 

-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'.  */
+extern void berror PARAMS((const char *));

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


@@ -63,10 +54,8 @@ 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);
-
-  openfiles ();
+  muscle_init ();
+  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
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in


@@ -75,15 +64,16 @@ main (int argc, char *argv[])
   if (complain_message_count)
     exit (1);
 
   if (complain_message_count)
     exit (1);
 

-  /* find useless nonterminals and productions and reduce the grammar.  In
-     file reduce.c */
+  /* Find useless nonterminals and productions and reduce the grammar.
+     In file reduce.c.  */

   reduce_grammar ();
 
   reduce_grammar ();
 

-  /* record other info about the grammar.  In files derives and nullable.  */
+  /* Record other info about the grammar.  In files derives and
+     nullable.  */

   set_derives ();
   set_nullable ();
 
   set_derives ();
   set_nullable ();
 

-  /* convert to nondeterministic finite state machine.  In file LR0.
+  /* Convert to nondeterministic finite state machine.  In file LR0.

      See state.h for more info.  */
   generate_states ();
 
      See state.h for more info.  */
   generate_states ();
 


@@ -94,42 +84,44 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */

-  initialize_conflicts ();
+  solve_conflicts ();
+  conflicts_print ();
+
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);

 
 

-  /* Print information about results, if requested.  In file print.
-     */
-  if (verboseflag)
-    verbose ();
-  else
-    terse ();
+  /* Output the detailed report on the grammar.  */
+  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 ();
 

-  finalize_conflicts ();
+  /* Close the input files. */
+  close_files ();
+
+  /* Free the symbol table data structure.  */
+  free_symtab ();
+
+  lex_free ();
+
+  reduce_free ();
+  free_conflicts ();

   free_nullable ();
   free_derives ();
 
   free_nullable ();
   free_derives ();
 

-  exit (complain_message_count ? 1 : 0);
-}
-\f
-/* Return a string containing a printable version of C:
-   either C itself, or the corresponding \DDD code.  */
+  output_files ();

 
 

-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;
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }

-
+\f

 /* Abort for an internal error denoted by string S.  */
 
 void
 /* Abort for an internal error denoted by string S.  */
 
 void