X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2cec9080f685192e231333686b411fb524239a1b..0f664b89d4aa86146015acd87a770db878d7e5d4:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 927dbb63..2c26c4e4 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,11 +1,12 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000, 2001, 2002, 2004, 2005 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 - 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 @@ -13,9 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ + along with this program. If not, see . */ /* Based on error.c and error.h, written by David MacKenzie . */ @@ -27,54 +26,81 @@ #include "complain.h" #include "files.h" +#include "getargs.h" -/* The calling program should define program_name and set it to the - name of the executing program. */ -extern char *program_name; - -/* 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 loc, const char *message, ...) +error_message (location *loc, + const char *prefix, + const char *message, va_list args) { - va_list args; - - location_print (stderr, loc); + 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); + 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. | +`--------------------------------*/ +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; - putc ('\n', stderr); } void -warn (const char *message, ...) +warn_at (location loc, const char *message, ...) { - va_list args; + set_warning_issued (); + ERROR_MESSAGE (&loc, _("warning"), message); +} - fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); +void +warn (const char *message, ...) +{ + 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); -} - /*-----------------------------------------------------------. | An error has occurred, but we can proceed, and die later. | `-----------------------------------------------------------*/ @@ -82,34 +108,18 @@ warn (const char *message, ...) void complain_at (location loc, const char *message, ...) { - va_list args; - - 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); } void complain (const char *message, ...) { - va_list args; - - 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); } - + + /*-------------------------------------------------. | A severe error has occurred, we cannot proceed. | `-------------------------------------------------*/ @@ -117,31 +127,13 @@ complain (const char *message, ...) void fatal_at (location loc, const char *message, ...) { - va_list args; - - location_print (stderr, loc); - fputs (": ", stderr); - fputs (_("fatal error: "), stderr); - - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); - putc ('\n', stderr); + ERROR_MESSAGE (&loc, _("fatal error"), message); exit (EXIT_FAILURE); } void fatal (const char *message, ...) { - va_list args; - - 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); + ERROR_MESSAGE (NULL, _("fatal error"), message); exit (EXIT_FAILURE); }