X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a0f6b076110ea79f25e13701d7f0ee4b38630d4d..d67e37a74bc91e2fe254e5b7a28c62537a20e206:/src/complain.h

diff --git a/src/complain.h b/src/complain.h
index 81f4e6cc..3e028d69 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,10 +1,11 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2006, 2009-2010 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,64 +13,67 @@
    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
+# include "location.h"
+
+# ifdef	__cplusplus
 extern "C" {
-#endif
+# endif
+
+/** Informative messages, but we proceed.  */
 
-#if defined (__STDC__) && __STDC__
+void warn (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-/* Informative messages, but we proceed. */
+void warn_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-extern void warn (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+/* Generate a message aligned by an indent.
+   When *indent == 0, assign message's indent to *indent,
+   When *indent > 0, align the message by *indent value. */
+void warn_at_indent (location loc, unsigned *indent,
+                     char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 3, 4)));
 
-/* Something bad happen, but let's continue and die later. */
+/** An error, but we continue and die later.  */
 
-extern void complain (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+void complain (char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
 
-/* Something bad happen and we die now. */
+void complain_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-extern void fatal (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
+/* Generate a message aligned by an indent.
+   When *indent == 0, assign message's indent to *indent,
+   When *indent > 0, align the message by *indent value. */
+void complain_at_indent (location loc, unsigned *indent,
+                         char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 3, 4)));
 
-/* 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)'.  */
+/** An incompatibility with POSIX Yacc: mapped either to warn* or
+    complain* depending on yacc_flag. */
 
-extern void error (int status, int errnum,
-		   const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
+void yacc_at (location loc, char const *format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
 
-#else
-void warn ();
-void complain ();
-void error ();
-#endif
 
-/* 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_ */