(prepare_symbols): When printing token names, escape "[" as "@<:@" and

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 3642aab3814a8de5f3a6b82c61d1476d54603879..0e527c4527e1dbdab1b6a44f212ab0c23f5d00a3 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 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
 
    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,49 @@
    USA.  */
 
 #ifndef COMPLAIN_H_
    USA.  */
 
 #ifndef COMPLAIN_H_

-#define COMPLAIN_H_ 1
+# define COMPLAIN_H_ 1

 
 

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

 
 

-#if defined (__STDC__) && __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 (const char *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
+
+void warn_at (location_t location, const char *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));

 
 /* Something bad happen, but let's continue and die later. */
 
 
 /* Something bad happen, but let's continue and die later. */
 

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

 
 

-/* Something bad happen and we die now. */
+void complain_at (location_t location, const char *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));

 
 

-extern void fatal (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-
-/* 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)'.  */
+/* Something bad happen and we die now. */

 
 

-extern void error (int status, int errnum,
-                  const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
+void fatal (const char *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)));

 
 

-#else
-void warn ();
-void complain ();
-void error ();
-#endif
+void fatal_at (location_t location, const char *format, ...)
+  __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));

 
 /* Position in the current input file. */
 extern char *infile;
 
 /* Position in the current input file. */
 extern char *infile;

-extern int lineno;
-
-/* This variable is incremented each time `warn' is called.  */
-extern unsigned int warn_message_count;

 
 

-/* 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_ */
 
 #endif /* !COMPLAIN_H_ */