style: move argument handling of -W into the diagnostics module

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 30d01bb2554e956687e810c79cf68e59c870cf3d..1162da29ea5c33dff99fdaa84bc16ab91e1c9b6d 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

-   Copyright (C) 2000-2002, 2004-2006, 2009-2012 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software

    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify


@@ -22,6 +22,7 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include <argmatch.h>

 #include <stdarg.h>
 #include <progname.h>
 
 #include <stdarg.h>
 #include <progname.h>
 


@@ -30,44 +31,188 @@
 #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;
+
+/** Diagnostics severity.  */
+typedef enum
+  {
+    severity_disabled = 0,
+    severity_unset = 1,
+    severity_warning = 2,
+    severity_error = 3,
+    severity_fatal = 4
+  } severity;
+
+
+/** For each warning type, its severity.  */
+static severity warnings_flag[warnings_size];

 
 

-err_status complaint_status = status_none;

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

+/*------------------------.
+| --warnings's handling.  |
+`------------------------*/
+
+static const char * const warnings_args[] =
+{
+  "none",
+  "midrule-values",
+  "yacc",
+  "conflicts-sr",
+  "conflicts-rr",
+  "deprecated",
+  "precedence",
+  "other",
+  "all",
+  "error",
+  0
+};
+
+static const int warnings_types[] =
+{
+  Wnone,
+  Wmidrule_values,
+  Wyacc,
+  Wconflicts_sr,
+  Wconflicts_rr,
+  Wdeprecated,
+  Wprecedence,
+  Wother,
+  Wall,
+  Werror
+};
+
+ARGMATCH_VERIFY (warnings_args, warnings_types);
+

 void
 void

-warnings_print_categories (warnings warn_flags)
+warning_argmatch (char const *arg, size_t no, size_t err)

 {
 {

-  if (! (warn_flags & silent))
+  int value = XARGMATCH ("--warning", arg + no + err,
+                         warnings_args, warnings_types);
+
+  /* -Wnone == -Wno-all, and -Wno-none == -Wall.  */
+  if (!value)

     {
     {

-      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)
+      value = Wall;
+      no = !no;
+    }
+
+  if (no)
+    {
+      size_t b;
+      for (b = 0; b < warnings_size; ++b)
+        if (value & 1 << b)

           {
           {

-            bool err = warn_flags & errors_flag;
-            fprintf (stderr, "%s-W", any ? ", " : " [");
-            fprintf (stderr, "%s%s", err ? "error=" : "" , warn_names[i]);
-            any = true;
+            if (err)
+              {
+                /* -Wno-error=foo: if foo enabled as an error,
+                   make it a warning.  */
+                if (warnings_flag[b] == severity_error)
+                  warnings_flag[b] = severity_warning;
+              }
+            else
+              /* -Wno-foo.  */
+              warnings_flag[b] = severity_disabled;

           }
           }

-      if (any)
-        fprintf (stderr, "]");
+    }
+  else
+    {
+      size_t b;
+      for (b = 0; b < warnings_size; ++b)
+        if (value & 1 << b)
+          /* -Wfoo and -Werror=foo. */
+          warnings_flag[b] = err ? severity_error : severity_warning;

     }
 }
 
     }
 }
 

+/** Decode a comma-separated list of arguments from -W.
+ *
+ *  \param args     comma separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ */
+
+void
+warnings_argmatch (char *args)
+{
+  if (args)
+    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+      if (STREQ (args, "error"))
+        warnings_are_errors = true;
+      else if (STREQ (args, "no-error"))
+        {
+          warnings_are_errors = false;
+          warning_argmatch ("no-error=all", 3, 6);
+        }
+      else
+        {
+          size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+          size_t err = STRPREFIX_LIT ("error=", args + no) ? 6 : 0;
+
+          warning_argmatch (args, no, err);
+        }
+  else
+    warning_argmatch ("all", 0, 0);
+}
+
+
+/*-----------.
+| complain.  |
+`-----------*/
+
+void
+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 (flags & fatal)
+    return severity_fatal;
+  else if (flags & complaint)
+    return severity_error;
+  else
+    {
+      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 +233,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 +253,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 +262,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 +340,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