X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0ae6073a18a8f31ececdef5e0e0bf1c645b46ad6..6082531abb3dca4b2fc213844200ce7b13fc05c5:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 1ad672ba..2c26c4e4 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,10 +1,12 @@ /* Declaration for error-reporting function for Bison. - 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 - Free Software Foundation; either version 2, or (at your option) any - later version. + 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 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,199 +14,126 @@ 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/>. */ /* Based on error.c and error.h, written by David MacKenzie <djm@gnu.ai.mit.edu>. */ +#include <config.h> #include "system.h" #include <stdarg.h> -#if ! (HAVE_VPRINTF || defined vfprintf) -# define vfprintf(stream, message, args) _doprnt (message, args, stream) -#endif - -#if STDC_HEADERS || _LIBC -# include <stdlib.h> -# include <string.h> -#else -void exit (); -#endif #include "complain.h" +#include "files.h" +#include "getargs.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 <errno.h> - -/* 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 <libio/iolibio.h> -# define fflush(s) _IO_fflush (s) -# endif - -#else /* not _LIBC */ - -/* 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); } -void -warn (const char *message, ...) -{ - va_list args; +/** 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); \ +} - fflush (stdout); - fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: ")); - va_start (args, message); - vfprintf (stderr, message, args); - va_end (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); - fflush (stderr); } - -/*-----------------------------------------------------------. -| An error has occurred, but we can proceed, and die later. | -`-----------------------------------------------------------*/ void -complain_at (location_t location, const char *message, ...) +warn_at (location loc, const char *message, ...) { - va_list args; + set_warning_issued (); + ERROR_MESSAGE (&loc, _("warning"), message); +} - fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); +void +warn (const char *message, ...) +{ + set_warning_issued (); + ERROR_MESSAGE (NULL, _("warning"), message); +} - va_start (args, message); - vfprintf (stderr, message, args); - va_end (args); +/*-----------------------------------------------------------. +| An error has occurred, but we can proceed, and die later. | +`-----------------------------------------------------------*/ + +void +complain_at (location loc, const char *message, ...) +{ + 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); }