Remove all uses of PARAMS, since we now assume C89 or better.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 28b08e18725fec696bcd60a2d1cf5bbf1178c5d8..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
+   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.


@@ -21,10 +21,15 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "bitset_stats.h"
+#include "bitset.h"

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

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

 #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"


@@ -35,86 +40,142 @@
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"

-#include "symtab.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;
 

+
+

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

 
 

-  lineno = 0;

   getargs (argc, argv);
 
   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.  */
   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 ();
   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 ();

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

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

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

   /* 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 detailed report on the grammar.  */
-  if (verbose_flag)
-    print_results ();
-
-  /* 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 ();

+  timevar_pop (TV_PARSER);

 
 

-  /* Free the symbol table data structure.  */
-  free_symtab ();
-
+  timevar_push (TV_FREE);
+  nullable_free ();
+  derives_free ();
+  tables_free ();
+  states_free ();

   reduce_free ();
   reduce_free ();

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

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

-    alloca (0);
+  alloca (0);

 #endif
 #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;
 }
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }