Change %merge result type clash warnings to errors. Discussed at

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b5a8e0010cba635f13dead55b0e107927e6cb2b6..69e72fec31865e402182009734ffa1ed5fe453d7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,7 @@
-/* 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,
+   2006

    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 +18,35 @@
 
    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 "scan-gram.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 +59,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);
 


@@ -73,8 +83,8 @@ main (int argc, char *argv[])
   reader ();
   timevar_pop (TV_READER);
 
   reader ();
   timevar_pop (TV_READER);
 

-  if (complain_message_count)
-    exit (1);
+  if (complaint_issued)
+    goto finish;

 
   /* Find useless nonterminals and productions and reduce the grammar. */
   timevar_push (TV_REDUCE);
 
   /* Find useless nonterminals and productions and reduce the grammar. */
   timevar_push (TV_REDUCE);


@@ -137,10 +147,10 @@ main (int argc, char *argv[])
 
   /* Stop if there were errors, to avoid trashing previous output
      files.  */
 
   /* Stop if there were errors, to avoid trashing previous output
      files.  */

-  if (complain_message_count)
-    exit (1);
+  if (complaint_issued)
+    goto finish;

 
 

-  /* Lookaheads are no longer needed. */
+  /* Lookahead 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);


@@ -161,21 +171,19 @@ main (int argc, char *argv[])
 
   /* The scanner memory cannot be released right after parsing, as it
      contains things such as user actions, prologue, epilogue etc.  */
 
   /* The scanner memory cannot be released right after parsing, as it
      contains things such as user actions, prologue, epilogue etc.  */

-  scanner_free ();
+  gram_scanner_free ();

   muscle_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)
     bitset_stats_dump (stderr);
 
   timevar_pop (TV_FREE);
 
   if (trace_flag & trace_bitsets)
     bitset_stats_dump (stderr);
 

+ finish:
+

   /* Stop timing and print the times.  */
   timevar_stop (TV_TOTAL);
   timevar_print (stderr);
 
   /* Stop timing and print the times.  */
   timevar_stop (TV_TOTAL);
   timevar_print (stderr);
 

-  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
+  return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }