/* 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
#include "system.h"
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# ifdef __STDC__
-# include <stdarg.h>
-# define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-# include <varargs.h>
-# 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 <stdlib.h>
-# include <string.h>
-#else
-void exit ();
+#include <stdarg.h>
+#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 <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 */
-
/* 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;
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;
\f
/*--------------------------------.
`--------------------------------*/
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
+warn_at (location loc, const char *message, ...)
{
-#ifdef VA_START
va_list args;
-#endif
- fflush (stdout);
- LOCATION_PRINT (stderr, location);
+ location_print (stderr, loc);
fputs (": ", stderr);
fputs (_("warning: "), 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
- ++warn_message_count;
+ warning_issued = true;
+ putc ('\n', stderr);
+}
+
+void
+warn (const char *message, ...)
+{
+ va_list args;
+
+ fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
+
+ va_start (args, message);
+ vfprintf (stderr, message, args);
+ va_end (args);
+
+ warning_issued = true;
putc ('\n', stderr);
- fflush (stderr);
}
\f
/*-----------------------------------------------------------.
`-----------------------------------------------------------*/
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
+complain_at (location loc, const char *message, ...)
{
-#ifdef VA_START
va_list args;
-#endif
- fflush (stdout);
- LOCATION_PRINT (stderr, location);
+ location_print (stderr, loc);
fputs (": ", stderr);
-#ifdef VA_START
- VA_START (args, message);
+ va_start (args, message);
+ vfprintf (stderr, message, args);
+ va_end (args);
+
+ complaint_issued = true;
+ putc ('\n', stderr);
+}
+
+void
+complain (const char *message, ...)
+{
+ va_list args;
+
+ 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);
}
\f
/*-------------------------------------------------.
`-------------------------------------------------*/
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
+fatal_at (location loc, const char *message, ...)
{
-#ifdef VA_START
va_list args;
-#endif
- fflush (stdout);
- LOCATION_PRINT (stderr, location);
+ 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);
}
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);
}
projects / bison.git / blobdiff