* m4/prereq.m4: Update, from Coreutils 4.5.1.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d6a691af55dc036d4bdcd9f7c72851c38bb69719..b5a8e0010cba635f13dead55b0e107927e6cb2b6 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 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002
+   Copyright (C) 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.


@@ -29,6 +29,7 @@
 #include "files.h"
 #include "complain.h"
 #include "derives.h"
 #include "files.h"
 #include "complain.h"
 #include "derives.h"

+#include "tables.h"

 #include "output.h"
 #include "reader.h"
 #include "lalr.h"
 #include "output.h"
 #include "reader.h"
 #include "lalr.h"


@@ -44,135 +45,137 @@
 char *program_name;
 
 
 char *program_name;
 
 

-/*--------------------------.
-| Tracking space and time.  |
-`--------------------------*/
-
-#if HAVE_MALLOC_H & HAVE_SYS_TIMES_H
-# include <malloc.h>
-# include <sys/times.h>
-#endif
-
-static void
-stage (const char *title)
-{
-#if HAVE_MALLOC_H & HAVE_SYS_TIMES_H
-  if (trace_flag)
-    {
-      struct mallinfo minfo = mallinfo ();
-      struct tms tinfo;
-      times (&tinfo);
-      fprintf (stderr, "STAGE: %30s: %9d (%9d): %ldu %lds\n",
-              title,
-              minfo.uordblks, minfo.arena,
-              tinfo.tms_utime, tinfo.tms_stime);
-    }
-#endif
-}
-

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

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

-  if (trace_flag)
+  time_report = trace_flag & trace_time;
+  init_timevar ();
+  timevar_start (TV_TOTAL);
+
+  if (trace_flag & trace_bitsets)

     bitset_stats_enable ();
 
   muscle_init ();
 
     bitset_stats_enable ();
 
   muscle_init ();
 

-  stage ("initialized muscles");
-

   /* 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 ();

 
 

-  stage ("reader");
+  timevar_push (TV_READER);
+  reader ();
+  timevar_pop (TV_READER);

 
   if (complain_message_count)
     exit (1);
 
   /* Find useless nonterminals and productions and reduce the grammar. */
 
   if (complain_message_count)
     exit (1);
 
   /* Find useless nonterminals and productions and reduce the grammar. */

+  timevar_push (TV_REDUCE);

   reduce_grammar ();
   reduce_grammar ();

-
-  stage ("reduced 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);

 
 

-  stage ("generated states");

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

+  timevar_push (TV_LALR);

   lalr ();
   lalr ();

+  timevar_pop (TV_LALR);

 
 

-  stage ("lalred");

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

+  timevar_push (TV_CONFLICTS);

   conflicts_solve ();
   conflicts_print ();
   conflicts_solve ();
   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"));

 
 

-  stage ("solved conflicts");

   /* Output file names. */
   compute_output_file_names ();
 
   /* Output the detailed report on the grammar.  */
   if (report_flag)
   /* 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);
+    }
+
+  /* Output the VCG graph.  */
+  if (graph_flag)
+    {
+      timevar_push (TV_GRAPH);
+      print_graph ();
+      timevar_pop (TV_GRAPH);
+    }

 
 

-  stage ("printed results");

   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 
   /* 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 ();
+  /* Lookaheads 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.  */
 
   /* Output the tables and the parser to ftable.  In file output.  */

+  timevar_push (TV_PARSER);

   output ();
   output ();

-  stage ("made output");
+  timevar_pop (TV_PARSER);

 
 

+  timevar_push (TV_FREE);
+  nullable_free ();
+  derives_free ();
+  tables_free ();

   states_free ();
   states_free ();

-  stage ("freed states");

   reduce_free ();
   reduce_free ();

-  stage ("freed reduce");

   conflicts_free ();
   conflicts_free ();

-  stage ("freed conflicts");
-  free_nullable ();
-  stage ("freed nullable");
-  free_derives ();
-  stage ("freed derives");

   grammar_free ();
   grammar_free ();

-  stage ("freed grammar");

 
   /* The scanner memory cannot be released right after parsing, as it
      contains things such as user actions, prologue, epilogue etc.  */
   scanner_free ();
 
   /* The scanner memory cannot be released right after parsing, as it
      contains things such as user actions, prologue, epilogue etc.  */
   scanner_free ();

-  stage ("freed scanner");

   muscle_free ();
   muscle_free ();

-  stage ("freed muscles");

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

+  timevar_pop (TV_FREE);

 
 

-  if (trace_flag)
+  if (trace_flag & trace_bitsets)

     bitset_stats_dump (stderr);
 
     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;
 }
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }