regen

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 1d47391429162a2800aba7481fbe447752f062ca..0110c6b5313848b8d2d4f491bd269720fdbea182 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,6 +1,6 @@
 /* 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
@@ -22,7 +22,7 @@
 # include "location.h"
 
 /* Sub-messages indent. */
-#define SUB_INDENT (4)
+# define SUB_INDENT (4)
 
 /*-------------.
 | --warnings.  |
@@ -36,13 +36,16 @@ typedef enum
     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.  */
+    Wprecedence       = 1 << 5,  /**< Useless precedence and associativity.  */
+
+    Wother            = 1 << 6,  /**< All other warnings.  */
 
     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.  */
+    no_caret          = 1 << 14, /**< Do not display caret location.  */
 
     /**< All above warnings.  */
     Wall              = ~complaint & ~fatal & ~silent
@@ -57,20 +60,35 @@ extern warnings errors_flag;
 /** Display a "[-Wyacc]" like message on stderr.  */
 void warnings_print_categories (warnings warn_flags);
 
-/** 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)));
 
+
+/** 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.  */
-extern bool complaint_issued;
+extern err_status complaint_status;
 
 #endif /* !COMPLAIN_H_ */