warnings: fix early exit of warnings treated as errors

Treating warnings as errors caused Bison to exit earlier than needed, making it
hide warnings that would have been printed had -Werror not been set.

Also, fix a bug that caused some context information of errors to not be
shown.

* src/complain.c (complaint_issued): Rename as...
(complaint_status): This, and change its type from boolean to
* src/complain.h (err_status): This, new enumeration.
* src/main.c (main): Adjust (only finish early if an actual complaint was
risen, not a mere warning treated an error).
* src/reader.c: Adjust.

diff --git a/src/complain.c b/src/complain.c
index 0fa812abe1ff492a6f868e35e399dc84953d82fd..2e4e71afb92e1deac07c1d9e7bd69643fd746c2a 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -34,7 +34,7 @@ warnings warnings_flag =
 
 warnings errors_flag;
 
 
 warnings errors_flag;
 

-bool complaint_issued;
+err_status complaint_status = status_none;

 static unsigned *indent_ptr = 0;
 
 void
 static unsigned *indent_ptr = 0;
 
 void


@@ -129,8 +129,11 @@ complains (const location *loc, warnings flags, const char *message,
     : flags & (errors_flag | complaint) ? _("error")
     : _("warning");
 
     : flags & (errors_flag | complaint) ? _("error")
     : _("warning");
 

-  complaint_issued |= flags & (complaint | errors_flag);
-  if (flags & (warnings_flag | silent | fatal | complaint))
+  if ((flags & complaint) && complaint_status < status_complaint)
+    complaint_status = status_complaint;
+  else if ((flags & (warnings_flag & errors_flag)) && ! complaint_status)
+    complaint_status = status_warning_as_error;
+  if (flags & (warnings_flag | fatal | complaint))

     error_message (loc, flags, prefix, message, args);
   if (flags & fatal)
     exit (EXIT_FAILURE);
     error_message (loc, flags, prefix, message, args);
   if (flags & fatal)
     exit (EXIT_FAILURE);

diff --git a/src/complain.h b/src/complain.h
index 6a871d8290e9a6844b43acf1f676a7de3d66f3cc..56ddfa045a5344c073dab0f8cf10a581fbbe9a42 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -70,7 +70,18 @@ void complain_indent (location const *loc, warnings flags, unsigned *indent,
                       char const *message, ...)
   __attribute__ ((__format__ (__printf__, 4, 5)));
 
                       char const *message, ...)
   __attribute__ ((__format__ (__printf__, 4, 5)));
 

+
+/** Warnings treated as errors shouldn't stop the execution as regular errors
+    should (because due to their nature, it is safe to go on). Thus, there are
+    three possible execution statuses.  */
+typedef enum
+  {
+    status_none,
+    status_warning_as_error,
+    status_complaint
+  } err_status;
+

 /** Whether an error was reported.  */
 /** Whether an error was reported.  */

-extern bool complaint_issued;
+extern err_status complaint_status;

 
 #endif /* !COMPLAIN_H_ */
 
 #endif /* !COMPLAIN_H_ */

diff --git a/src/main.c b/src/main.c
index 9a03630d8d732d5a6b62d9dc0630fd1ddc42ea8a..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. */


@@ -173,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. */


@@ -215,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;

 }
 }

diff --git a/src/reader.c b/src/reader.c
index f18b5b82ceb67486c4271be5542151b5d0a8ba53..fb17b0186c41c6b24fa3bb1712d53aac4d5db15b 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -631,7 +631,7 @@ reader (void)
   gram_parse ();
   prepare_percent_define_front_end_variables ();
 
   gram_parse ();
   prepare_percent_define_front_end_variables ();
 

-  if (! complaint_issued)
+  if (complaint_status  < status_complaint)

     check_and_convert_grammar ();
 
   xfclose (gram_in);
     check_and_convert_grammar ();
 
   xfclose (gram_in);