* data/c.m4 (b4_c_modern): New macro, with a new provision for _MSC_VER.

[bison.git] / src / main.c

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

    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,30 +17,34 @@
 
    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 <config.h>

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

-#include "bitset_stats.h"
-#include "bitset.h"
-#include "getargs.h"
-#include "symtab.h"
-#include "gram.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 "tables.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 "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;


@@ -52,11 +57,14 @@ main (int argc, char *argv[])
   program_name = argv[0];
   setlocale (LC_ALL, "");
   (void) bindtextdomain (PACKAGE, LOCALEDIR);
   program_name = argv[0];
   setlocale (LC_ALL, "");
   (void) bindtextdomain (PACKAGE, LOCALEDIR);

+  (void) bindtextdomain ("bison-runtime", LOCALEDIR);

   (void) textdomain (PACKAGE);
 
   (void) textdomain (PACKAGE);
 

+  uniqstrs_new ();
+

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

-  time_report = trace_flag & trace_time;
+  timevar_report = trace_flag & trace_time;

   init_timevar ();
   timevar_start (TV_TOTAL);
 
   init_timevar ();
   timevar_start (TV_TOTAL);
 


@@ -100,7 +108,7 @@ main (int argc, char *argv[])
   timevar_pop (TV_LALR);
 
   /* Find and record any conflicts: places where one token of
   timevar_pop (TV_LALR);
 
   /* 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.  */
   timevar_push (TV_CONFLICTS);
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
   timevar_push (TV_CONFLICTS);


@@ -140,7 +148,7 @@ main (int argc, char *argv[])
   if (complaint_issued)
     goto finish;
 
   if (complaint_issued)
     goto finish;
 

-  /* Lookaheads are no longer needed. */
+  /* Look-ahead tokens are no longer needed. */

   timevar_push (TV_FREE);
   lalr_free ();
   timevar_pop (TV_FREE);
   timevar_push (TV_FREE);
   lalr_free ();
   timevar_pop (TV_FREE);


@@ -158,18 +166,12 @@ main (int argc, char *argv[])
   reduce_free ();
   conflicts_free ();
   grammar_free ();
   reduce_free ();
   conflicts_free ();
   grammar_free ();

-  /* FIXME: We are leaking all the other file names.  */
-  free (infile);

 
   /* The scanner memory cannot be released right after parsing, as it
      contains things such as user actions, prologue, epilogue etc.  */
   scanner_free ();
   muscle_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);
-#endif
+  uniqstrs_free ();

   timevar_pop (TV_FREE);
 
   if (trace_flag & trace_bitsets)
   timevar_pop (TV_FREE);
 
   if (trace_flag & trace_bitsets)