cpp: improve the Flex version checking macro

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 76acceec15ff94710fcf7eb0378590f6f245549d..5730e596026729c24c2cec1f7bd4f85527d92a8b 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,6 +1,6 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2011 Free Software
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2012 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,9 +21,8 @@
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "complain.h"
+#include "getargs.h"
 #include "gram.h"
 #include "print-xml.h"
 #include "reader.h"
@@ -309,9 +308,17 @@ grammar_rules_useless_report (const char *message)
   for (r = 0; r < nrules ; ++r)
     if (!rules[r].useful)
       {
-        warn_at (rules[r].location, "%s: ", message);
-        rule_print (&rules[r], stderr);
-        fflush (stderr);
+        if (feature_flag & feature_caret)
+          warn_at (rules[r].location, "%s", message);
+        else
+          {
+            warn_at (rules[r].location, "%s: ", message);
+            if (warnings_flag & warnings_other)
+              {
+                rule_print (&rules[r], stderr);
+                fflush (stderr);
+              }
+          }
       }
 }