* tests/actions.at (Actions after errors): New test case.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 602d4db6b72e9f94ac8699fc8b296333aa4c0ed7..ce470f3a1c7d21195e821ee10905e7d4015bfec5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
 #include "bitset_stats.h"
 #include "bitset.h"
 #include "getargs.h"
 #include "bitset_stats.h"
 #include "bitset.h"
 #include "getargs.h"

+#include "struniq.h"

 #include "symtab.h"
 #include "gram.h"
 #include "files.h"
 #include "symtab.h"
 #include "gram.h"
 #include "files.h"


@@ -51,8 +52,10 @@ main (int argc, char *argv[])
 {
   program_name = argv[0];
   setlocale (LC_ALL, "");
 {
   program_name = argv[0];
   setlocale (LC_ALL, "");

-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+  (void) bindtextdomain (PACKAGE, LOCALEDIR);
+  (void) textdomain (PACKAGE);
+
+  struniqs_new ();

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


@@ -73,8 +76,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,8 +140,8 @@ 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. */
   timevar_push (TV_FREE);
 
   /* Lookaheads are no longer needed. */
   timevar_push (TV_FREE);


@@ -163,6 +166,7 @@ main (int argc, char *argv[])
      contains things such as user actions, prologue, epilogue etc.  */
   scanner_free ();
   muscle_free ();
      contains things such as user actions, prologue, epilogue etc.  */
   scanner_free ();
   muscle_free ();

+  struniqs_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


@@ -173,9 +177,11 @@ main (int argc, char *argv[])
   if (trace_flag & trace_bitsets)
     bitset_stats_dump (stderr);
 
   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;

 }
 }