Normalize conflict related messages.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 8f27b37806abbc5448ba78c8cb5d729952094ba9..14ef2388c9aea33eeeff7f789c9a5bdf1e9b5dd5 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* 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
 
    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,9 +41,6 @@
 void exit ();
 #endif
 
 void exit ();
 #endif
 

-/* To get error_one_per_line. */
-#include "error.h"
-

 #include "complain.h"
 
 #ifndef HAVE_DECL_STRERROR_R
 #include "complain.h"
 
 #ifndef HAVE_DECL_STRERROR_R


@@ -128,25 +125,40 @@ warn_at (location, message, va_alist)
   va_list args;
 #endif
 
   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);
 
   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, ...)
+#else
+warn (message, va_alist)
+  char *message;
+  va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  fflush (stdout);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
+

 #ifdef VA_START
   VA_START (args, message);
   vfprintf (stderr, message, args);
 #ifdef VA_START
   VA_START (args, message);
   vfprintf (stderr, message, args);


@@ -178,23 +190,38 @@ complain_at (location, message, va_alist)
   va_list args;
 #endif
 
   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;
+#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

 
 

-      old_infile = infile;
-      old_lineno = location.first_line;
-    }
+  ++complain_message_count;
+  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
+{
+#ifdef VA_START
+  va_list args;
+#endif

 
   fflush (stdout);
 
   fflush (stdout);

-  LOCATION_PRINT (stderr, location);
-  fputs (": ", stderr);
+  fprintf (stderr, "%s: ", infile ? infile : program_name);

 
 #ifdef VA_START
   VA_START (args, message);
 
 #ifdef VA_START
   VA_START (args, message);


@@ -217,7 +244,7 @@ void
 #if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
 #else
 #if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
 #else

-fatal (location, message, va_alist)
+fatal_at (location, message, va_alist)

   location_t location;
   char *message;
   va_dcl
   location_t location;
   char *message;
   va_dcl