X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bd9d212b13d6ba9678bd55048bd8f5b55fa37e72..bb8e56ff67d289d15f1a4dc7f5e1502cd3bbfc24:/src/scan-skel.l
diff --git a/src/scan-skel.l b/src/scan-skel.l
index 4bba4ac4..9854727d 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,26 +1,23 @@
/* 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.
- 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
- 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 . */
-%option nodefault noyywrap nounput never-interactive debug
+%option nodefault noyywrap noinput nounput never-interactive debug
%option prefix="skel_" outfile="lex.yy.c"
%{
@@ -29,69 +26,67 @@
#undef skel_wrap
#define skel_wrap() 1
-#define FLEX_NO_OBSTACK
#define FLEX_PREFIX(Id) skel_ ## Id
-#include "flex-scanner.h"
+#include
#include
#include
#include
-#include "complain.h"
-#include "getargs.h"
-#include "files.h"
-#include "scan-skel.h"
+#include
+#include
+#include
+#include
-int skel_lex (void);
+#define YY_DECL static int skel_lex (void)
+YY_DECL;
-#define QPUTS(String) \
- fputs (quotearg_style (c_quoting_style, String), yyout)
-
-static char *decode_at_digraphs (char *in);
+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;
-%}
-"@output ".*\n {
- char *file_name = yytext + sizeof "@output " - 1;
- yytext[yyleng - 1] = '\0';
- if (outname)
- {
- free (outname);
- xfclose (yyout);
- }
- outname = decode_at_digraphs (file_name);
- output_file_name_check (outname);
- yyout = xfopen (outname, "w");
- lineno = 1;
-}
+ /* 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];
+%}
-"@@" fputc ('@', yyout);
-"@{" fputc ('[', yyout);
-"@}" fputc (']', yyout);
+"@@" fputc ('@', yyout);
+"@{" fputc ('[', yyout);
+"@}" fputc (']', yyout);
+"@`" continue; /* Used by b4_cat in ../data/bison.m4. */
+@\n continue;
-"@oline@" fprintf (yyout, "%d", lineno + 1);
-"@ofile@" QPUTS (outname);
-"@dir_prefix@" QPUTS (dir_prefix);
+"@oline@" fprintf (yyout, "%d", out_lineno + 1);
+"@ofile@" fputs (quotearg_style (c_quoting_style, outname), yyout);
-"@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);
+@[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;
}
/* 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;
-<> {
+<> {
if (outname)
{
free (outname);
@@ -99,6 +94,49 @@ static char *decode_at_digraphs (char *in);
}
return EOF;
}
+
+
+{
+ [^@]+ 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);
+}
+
+
+{
+ [ \t\r\n] continue;
+ . yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
+}
+
+
+{
+ <> complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);
+}
+
%%
/*------------------------.
@@ -108,37 +146,140 @@ static char *decode_at_digraphs (char *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 ();
+}
+
+void
+skel_scanner_free (void)
+{
+ obstack_free (&obstack_for_string, 0);
/* Reclaim Flex's buffers. */
yylex_destroy ();
}
-static char *
-decode_at_digraphs (char *in)
+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)
{
- char *out_start = xnmalloc (strlen (in)+1, sizeof *out_start);
- char *out;
- for (out = out_start; *in != '\0'; ++in, ++out)
+ 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 (NULL, w, "%s", _(argv[1]));
+ break;
+ case 3:
+ complain (NULL, w, _(argv[1]), argv[2]);
+ break;
+ case 4:
+ complain (NULL, w, _(argv[1]), argv[2], argv[3]);
+ break;
+ case 5:
+ complain (NULL, w, _(argv[1]), argv[2], argv[3], argv[4]);
+ break;
+ case 6:
+ complain (NULL, 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"))
{
- if (*in == '@')
+ 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)
{
- 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;
- }
+ case 4:
+ complain (&loc, w, "%s", _(argv[3]));
+ break;
+ case 5:
+ complain (&loc, w, _(argv[3]), argv[4]);
+ break;
+ case 6:
+ complain (&loc, w, _(argv[3]), argv[4], argv[5]);
+ break;
+ case 7:
+ complain (&loc, w, _(argv[3]), argv[4], argv[5], argv[6]);
+ break;
+ case 8:
+ complain (&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
- *out = *in;
}
- *out = '\0';
- return out_start;
+ 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 (NULL, 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 (NULL, fatal, _("too many arguments for %s directive in skeleton"),
+ at_directive_name);
+}
+
+static void
+fail_for_invalid_at (char const *at)
+{
+ complain (NULL, fatal, "invalid @ in skeleton: %s", at);
}