Sync.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8ca5a672d67b23394e87098f1798deb39be0629f..cd68c90381e4fdbfbeb33e03a7f35bec6483d534 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
+/* Top level entry point of Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2004

    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.


@@ -16,126 +17,178 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to

-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

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

-#include "getargs.h"
-#include "files.h"
+
+#include <bitset_stats.h>
+#include <bitset.h>
+#include <timevar.h>
+
+#include "LR0.h"

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

+#include "conflicts.h"

 #include "derives.h"
 #include "derives.h"

+#include "files.h"
+#include "getargs.h"
+#include "gram.h"
+#include "lalr.h"
+#include "muscle_tab.h"
+#include "nullable.h"

 #include "output.h"
 #include "output.h"

+#include "print.h"
+#include "print_graph.h"

 #include "reader.h"
 #include "reader.h"

-#include "lalr.h"

 #include "reduce.h"
 #include "reduce.h"

-
-#if 0                          /* XXX currently unused.  */
-/* Nonzero means failure has been detected; don't write a parser file.  */
-static int failure;
-#endif
+#include "symtab.h"
+#include "tables.h"
+#include "uniqstr.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 void berror PARAMS((const char *));
-
-extern char *printable_version PARAMS ((int));
-
-extern void set_nullable PARAMS ((void));
-extern void free_nullable PARAMS ((void));
-extern void generate_states 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'.  */
-

 int
 main (int argc, char *argv[])
 {
   program_name = argv[0];
   setlocale (LC_ALL, "");
 int
 main (int argc, char *argv[])
 {
   program_name = argv[0];
   setlocale (LC_ALL, "");

-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+  (void) bindtextdomain (PACKAGE, LOCALEDIR);
+  (void) textdomain (PACKAGE);
+
+  uniqstrs_new ();

 
 

-  lineno = 0;

   getargs (argc, argv);
 
   getargs (argc, argv);
 

-  /* Be ready to clean up if we exit. */
-  atexit (done);
+  timevar_report = trace_flag & trace_time;
+  init_timevar ();
+  timevar_start (TV_TOTAL);

 
 

-  open_files ();
+  if (trace_flag & trace_bitsets)
+    bitset_stats_enable ();
+
+  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.  */

+
+  timevar_push (TV_READER);

   reader ();
   reader ();

-  if (complain_message_count)
-    exit (1);
+  timevar_pop (TV_READER);

 
 

-  /* find useless nonterminals and productions and reduce the grammar.  In
-     file reduce.c */
+  if (complaint_issued)
+    goto finish;
+
+  /* Find useless nonterminals and productions and reduce the grammar. */
+  timevar_push (TV_REDUCE);

   reduce_grammar ();
   reduce_grammar ();

+  timevar_pop (TV_REDUCE);

 
 

-  /* 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.  */
+  timevar_push (TV_SETS);
+  derives_compute ();
+  nullable_compute ();
+  timevar_pop (TV_SETS);

 
 

-  /* 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.  */

+  timevar_push (TV_LR0);

   generate_states ();
   generate_states ();

+  timevar_pop (TV_LR0);

 
   /* make it deterministic.  In file lalr.  */
 
   /* make it deterministic.  In file lalr.  */

+  timevar_push (TV_LALR);

   lalr ();
   lalr ();

+  timevar_pop (TV_LALR);

 
   /* Find and record any conflicts: places where one token of
 
   /* Find and record any conflicts: places where one token of

-     lookahead is not enough to disambiguate the parsing.  In file
+     look-ahead is not enough to disambiguate the parsing.  In file

      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */

-  initialize_conflicts ();
+  timevar_push (TV_CONFLICTS);
+  conflicts_solve ();
+  conflicts_print ();
+  timevar_pop (TV_CONFLICTS);

 
 

-  /* Print information about results, if requested.  In file print.
-     */
-  if (verboseflag)
-    verbose ();
-  else
-    terse ();
+  /* Compute the parser tables.  */
+  timevar_push (TV_ACTIONS);
+  tables_generate ();
+  timevar_pop (TV_ACTIONS);

 
 

-  /* Output the tables and the parser to ftable.  In file output.  */
-  output ();
+  grammar_rules_never_reduced_report
+    (_("rule never reduced because of conflicts"));

 
 

-  finalize_conflicts ();
-  free_nullable ();
-  free_derives ();
+  /* Output file names. */
+  compute_output_file_names ();

 
 

-  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 the detailed report on the grammar.  */
+  if (report_flag)
+    {
+      timevar_push (TV_REPORT);
+      print_results ();
+      timevar_pop (TV_REPORT);
+    }

 
 

-char *
-printable_version (int c)
-{
-  static char buf[10];
-  if (c < ' ' || c >= '\177')
-    sprintf (buf, "\\%o", c);
-  else
+  /* Output the VCG graph.  */
+  if (graph_flag)

     {
     {

-      buf[0] = c;
-      buf[1] = '\0';
+      timevar_push (TV_GRAPH);
+      print_graph ();
+      timevar_pop (TV_GRAPH);

     }
     }

-  return buf;
-}

 
 

-/* Abort for an internal error denoted by string S.  */
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complaint_issued)
+    goto finish;

 
 

-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
+  /* Look-ahead tokens are no longer needed. */
+  timevar_push (TV_FREE);
+  lalr_free ();
+  timevar_pop (TV_FREE);
+
+  /* Output the tables and the parser to ftable.  In file output.  */
+  timevar_push (TV_PARSER);
+  output ();
+  timevar_pop (TV_PARSER);
+
+  timevar_push (TV_FREE);
+  nullable_free ();
+  derives_free ();
+  tables_free ();
+  states_free ();
+  reduce_free ();
+  conflicts_free ();
+  grammar_free ();
+
+  /* The scanner memory cannot be released right after parsing, as it
+     contains things such as user actions, prologue, epilogue etc.  */
+  scanner_free ();
+  muscle_free ();
+  uniqstrs_free ();
+  /* If using alloca.c, flush the alloca'ed memory for the benefit of
+     people running Bison as a library in IDEs.  */
+#if C_ALLOCA
+  {
+    extern void *alloca (size_t);
+    alloca (0);
+  }
+#endif
+  timevar_pop (TV_FREE);
+
+  if (trace_flag & trace_bitsets)
+    bitset_stats_dump (stderr);
+
+ finish:
+
+  /* Stop timing and print the times.  */
+  timevar_stop (TV_TOTAL);
+  timevar_print (stderr);
+
+  return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }