diagnostics: revamp the handling of -Werror

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index d43e623e933b6bac43b50dfecddeea65b7447061..2bc276e95a4717fc6ff34e32d07ca289148432dc 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -30,44 +30,65 @@
 #include "getargs.h"
 #include "quote.h"
 
 #include "getargs.h"
 #include "quote.h"
 

-warnings warnings_flag =
-  Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;
+err_status complaint_status = status_none;

 
 

-warnings errors_flag;
+bool warnings_are_errors = false;
+severity warnings_flag[warnings_size];

 
 

-err_status complaint_status = status_none;

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

-warnings_print_categories (warnings warn_flags)
+complain_init (void)
+{
+  warnings warnings_default =
+    Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother;
+
+  size_t b;
+  for (b = 0; b < warnings_size; ++b)
+    warnings_flag[b] = (1 << b & warnings_default
+                        ? severity_warning
+                        : severity_unset);
+}
+
+static severity
+warning_severity (warnings flags)

 {
 {

-  if (! (warn_flags & silent))
+  if (flags & fatal)
+    return severity_fatal;
+  else if (flags & complaint)
+    return severity_error;
+  else

     {
     {

-      char const *warn_names[] =
-        {
-          "midrule-values",
-          "yacc",
-          "conflicts-sr",
-          "conflicts-rr",
-          "deprecated",
-          "other"
-        };
-
-      bool any = false;
-      int i;
-      for (i = 0; i < ARRAY_CARDINALITY (warn_names); ++i)
-        if (warn_flags & 1 << i)
-          {
-            bool err = warn_flags & errors_flag;
-            fprintf (stderr, "%s-W", any ? ", " : " [");
-            fprintf (stderr, "%s%s", err ? "error=" : "" , warn_names[i]);
-            any = true;
-          }
-      if (any)
-        fprintf (stderr, "]");
+      severity res = severity_disabled;
+      size_t b;
+      for (b = 0; b < warnings_size; ++b)
+        if (flags & 1 << b)
+          res = res < warnings_flag[b] ? warnings_flag[b] : res;
+      if (res == severity_warning && warnings_are_errors)
+        res = severity_error;
+      return res;

     }
 }
 
     }
 }
 

+
+/** Display a "[-Wyacc]" like message on \a f.  */
+
+static void
+warnings_print_categories (warnings warn_flags, FILE *f)
+{
+  /* Display only the first match, the second is "-Wall".  */
+  size_t i;
+  for (i = 0; warnings_args[i]; ++i)
+    if (warn_flags & warnings_types[i])
+      {
+        severity s = warning_severity (warnings_types[i]);
+        fprintf (f, " [-W%s%s]",
+                 s == severity_error ? "error=" : "",
+                 warnings_args[i]);
+        return;
+      }
+}
+

 /** Report an error message.
  *
  * \param loc     the location, defaulting to the current file,
 /** Report an error message.
  *
  * \param loc     the location, defaulting to the current file,


@@ -88,7 +109,7 @@ error_message (const location *loc, warnings flags, const char *prefix,
   unsigned pos = 0;
 
   if (loc)
   unsigned pos = 0;
 
   if (loc)

-    pos += location_print (stderr, *loc);
+    pos += location_print (*loc, stderr);

   else
     pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
   pos += fprintf (stderr, ": ");
   else
     pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
   pos += fprintf (stderr, ": ");


@@ -108,7 +129,8 @@ error_message (const location *loc, warnings flags, const char *prefix,
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);

-  warnings_print_categories (flags);
+  if (! (flags & silent))
+    warnings_print_categories (flags, stderr);

   {
     size_t l = strlen (message);
     if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')
   {
     size_t l = strlen (message);
     if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')


@@ -116,29 +138,34 @@ error_message (const location *loc, warnings flags, const char *prefix,
         putc ('\n', stderr);
         fflush (stderr);
         if (loc && feature_flag & feature_caret && !(flags & no_caret))
         putc ('\n', stderr);
         fflush (stderr);
         if (loc && feature_flag & feature_caret && !(flags & no_caret))

-          location_caret (stderr, *loc);
+          location_caret (*loc, stderr);

       }
   }
   fflush (stderr);
 }
 
       }
   }
   fflush (stderr);
 }
 

-/** Raise a complaint. That can be a fatal error, a complaint or just a
+/** Raise a complaint. That can be a fatal error, an error or just a

     warning.  */
     warning.  */

-static inline void
+
+static void

 complains (const location *loc, warnings flags, const char *message,
            va_list args)
 {
 complains (const location *loc, warnings flags, const char *message,
            va_list args)
 {

-  const char* prefix =
-    flags & fatal ? _("fatal error")
-    : flags & (errors_flag | complaint) ? _("error")
-    : _("warning");
-
+  severity s = warning_severity (flags);

   if ((flags & complaint) && complaint_status < status_complaint)
     complaint_status = status_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 (severity_warning <= s)
+    {
+      const char* prefix =
+        s == severity_fatal ? _("fatal error")
+        : s == severity_error ? _("error")
+        : _("warning");
+      if (severity_error <= s && ! complaint_status)
+        complaint_status = status_warning_as_error;
+      error_message (loc, flags, prefix, message, args);
+    }
+

   if (flags & fatal)
     exit (EXIT_FAILURE);
 }
   if (flags & fatal)
     exit (EXIT_FAILURE);
 }


@@ -189,7 +216,6 @@ complain_args (location const *loc, warnings w, unsigned *indent,
     complain (loc, fatal, "too many arguments for complains");
     break;
   }
     complain (loc, fatal, "too many arguments for complains");
     break;
   }

-

 }
 
 void
 }
 
 void