Regen.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 82f9ed1a6cd82e62252f74401895f3c262e012bf..e56d37230c26ff6b9b8460e170b6888ce8a23d35 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -18,26 +18,52 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-%option nodefault noyywrap nounput
+%option nodefault noyywrap nounput never-interactive
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
 #include "system.h"
+#include "error.h"
+#include "getargs.h"
 #include "files.h"
-int skel_lex PARAMS ((void));
+int skel_lex (void);
 static int yylineno = 1;
+static char *yyoutname = NULL;
 %}
 %%
   /* This is an approximation, but we don't need more. */
 ^"#output \""[^\"]+\"\n        {
      yytext[yyleng - 2] = '\0';
-     skel_out = xfopen (yytext + strlen ("#output \""), "w");
+     XFREE (yyoutname);
+     yyoutname = xstrdup (yytext + strlen ("#output \""));
+     yyout = xfopen (yyoutname, "w");
      yylineno = 1;
    }
 
-"__oline__"      fprintf (yyout, "%d", yylineno);
-[^_\n]+          ECHO;
+"@<:@"           fputc ('[', yyout);
+"@:>@"           fputc (']', yyout);
+
+"__oline__"      fprintf (yyout, "%d", yylineno+1);
+"__ofile__"      fprintf (yyout, "%s", yyoutname);
+[^@_\n]+         ECHO;
 \n+              yylineno += yyleng; ECHO;
 .                ECHO;
 
+<<EOF>>          xfclose (yyout); free (yyoutname); return EOF;
 %%
+
+/*------------------------.
+| Scan a Bison skeleton.  |
+`------------------------*/
+
+void scan_skel (FILE *);
+
+void
+scan_skel (FILE *in)
+{
+  skel_in = in;
+  skel_lex ();
+
+  /* Reclaim Flex's buffers.  */
+  yy_delete_buffer (YY_CURRENT_BUFFER);
+}