tests: please clang and use ".cc", not ".c", for C++ input

[bison.git] / src / scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index c3844f137a181b944b05e8eab1c411c94dbbf1ec..c7e7190f034949ccc36c8cb1fed10cb76b6cc29d 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -186,7 +186,7 @@ flag (const char *arg)
   else if (STREQ (arg, "fatal"))
     return fatal;
   else if (STREQ (arg, "note"))
-    return silent;
+    return silent | complaint | no_caret;
   else if (STREQ (arg, "warn"))
     return Wother;
   else
@@ -226,7 +226,7 @@ at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
     indent += SUB_INDENT;
   else
     indent = 0;
-  complain_args (locp, w, &indent, argc - 3, argv + 3);
+  complain_args (locp, w, &indent, argc - 4, argv + 4);
   if (w & silent)
     indent -= SUB_INDENT;
 }
@@ -247,7 +247,7 @@ at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
   *out_linenop = 1;
 }
 
-  static void
+static void
 fail_for_at_directive_too_few_args (char const *at_directive_name)
 {
   complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),