Akim Demaille <akim@epita.fr>

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 3cb2178aa17e18f8c5d58606d6686d7f0a3fde23..4f34a6c67716aacb303736269c61c52186917ed9 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -31,8 +31,7 @@
 #include "complain.h"
 #include "getargs.h"
 #include "files.h"
 #include "complain.h"
 #include "getargs.h"
 #include "files.h"

-
-int skel_lex (void);
+#include "scan-skel.h"

 
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, (String)), yyout)
 
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, (String)), yyout)


@@ -46,15 +45,15 @@ int skel_lex (void);
 %}
 
 "@output ".*\n {
 %}
 
 "@output ".*\n {

-  char const *filename = yytext + sizeof "@output " - 1;
+  char const *file_name = yytext + sizeof "@output " - 1;

   yytext[yyleng - 1] = '\0';
 
   yytext[yyleng - 1] = '\0';
 

-  if (*filename == '@')
+  if (*file_name == '@')

     {
     {

-      if (strcmp (filename, "@output_header_name@") == 0)
-       filename = spec_defines_file;
-      else if (strcmp (filename, "@output_parser_name@") == 0)
-       filename = parser_file_name;
+      if (strcmp (file_name, "@output_header_name@") == 0)
+       file_name = spec_defines_file;
+      else if (strcmp (file_name, "@output_parser_name@") == 0)
+       file_name = parser_file_name;

       else
        fatal ("invalid token in skeleton: %s", yytext);
     }
       else
        fatal ("invalid token in skeleton: %s", yytext);
     }


@@ -64,7 +63,7 @@ int skel_lex (void);
       free (outname);
       xfclose (yyout);
     }
       free (outname);
       xfclose (yyout);
     }

-  outname = xstrdup (filename);
+  outname = xstrdup (file_name);

   yyout = xfopen (outname, "w");
   lineno = 1;
 }
   yyout = xfopen (outname, "w");
   lineno = 1;
 }


@@ -75,6 +74,7 @@ int skel_lex (void);
 
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);

+"@dir_prefix@" QPUTS (dir_prefix);

 "@output_parser_name@" QPUTS (parser_file_name);
 "@output_header_name@" QPUTS (spec_defines_file);
 
 "@output_parser_name@" QPUTS (parser_file_name);
 "@output_header_name@" QPUTS (spec_defines_file);
 


@@ -97,8 +97,6 @@ int skel_lex (void);
 | Scan a Bison skeleton.  |
 `------------------------*/
 
 | Scan a Bison skeleton.  |
 `------------------------*/
 

-void scan_skel (FILE *);
-

 void
 scan_skel (FILE *in)
 {
 void
 scan_skel (FILE *in)
 {