/* 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;
+#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
-/* 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
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;
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;
\f
/*--------------------------------.
`--------------------------------*/
void
-#if defined VA_START && defined __STDC__
-warn (const char *message, ...)
-#else
-warn (message, va_alist)
- char *message;
- va_dcl
-#endif
+warn_at (location_t location, const char *message, ...)
{
-#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);
+ 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 (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);
+ fflush (stdout);
+ fprintf (stderr, "%s: %s", infile ? infile : 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);
}
`-----------------------------------------------------------*/
void
-#if defined VA_START && defined __STDC__
-complain (const char *message, ...)
-#else
-complain (message, va_alist)
- char *message;
- va_dcl
-#endif
+complain_at (location_t location, const char *message, ...)
{
-#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);
+
+ va_start (args, message);
+ vfprintf (stderr, message, args);
+ va_end (args);
- if (old_lineno == lineno &&
- (infile == old_infile || !strcmp (old_infile, infile)))
- /* Simply return and print nothing. */
- return;
+ complaint_issued = true;
+ putc ('\n', stderr);
+ fflush (stderr);
+}
- old_infile = infile;
- old_lineno = lineno;
- }
+void
+complain (const char *message, ...)
+{
+ va_list args;
fflush (stdout);
- if (infile != NULL)
- fprintf (stderr, "%s:%d: ", infile, lineno);
- else
- fprintf (stderr, "%s:", program_name);
+ fprintf (stderr, "%s: ", infile ? infile : 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);
}
`-------------------------------------------------*/
void
-#if defined VA_START && defined __STDC__
+fatal_at (location_t location, const char *message, ...)
+{
+ va_list args;
+
+ fflush (stdout);
+ LOCATION_PRINT (stderr, location);
+ fputs (": ", stderr);
+ fputs (_("fatal error: "), stderr);
+
+ va_start (args, message);
+ vfprintf (stderr, message, args);
+ va_end (args);
+ putc ('\n', stderr);
+ fflush (stderr);
+ exit (EXIT_FAILURE);
+}
+
+void
fatal (const char *message, ...)
-#else
-fatal (message, va_alist)
- char *message;
- va_dcl
-#endif
{
-#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: ", infile ? infile : 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