Normalize conflict related messages.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 49c61897fc22542e76fe6a25e53afddd60253530..14ef2388c9aea33eeeff7f789c9a5bdf1e9b5dd5 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* 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
@@ -41,9 +41,6 @@
 void exit ();
 #endif
 
-/* To get error_one_per_line. */
-#include "error.h"
-
 #include "complain.h"
 
 #ifndef HAVE_DECL_STRERROR_R
@@ -116,10 +113,10 @@ unsigned int complain_message_count;
 
 void
 #if defined VA_START && defined __STDC__
-warn_at (int location, const char *message, ...)
+warn_at (location_t location, const char *message, ...)
 #else
 warn_at (location, message, va_alist)
-  int location
+  location_t location
   char *message;
   va_dcl
 #endif
@@ -128,26 +125,9 @@ warn_at (location, message, va_alist)
   va_list args;
 #endif
 
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location;
-    }
-
   fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);
-
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
   fputs (_("warning: "), stderr);
 
 #ifdef VA_START
@@ -163,41 +143,21 @@ warn_at (location, message, va_alist)
   fflush (stderr);
 }
 
-
 void
 #if defined VA_START && defined __STDC__
 warn (const char *message, ...)
 #else
 warn (message, va_alist)
-     char *message;
-     va_dcl
+  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 == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = lineno;
-    }
-
   fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-  fputs (_("warning: "), stderr);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
 
 #ifdef VA_START
   VA_START (args, message);
@@ -218,10 +178,10 @@ warn (message, va_alist)
 
 void
 #if defined VA_START && defined __STDC__
-complain_at (int location, const char *message, ...)
+complain_at (location_t location, const char *message, ...)
 #else
 complain_at (location, message, va_alist)
-  int location;
+  location_t location;
   char *message;
   va_dcl
 #endif
@@ -230,25 +190,9 @@ complain_at (location, message, va_alist)
   va_list args;
 #endif
 
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location;
-    }
-
   fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
 
 #ifdef VA_START
   VA_START (args, message);
@@ -263,7 +207,6 @@ complain_at (location, message, va_alist)
   fflush (stderr);
 }
 
-
 void
 #if defined VA_START && defined __STDC__
 complain (const char *message, ...)
@@ -277,25 +220,8 @@ complain (message, va_alist)
   va_list args;
 #endif
 
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = lineno;
-    }
-
   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);
@@ -316,10 +242,10 @@ complain (message, va_alist)
 
 void
 #if defined VA_START && defined __STDC__
-fatal_at (int location, const char *message, ...)
+fatal_at (location_t location, const char *message, ...)
 #else
-fatal (location, message, va_alist)
-  int location;
+fatal_at (location, message, va_alist)
+  location_t location;
   char *message;
   va_dcl
 #endif
@@ -329,11 +255,8 @@ fatal (location, message, va_alist)
 #endif
 
   fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);
-
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
 
 #ifdef VA_START
@@ -362,10 +285,7 @@ fatal (message, va_alist)
 #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);