X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a5d5099417229a48aa18477073266e9aa3b77a8e..500bbfcd816776d0ddbf3555fedd41b529c405b3:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 8f27b378..7d2f0c55 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,5 @@ /* Declaration for error-reporting function for Bison. - Copyright 2000, 2001 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,38 +21,18 @@ #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; +#include +#if ! (HAVE_VPRINTF || defined vfprintf) +# define vfprintf(stream, message, args) _doprnt (message, args, stream) #endif #if STDC_HEADERS || _LIBC # include # include -#else -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 @@ -79,17 +59,16 @@ 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 (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; +private_strerror (int errnum) { extern char *sys_errlist[]; extern int sys_nerr; @@ -98,16 +77,15 @@ 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. */ -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; /*--------------------------------. @@ -115,47 +93,37 @@ unsigned int complain_message_count; `--------------------------------*/ void -#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); + va_start (args, message); + vfprintf (stderr, message, args); + va_end (args); + + warning_issued = true; + putc ('\n', stderr); + fflush (stderr); +} + +void +warn (const char *message, ...) +{ + va_list args; + + fflush (stdout); + fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); + + 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); } @@ -165,46 +133,36 @@ warn_at (location, message, va_alist) `-----------------------------------------------------------*/ void -#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; + fflush (stdout); + LOCATION_PRINT (stderr, location); + fputs (": ", stderr); - if (old_lineno == location.first_line && - (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 = location.first_line; - } + complaint_issued = true; + putc ('\n', stderr); + fflush (stderr); +} + +void +complain (const char *message, ...) +{ + va_list args; fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); -#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 - ++complain_message_count; + complaint_issued = true; putc ('\n', stderr); fflush (stderr); } @@ -214,62 +172,37 @@ complain_at (location, message, va_alist) `-------------------------------------------------*/ void -#if defined VA_START && defined __STDC__ fatal_at (location_t location, const char *message, ...) -#else -fatal (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); 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); } void -#if defined VA_START && defined __STDC__ fatal (const char *message, ...) -#else -fatal (message, va_alist) - char *message; - va_dcl -#endif { -#ifdef VA_START va_list args; -#endif fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : 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 putc ('\n', stderr); fflush (stderr); - exit (1); + exit (EXIT_FAILURE); }