X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/be2a1a68efe93f7046f77b81346e4c740c14fb40..5719c1092fec376fe02ecbd7f82bf2263e513959:/src/scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 82f9ed1a..b624cdfb 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -18,7 +18,7 @@
    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"
 
 %{
@@ -26,17 +26,24 @@
 #include "files.h"
 int skel_lex PARAMS ((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;