diagnostics: revamp the handling of -Werror

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index bdf6bfcd0c9fd13918f2e24d89e7625ddf272078..c7f93e1e9c7e2bd33a8df7cce55f9aabdf98492b 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

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

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


@@ -21,61 +21,100 @@
 
 # include "location.h"
 
 
 # include "location.h"
 

+/* Sub-messages indent. */
+# define SUB_INDENT (4)
+

 /*-------------.
 | --warnings.  |
 `-------------*/
 
 /*-------------.
 | --warnings.  |
 `-------------*/
 

+/** The bits assigned to each warning type.  */

 typedef enum
   {
 typedef enum
   {

-    Wnone             = 0,       /**< Issue no warnings.  */
-    Wmidrule_values   = 1 << 0,  /**< Unset or unused midrule values.  */
-    Wyacc             = 1 << 1,  /**< POSIXME.  */
-    Wconflicts_sr     = 1 << 2,  /**< S/R conflicts.  */
-    Wconflicts_rr     = 1 << 3,  /**< R/R conflicts.  */
-    Wdeprecated       = 1 << 4,  /**< Obsolete constructs.  */
-    Wother            = 1 << 5,  /**< All other warnings.  */
+    warning_midrule_values, /**< Unset or unused midrule values.  */
+    warning_yacc,           /**< POSIXME.  */
+    warning_conflicts_sr,   /**< S/R conflicts.  */
+    warning_conflicts_rr,   /**< R/R conflicts.  */
+    warning_deprecated,     /**< Obsolete constructs.  */
+    warning_precedence,     /**< Useless precedence and associativity.  */
+    warning_other,          /**< All other warnings.  */
+
+    warnings_size           /**< The number of warnings.  Must be last.  */
+  } warning_bit;

 
 

-    /* Deprecated, this option now uses a second instance of this enum */
-    Werror            = 1 << 10, /**< Warnings are treated as errors.  */
+typedef enum
+  {
+    /**< Issue no warnings.  */
+    Wnone             = 0,
+
+    Wmidrule_values   = 1 << warning_midrule_values,
+    Wyacc             = 1 << warning_yacc,
+    Wconflicts_sr     = 1 << warning_conflicts_sr,
+    Wconflicts_rr     = 1 << warning_conflicts_rr,
+    Wdeprecated       = 1 << warning_deprecated,
+    Wprecedence       = 1 << warning_precedence,
+    Wother            = 1 << warning_other,
+
+    Werror            = 1 << 10, /** This bit is no longer used. */

 
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */
 
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */

+    no_caret          = 1 << 14, /**< Do not display caret location.  */

 
     /**< All above warnings.  */
 
     /**< All above warnings.  */

-    Wall              = ~complaint & ~fatal & ~silent 
+    Wall              = ~complaint & ~fatal & ~silent

   } warnings;
 
   } warnings;
 

-/** What warnings are issued.  */
-extern warnings warnings_flag;

 
 

-/** What warnings are made errors.  */
-extern warnings errors_flag;
+/** For each warning type, its severity.  */
+typedef enum
+  {
+    severity_disabled = 0,
+    severity_unset = 1,
+    severity_warning = 2,
+    severity_error = 3,
+    severity_fatal = 4
+  } severity;

 
 

-/** Display a "[-Wyacc]" like message on stderr.  */
-void warnings_print_categories (warnings warn_flags);
+/** Whether -Werror was set. */
+extern bool warnings_are_errors;

 
 

-/** Record that a warning is about to be issued, and treat it as an
-    error if <tt>warnings_flag & Werror</tt>.  This is exported
-    only for the sake of Yacc-compatible conflict reports in conflicts.c.
-    All other warnings should be implemented in complain.c and should use
-    the normal warning format.  */
-void set_warning_issued (warnings warning);
+/** For each warning type, its severity.  */
+extern severity warnings_flag[];

 
 

-/** Make a complaint, but don't specify any location.  */
-void complain (warnings flags, char const *message, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
+/** Initialize this module.  */
+void complain_init (void);

 
 

-/** Make a complaint with location.  */
-void complain_at (location loc, warnings flags, char const *message, ...)
+/** Make a complaint, with maybe a location.  */
+void complain (location const *loc, warnings flags, char const *message, ...)

   __attribute__ ((__format__ (__printf__, 3, 4)));
 
   __attribute__ ((__format__ (__printf__, 3, 4)));
 

+/** Likewise, but with an \a argc/argv interface.  */
+void complain_args (location const *loc, warnings w, unsigned *indent,
+                    int argc, char *arg[]);
+

 /** Make a complaint with location and some indentation.  */
 /** Make a complaint with location and some indentation.  */

-void complain_at_indent (location loc, warnings flags, unsigned *indent,
-                         char const *message, ...)
+void complain_indent (location const *loc, warnings flags, unsigned *indent,
+                      char const *message, ...)

   __attribute__ ((__format__ (__printf__, 4, 5)));
 
   __attribute__ ((__format__ (__printf__, 4, 5)));
 

+
+/** Report an obsolete syntax, suggest the updated one.  */
+void deprecated_directive (location const *loc,
+                           char const *obsolete, char const *updated);
+
+/** 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_ */