tests: link lib/libbison.a for gnulib.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 963478b242705d53e1e98bb35c1fabdd099c41b9..90a52ddaf1eb9a1374d7c34ec5cb344e2edff24a 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* Scan Bison Skeletons.                                       -*- C -*-
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -18,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 

-%option nodefault noyywrap nounput never-interactive debug
+%option nodefault noyywrap noinput nounput never-interactive debug

 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{


@@ -70,9 +69,11 @@ static void fail_for_invalid_at (char const *at);
   char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
 %}
 
   char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
 %}
 

-"@@"      fputc ('@', yyout);
-"@{"      fputc ('[', yyout);
-"@}"      fputc (']', yyout);
+"@@" fputc ('@', yyout);
+"@{" fputc ('[', yyout);
+"@}" fputc (']', yyout);
+"@`" /* Emtpy.  Used by b4_cat in ../data/bison.m4.  */
+@\n  /* Likewise.  */

 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 "@ofile@"  QPUTS (outname);
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 "@ofile@"  QPUTS (outname);


@@ -87,7 +88,7 @@ static void fail_for_invalid_at (char const *at);
 }
 
   /* This pattern must not match more than the previous @ patterns. */
 }
 
   /* 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;
 


@@ -108,6 +109,7 @@ static void fail_for_invalid_at (char const *at);
   "@}" { obstack_1grow (&obstack_for_string, ']'); }
   "@`" /* Emtpy.  Useful for starting an argument
           that begins with whitespace. */
   "@}" { obstack_1grow (&obstack_for_string, ']'); }
   "@`" /* Emtpy.  Useful for starting an argument
           that begins with whitespace. */

+  @\n  /* Empty.  */

 
   @[,)] {
     if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
 
   @[,)] {
     if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)