Work around portability problems with Visual Age C compiler

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 3191f819204281932f00740e24485cf78d13ec53..06370fa6dedca1012806dd4ef4257a9d71412c53 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* Scan Bison Skeletons.                                       -*- C -*-
 

-   Copyright (C) 2001, 2002, 2003, 2004 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -16,13 +16,18 @@
 
    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"
 
 %{

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


@@ -31,8 +36,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,22 +50,25 @@ 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);
     }
 

-  free (outname);
-  outname = xstrdup (filename);
-  xfclose (yyout);
+  if (outname)
+    {
+      free (outname);
+      xfclose (yyout);
+    }
+  outname = xstrdup (file_name);

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


@@ -72,23 +79,29 @@ 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_parser_name@" QPUTS (parser_file_name);

-"@output_header_name@"  QPUTS (spec_defines_file);
+"@output_header_name@" 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>>           xfclose (yyout); free (outname); 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)
 {