* data/push.c (YYPUSH_MORE): Make it an enum instead.

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 34aa70b25b754b9f3bb35dbe3d83989a1b06b704..fe23eb9f8ac7e736cbaa0f8a0393023e904483be 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002 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
@@ -13,7 +13,7 @@
 
    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,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef COMPLAIN_H_
@@ -25,50 +25,32 @@
 extern "C" {
 # endif
 
-# ifdef __STDC__
+/** Informative messages, but we proceed.  */
 
-/* Informative messages, but we proceed. */
-
-void warn (const char *format, ...)
+void warn (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
 
-void warn_at (location_t location, const char *format, ...)
+void warn_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happen, but let's continue and die later. */
+/** An error, but we continue and die later.  */
 
-void complain (const char *format, ...)
+void complain (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
 
-void complain_at (location_t location, const char *format, ...)
+void complain_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happen and we die now. */
-
-void fatal (const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 1, 2)));
-
-void fatal_at (location_t location, const char *format, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
-
-# else
-void warn ();
-void warn_at ();
-void complain ();
-void complain_at ();
-void fatal ();
-void fatal_at ();
-# 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
 }