X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8f13fe33b766c69b10674558003d070aea5da1f2..d1a1114f7f257f89887ea5825ba0d896dfaa747b:/src/complain.c diff --git a/src/complain.c b/src/complain.c index b25f0b29..44d486d4 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,5 @@ /* Declaration for error-reporting function for Bison. - Copyright 2000 Free Software Foundation, Inc. + 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 @@ -19,14 +19,10 @@ /* Based on error.c and error.h, written by David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include <stdio.h> +#include "system.h" #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ +# ifdef __STDC__ # include <stdarg.h> # define VA_START(args, lastarg) va_start(args, lastarg) # else @@ -47,13 +43,6 @@ void exit (); #include "complain.h" -#ifndef HAVE_DECL_STRERROR_R -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_STRERROR_R -char *strerror_r (); -#endif - #ifndef _ # define _(String) String #endif @@ -80,14 +69,14 @@ char *strerror_r (); name of the executing program. */ extern char *program_name; -# ifdef HAVE_STRERROR_R -# define __strerror_r strerror_r +# if HAVE_STRERROR +# ifndef HAVE_DECL_STRERROR +"this configure-time declaration test was not run" +# endif +# if !HAVE_DECL_STRERROR && !defined strerror +char *strerror PARAMS ((int)); +# endif # else -# if HAVE_STRERROR -# ifndef strerror /* On some systems, strerror is a macro */ -char *strerror (); -# endif -# else static char * private_strerror (errnum) int errnum; @@ -99,9 +88,8 @@ private_strerror (errnum) return _(sys_errlist[errnum]); return _("Unknown system error"); } -# define strerror private_strerror -# endif /* HAVE_STRERROR */ -# endif /* HAVE_STRERROR_R */ +# define strerror private_strerror +# endif /* HAVE_STRERROR */ #endif /* not _LIBC */ /* This variable is incremented each time `warn' is called. */ @@ -110,48 +98,58 @@ unsigned int warn_message_count; /* 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, ...) +#if defined VA_START && defined __STDC__ +warn_at (location_t location, const char *message, ...) #else -warn (message, va_alist) - char *message; - va_dcl +warn_at (location, message, va_alist) + location_t location + char *message; + va_dcl #endif { #ifdef VA_START va_list args; #endif - if (error_one_per_line) - { - static const char *old_infile; - static int old_lineno; + fflush (stdout); + LOCATION_PRINT (stderr, location); + fputs (": ", stderr); + fputs (_("warning: "), stderr); - if (old_lineno == lineno && - (infile == old_infile || !strcmp (old_infile, infile))) - /* Simply return and print nothing. */ - return; +#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 - old_infile = infile; - old_lineno = lineno; - } + ++warn_message_count; + putc ('\n', stderr); + fflush (stderr); +} - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); +void +#if defined VA_START && defined __STDC__ +warn (const char *message, ...) +#else +warn (message, va_alist) + char *message; + va_dcl +#endif +{ +#ifdef VA_START + va_list args; +#endif - fputs (_("warning: "), stderr); + fflush (stdout); + fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: ")); #ifdef VA_START VA_START (args, message); @@ -171,7 +169,38 @@ warn (message, va_alist) `-----------------------------------------------------------*/ void -#if defined VA_START && __STDC__ +#if defined VA_START && defined __STDC__ +complain_at (location_t location, const char *message, ...) +#else +complain_at (location, message, va_alist) + location_t location; + char *message; + va_dcl +#endif +{ +#ifdef VA_START + va_list args; +#endif + + fflush (stdout); + LOCATION_PRINT (stderr, location); + fputs (": ", 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 + + ++complain_message_count; + putc ('\n', stderr); + fflush (stderr); +} + +void +#if defined VA_START && defined __STDC__ complain (const char *message, ...) #else complain (message, va_alist) @@ -183,25 +212,8 @@ complain (message, va_alist) 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; - - old_infile = infile; - old_lineno = lineno; - } - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); + fprintf (stderr, "%s: ", infile ? infile : program_name); #ifdef VA_START VA_START (args, message); @@ -221,12 +233,13 @@ complain (message, va_alist) `-------------------------------------------------*/ void -#if defined VA_START && __STDC__ -fatal (const char *message, ...) +#if defined VA_START && defined __STDC__ +fatal_at (location_t location, const char *message, ...) #else -fatal (message, va_alist) - char *message; - va_dcl +fatal_at (location, message, va_alist) + location_t location; + char *message; + va_dcl #endif { #ifdef VA_START @@ -234,11 +247,8 @@ fatal (message, va_alist) #endif fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); - + LOCATION_PRINT (stderr, location); + fputs (": ", stderr); fputs (_("fatal error: "), stderr); #ifdef VA_START @@ -252,20 +262,12 @@ fatal (message, va_alist) fflush (stderr); exit (1); } - -/*------------------------------------------------------------------. -| 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, ...) +#if defined VA_START && defined __STDC__ +fatal (const char *message, ...) #else -error (status, errnum, message, va_alist) - int status; - int errnum; +fatal (message, va_alist) char *message; va_dcl #endif @@ -275,10 +277,7 @@ error (status, errnum, message, va_alist) #endif fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); + fprintf (stderr, "%s: ", infile ? infile : program_name); fputs (_("fatal error: "), stderr); @@ -289,25 +288,7 @@ error (status, errnum, message, va_alist) #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); + exit (1); }