X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a0f6b076110ea79f25e13701d7f0ee4b38630d4d..9801d40c506b718971aed52c44975c7951bcb3bc:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 973ff299..579cdf86 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,5 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright 2000, 2001 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 . */ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include +#include "system.h" #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ +# ifdef __STDC__ # include # define VA_START(args, lastarg) va_start(args, lastarg) # else @@ -45,20 +41,67 @@ void exit (); #endif +/* To get error_one_per_line. */ +#include "error.h" + #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 #ifdef _LIBC /* In the GNU C library, there is a predefined variable for this. */ + # define program_name program_invocation_name +# include + +/* 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 +# 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; -#endif + +# ifdef HAVE_STRERROR_R +# define __strerror_r strerror_r +# else +# if HAVE_STRERROR +# ifndef strerror /* On some systems, strerror is a macro */ +char *strerror (); +# endif +# else +static char * +private_strerror (errnum) + 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 /* HAVE_STRERROR_R */ +#endif /* not _LIBC */ /* This variable is incremented each time `warn' is called. */ unsigned int warn_message_count; @@ -66,16 +109,60 @@ 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__ +#if defined VA_START && defined __STDC__ +warn_at (location_t location, const char *message, ...) +#else +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; + + if (old_lineno == location.first_line && + (infile == old_infile || !strcmp (old_infile, infile))) + /* Simply return and print nothing. */ + return; + + old_infile = infile; + old_lineno = location.first_line; + } + + fflush (stdout); + LOCATION_PRINT (stderr, location); + fputs (": ", stderr); + fputs (_("warning: "), 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 + + ++warn_message_count; + putc ('\n', stderr); + fflush (stderr); +} + + +void +#if defined VA_START && defined __STDC__ warn (const char *message, ...) #else warn (message, va_alist) @@ -90,7 +177,7 @@ warn (message, va_alist) if (error_one_per_line) { static const char *old_infile; - static unsigned int old_lineno; + static int old_lineno; if (old_lineno == lineno && (infile == old_infile || !strcmp (old_infile, infile))) @@ -127,7 +214,53 @@ 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 + + if (error_one_per_line) + { + static const char *old_infile; + static int old_lineno; + + if (old_lineno == location.first_line && + (infile == old_infile || !strcmp (old_infile, infile))) + /* Simply return and print nothing. */ + return; + + old_infile = infile; + old_lineno = location.first_line; + } + + 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) @@ -142,7 +275,7 @@ complain (message, va_alist) if (error_one_per_line) { static const char *old_infile; - static unsigned int old_lineno; + static int old_lineno; if (old_lineno == lineno && (infile == old_infile || !strcmp (old_infile, infile))) @@ -177,12 +310,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 (location, message, va_alist) + location_t location; + char *message; + va_dcl #endif { #ifdef VA_START @@ -190,11 +324,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 @@ -208,20 +339,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 @@ -245,25 +368,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); }