Merge remote-tracking branch 'origin/maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 809f1b48bdfb7fffa347f9e890bb106fe57a0103..56ddfa045a5344c073dab0f8cf10a581fbbe9a42 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -58,18 +58,30 @@ extern warnings errors_flag;
 void warnings_print_categories (warnings warn_flags);
 
 /** Make a complaint, with maybe a location.  */
-void complain (location const* loc, warnings flags, char const *message, ...)
+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, int argc, char *arg[]);
+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)));
 
+
+/** 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_ */