* src/output.c (output): Topological sort of the functions, in

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 850076b82e093bafad63ef527d6b9c91e8a346c6..1c581c8e8d57abc3cb4a5a148d64583945ddbbfd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* Top level entry point of bison,
-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -19,36 +20,34 @@
    Boston, MA 02111-1307, USA.  */
 
 
-#include <stdio.h>
 #include "system.h"
-#include "machine.h"   /* for MAXSHORT */
+#include "getargs.h"
 #include "files.h"
 #include "complain.h"
+#include "derives.h"
+#include "output.h"
 
-extern int verboseflag;
-
+#if 0                          /* XXX currently unused.  */
 /* Nonzero means failure has been detected; don't write a parser file.  */
-int failure;
+static int failure;
+#endif
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
-char *printable_version PARAMS((int));
-void toomany PARAMS((char *));
-void berror PARAMS((char *));
+extern char *printable_version PARAMS ((int));
 
-extern void getargs PARAMS((int, char *[]));
-extern void openfiles PARAMS((void));
-extern void reader PARAMS((void));
-extern void reduce_grammar PARAMS((void));
-extern void set_derives PARAMS((void));
-extern void set_nullable PARAMS((void));
-extern void generate_states PARAMS((void));
-extern void lalr PARAMS((void));
-extern void initialize_conflicts PARAMS((void));
-extern void verbose PARAMS((void));
-extern void terse PARAMS((void));
-extern void output PARAMS((void));
+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'.  */
@@ -62,56 +61,58 @@ main (int argc, char *argv[])
   textdomain (PACKAGE);
 
   lineno = 0;
-  getargs(argc, argv);
+  getargs (argc, argv);
 
-  /* Be ready to clean up if we exit.*/
+  /* Be ready to clean up if we exit. */
   atexit (done);
 
-  openfiles();
+  openfiles ();
 
-  /* read the input.  Copy some parts of it to fguard, faction, ftable and fattrs.
-     In file reader.c.
-     The other parts are recorded in the grammar; see gram.h.  */
+  /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
+     and FATTRS.  In file reader.c.  The other parts are recorded in
+     the grammar; see gram.h.  */
   reader ();
   if (complain_message_count)
     exit (1);
 
   /* 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.  */
-  set_derives();
-  set_nullable();
+  set_derives ();
+  set_nullable ();
 
   /* convert to nondeterministic finite state machine.  In file LR0.
      See state.h for more info.  */
-  generate_states();
+  generate_states ();
 
   /* make it deterministic.  In file lalr.  */
-  lalr();
+  lalr ();
 
-  /* Find and record any conflicts: places where one token of lookahead is not
-     enough to disambiguate the parsing.  In file conflicts.
-     Also resolve s/r conflicts based on precedence declarations.  */
-  initialize_conflicts();
+  /* Find and record any conflicts: places where one token of
+     lookahead is not enough to disambiguate the parsing.  In file
+     conflicts.  Also resolve s/r conflicts based on precedence
+     declarations.  */
+  initialize_conflicts ();
 
-  /* print information about results, if requested.  In file print. */
+  /* Print information about results, if requested.  In file print.
+     */
   if (verboseflag)
-    verbose();
+    verbose ();
   else
-    terse();
+    terse ();
+
+  /* Output the tables and the parser to ftable.  In file output.  */
+  output ();
 
-  /* output the tables and the parser to ftable.  In file output. */
-  output();
-  done ();
+  finalize_conflicts ();
+  free_nullable ();
+  free_derives ();
 
   exit (complain_message_count ? 1 : 0);
 }
 \f
-/* functions to report errors which prevent a parser from being generated */
-
-
 /* Return a string containing a printable version of C:
    either C itself, or the corresponding \DDD code.  */
 
@@ -120,7 +121,7 @@ printable_version (int c)
 {
   static char buf[10];
   if (c < ' ' || c >= '\177')
-    sprintf(buf, "\\%o", c);
+    sprintf (buf, "\\%o", c);
   else
     {
       buf[0] = c;
@@ -132,8 +133,8 @@ printable_version (int c)
 /* Abort for an internal error denoted by string S.  */
 
 void
-berror (char *s)
+berror (const char *s)
 {
   fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort();
+  abort ();
 }