* data/lalr1.cc: Reinstall the former ctor, for sake of

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 81f4e6cc2633abcef93d2fe800b98e8edab4a1e4..b9b00c66610ed5962183d7c1361ffc1d698026d9 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   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
@@ -17,59 +17,46 @@
    USA.  */
 
 #ifndef COMPLAIN_H_
-#define COMPLAIN_H_ 1
+# define COMPLAIN_H_ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (__STDC__) && __STDC__
+# include "location.h"
 
-/* Informative messages, but we proceed. */
-
-extern void warn (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+# ifdef        __cplusplus
+extern "C" {
+# endif
 
-/* Something bad happen, but let's continue and die later. */
+/* Informative messages, but we proceed.  */
 
-extern void complain (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void warn (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-/* Something bad happen and we die now. */
+void warn_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-extern void fatal (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+/* Something bad happened, but let's continue and die later.  */
 
-/* Print a message with `fprintf (stderr, FORMAT, ...)';
-   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
+void complain (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-extern void error (int status, int errnum,
-                  const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
+void complain_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-#else
-void warn ();
-void complain ();
-void error ();
-#endif
+/* Something bad happened, and let's die now.  */
 
-/* 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;
+/* This variable is set each time `warn' is called.  */
+extern bool warning_issued;
 
-/* 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;
+/* This variable is set each time `complain' is called.  */
+extern bool complaint_issued;
 
-#ifdef __cplusplus
+# ifdef        __cplusplus
 }
-#endif
+# endif
 
 #endif /* !COMPLAIN_H_ */