Merge remote-tracking branch 'origin/maint'

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 110813514509e35285bdf80c58972765ecbb1b45..39b39c7a5902f6bc33e844c65c3ffe9e9823a762 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
   reader ();
   timevar_pop (TV_READER);
 
   reader ();
   timevar_pop (TV_READER);
 

-  if (complaint_issued)
+  if (complaint_status == status_complaint)

     goto finish;
 
   /* Find useless nonterminals and productions and reduce the grammar. */
     goto finish;
 
   /* Find useless nonterminals and productions and reduce the grammar. */


@@ -125,7 +125,7 @@ main (int argc, char *argv[])
      declarations.  */
   timevar_push (TV_CONFLICTS);
   conflicts_solve ();
      declarations.  */
   timevar_push (TV_CONFLICTS);
   conflicts_solve ();

-  if (!muscle_percent_define_flag_if ("lr.keep-unreachable-states"))
+  if (!muscle_percent_define_flag_if ("lr.keep-unreachable-state"))

     {
       state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
       state_number nstates_old = nstates;
     {
       state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
       state_number nstates_old = nstates;


@@ -142,8 +142,7 @@ main (int argc, char *argv[])
   tables_generate ();
   timevar_pop (TV_ACTIONS);
 
   tables_generate ();
   timevar_pop (TV_ACTIONS);
 

-  grammar_rules_useless_report
-    (_("rule useless in parser due to conflicts"));
+  grammar_rules_useless_report (_("rule useless in parser due to conflicts"));

 
   /* Output file names. */
   compute_output_file_names ();
 
   /* Output file names. */
   compute_output_file_names ();


@@ -174,7 +173,7 @@ 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 (complaint_issued)
+  if (complaint_status == status_complaint)

     goto finish;
 
   /* Lookahead tokens are no longer needed. */
     goto finish;
 
   /* Lookahead tokens are no longer needed. */


@@ -216,5 +215,5 @@ main (int argc, char *argv[])
   timevar_stop (TV_TOTAL);
   timevar_print (stderr);
 
   timevar_stop (TV_TOTAL);
   timevar_print (stderr);
 

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

 }
 }