Merge remote-tracking branch 'origin/maint'

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 3b0041e830d4ccc669459fda55ca864778f5eff9..18432b49ee2cadca2809e6f323af66381e9a91bc 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

-   Copyright (C) 2000-2002, 2004-2006, 2009-2011 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2012 Free Software

    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify


@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include <stdarg.h>
 #include "system.h"
 
 #include <stdarg.h>

+#include <progname.h>

 
 #include "complain.h"
 #include "files.h"
 
 #include "complain.h"
 #include "files.h"


@@ -47,8 +48,8 @@ static unsigned *indent_ptr = 0;
 static
 void
 error_message (location *loc,
 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;
 
 {
   unsigned pos = 0;
 


@@ -81,12 +82,12 @@ error_message (location *loc,
 }
 
 /** Wrap error_message() with varargs handling. */
 }
 
 /** 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);                                \

 }
 
 
 }
 
 


@@ -94,7 +95,7 @@ error_message (location *loc,
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 | Report a warning, and proceed.  |
 `--------------------------------*/
 

-static void
+void

 set_warning_issued (void)
 {
   static bool warning_issued = false;
 set_warning_issued (void)
 {
   static bool warning_issued = false;


@@ -109,6 +110,8 @@ set_warning_issued (void)
 void
 warn_at (location loc, const char *message, ...)
 {
 void
 warn_at (location loc, const char *message, ...)
 {

+  if (!(warnings_flag & warnings_other))
+    return;

   set_warning_issued ();
   ERROR_MESSAGE (&loc, _("warning"), message);
 }
   set_warning_issued ();
   ERROR_MESSAGE (&loc, _("warning"), message);
 }


@@ -117,6 +120,8 @@ void
 warn_at_indent (location loc, unsigned *indent,
                 const char *message, ...)
 {
 warn_at_indent (location loc, unsigned *indent,
                 const char *message, ...)
 {

+  if (!(warnings_flag & warnings_other))
+    return;

   set_warning_issued ();
   indent_ptr = indent;
   ERROR_MESSAGE (&loc, _("warning"), message);
   set_warning_issued ();
   indent_ptr = indent;
   ERROR_MESSAGE (&loc, _("warning"), message);


@@ -125,6 +130,8 @@ warn_at_indent (location loc, unsigned *indent,
 void
 warn (const char *message, ...)
 {
 void
 warn (const char *message, ...)
 {

+  if (!(warnings_flag & warnings_other))
+    return;

   set_warning_issued ();
   ERROR_MESSAGE (NULL, _("warning"), message);
 }
   set_warning_issued ();
   ERROR_MESSAGE (NULL, _("warning"), message);
 }


@@ -178,6 +185,14 @@ yacc_at (location loc, const char *message, ...)
     }
 }
 
     }
 }
 

+void
+midrule_value_at (location loc, const char *message, ...)
+{
+  if (!(warnings_flag & warnings_midrule_values))
+    return;
+  set_warning_issued ();
+  ERROR_MESSAGE (&loc, _("warning"), message);
+}

 
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |