Sync.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 76caf7a0242b58b0e6c4d360b26aa609d0001f75..cd68c90381e4fdbfbeb33e03a7f35bec6483d534 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
-/* Top level entry point of bison,
-   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001
+/* 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,122 +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 "output.h"
-#include "reader.h"
+#include "files.h"
+#include "getargs.h"
+#include "gram.h"

 #include "lalr.h"
 #include "lalr.h"

-#include "reduce.h"
+#include "muscle_tab.h"

 #include "nullable.h"
 #include "nullable.h"

+#include "output.h"

 #include "print.h"
 #include "print.h"

-#include "LR0.h"
-#include "conflicts.h"

 #include "print_graph.h"
 #include "print_graph.h"

-#include "muscle_tab.h"
+#include "reader.h"
+#include "reduce.h"

 #include "symtab.h"
 #include "symtab.h"

-#include "lex.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 *));
+

 
 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);
 

+  timevar_report = trace_flag & trace_time;
+  init_timevar ();
+  timevar_start (TV_TOTAL);
+
+  if (trace_flag & trace_bitsets)
+    bitset_stats_enable ();
+

   muscle_init ();
   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
      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);
+
+  if (complaint_issued)
+    goto finish;

 
   /* Find useless nonterminals and productions and reduce the grammar. */
 
   /* 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.  */
 
   /* Record other info about the grammar.  In files derives and
      nullable.  */

-  set_derives ();
-  set_nullable ();
+  timevar_push (TV_SETS);
+  derives_compute ();
+  nullable_compute ();
+  timevar_pop (TV_SETS);

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

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

-  solve_conflicts ();
+  timevar_push (TV_CONFLICTS);
+  conflicts_solve ();

   conflicts_print ();
   conflicts_print ();

+  timevar_pop (TV_CONFLICTS);
+
+  /* Compute the parser tables.  */
+  timevar_push (TV_ACTIONS);
+  tables_generate ();
+  timevar_pop (TV_ACTIONS);
+
+  grammar_rules_never_reduced_report
+    (_("rule never reduced because of conflicts"));

 
   /* Output file names. */
   compute_output_file_names ();
 
 
   /* Output file names. */
   compute_output_file_names ();
 

-  /* Stop if there were errors, to avoid trashing previous output
-     files.  */
-  if (complain_message_count)
-    exit (1);
-

   /* Output the detailed report on the grammar.  */
   /* Output the detailed report on the grammar.  */

-  print_results ();
+  if (report_flag)
+    {
+      timevar_push (TV_REPORT);
+      print_results ();
+      timevar_pop (TV_REPORT);
+    }

 
   /* Output the VCG graph.  */
 
   /* Output the VCG graph.  */

-  print_graph ();
-
-  /* Output the tables and the parser to ftable.  In file output.  */
-  output ();
+  if (graph_flag)
+    {
+      timevar_push (TV_GRAPH);
+      print_graph ();
+      timevar_pop (TV_GRAPH);
+    }

 
 

-  /* Close the input files. */
-  close_files ();
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complaint_issued)
+    goto finish;

 
 

-  /* Free the symbol table data structure.  */
-  free_symtab ();
+  /* Look-ahead tokens are no longer needed. */
+  timevar_push (TV_FREE);
+  lalr_free ();
+  timevar_pop (TV_FREE);

 
 

-  lex_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 ();
   reduce_free ();

-  free_conflicts ();
-  free_nullable ();
-  free_derives ();
-
-  output_files ();
-
+  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
   /* 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);
     alloca (0);

+  }

 #endif
 #endif

+  timevar_pop (TV_FREE);

 
 

-  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-\f
-/* Abort for an internal error denoted by string S.  */
+  if (trace_flag & trace_bitsets)
+    bitset_stats_dump (stderr);

 
 

-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
+ finish:
+
+  /* Stop timing and print the times.  */
+  timevar_stop (TV_TOTAL);
+  timevar_print (stderr);
+
+  return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }