Update etc/bench.pl. Optimize push mode a little (the yyn change

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index b14fb40c1f5e467de957a116e2cbe89e6267c35c..4bba4ac4063d42b9d869d53d51f68f83a561e13d 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.
 


@@ -28,8 +29,11 @@
 #undef skel_wrap
 #define skel_wrap() 1
 
 #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>
 
 #include <error.h>
 #include <quotearg.h>
 


@@ -38,12 +42,12 @@
 #include "files.h"
 #include "scan-skel.h"
 
 #include "files.h"
 #include "scan-skel.h"
 

-#define QPUTS(String) \
-   fputs (quotearg_style (c_quoting_style, (String)), yyout)
+int skel_lex (void);

 
 

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

 
 

+static char *decode_at_digraphs (char *in);

 %}
 %%
 
 %}
 %%
 


@@ -53,34 +57,15 @@
 %}
 
 "@output ".*\n {
 %}
 
 "@output ".*\n {

-  char const *file_name = yytext + sizeof "@output " - 1;
+  char *file_name = yytext + sizeof "@output " - 1;

   yytext[yyleng - 1] = '\0';
   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)
-       {
-         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
-       fatal ("invalid token in skeleton: %s", yytext);
-    }

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

-  outname = xstrdup (file_name);
+  outname = decode_at_digraphs (file_name);
+  output_file_name_check (outname);

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


@@ -92,8 +77,14 @@
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);

-"@output_parser_name@" BASE_QPUTS (parser_file_name);
-"@output_header_name@" BASE_QPUTS (spec_defines_file);
+
+"@basename(".*"@)" {
+  char *file_name = yytext + sizeof "@basename " - 1;
+  yytext[yyleng - 2] = '\0';
+  file_name = decode_at_digraphs (file_name);
+  fputs (last_component (file_name), yyout);
+  free (file_name);
+}

 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);


@@ -121,5 +112,33 @@ scan_skel (FILE *in)
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
   /* Reclaim Flex's buffers.  */
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
   /* Reclaim Flex's buffers.  */

-  yy_delete_buffer (YY_CURRENT_BUFFER);
+  yylex_destroy ();
+}
+
+static char *
+decode_at_digraphs (char *in)
+{
+  char *out_start = xnmalloc (strlen (in)+1, sizeof *out_start);
+  char *out;
+  for (out = out_start; *in != '\0'; ++in, ++out)
+    {
+      if (*in == '@')
+        {
+          switch (*++in)
+            {
+              case '@': *out = '@'; break;
+              case '{': *out = '['; break;
+              case '}': *out = ']'; break;
+              default:
+                if (*in != '\0')
+                  in[1] = '\0';
+                fatal ("invalid @ in skeleton: %s", in-1);
+                break;
+            }
+        }
+      else
+        *out = *in;
+    }
+  *out = '\0';
+  return out_start;

 }
 }