* src/tables.h, src/tables.c, src/output.c: Comment changes.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 9a01ffefe37d4b870d1c2cd81dfbb8d404346490..3f98cf7dd59946aaeab2715933bd726f1d05d047 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -18,11 +18,13 @@
    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));
 static int yylineno = 1;
@@ -38,10 +40,30 @@ static char *yyoutname = NULL;
      yylineno = 1;
    }
 
-"__oline__"      fprintf (yyout, "%d", yylineno);
+"@<:@"           fputc ('[', yyout);
+"@:>@"           fputc (']', yyout);
+
+"__oline__"      fprintf (yyout, "%d", yylineno+1);
 "__ofile__"      fprintf (yyout, "%s", yyoutname);
-[^_\n]+          ECHO;
+[^@_\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);
+}