* src/scan-skel.l: Correct off-by-one error in handling of __oline__.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f3141d4ca3fcb24353e0c83f88ff43cf9d2a73e7..f5aeb2898634a8cab251213f761df36ee75742c0 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, 2002

    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.


@@ -21,39 +21,28 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "bitset.h"

 #include "getargs.h"
 #include "getargs.h"

+#include "symtab.h"
+#include "gram.h"

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

-
-#if 0                           /* XXX currently unused.  */
-/* Nonzero means failure has been detected; don't write a parser file.  */
-static int failure;
-#endif
+#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"
+#include "print_graph.h"
+#include "muscle_tab.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 berror PARAMS((const 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 free_derives 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));
-extern void output PARAMS((void));
-
-
-/* VMS complained about using `int'.  */
-

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


@@ -62,82 +51,72 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 

-  lineno = 0;
-  getargs(argc, argv);
+  bitset_stats_init ();

 
 

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

 
 

-  openfiles();
+  muscle_init ();

 
 

-  /* 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);
 
   reader ();
   if (complain_message_count)
     exit (1);
 

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

 
 

-  /* record other info about the grammar.  In files derives and nullable.  */
-  set_derives();
-  set_nullable();
+  /* Record other info about the grammar.  In files derives and
+     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.  */
      See state.h for more info.  */

-  generate_states();
+  generate_states ();

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

 
 

-  /* print information about results, if requested.  In file print. */
-  if (verboseflag)
-    verbose();
-  else
-    terse();
+  /* Output file names. */
+  compute_output_file_names ();

 
 

-  /* output the tables and the parser to ftable.  In file output. */
-  output();
+  /* Output the detailed report on the grammar.  */
+  if (verbose_flag)
+    print_results ();

 
 

-  finalize_conflicts();
-  free_nullable();
-  free_derives();
-
-  exit (complain_message_count ? 1 : 0);
-}
-\f
-/* functions to report errors which prevent a parser from being generated */
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);

 
 

+  /* Output the VCG graph.  */
+  if (graph_flag)
+    print_graph ();

 
 

-/* Return a string containing a printable version of C:
-   either C itself, or the corresponding \DDD code.  */
+  /* Output the tables and the parser to ftable.  In file output.  */
+  output ();

 
 

-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;
-}
+  reduce_free ();
+  free_conflicts ();
+  free_nullable ();
+  free_derives ();
+  grammar_free ();

 
 

-/* Abort for an internal error denoted by string S.  */
+  /* If using alloca.c, flush the alloca'ed memory for the benefit of
+     people running Bison as a library in IDEs.  */
+#if C_ALLOCA
+    alloca (0);
+#endif

 
 

-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort();
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }