* src/scan-skel.l: Correct off-by-one error in handling of __oline__.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 71577d7e6aa3281f0655d82989e7bb319dce771f..be336079bb91df718c6dd386eb9ed0d609db4b65 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,5 @@
-                                                             /* -*- C -*- */
-/* Scan Bison Skeletons.
-   Copyright (C) 2001  Free Software Foundation, Inc.
+/* Scan Bison Skeletons.                                       -*- C -*-
+   Copyright (C) 2001, 2002  Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -19,63 +18,33 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-%{
+%option nodefault noyywrap nounput
+%option prefix="skel_" outfile="lex.yy.c"
 
+%{
 #include "system.h"
-#include "skeleton.h"
-#include "parse-skel.h"
-
+#include "files.h"
+int skel_lex PARAMS ((void));
+static int yylineno = 1;
+static char *yyoutname = NULL;
 %}
-
-%option nounput
-%option noyywrap
-/* If we enable
-
-   %option yylineno
-
-   Then we have warning: `yy_flex_realloc' defined but not used.
-   Seems like a Flex bug to me: Why the heck yylineno would trigger
-   the REJECT exception???  */
-
 %%
-
-"%%{line}"          { return LINE; }
-"%%{skeleton-line}" { return SLINE; }
-
-"%%{yacc}"    { return YACC; }
-"%%{section}" { return SECTION; }
-
-"%%{guards}"   { return GUARDS; }
-"%%{actions}"  { return ACTIONS; }
-"%%{tokendef}" { return TOKENS; }
-
-"%%{"[a-zA-Z][0-9a-zA-Z_-]+"}" { /* Muscle.  */
-  size_t len = strlen (yytext);
-  yylval.string = (char*) malloc (len - 3);
-  strncpy (yylval.string, yytext + 3, len - 4);
-  yylval.string[len - 4] = 0;
-  return MUSCLE;
-}
-
-"%%\"".*"\"" { /* String.  */
-  size_t len = strlen (yytext);
-  yylval.string = (char*) malloc (len - 3);
-  strncpy (yylval.string, yytext + 3, len - 4);
-  yylval.string[len - 4] = 0;
-  return STRING;
-}
-
-<<EOF>> { /* End of file.  */
-  return 0;
-}
-
-"\n" { /* End of line.  */
-  return '\n';
-}
-
-. { /* Character.  */
-  yylval.character = *yytext;
-  return CHARACTER;
-}
+  /* This is an approximation, but we don't need more. */
+^"#output \""[^\"]+\"\n        {
+     yytext[yyleng - 2] = '\0';
+     XFREE (yyoutname);
+     yyoutname = xstrdup (yytext + strlen ("#output \""));
+     yyout = xfopen (yyoutname, "w");
+     yylineno = 1;
+   }
+
+"@<:@" fputc ('[', yyout);
+"@:>@" fputc (']', yyout);
+
+"__oline__"      fprintf (yyout, "%d", yylineno+1);
+"__ofile__"      fprintf (yyout, "%s", yyoutname);
+[^@_\n]+         ECHO;
+\n+              yylineno += yyleng; ECHO;
+.                ECHO;
 
 %%