Merge branch 'maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index c2ae09dd43c37dace21de8eee13d7cda2d53f8f5..6a871d8290e9a6844b43acf1f676a7de3d66f3cc 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,10 +1,12 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   Copyright (C) 2000-2002, 2006, 2009-2012 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,57 +14,63 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef COMPLAIN_H_
 # define COMPLAIN_H_ 1
 
 # include "location.h"
 
-# ifdef        __cplusplus
-extern "C" {
-# endif
-
-# ifdef __STDC__
+/* Sub-messages indent. */
+#define SUB_INDENT (4)
 
-/* Informative messages, but we proceed. */
+/*-------------.
+| --warnings.  |
+`-------------*/
 
-void warn_at (location_t location, const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
+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.  */
 
-/* Something bad happen, but let's continue and die later. */
+    Werror            = 1 << 10, /** This bit is no longer used. */
 
-void complain_at (location_t location, const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
+    complaint         = 1 << 11, /**< All complaints.  */
+    fatal             = 1 << 12, /**< All fatal errors.  */
+    silent            = 1 << 13, /**< Do not display the warning type.  */
 
-/* Something bad happen and we die now. */
+    /**< All above warnings.  */
+    Wall              = ~complaint & ~fatal & ~silent
+  } warnings;
 
-void fatal (const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 1, 2)));
+/** What warnings are issued.  */
+extern warnings warnings_flag;
 
-void fatal_at (location_t location, const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
+/** What warnings are made errors.  */
+extern warnings errors_flag;
 
-# else
-void warn_at ();
-void complain_at ();
-void fatal ();
-void fatal_at ();
-# endif
+/** Display a "[-Wyacc]" like message on stderr.  */
+void warnings_print_categories (warnings warn_flags);
 
-/* Position in the current input file. */
-extern char *infile;
+/** Make a complaint, with maybe a location.  */
+void complain (location const *loc, warnings flags, char const *message, ...)
+  __attribute__ ((__format__ (__printf__, 3, 4)));
 
-/* This variable is incremented each time `warn' is called.  */
-extern unsigned int warn_message_count;
+/** Likewise, but with an \a argc/argv interface.  */
+void complain_args (location const *loc, warnings w, unsigned *indent,
+                    int argc, char *arg[]);
 
-/* This variable is incremented each time `complain' is called.  */
-extern unsigned int complain_message_count;
+/** Make a complaint with location and some indentation.  */
+void complain_indent (location const *loc, warnings flags, unsigned *indent,
+                      char const *message, ...)
+  __attribute__ ((__format__ (__printf__, 4, 5)));
 
-# ifdef        __cplusplus
-}
-# endif
+/** Whether an error was reported.  */
+extern bool complaint_issued;
 
 #endif /* !COMPLAIN_H_ */