X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa7815f5c6e8e07a85e47df9cd7b579468969efb..0e021770cc023c6a2e7ae132a3aab55bc7cbc058:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 35a784ee..910b4110 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,7 @@ /* Declaration for error-reporting function for Bison. - Copyright 2000 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,257 +15,127 @@ 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 . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include +#include "system.h" -#include +#include -#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# define VA_START(args, lastarg) va_start(args) -# endif -#else -# define va_alist a1, a2, a3, a4, a5, a6, a7, a8 -# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8; -#endif +#include "complain.h" +#include "files.h" +#include "getargs.h" -#if STDC_HEADERS || _LIBC -# include -# include -#else -void exit (); -#endif +bool complaint_issued; -#include "complain.h" + -#ifndef _ -# define _(String) String -#endif +/** 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) +{ + if (loc) + location_print (stderr, *loc); + else + fputs (current_file ? current_file : program_name, stderr); + fputs (": ", stderr); -#ifdef _LIBC -/* In the GNU C library, there is a predefined variable for this. */ -# define program_name program_invocation_name -#else /* not _LIBC */ -/* The calling program should define program_name and set it to the - name of the executing program. */ -extern char *program_name; -#endif + if (prefix) + fprintf (stderr, "%s: ", prefix); -/* This variable is incremented each time `warn' is called. */ -unsigned int warn_message_count; + 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); \ +} -/* This variable is incremented each time `complain' is called. */ -unsigned int complain_message_count; -/* Sometimes we want to have at most one error per line. This - variable controls whether this mode is selected or not. */ -int error_one_per_line; - /*--------------------------------. | Report a warning, and proceed. | `--------------------------------*/ -void -#if defined VA_START && __STDC__ -warn (const char *message, ...) -#else -warn (message, va_alist) - char *message; - va_dcl -#endif +static void +set_warning_issued (void) { -#ifdef VA_START - va_list args; -#endif - - if (error_one_per_line) + static bool warning_issued = false; + if (!warning_issued && (warnings_flag & warnings_error)) { - static const char *old_infile; - static int old_lineno; - - if (old_lineno == lineno && - (infile == old_infile || !strcmp (old_infile, infile))) - /* Simply return and print nothing. */ - return; - - old_infile = infile; - old_lineno = lineno; + fprintf (stderr, "%s: warnings being treated as errors\n", program_name); + complaint_issued = true; } + warning_issued = true; +} - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); +void +warn_at (location loc, const char *message, ...) +{ + set_warning_issued (); + ERROR_MESSAGE (&loc, _("warning"), message); +} - fputs (_("warning: "), stderr); +void +warn (const char *message, ...) +{ + set_warning_issued (); + ERROR_MESSAGE (NULL, _("warning"), message); +} -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); - va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - ++warn_message_count; - putc ('\n', stderr); - fflush (stderr); -} - /*-----------------------------------------------------------. | An error has occurred, but we can proceed, and die later. | `-----------------------------------------------------------*/ void -#if defined VA_START && __STDC__ -complain (const char *message, ...) -#else -complain (message, va_alist) - char *message; - va_dcl -#endif +complain_at (location loc, const char *message, ...) { -#ifdef VA_START - va_list args; -#endif - - if (error_one_per_line) - { - static const char *old_infile; - static int old_lineno; - - if (old_lineno == lineno && - (infile == old_infile || !strcmp (old_infile, infile))) - /* Simply return and print nothing. */ - return; + ERROR_MESSAGE (&loc, NULL, message); + complaint_issued = true; +} - old_infile = infile; - old_lineno = lineno; - } +void +complain (const char *message, ...) +{ + ERROR_MESSAGE (NULL, NULL, message); + complaint_issued = true; +} - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); - va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - - ++complain_message_count; - putc ('\n', stderr); - fflush (stderr); -} - /*-------------------------------------------------. | A severe error has occurred, we cannot proceed. | `-------------------------------------------------*/ void -#if defined VA_START && __STDC__ -fatal (const char *message, ...) -#else -fatal (message, va_alist) - char *message; - va_dcl -#endif +fatal_at (location loc, const char *message, ...) { -#ifdef VA_START - va_list args; -#endif - - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); - - fputs (_("fatal error: "), stderr); - -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); - va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - putc ('\n', stderr); - fflush (stderr); - exit (1); + ERROR_MESSAGE (&loc, _("fatal error"), message); + exit (EXIT_FAILURE); } - -/*------------------------------------------------------------------. -| A severe error has occurred, we cannot proceed. Exit with STATUS, | -| and report the error message of the errno ERRNUM. | -`------------------------------------------------------------------*/ void -#if defined VA_START && __STDC__ -error (int status, int errnum, - const char *message, ...) -#else -error (status, errnum, message, va_alist) - int status; - int errnum; - char *message; - va_dcl -#endif +fatal (const char *message, ...) { -#ifdef VA_START - va_list args; -#endif - - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); - - fputs (_("fatal error: "), stderr); - -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); - va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - - if (errnum) - { -#if defined HAVE_STRERROR_R || _LIBC - char errbuf[1024]; -# if HAVE_WORKING_STRERROR_R || _LIBC - fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf)); -# else - /* Don't use __strerror_r's return value because on some systems - (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'. */ - __strerror_r (errnum, errbuf, sizeof errbuf); - fprintf (stderr, ": %s", errbuf); -# endif -#else - fprintf (stderr, ": %s", strerror (errnum)); -#endif - } - putc ('\n', stderr); - fflush (stderr); - if (status) - exit (status); + ERROR_MESSAGE (NULL, _("fatal error"), message); + exit (EXIT_FAILURE); }