* src/system.h (obstack_grow_literal_string): Rename as...

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 2cf2a9363d4c1067f9008c10ac6f19f953310b4f..ec65f528616bf251f57f1abbb1243afee79350f1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* Top level entry point of bison,
 /* Top level entry point of bison,

-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000
+   Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -19,39 +20,24 @@
    Boston, MA 02111-1307, USA.  */
 
 
    Boston, MA 02111-1307, USA.  */
 
 

-#include <stdio.h>

 #include "system.h"
 #include "system.h"

-#include "machine.h"   /* for MAXSHORT */
+#include "getargs.h"

 #include "files.h"
 #include "complain.h"
 #include "files.h"
 #include "complain.h"

-
-extern int verboseflag;
-
-/* Nonzero means failure has been detected; don't write a parser file.  */
-int failure;
+#include "derives.h"
+#include "output.h"
+#include "reader.h"
+#include "lalr.h"
+#include "reduce.h"
+#include "nullable.h"
+#include "print.h"
+#include "LR0.h"
+#include "conflicts.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;
 

-char *printable_version PARAMS((int));
-void toomany PARAMS((char *));
-void berror PARAMS((char *));
-
-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));
-
-
-/* VMS complained about using `int'.  */
+extern void berror PARAMS((const char *));

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


@@ -62,77 +48,59 @@ main (int argc, char *argv[])
   textdomain (PACKAGE);
 
   lineno = 0;
   textdomain (PACKAGE);
 
   lineno = 0;

-  getargs(argc, argv);
-
-  /* Be ready to clean up if we exit.*/
-  atexit (done);
+  getargs (argc, argv);

 
 

-  openfiles();
+  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 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 */
   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.  */
 
   /* 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.  */
 
   /* 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.  */
 
   /* make it deterministic.  In file 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();
+  lalr ();

 
 

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

 
 

-  /* output the tables and the parser to ftable.  In file output. */
-  output();
+  /* Print information about results, if requested.  */
+  print_results ();

 
 

-  exit (complain_message_count ? 1 : 0);
-}
-\f
-/* functions to report errors which prevent a parser from being generated */
+  /* Output the tables and the parser to ftable.  In file output.  */
+  output ();

 
 

+  finalize_conflicts ();
+  free_nullable ();
+  free_derives ();

 
 

-/* Return a string containing a printable version of C:
-   either C itself, or the corresponding \DDD code.  */
+  if (!complain_message_count)
+    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;
+  exit (complain_message_count ? 1 : 0);

 }
 }

-
+\f

 /* Abort for an internal error denoted by string S.  */
 
 void
 /* 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);
 {
   fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);

-  abort();
+  abort ();

 }
 }