Revert "introduced a GCC-like -Werror=type"

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

diff --git a/src/scan-skel.l b/src/scan-skel.l
index c84eea132ae50a2d48b48ca872e6a9a37b0a2067..5126d5f2f87c924547ad48ba21765120a790186d 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,26 +1,23 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* Scan Bison Skeletons.                                       -*- C -*-
 

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

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

-   Bison is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
    You should have received a copy of the GNU General Public License
 
    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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-%option nodefault noyywrap nounput never-interactive debug
+%option nodefault noyywrap noinput nounput never-interactive debug

 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{


@@ -29,87 +26,67 @@
 #undef skel_wrap
 #define skel_wrap() 1
 
 #undef skel_wrap
 #define skel_wrap() 1
 

-#include "system.h"
+#define FLEX_PREFIX(Id) skel_ ## Id
+#include <src/flex-scanner.h>

 
 

+#include <dirname.h>

 #include <error.h>
 #include <quotearg.h>
 
 #include <error.h>
 #include <quotearg.h>
 

-#include "complain.h"
-#include "getargs.h"
-#include "files.h"
-#include "scan-skel.h"
-
-/* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used.  */
-int skel_lex (void);
-int skel_get_lineno (void);
-FILE *skel_get_in (void);
-FILE *skel_get_out (void);
-int skel_get_leng (void);
-char *skel_get_text (void);
-void skel_set_lineno (int);
-void skel_set_in (FILE *);
-void skel_set_out (FILE *);
-int skel_get_debug (void);
-void skel_set_debug (int);
-int skel_lex_destroy (void);
-
-#define QPUTS(String) \
-   fputs (quotearg_style (c_quoting_style, String), yyout)
-
-#define BASE_QPUTS(File) \
-   QPUTS (base_name (File))
+#include <src/complain.h>
+#include <src/getargs.h>
+#include <src/files.h>
+#include <src/scan-skel.h>

 
 

+#define YY_DECL static int skel_lex (void)
+YY_DECL;
+
+static void at_directive_perform (int argc, char *argv[],
+                                  char **outnamep, int *out_linenop);
+static void fail_for_at_directive_too_many_args (char const *at_directive_name);
+static void fail_for_at_directive_too_few_args (char const *at_directive_name);
+static void fail_for_invalid_at (char const *at);

 %}
 %}

+
+%x SC_AT_DIRECTIVE_ARGS
+%x SC_AT_DIRECTIVE_SKIP_WS
+

 %%
 
 %{
 %%
 
 %{

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

   char *outname = NULL;
   char *outname = NULL;

+
+  /* 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.  argv[0] is the directive name.  */
+  #define ARGC_MAX 8
+  int argc = 0;
+  char *argv[ARGC_MAX];

 %}
 
 %}
 

-"@output ".*\n {
-  char const *file_name = yytext + sizeof "@output " - 1;
-  yytext[yyleng - 1] = '\0';
+"@@" fputc ('@', yyout);
+"@{" fputc ('[', yyout);
+"@}" fputc (']', yyout);
+"@`" continue;  /* Used by b4_cat in ../data/bison.m4.  */
+@\n  continue;

 
 

-  /* 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.  */
+"@oline@"  fprintf (yyout, "%d", out_lineno + 1);
+"@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);

 
 

-  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;
+@[a-z_]+"(" {
+  yytext[yyleng-1] = '\0';
+  obstack_grow (&obstack_for_string, yytext, yyleng);
+  argv[argc++] = obstack_finish (&obstack_for_string);
+  BEGIN SC_AT_DIRECTIVE_ARGS;

 }
 
 }
 

-"@@"      fputc ('@', yyout);
-"@{"      fputc ('[', yyout);
-"@}"      fputc (']', yyout);
-
-"@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);
-

   /* 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]+           ECHO;
+@[^@{}`(\n]* fail_for_invalid_at (yytext);
+\n         out_lineno++; ECHO;
+[^@\n]+    ECHO;

 
 

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

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


@@ -117,6 +94,49 @@ int skel_lex_destroy (void);
     }
   return EOF;
 }
     }
   return EOF;
 }

+
+<SC_AT_DIRECTIVE_ARGS>
+{
+  [^@]+  STRING_GROW;
+
+  "@@"   obstack_1grow (&obstack_for_string, '@');
+  "@{"   obstack_1grow (&obstack_for_string, '[');
+  "@}"   obstack_1grow (&obstack_for_string, ']');
+  "@`"   continue; /* For starting an argument that begins with whitespace. */
+  @\n    continue;
+
+  @[,)] {
+    if (argc >= ARGC_MAX)
+      fail_for_at_directive_too_many_args (argv[0]);
+
+    argv[argc++] = obstack_finish0 (&obstack_for_string);
+
+    /* Like M4, skip whitespace after a comma.  */
+    if (yytext[1] == ',')
+      BEGIN SC_AT_DIRECTIVE_SKIP_WS;
+    else
+      {
+        at_directive_perform (argc, argv, &outname, &out_lineno);
+        obstack_free (&obstack_for_string, argv[0]);
+        argc = 0;
+        BEGIN INITIAL;
+      }
+  }
+
+  @.?  fail_for_invalid_at (yytext);
+}
+
+<SC_AT_DIRECTIVE_SKIP_WS>
+{
+  [ \t\r\n]    continue;
+  .            yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
+}
+
+<SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>
+{
+  <<EOF>>  complain (fatal, _("unclosed %s directive in skeleton"), argv[0]);
+}
+

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


@@ -126,9 +146,140 @@ int skel_lex_destroy (void);
 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 ();
   skel_in = in;
   skel__flex_debug = trace_flag & trace_skeleton;
   skel_lex ();

+}
+
+void
+skel_scanner_free (void)
+{
+  obstack_free (&obstack_for_string, 0);

   /* Reclaim Flex's buffers.  */
   /* Reclaim Flex's buffers.  */

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

 }
 }