warnings: rename the categories

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index d5d17b7ce1d66039da57dff8942bf6b7a227fab0..fc73cfe48c26c1e908157461f59ddd185e83bb90 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2012 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
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include <stdarg.h>
+#include <progname.h>
 
 #include "complain.h"
 #include "files.h"
@@ -38,14 +39,17 @@ static unsigned *indent_ptr = 0;
  * \param loc     the location, defaulting to the current file,
  *                or the program name.
  * \param prefix  put before the message (e.g., "warning").
- * \param message the error message, a printf format string.
+ * \param message the error message, a printf format string.  Iff it
+ *                ends with ": ", then no trailing newline is printed,
+ *                and the caller should print the remaining
+ *                newline-terminated message to stderr.
  * \param args    the arguments of the format string.
  */
 static
 void
 error_message (location *loc,
-              const char *prefix,
-              const char *message, va_list args)
+               const char *prefix,
+               const char *message, va_list args)
 {
   unsigned pos = 0;
 
@@ -68,17 +72,23 @@ error_message (location *loc,
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
-  putc ('\n', stderr);
-  fflush (stderr);
+  {
+    size_t l = strlen (message);
+    if (l < 2 || message[l-2] != ':' || message[l-1] != ' ')
+      {
+        putc ('\n', stderr);
+        fflush (stderr);
+      }
+  }
 }
 
 /** Wrap error_message() with varargs handling. */
-#define ERROR_MESSAGE(Loc, Prefix, Message)    \
-{                                              \
-  va_list args;                                        \
-  va_start (args, Message);                    \
-  error_message (Loc, Prefix, Message, args);  \
-  va_end (args);                               \
+#define ERROR_MESSAGE(Loc, Prefix, Message)     \
+{                                               \
+  va_list args;                                 \
+  va_start (args, Message);                     \
+  error_message (Loc, Prefix, Message, args);   \
+  va_end (args);                                \
 }
 
 
@@ -86,11 +96,11 @@ error_message (location *loc,
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
-static void
+void
 set_warning_issued (void)
 {
   static bool warning_issued = false;
-  if (!warning_issued && (warnings_flag & warnings_error))
+  if (!warning_issued && (warnings_flag & Werror))
     {
       fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
       complaint_issued = true;
@@ -101,6 +111,8 @@ set_warning_issued (void)
 void
 warn_at (location loc, const char *message, ...)
 {
+  if (!(warnings_flag & Wother))
+    return;
   set_warning_issued ();
   ERROR_MESSAGE (&loc, _("warning"), message);
 }
@@ -109,6 +121,8 @@ void
 warn_at_indent (location loc, unsigned *indent,
                 const char *message, ...)
 {
+  if (!(warnings_flag & Wother))
+    return;
   set_warning_issued ();
   indent_ptr = indent;
   ERROR_MESSAGE (&loc, _("warning"), message);
@@ -117,6 +131,8 @@ warn_at_indent (location loc, unsigned *indent,
 void
 warn (const char *message, ...)
 {
+  if (!(warnings_flag & Wother))
+    return;
   set_warning_issued ();
   ERROR_MESSAGE (NULL, _("warning"), message);
 }
@@ -163,13 +179,21 @@ yacc_at (location loc, const char *message, ...)
       ERROR_MESSAGE (&loc, NULL, message);
       complaint_issued = true;
     }
-  else if (warnings_flag & warnings_yacc)
+  else if (warnings_flag & Wyacc)
     {
       set_warning_issued ();
       ERROR_MESSAGE (&loc, _("warning"), message);
     }
 }
 
+void
+midrule_value_at (location loc, const char *message, ...)
+{
+  if (!(warnings_flag & Wmidrule_values))
+    return;
+  set_warning_issued ();
+  ERROR_MESSAGE (&loc, _("warning"), message);
+}
 
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |