Split the default %destructor/%printer into two kinds: <*> and <!>.

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index d860c08a55313db2a1f6c576a9d853115615c390..e787d288a04dcdf236e784e2c46cea4815eb95e8 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,7 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* Scan Bison Skeletons.                                       -*- C -*-
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -16,26 +17,38 @@
 
    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
 
    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"
 
 %{
 
 %option nodefault noyywrap nounput never-interactive debug
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{

-#include "system.h"
+/* 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

 
 

+#define FLEX_NO_OBSTACK
+#define FLEX_PREFIX(Id) skel_ ## Id
+#include "flex-scanner.h"
+
+#include <dirname.h>

 #include <error.h>
 #include <quotearg.h>
 
 #include "complain.h"
 #include "getargs.h"
 #include "files.h"
 #include <error.h>
 #include <quotearg.h>
 
 #include "complain.h"
 #include "getargs.h"
 #include "files.h"

+#include "scan-skel.h"

 
 int skel_lex (void);
 
 #define QPUTS(String) \
 
 int skel_lex (void);
 
 #define QPUTS(String) \

-   fputs (quotearg_style (c_quoting_style, (String)), yyout)
+   fputs (quotearg_style (c_quoting_style, String), yyout)
+
+#define BASE_QPUTS(File) \
+   QPUTS (last_component (File))

 
 %}
 %%
 
 %}
 %%


@@ -46,25 +59,28 @@ 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 == '@')
+  /* 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)
+       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);
     }

-

   if (outname)
     {
       free (outname);
       xfclose (yyout);
     }
   if (outname)
     {
       free (outname);
       xfclose (yyout);
     }

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

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


@@ -75,23 +91,29 @@ int skel_lex (void);
 
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 
 "@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);
 \n        lineno++; ECHO;
 [^@\n]+           ECHO;
 
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
 \n        lineno++; ECHO;
 [^@\n]+           ECHO;
 

-<<EOF>>           free (outname); xfclose (yyout); return EOF;
+<<EOF>> {
+  if (outname)
+    {
+      free (outname);
+      xfclose (yyout);
+    }
+  return EOF;
+}

 %%
 
 /*------------------------.
 | Scan a Bison skeleton.  |
 `------------------------*/
 
 %%
 
 /*------------------------.
 | Scan a Bison skeleton.  |
 `------------------------*/
 

-void scan_skel (FILE *);
-

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