X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/41f83caf1cbad0e79f7fcd3e35386a523e463784..eb1b07409f0ccad9970c8a60ded9f2a56d205b9c:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 8d3004bb..910b4110 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,98 +15,94 @@ 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 #include "complain.h" #include "files.h" +#include "getargs.h" + +bool complaint_issued; + + -#ifndef _ -# define _(String) String -#endif - -/* 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) +/** 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 +error_message (location *loc, + const char *prefix, + const char *message, va_list args) { - extern char *sys_errlist[]; - extern int sys_nerr; + if (loc) + location_print (stderr, *loc); + else + fputs (current_file ? current_file : program_name, stderr); + fputs (": ", stderr); - if (errnum > 0 && errnum <= sys_nerr) - return _(sys_errlist[errnum]); - return _("Unknown system error"); + if (prefix) + fprintf (stderr, "%s: ", prefix); + + vfprintf (stderr, message, args); + va_end (args); + putc ('\n', stderr); + fflush (stderr); } -# define strerror private_strerror -#endif /* HAVE_STRERROR */ -/* This variable is set each time `warn' is called. */ -bool warning_issued; +/** 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); \ +} -/* This variable is set each time `complain' is called. */ -bool complaint_issued; - /*--------------------------------. | Report a warning, and proceed. | `--------------------------------*/ +static void +set_warning_issued (void) +{ + static bool warning_issued = false; + if (!warning_issued && (warnings_flag & warnings_error)) + { + fprintf (stderr, "%s: warnings being treated as errors\n", program_name); + complaint_issued = true; + } + warning_issued = true; +} + void warn_at (location loc, const char *message, ...) { - va_list args; - - fflush (stdout); - location_print (stderr, loc); - fputs (": ", stderr); - fputs (_("warning: "), stderr); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - - warning_issued = true; - putc ('\n', stderr); - fflush (stderr); + set_warning_issued (); + ERROR_MESSAGE (&loc, _("warning"), message); } void warn (const char *message, ...) { - va_list args; - - fflush (stdout); - fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); + set_warning_issued (); + 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. | `-----------------------------------------------------------*/ @@ -112,38 +110,18 @@ warn (const char *message, ...) void complain_at (location loc, const char *message, ...) { - va_list args; - - fflush (stdout); - location_print (stderr, loc); - 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: ", current_file ? current_file : 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. | `-------------------------------------------------*/ @@ -151,35 +129,13 @@ complain (const char *message, ...) void fatal_at (location loc, const char *message, ...) { - va_list args; - - fflush (stdout); - location_print (stderr, loc); - 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: ", current_file ? current_file : 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); }