X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/48b16bbc0492820cf1fdb683b289c77f4cdadb3d..b09a18c50d221b54e6bc94e03deb65ecd52c4288:/src/scan-skel.l?ds=sidebyside

diff --git a/src/scan-skel.l b/src/scan-skel.l
index a5b5f3f1..b14fb40c 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -23,6 +23,11 @@
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
+/* Work around a bug in flex 2.5.31.  See Debian bug 333231
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
+#undef skel_wrap
+#define skel_wrap() 1
+
 #include "system.h"
 
 #include <error.h>
@@ -36,6 +41,9 @@
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, (String)), yyout)
 
+#define BASE_QPUTS(File) \
+   assert (File), QPUTS (base_name (File))
+
 %}
 %%
 
@@ -48,16 +56,25 @@
   char const *file_name = yytext + sizeof "@output " - 1;
   yytext[yyleng - 1] = '\0';
 
+  /* Decode special file names.  They include the directory part,
+     contrary to their "free" occurrences, used for issuing #includes,
+     which must not include the directory part.  */
+
   if (*file_name == '@')
     {
       if (strcmp (file_name, "@output_header_name@") == 0)
-	file_name = spec_defines_file;
+	{
+	  assert (spec_defines_file);
+	  file_name = spec_defines_file;
+	}
       else if (strcmp (file_name, "@output_parser_name@") == 0)
-	file_name = parser_file_name;
+	{
+	  assert (parser_file_name);
+	  file_name = parser_file_name;
+	}
       else
 	fatal ("invalid token in skeleton: %s", yytext);
     }
-
   if (outname)
     {
       free (outname);
@@ -74,8 +91,9 @@
 
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
-"@output_parser_name@"	QPUTS (parser_file_name);
-"@output_header_name@"	QPUTS (spec_defines_file);
+"@dir_prefix@" QPUTS (dir_prefix);
+"@output_parser_name@"	BASE_QPUTS (parser_file_name);
+"@output_header_name@"	BASE_QPUTS (spec_defines_file);
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);