2007-01-30 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 29d9f86980bc29080998c2702cf20520a4771c9e..fe23eb9f8ac7e736cbaa0f8a0393023e904483be 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* 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
 
    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,55 +13,47 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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_
    USA.  */
 
 #ifndef COMPLAIN_H_

-#define COMPLAIN_H_ 1
+# define COMPLAIN_H_ 1

 
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __STDC__
+# include "location.h"

 
 

-/* Informative messages, but we proceed. */
+# ifdef        __cplusplus
+extern "C" {
+# endif

 
 

-extern void warn (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+/** Informative messages, but we proceed.  */

 
 

-/* Something bad happen, but let's continue and die later. */
+void warn (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));

 
 

-extern void complain (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void warn_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));

 
 

-/* Something bad happen and we die now. */
+/** An error, but we continue and die later.  */

 
 

-extern void fatal (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void complain (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));

 
 

-#else
-void warn ();
-void complain ();
-void fatal ();
-#endif
+void complain_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));

 
 

-/* Position in the current input file. */
-extern char *infile;
-extern int lineno;
+/** A fatal error, causing immediate exit.  */

 
 

-/* This variable is incremented each time `warn' is called.  */
-extern unsigned int warn_message_count;
+void fatal (char const *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)));

 
 

-/* This variable is incremented each time `complain' is called.  */
-extern unsigned int complain_message_count;
+void fatal_at (location loc, char const *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));

 
 

-/* Sometimes we want to have at most one error per line.  This
-   variable controls whether this mode is selected or not.  */
-extern int error_one_per_line;
+/** Whether an error was reported.  */
+extern bool complaint_issued;

 
 

-#ifdef __cplusplus
+# ifdef        __cplusplus

 }
 }

-#endif
+# endif

 
 #endif /* !COMPLAIN_H_ */
 
 #endif /* !COMPLAIN_H_ */