* NEWS, data/c++-skel.m4, data/c++.m4, data/c-skel.m4, data/c.m4,

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 06370fa6dedca1012806dd4ef4257a9d71412c53..d9ca8e28c6427d33cad716b9caaf70849c9d4ef8 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, 2007 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,10 @@
 #undef skel_wrap
 #define skel_wrap() 1
 
 #undef skel_wrap
 #define skel_wrap() 1
 

-#include "system.h"
+#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,57 +41,58 @@
 #include "files.h"
 #include "scan-skel.h"
 
 #include "files.h"
 #include "scan-skel.h"
 

+#define YY_DECL static int skel_lex (void)
+YY_DECL;
+

 #define QPUTS(String) \
 #define QPUTS(String) \

-   fputs (quotearg_style (c_quoting_style, (String)), yyout)
+   fputs (quotearg_style (c_quoting_style, String), yyout)
+
+static void at_directive_perform (char **outnamep, int *out_linenop);
+static void fail_for_at_directive_too_many_args (void);
+static void fail_for_at_directive_too_few_args (void);
+static void fail_for_invalid_at (char const *at);

 
 

+/* In SC_AT_DIRECTIVE_ARG context, the name of the directive.  */
+static char *at_directive_name;
+
+/* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and
+   @fatal_at directives take multiple arguments, and the last three already
+   can't take more than 7.  */
+#define AT_DIRECTIVE_ARGC_MAX 7
+static int at_directive_argc = 0;
+static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];

 %}
 %}

+
+%x SC_AT_DIRECTIVE_ARG
+%x SC_AT_DIRECTIVE_SKIP_WS
+

 %%
 
 %{
 %%
 
 %{

-  int lineno IF_LINT (= 0);
+  int out_lineno IF_LINT (= 0);

   char *outname = NULL;
 %}
 
   char *outname = NULL;
 %}
 

-"@output ".*\n {
-  char const *file_name = yytext + sizeof "@output " - 1;
-  yytext[yyleng - 1] = '\0';
-
-  if (*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);
-    }
-
-  if (outname)
-    {
-      free (outname);
-      xfclose (yyout);
-    }
-  outname = xstrdup (file_name);
-  yyout = xfopen (outname, "w");
-  lineno = 1;
-}
-

 "@@"      fputc ('@', yyout);
 "@{"      fputc ('[', yyout);
 "@}"      fputc (']', yyout);
 
 "@@"      fputc ('@', yyout);
 "@{"      fputc ('[', yyout);
 "@}"      fputc (']', yyout);
 

-"@oline@"  fprintf (yyout, "%d", lineno + 1);
+"@oline@"  fprintf (yyout, "%d", out_lineno + 1);

 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);
 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);

-"@output_parser_name@" QPUTS (parser_file_name);
-"@output_header_name@" QPUTS (spec_defines_file);
+
+@[a-z_]+"(" {
+  yytext[yyleng-1] = '\0';
+  at_directive_name = xstrdup (yytext);
+  BEGIN SC_AT_DIRECTIVE_ARG;
+}

 
   /* This pattern must not match more than the previous @ patterns. */
 
   /* This pattern must not match more than the previous @ patterns. */

-@[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
-\n        lineno++; ECHO;
+@[^@{}(\n]* fail_for_invalid_at (yytext);
+\n        out_lineno++; ECHO;

 [^@\n]+           ECHO;
 
 [^@\n]+           ECHO;
 

-<<EOF>> {
+<INITIAL><<EOF>> {

   if (outname)
     {
       free (outname);
   if (outname)
     {
       free (outname);


@@ -96,6 +100,51 @@
     }
   return EOF;
 }
     }
   return EOF;
 }

+
+<SC_AT_DIRECTIVE_ARG>{
+  [^@]+ { STRING_GROW; }
+
+  "@@" { obstack_1grow (&obstack_for_string, '@'); }
+  "@{" { obstack_1grow (&obstack_for_string, '['); }
+  "@}" { obstack_1grow (&obstack_for_string, ']'); }
+  "@`" /* Emtpy.  Useful for starting an argument
+          that begins with whitespace. */
+
+  @[,)] {
+    if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
+      fail_for_at_directive_too_many_args ();
+
+    obstack_1grow (&obstack_for_string, '\0');
+    at_directive_argv[at_directive_argc++] =
+      obstack_finish (&obstack_for_string);
+
+    /* Like M4, skip whitespace after a comma.  */
+    if (yytext[1] == ',')
+      BEGIN SC_AT_DIRECTIVE_SKIP_WS;
+    else
+      {
+        at_directive_perform (&outname, &out_lineno);
+        obstack_free (&obstack_for_string, at_directive_argv[0]);
+        at_directive_argc = 0;
+        free (at_directive_name);
+        BEGIN INITIAL;
+      }
+  }
+
+  @.? { fail_for_invalid_at (yytext); }
+}
+
+<SC_AT_DIRECTIVE_SKIP_WS>{
+  [ \t\r\n]
+  . { yyless (0); BEGIN SC_AT_DIRECTIVE_ARG; }
+}
+
+<SC_AT_DIRECTIVE_ARG,SC_AT_DIRECTIVE_SKIP_WS>{
+  <<EOF>> {
+    fatal (_("unclosed %s directive in skeleton"), at_directive_name);
+  }
+}
+

 %%
 
 /*------------------------.
 %%
 
 /*------------------------.


@@ -105,9 +154,149 @@
 void
 scan_skel (FILE *in)
 {
 void
 scan_skel (FILE *in)
 {

+  static bool initialized = false;
+  if (!initialized)
+    {
+      initialized = true;
+      obstack_init (&obstack_for_string);
+    }

   skel_in = in;
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
   /* Reclaim Flex's buffers.  */
   skel_in = in;
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();
   /* Reclaim Flex's buffers.  */

-  yy_delete_buffer (YY_CURRENT_BUFFER);
+  yylex_destroy ();
+}
+
+void
+skel_scanner_free (void)
+{
+  obstack_free (&obstack_for_string, 0);
+}
+
+static
+void at_directive_perform (char **outnamep, int *out_linenop)
+{
+  if (0 == strcmp (at_directive_name, "@basename"))
+    {
+      if (at_directive_argc > 1)
+        fail_for_at_directive_too_many_args ();
+      fputs (last_component (at_directive_argv[0]), yyout);
+    }
+  else if (0 == strcmp (at_directive_name, "@warn")
+           || 0 == strcmp (at_directive_name, "@complain")
+           || 0 == strcmp (at_directive_name, "@fatal"))
+    {
+      void (*func)(char const *, ...);
+      switch (at_directive_name[1])
+        {
+          case 'w': func = warn; break;
+          case 'c': func = complain; break;
+          case 'f': func = fatal; break;
+          default: aver (false); func = NULL; break;
+        }
+      switch (at_directive_argc)
+        {
+          case 1:
+            func (_(at_directive_argv[0]));
+            break;
+          case 2:
+            func (_(at_directive_argv[0]), at_directive_argv[1]);
+            break;
+          case 3:
+            func (_(at_directive_argv[0]), at_directive_argv[1],
+                  at_directive_argv[2]);
+            break;
+          case 4:
+            func (_(at_directive_argv[0]), at_directive_argv[1],
+                  at_directive_argv[2], at_directive_argv[3]);
+            break;
+          case 5:
+            func (_(at_directive_argv[0]), at_directive_argv[1],
+                  at_directive_argv[2], at_directive_argv[3],
+                  at_directive_argv[4]);
+            break;
+          default:
+            fail_for_at_directive_too_many_args ();
+            break;
+        }
+    }
+  else if (0 == strcmp (at_directive_name, "@warn_at")
+           || 0 == strcmp (at_directive_name, "@complain_at")
+           || 0 == strcmp (at_directive_name, "@fatal_at"))
+    {
+      void (*func)(location, char const *, ...);
+      location loc;
+      if (at_directive_argc < 3)
+        fail_for_at_directive_too_few_args ();
+      switch (at_directive_name[1])
+        {
+          case 'w': func = warn_at; break;
+          case 'c': func = complain_at; break;
+          case 'f': func = fatal_at; break;
+          default: aver (false); func = NULL; break;
+        }
+      boundary_set_from_string (&loc.start, at_directive_argv[0]);
+      boundary_set_from_string (&loc.end, at_directive_argv[1]);
+      switch (at_directive_argc)
+        {
+          case 3:
+            func (loc, _(at_directive_argv[2]));
+            break;
+          case 4:
+            func (loc, _(at_directive_argv[2]), at_directive_argv[3]);
+            break;
+          case 5:
+            func (loc, _(at_directive_argv[2]), at_directive_argv[3],
+                  at_directive_argv[4]);
+            break;
+          case 6:
+            func (loc, _(at_directive_argv[2]), at_directive_argv[3],
+                  at_directive_argv[4], at_directive_argv[5]);
+            break;
+          case 7:
+            func (loc, _(at_directive_argv[2]), at_directive_argv[3],
+                  at_directive_argv[4], at_directive_argv[5],
+                  at_directive_argv[6]);
+            break;
+          default:
+            fail_for_at_directive_too_many_args ();
+            break;
+        }
+    }
+  else if (0 == strcmp (at_directive_name, "@output"))
+    {
+      if (at_directive_argc > 1)
+        fail_for_at_directive_too_many_args ();
+      if (*outnamep)
+        {
+          free (*outnamep);
+          xfclose (yyout);
+        }
+      *outnamep = xstrdup (at_directive_argv[0]);
+      output_file_name_check (*outnamep);
+      yyout = xfopen (*outnamep, "w");
+      *out_linenop = 1;
+    }
+  else
+    fail_for_invalid_at (at_directive_name);
+}
+
+static void
+fail_for_at_directive_too_few_args (void)
+{
+  fatal (_("too few arguments for %s directive in skeleton"),
+         at_directive_name);
+}
+
+static void
+fail_for_at_directive_too_many_args (void)
+{
+  fatal (_("too many arguments for %s directive in skeleton"),
+         at_directive_name);
+}
+
+static void
+fail_for_invalid_at (char const *at)
+{
+  fatal ("invalid @ in skeleton: %s", at);

 }
 }