(struct state_list): Renamed from struct state_list_s.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 0d7114a7b7f26434dea9f4b5b8c5b34a3c89d61b..e7f5b708bf541042536956029741c63e67159ad1 100644 (file)
--- 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 never-interactive
+%option nodefault noyywrap nounput never-interactive debug
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
@@ -30,6 +30,9 @@
 
 int skel_lex (void);
 
+#define QPUTS(String) \
+   fputs (quotearg_style (c_quoting_style, (String)), yyout);
+
 %}
 %%
 
@@ -63,11 +66,13 @@ int skel_lex (void);
 "@}"      fputc (']', yyout);
 
 "@oline@"  fprintf (yyout, "%d", lineno);
-"@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);
+"@ofile@"  QPUTS (outname);
+"@output_parser_name@" QPUTS (parser_file_name);
+"@output_header_name@"  QPUTS (spec_defines_file);
 
 "@"       abort ();
 \n        lineno++; ECHO;
-.         ECHO;
+[^@\n]+           ECHO;
 
 <<EOF>>           xfclose (yyout); free (outname); return EOF;
 %%
@@ -82,8 +87,8 @@ void
 scan_skel (FILE *in)
 {
   skel_in = in;
+  skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
-
   /* Reclaim Flex's buffers.  */
   yy_delete_buffer (YY_CURRENT_BUFFER);
 }