grammar: do not add a \n at the end of blocks of code

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index a0d9c9e993f531431eaf8bfa168b0bbe2774686b..654491ef78ec308e2b1a20ea1f2a9ba40f360d85 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -72,7 +72,7 @@ static void fail_for_invalid_at (char const *at);
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);

-"@`" continue;  /* Used by b4_cat in ../data/bison.m4.  */
+"@'" continue;  /* Used by b4_cat in ../data/bison.m4.  */

 @\n  continue;
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 @\n  continue;
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);


@@ -83,7 +83,7 @@ static void fail_for_invalid_at (char const *at);
 "@output("      at_init (&argc, argv, &at_ptr, &at_output);
 
   /* This pattern must not match more than the previous @ patterns. */
 "@output("      at_init (&argc, argv, &at_ptr, &at_output);
 
   /* This pattern must not match more than the previous @ patterns. */

-@[^@{}`(\n]*    fail_for_invalid_at (yytext);
+@[^@{}'(\n]*    fail_for_invalid_at (yytext);

 \n              out_lineno++; ECHO;
 [^@\n]+         ECHO;
 
 \n              out_lineno++; ECHO;
 [^@\n]+         ECHO;
 


@@ -103,7 +103,7 @@ static void fail_for_invalid_at (char const *at);
   "@@"   obstack_1grow (&obstack_for_string, '@');
   "@{"   obstack_1grow (&obstack_for_string, '[');
   "@}"   obstack_1grow (&obstack_for_string, ']');
   "@@"   obstack_1grow (&obstack_for_string, '@');
   "@{"   obstack_1grow (&obstack_for_string, '[');
   "@}"   obstack_1grow (&obstack_for_string, ']');

-  "@`"   continue; /* For starting an argument that begins with whitespace. */
+  "@'"   continue; /* For starting an argument that begins with whitespace. */

   @\n    continue;
 
   @[,)] {
   @\n    continue;
 
   @[,)] {


@@ -186,7 +186,7 @@ flag (const char *arg)
   else if (STREQ (arg, "fatal"))
     return fatal;
   else if (STREQ (arg, "note"))
   else if (STREQ (arg, "fatal"))
     return fatal;
   else if (STREQ (arg, "note"))

-    return silent | complaint;
+    return silent | complaint | no_caret;

   else if (STREQ (arg, "warn"))
     return Wother;
   else
   else if (STREQ (arg, "warn"))
     return Wother;
   else