X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/88015bf06b342b34b0b4de833af3ba40acfd2f74..b09a18c50d221b54e6bc94e03deb65ecd52c4288:/src/scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index fd9bd4c6..b14fb40c 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -16,25 +16,33 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 %option nodefault noyywrap nounput never-interactive debug
 %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>
 #include <quotearg.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);
+   fputs (quotearg_style (c_quoting_style, (String)), yyout)
+
+#define BASE_QPUTS(File) \
+   assert (File), QPUTS (base_name (File))
 
 %}
 %%
@@ -45,22 +53,34 @@ int skel_lex (void);
 %}
 
 "@output ".*\n {
-  char const *filename = yytext + sizeof "@output " - 1;
+  char const *file_name = yytext + sizeof "@output " - 1;
   yytext[yyleng - 1] = '\0';
 
-  if (*filename == '@')
+  /* 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 (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)
+	{
+	  assert (spec_defines_file);
+	  file_name = spec_defines_file;
+	}
+      else if (strcmp (file_name, "@output_parser_name@") == 0)
+	{
+	  assert (parser_file_name);
+	  file_name = parser_file_name;
+	}
       else
-	abort ();
+	fatal ("invalid token in skeleton: %s", yytext);
     }
-
-  XFREE (outname);
-  outname = xstrdup (filename);
-  xfclose (yyout);
+  if (outname)
+    {
+      free (outname);
+      xfclose (yyout);
+    }
+  outname = xstrdup (file_name);
   yyout = xfopen (outname, "w");
   lineno = 1;
 }
@@ -69,24 +89,31 @@ int skel_lex (void);
 "@{"	   fputc ('[', yyout);
 "@}"	   fputc (']', yyout);
 
-"@oline@"  fprintf (yyout, "%d", lineno);
+"@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);
 
-"@"	   abort ();
+  /* This pattern must not match more than the previous @ patterns. */
+@[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
 \n	   lineno++; ECHO;
 [^@\n]+	   ECHO;
 
-<<EOF>>	   xfclose (yyout); free (outname); return EOF;
+<<EOF>> {
+  if (outname)
+    {
+      free (outname);
+      xfclose (yyout);
+    }
+  return EOF;
+}
 %%
 
 /*------------------------.
 | Scan a Bison skeleton.  |
 `------------------------*/
 
-void scan_skel (FILE *);
-
 void
 scan_skel (FILE *in)
 {