Merge branch 'maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index e8c26d16ae1440a087f32f8afdca6e59bee698d5..6a871d8290e9a6844b43acf1f676a7de3d66f3cc 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -21,9 +21,8 @@
 
 # include "location.h"
 
-# ifdef __cplusplus
-extern "C" {
-# endif
+/* Sub-messages indent. */
+#define SUB_INDENT (4)
 
 /*-------------.
 | --warnings.  |
@@ -36,46 +35,42 @@ typedef enum
     Wyacc             = 1 << 1,  /**< POSIXME.  */
     Wconflicts_sr     = 1 << 2,  /**< S/R conflicts.  */
     Wconflicts_rr     = 1 << 3,  /**< R/R conflicts.  */
-    Wother            = 1 << 4,  /**< All other warnings.  */
+    Wdeprecated       = 1 << 4,  /**< Obsolete constructs.  */
+    Wother            = 1 << 5,  /**< All other warnings.  */
+
+    Werror            = 1 << 10, /** This bit is no longer used. */
 
-    Werror            = 1 << 10, /**< Warnings are treated as errors.  */
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */
-    Wall              = ~Werror  /**< All above warnings.  */
+
+    /**< All above warnings.  */
+    Wall              = ~complaint & ~fatal & ~silent
   } warnings;
 
 /** What warnings are issued.  */
 extern warnings warnings_flag;
 
+/** What warnings are made errors.  */
+extern warnings errors_flag;
+
 /** Display a "[-Wyacc]" like message on stderr.  */
 void warnings_print_categories (warnings warn_flags);
 
-/** 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 (void);
-
-/** Make a complaint, but don't specify any location.  */
-void complain (warnings flags, char const *message, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
-
-/** 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)));
 
+/** 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.  */
-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)));
 
 /** Whether an error was reported.  */
 extern bool complaint_issued;
 
-# ifdef __cplusplus
-}
-# endif
-
 #endif /* !COMPLAIN_H_ */