* src/state.h, src/state.c (state_new): New, extracted from...

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 620e726c30bae4cb13fef6b9e117b245894484c5..579cdf86c6389a3e6a991cb7807700342c31fc31 100644 (file)
--- 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 2000, 2001 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
@@ -41,6 +41,9 @@
 void exit ();
 #endif
 
+/* To get error_one_per_line. */
+#include "error.h"
+
 #include "complain.h"
 
 #ifndef HAVE_DECL_STRERROR_R
@@ -106,14 +109,58 @@ unsigned int warn_message_count;
 /* This variable is incremented each time `complain' is called.  */
 unsigned int complain_message_count;
 
-/* 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;
 \f
 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
+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);
+  vfprintf (stderr, message, args);
+  va_end (args);
+#else
+  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+
+  ++warn_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
+
+
 void
 #if defined VA_START && defined __STDC__
 warn (const char *message, ...)
@@ -166,6 +213,52 @@ warn (message, va_alist)
 | An error has occurred, but we can proceed, and die later.  |
 `-----------------------------------------------------------*/
 
+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;
+
+      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);
+
+#ifdef VA_START
+  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;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
+
+
 void
 #if defined VA_START && defined __STDC__
 complain (const char *message, ...)
@@ -218,11 +311,12 @@ complain (message, va_alist)
 
 void
 #if defined VA_START && defined __STDC__
-fatal (const char *message, ...)
+fatal_at (location_t location, const char *message, ...)
 #else
-fatal (message, va_alist)
-     char *message;
-     va_dcl
+fatal (location, message, va_alist)
+  location_t location;
+  char *message;
+  va_dcl
 #endif
 {
 #ifdef VA_START
@@ -230,11 +324,8 @@ fatal (message, va_alist)
 #endif
 
   fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
 
 #ifdef VA_START
@@ -248,20 +339,12 @@ fatal (message, va_alist)
   fflush (stderr);
   exit (1);
 }
-\f
-/*------------------------------------------------------------------.
-| 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, ...)
+fatal (const char *message, ...)
 #else
-error (status, errnum, message, va_alist)
-     int status;
-     int errnum;
+fatal (message, va_alist)
      char *message;
      va_dcl
 #endif
@@ -285,25 +368,7 @@ error (status, errnum, message, va_alist)
 #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 (1);
 }