X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/342b8b6e2156e923797745af2da2596e3086ccd5..f8e8262e7011a26ef57d3186d33a8e68859832d4:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 620e726c..e14f40b6 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 @@ -21,72 +21,32 @@ #include "system.h" -#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# ifdef __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 - -#if STDC_HEADERS || _LIBC -# include -# include -#else -void exit (); +#include +#if ! (HAVE_VPRINTF || defined vfprintf) +# define vfprintf(stream, message, args) _doprnt (message, args, stream) #endif #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 +#include "files.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 - -/* 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; -# 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 +#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 (errnum) - int errnum; +private_strerror (int errnum) { extern char *sys_errlist[]; extern int sys_nerr; @@ -95,71 +55,50 @@ private_strerror (errnum) return _(sys_errlist[errnum]); return _("Unknown system error"); } -# define strerror private_strerror -# endif /* HAVE_STRERROR */ -# endif /* HAVE_STRERROR_R */ -#endif /* not _LIBC */ +# define strerror private_strerror +#endif /* HAVE_STRERROR */ -/* This variable is incremented each time `warn' is called. */ -unsigned int warn_message_count; +/* This variable is set each time `warn' is called. */ +bool warning_issued; -/* This variable is incremented each time `complain' is called. */ -unsigned int complain_message_count; +/* This variable is set each time `complain' is called. */ +bool complaint_issued; -/* 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 && defined __STDC__ -warn (const char *message, ...) -#else -warn (message, va_alist) - char *message; - va_dcl -#endif +warn_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; + location_print (stderr, loc); + fputs (": ", stderr); + fputs (_("warning: "), stderr); - if (old_lineno == lineno && - (infile == old_infile || !strcmp (old_infile, infile))) - /* Simply return and print nothing. */ - return; + va_start (args, message); + vfprintf (stderr, message, args); + va_end (args); - old_infile = infile; - old_lineno = lineno; - } + warning_issued = true; + putc ('\n', stderr); +} - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); +void +warn (const char *message, ...) +{ + va_list args; - fputs (_("warning: "), stderr); + fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); -#ifdef VA_START - VA_START (args, message); + 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; + warning_issued = true; putc ('\n', stderr); - fflush (stderr); } /*-----------------------------------------------------------. @@ -167,49 +106,34 @@ warn (message, va_alist) `-----------------------------------------------------------*/ void -#if defined VA_START && defined __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; + location_print (stderr, loc); + fputs (": ", stderr); - if (old_lineno == lineno && - (infile == old_infile || !strcmp (old_infile, infile))) - /* Simply return and print nothing. */ - return; + va_start (args, message); + vfprintf (stderr, message, args); + va_end (args); - old_infile = infile; - old_lineno = lineno; - } + complaint_issued = true; + putc ('\n', stderr); +} - fflush (stdout); - if (infile != NULL) - fprintf (stderr, "%s:%d: ", infile, lineno); - else - fprintf (stderr, "%s:", program_name); +void +complain (const char *message, ...) +{ + va_list args; -#ifdef VA_START - VA_START (args, message); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); + + 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; + complaint_issued = true; putc ('\n', stderr); - fflush (stderr); } /*-------------------------------------------------. @@ -217,93 +141,33 @@ complain (message, va_alist) `-------------------------------------------------*/ void -#if defined VA_START && defined __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); + location_print (stderr, loc); + fputs (": ", stderr); fputs (_("fatal error: "), stderr); -#ifdef VA_START - VA_START (args, message); + 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); + 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 && defined __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); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); fputs (_("fatal error: "), stderr); -#ifdef VA_START - VA_START (args, message); + 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); + exit (EXIT_FAILURE); }