Normalize conflict related messages.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 44dd3933597605734798f10ff1c3790c1829b028..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
@@ -106,9 +106,6 @@ 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.  |
@@ -116,38 +113,51 @@ int error_one_per_line;
 
 void
 #if defined VA_START && defined __STDC__
-warn (const char *message, ...)
+warn_at (location_t location, const char *message, ...)
 #else
-warn (message, va_alist)
-     char *message;
-     va_dcl
+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;
+  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;
+#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 = lineno;
-    }
+  ++warn_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
 
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
+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
 
-  fputs (_("warning: "), stderr);
+  fflush (stdout);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
 
 #ifdef VA_START
   VA_START (args, message);
@@ -166,6 +176,37 @@ 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
+
+  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, ...)
@@ -179,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);
@@ -216,6 +240,37 @@ complain (message, va_alist)
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/
 
+void
+#if defined VA_START && defined __STDC__
+fatal_at (location_t location, const char *message, ...)
+#else
+fatal_at (location, message, va_alist)
+  location_t location;
+  char *message;
+  va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  fflush (stdout);
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
+  fputs (_("fatal error: "), 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
+  putc ('\n', stderr);
+  fflush (stderr);
+  exit (1);
+}
+
 void
 #if defined VA_START && defined __STDC__
 fatal (const char *message, ...)
@@ -230,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);