X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/68cae94e0b4e83246787fc5a413f085513ae9160..3f7ca628535da8ee4296061580cc9a944bcf4ab4:/src/scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 8a57af51..b4661743 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -29,8 +29,11 @@
 #undef skel_wrap
 #define skel_wrap() 1
 
-#include "system.h"
+#define FLEX_NO_OBSTACK
+#define FLEX_PREFIX(Id) skel_ ## Id
+#include "flex-scanner.h"
 
+#include <dirname.h>
 #include <error.h>
 #include <quotearg.h>
 
@@ -39,11 +42,13 @@
 #include "files.h"
 #include "scan-skel.h"
 
+int skel_lex (void);
+
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, String), yyout)
 
 #define BASE_QPUTS(File) \
-   QPUTS (base_name (File))
+   QPUTS (last_component (File))
 
 %}
 %%
@@ -76,6 +81,7 @@
       xfclose (yyout);
     }
   outname = xstrdup (file_name);
+  output_file_name_check (file_name);
   yyout = xfopen (outname, "w");
   lineno = 1;
 }
@@ -116,5 +122,5 @@ scan_skel (FILE *in)
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
   /* Reclaim Flex's buffers.  */
-  yy_delete_buffer (YY_CURRENT_BUFFER);
+  yylex_destroy ();
 }