Remaining m4sugar merge from autoconf.

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 2911a4dcb60d35c3aba2b31662d805980f712141..a633613c19476462cfa342bafae74b0adbf357d7 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,10 +1,10 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2006 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.
+   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,52 +12,46 @@
    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
+# define COMPLAIN_H_ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+# include "location.h"
 
-#ifdef __STDC__
+# ifdef        __cplusplus
+extern "C" {
+# endif
 
-/* Informative messages, but we proceed. */
+/** Informative messages, but we proceed.  */
 
-extern void warn (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void warn (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-/* Something bad happen, but let's continue and die later. */
+void warn_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-extern void complain (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+/** An error, but we continue and die later.  */
 
-/* Something bad happen and we die now. */
+void complain (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-extern void fatal (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void complain_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-#else
-void warn ();
-void complain ();
-void fatal ();
-#endif
+/** A fatal error, causing immediate exit.  */
 
-/* Position in the current input file. */
-extern char *infile;
-extern int lineno;
+void fatal (char const *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)));
 
-/* This variable is incremented each time `warn' is called.  */
-extern unsigned int warn_message_count;
+void fatal_at (location loc, char const *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
 
-/* This variable is incremented each time `complain' is called.  */
-extern unsigned int complain_message_count;
+/** Whether an error was reported.  */
+extern bool complaint_issued;
 
-#ifdef __cplusplus
+# ifdef        __cplusplus
 }
-#endif
+# endif
 
 #endif /* !COMPLAIN_H_ */