X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e0c74f0d34a772df30dcec1d44c8e04c63e2452d..21fe08cadcb84fddd5038ac6857a904dbe1ad885:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 7adff368..f3cd0ec1 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,7 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + + Copyright (C) 2000, 2001, 2002, 2004, 2005, 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,196 +15,116 @@ 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. */ /* Based on error.c and error.h, written by David MacKenzie . */ +#include #include "system.h" #include -#if ! (HAVE_VPRINTF || defined vfprintf) -# define vfprintf(stream, message, args) _doprnt (message, args, stream) -#endif - -#if STDC_HEADERS || _LIBC -# include -# include -#endif #include "complain.h" - -#ifndef _ -# define _(String) String -#endif - -#ifdef _LIBC -/* In the GNU C library, there is a predefined variable for this. */ - -# define program_name program_invocation_name -# include - -/* In GNU libc we want do not want to use the common name `error' directly. - Instead make it a weak alias. */ -# define error __error -# define error_at_line __error_at_line - -# ifdef USE_IN_LIBIO -# include -# define fflush(s) _IO_fflush (s) -# endif - -#else /* not _LIBC */ +#include "files.h" /* The calling program should define program_name and set it to the name of the executing program. */ extern char *program_name; -# if HAVE_STRERROR -# ifndef HAVE_DECL_STRERROR -"this configure-time declaration test was not run" -# endif -# if !HAVE_DECL_STRERROR && !defined strerror -char *strerror (int); -# endif -# else -static char * -private_strerror (int errnum) -{ - extern char *sys_errlist[]; - extern int sys_nerr; - - if (errnum > 0 && errnum <= sys_nerr) - return _(sys_errlist[errnum]); - return _("Unknown system error"); -} -# define strerror private_strerror -# endif /* HAVE_STRERROR */ -#endif /* not _LIBC */ - -/* This variable is set each time `warn' is called. */ -bool warning_issued; - -/* This variable is set each time `complain' is called. */ bool complaint_issued; -/*--------------------------------. -| Report a warning, and proceed. | -`--------------------------------*/ +/** Report an error message. + * + * \param loc the location, defaulting to the current file, + * or the program name. + * \param prefix put before the message (e.g., "warning"). + * \param message the error message, a printf format string. + * \param args the arguments of the format string. + */ +static void -warn_at (location_t location, const char *message, ...) +error_message (location *loc, + const char *prefix, + const char *message, va_list args) { - va_list args; - - fflush (stdout); - LOCATION_PRINT (stderr, location); + if (loc) + location_print (stderr, *loc); + else + fputs (current_file ? current_file : program_name, stderr); fputs (": ", stderr); - fputs (_("warning: "), stderr); - va_start (args, message); + if (prefix) + fprintf (stderr, "%s: ", prefix); + vfprintf (stderr, message, args); va_end (args); - - warning_issued = true; putc ('\n', stderr); fflush (stderr); } +/** Wrap error_message() with varargs handling. */ +#define ERROR_MESSAGE(Loc, Prefix, Message) \ +{ \ + va_list args; \ + va_start (args, Message); \ + error_message (Loc, Prefix, Message, args); \ +} + + +/*--------------------------------. +| Report a warning, and proceed. | +`--------------------------------*/ + void -warn (const char *message, ...) +warn_at (location loc, const char *message, ...) { - va_list args; + ERROR_MESSAGE (&loc, _("warning"), message); +} - fflush (stdout); - fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: ")); +void +warn (const char *message, ...) +{ + ERROR_MESSAGE (NULL, _("warning"), message); +} - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - warning_issued = true; - putc ('\n', stderr); - fflush (stderr); -} - /*-----------------------------------------------------------. | An error has occurred, but we can proceed, and die later. | `-----------------------------------------------------------*/ void -complain_at (location_t location, const char *message, ...) +complain_at (location loc, const char *message, ...) { - va_list args; - - fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - + ERROR_MESSAGE (&loc, NULL, message); complaint_issued = true; - putc ('\n', stderr); - fflush (stderr); } void complain (const char *message, ...) { - va_list args; - - fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - + ERROR_MESSAGE (NULL, NULL, message); complaint_issued = true; - putc ('\n', stderr); - fflush (stderr); } - + + /*-------------------------------------------------. | A severe error has occurred, we cannot proceed. | `-------------------------------------------------*/ void -fatal_at (location_t location, const char *message, ...) +fatal_at (location loc, const char *message, ...) { - va_list args; - - fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); - fputs (_("fatal error: "), stderr); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - putc ('\n', stderr); - fflush (stderr); + ERROR_MESSAGE (&loc, _("fatal error"), message); exit (EXIT_FAILURE); } void fatal (const char *message, ...) { - va_list args; - - fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); - - fputs (_("fatal error: "), stderr); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - putc ('\n', stderr); - fflush (stderr); + ERROR_MESSAGE (NULL, _("fatal error"), message); exit (EXIT_FAILURE); }