Separate parser tables computation and output.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d9461cc4a4e552cd48f1e75a3c250dba8707e9b8..6b73f9eb67bb37c962f74fd624f1c8981d36549f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,6 +21,7 @@
 
 
 #include "system.h"
+#include "bitset_stats.h"
 #include "bitset.h"
 #include "getargs.h"
 #include "symtab.h"
@@ -28,6 +29,7 @@
 #include "files.h"
 #include "complain.h"
 #include "derives.h"
+#include "tables.h"
 #include "output.h"
 #include "reader.h"
 #include "lalr.h"
@@ -38,11 +40,12 @@
 #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;
 
+
+
 int
 main (int argc, char *argv[])
 {
@@ -51,48 +54,70 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  bitset_stats_init ();
-
-  lineno = 0;
   getargs (argc, argv);
 
+  time_report = trace_flag & trace_time;
+  init_timevar ();
+  timevar_start (TV_TOTAL);
+
+  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.  */
+
+  timevar_push (TV_READER);
   reader ();
+  timevar_pop (TV_READER);
+
   if (complain_message_count)
     exit (1);
 
   /* Find useless nonterminals and productions and reduce the grammar. */
+  timevar_push (TV_REDUCE);
   reduce_grammar ();
+  timevar_pop (TV_REDUCE);
 
   /* Record other info about the grammar.  In files derives and
      nullable.  */
+  timevar_push (TV_SETS);
   set_derives ();
   set_nullable ();
+  timevar_pop (TV_SETS);
 
   /* Convert to nondeterministic finite state machine.  In file LR0.
      See state.h for more info.  */
+  timevar_push (TV_LR0);
   generate_states ();
+  timevar_pop (TV_LR0);
 
   /* make it deterministic.  In file lalr.  */
+  timevar_push (TV_LALR);
   lalr ();
+  timevar_pop (TV_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.  */
-  solve_conflicts ();
+  timevar_push (TV_CONFLICTS);
+  conflicts_solve ();
   conflicts_print ();
+  timevar_pop (TV_CONFLICTS);
 
   /* Output file names. */
   compute_output_file_names ();
 
   /* Output the detailed report on the grammar.  */
   if (report_flag)
-    print_results ();
+    {
+      timevar_push (TV_REPORT);
+      print_results ();
+      timevar_pop (TV_REPORT);
+    }
 
   /* Stop if there were errors, to avoid trashing previous output
      files.  */
@@ -101,22 +126,48 @@ main (int argc, char *argv[])
 
   /* Output the VCG graph.  */
   if (graph_flag)
-    print_graph ();
+    {
+      timevar_push (TV_GRAPH);
+      print_graph ();
+      timevar_pop (TV_GRAPH);
+    }
+
+  /* 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.  */
+  timevar_push (TV_PARSER);
   output ();
+  timevar_pop (TV_PARSER);
 
+  timevar_push (TV_FREE);
+  tables_free ();
+  states_free ();
   reduce_free ();
-  free_conflicts ();
+  conflicts_free ();
   free_nullable ();
   free_derives ();
   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 ();
   /* 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);
+  alloca (0);
 #endif
+  timevar_pop (TV_FREE);
+
+  if (trace_flag & trace_bitsets)
+    bitset_stats_dump (stderr);
+
+  /* Stop timing and print the times.  */
+  timevar_stop (TV_TOTAL);
+  timevar_print (stderr);
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }