Merge remote-tracking branch 'origin/maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 3e028d69dec85cd8e3271b20bdbe389e8e47297c..e27b40d3667d43f31d4c1f83dd57ae1866276a60 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000-2002, 2006, 2009-2010 Free Software Foundation,
+
+   Copyright (C) 2000-2002, 2006, 2009-2012 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,11 +21,19 @@
 
 # include "location.h"
 
-# ifdef        __cplusplus
+# ifdef __cplusplus
 extern "C" {
 # endif
 
-/** Informative messages, but we proceed.  */
+/** Record that a warning is about to be issued, and treat it as an
+    error if <tt>warnings_flag & warnings_error</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);
+
+/** Informative messages, but we proceed.  Report iff
+    <tt>warnings_flag & warnings_other</tt>.  */
 
 void warn (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
@@ -60,6 +69,11 @@ void complain_at_indent (location loc, unsigned *indent,
 void yacc_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
+/** A midrule-value warning.  Report iff
+    <tt>warnings_flag & warnings_midrule_values</tt>.  */
+
+void midrule_value_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
 /** A fatal error, causing immediate exit.  */
 
@@ -72,7 +86,7 @@ void fatal_at (location loc, char const *format, ...)
 /** Whether an error was reported.  */
 extern bool complaint_issued;
 
-# ifdef        __cplusplus
+# ifdef __cplusplus
 }
 # endif