X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2118414023ee17df31fb47c34fbff0bd7061d58e..e342c3beaf9d73616e8ff6fe005b97f3a72c0476:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 01cda949..8a192bd2 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,5 +1,5 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2004 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 @@ -22,72 +22,19 @@ #include "system.h" #include <stdarg.h> -#if ! (HAVE_VPRINTF || defined vfprintf) -# define vfprintf(stream, message, args) _doprnt (message, args, stream) -#endif - -#if STDC_HEADERS || _LIBC -# include <stdlib.h> -# include <string.h> -#else -void exit (); -#endif #include "complain.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 <errno.h> - -/* 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 <libio/iolibio.h> -# define fflush(s) _IO_fflush (s) -# endif - -#else /* not _LIBC */ +#include "files.h" /* The calling program should define program_name and set it to the name of the executing program. */ extern char *program_name; -# 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 (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 /* 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; /*--------------------------------. @@ -95,12 +42,11 @@ unsigned int complain_message_count; `--------------------------------*/ void -warn_at (location_t location, const char *message, ...) +warn_at (location loc, const char *message, ...) { va_list args; - fflush (stdout); - LOCATION_PRINT (stderr, location); + location_print (stderr, loc); fputs (": ", stderr); fputs (_("warning: "), stderr); @@ -108,9 +54,8 @@ warn_at (location_t location, const char *message, ...) vfprintf (stderr, message, args); va_end (args); - ++warn_message_count; + warning_issued = true; putc ('\n', stderr); - fflush (stderr); } void @@ -118,16 +63,14 @@ warn (const char *message, ...) { va_list args; - fflush (stdout); - fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: ")); + fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); va_start (args, message); vfprintf (stderr, message, args); va_end (args); - ++warn_message_count; + warning_issued = true; putc ('\n', stderr); - fflush (stderr); } /*-----------------------------------------------------------. @@ -135,21 +78,19 @@ warn (const char *message, ...) `-----------------------------------------------------------*/ void -complain_at (location_t location, const char *message, ...) +complain_at (location loc, const char *message, ...) { va_list args; - fflush (stdout); - LOCATION_PRINT (stderr, location); + location_print (stderr, loc); fputs (": ", stderr); va_start (args, message); vfprintf (stderr, message, args); va_end (args); - ++complain_message_count; + complaint_issued = true; putc ('\n', stderr); - fflush (stderr); } void @@ -157,16 +98,14 @@ complain (const char *message, ...) { va_list args; - fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); va_start (args, message); vfprintf (stderr, message, args); va_end (args); - ++complain_message_count; + complaint_issued = true; putc ('\n', stderr); - fflush (stderr); } /*-------------------------------------------------. @@ -174,12 +113,11 @@ complain (const char *message, ...) `-------------------------------------------------*/ void -fatal_at (location_t location, const char *message, ...) +fatal_at (location loc, const char *message, ...) { va_list args; - fflush (stdout); - LOCATION_PRINT (stderr, location); + location_print (stderr, loc); fputs (": ", stderr); fputs (_("fatal error: "), stderr); @@ -187,8 +125,7 @@ fatal_at (location_t location, const char *message, ...) vfprintf (stderr, message, args); va_end (args); putc ('\n', stderr); - fflush (stderr); - exit (1); + exit (EXIT_FAILURE); } void @@ -196,8 +133,7 @@ fatal (const char *message, ...) { va_list args; - fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); fputs (_("fatal error: "), stderr); @@ -205,6 +141,5 @@ fatal (const char *message, ...) vfprintf (stderr, message, args); va_end (args); putc ('\n', stderr); - fflush (stderr); - exit (1); + exit (EXIT_FAILURE); }