X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d4bdb9167769a7247ac7c93c03fbe9ff7c238d34..baa423bd59767a687ad742adc66a5b7428a41dee:/src/scan-skel.l?ds=sidebyside
diff --git a/src/scan-skel.l b/src/scan-skel.l
index aab570c6..22756267 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, 2007 Free Software
- Foundation, Inc.
+ Copyright (C) 2001-2015 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"
%{
@@ -30,167 +27,130 @@
#define skel_wrap() 1
#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
#define YY_DECL static int skel_lex (void)
YY_DECL;
-#define QPUTS(String) \
- 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);
+typedef void (*at_directive)(int, char**, char **, int*);
+static void at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun);
+static void at_basename (int argc, char *argv[], char**, int*);
+static void at_complain (int argc, char *argv[], char**, int*);
+static void at_output (int argc, char *argv[], char **name, int *lineno);
+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);
-
-/* In SC_AT_DIRECTIVE_ARG context, the name of the directive. */
-static char *at_directive_name = 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. */
-#define AT_DIRECTIVE_ARGC_MAX 7
-static int at_directive_argc = 0;
-static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%}
-%x SC_AT_GETTEXT_ARG
%x SC_AT_DIRECTIVE_ARGS
%x SC_AT_DIRECTIVE_SKIP_WS
%%
%{
- int out_lineno IF_LINT (= 0);
- char *outname = NULL;
+ int out_lineno PACIFY_CC (= 0);
+ char *out_name = NULL;
+
+ /* Currently, only the @complain directive takes multiple arguments, and
+ never more than 7, with argv[0] being the directive name and argv[1]
+ being the type of complaint to dispatch. */
+#define ARGC_MAX 9
+ int argc = 0;
+ char *argv[ARGC_MAX];
+ at_directive at_ptr = NULL;
%}
-"@@" 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", out_lineno + 1);
-"@ofile@" QPUTS (outname);
-"@dir_prefix@" QPUTS (dir_prefix);
-
-"@gettext<" BEGIN SC_AT_GETTEXT_ARG;
+"@ofile@" fputs (quotearg_style (c_quoting_style, out_name), yyout);
-@[a-z_]+"(" {
- yytext[yyleng-1] = '\0';
- at_directive_name = xstrdup (yytext);
- BEGIN SC_AT_DIRECTIVE_ARGS;
-}
+"@basename(" at_init (&argc, argv, &at_ptr, &at_basename);
+"@complain(" at_init (&argc, argv, &at_ptr, &at_complain);
+"@output(" at_init (&argc, argv, &at_ptr, &at_output);
/* This pattern must not match more than the previous @ patterns. */
-@[^<@{}(\n]* fail_for_invalid_at (yytext);
-\n out_lineno++; ECHO;
-[^@\n]+ ECHO;
+@[^@{}\'(\n]* fail_for_invalid_at (yytext);
+\n out_lineno++; ECHO;
+[^@\n]+ ECHO;
<> {
- if (outname)
+ if (out_name)
{
- free (outname);
+ free (out_name);
xfclose (yyout);
}
return EOF;
}
-{
- "@>" {
- char *arg;
- obstack_1grow (&obstack_for_string, '\0');
- arg = obstack_finish (&obstack_for_string);
- if (!at_directive_name)
- {
- fprintf (yyout, "%s", _(arg));
- obstack_free (&obstack_for_string, arg);
- BEGIN INITIAL;
- }
- else
- {
- char const *translated = _(arg);
- size_t parent_size = strlen (at_directive_argv[at_directive_argc]);
- size_t translated_size = strlen (translated);
- char *copy = xmalloc (parent_size + translated_size + 1);
- strcpy (copy, at_directive_argv[at_directive_argc]);
- strcpy (copy + parent_size, translated);
- obstack_free (&obstack_for_string,
- at_directive_argv[at_directive_argc]);
- obstack_grow (&obstack_for_string, copy,
- parent_size + translated_size);
- free (copy);
- BEGIN SC_AT_DIRECTIVE_ARGS;
- }
- }
-}
+
+{
+ [^@]+ STRING_GROW;
-{
- "@`" /* Emtpy. Useful for starting an argument
- that begins with whitespace. */
-
- "@gettext<" {
- 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);
- BEGIN SC_AT_GETTEXT_ARG;
- }
+ "@@" 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 (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
- fail_for_at_directive_too_many_args ();
+ if (argc >= ARGC_MAX)
+ fail_for_at_directive_too_many_args (argv[0]);
- obstack_1grow (&obstack_for_string, '\0');
- at_directive_argv[at_directive_argc++] =
- obstack_finish (&obstack_for_string);
+ 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 (&outname, &out_lineno);
- obstack_free (&obstack_for_string, at_directive_argv[0]);
- at_directive_argc = 0;
- free (at_directive_name);
- at_directive_name = NULL;
+ aver (at_ptr);
+ at_ptr (argc, argv, &out_name, &out_lineno);
+ obstack_free (&obstack_for_string, argv[0]);
+ argc = 0;
BEGIN INITIAL;
}
}
-}
-{
- [^@]+ { STRING_GROW; }
- "@@" { obstack_1grow (&obstack_for_string, '@'); }
- "@{" { obstack_1grow (&obstack_for_string, '['); }
- "@}" { obstack_1grow (&obstack_for_string, ']'); }
- @.? { fail_for_invalid_at (yytext); }
+ @.? fail_for_invalid_at (yytext);
}
-{
- [ \t\r\n]
- . { yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS; }
+
+{
+ [ \t\r\n] continue;
+ . yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
}
-{
- <> {
- fatal (_("unclosed %s directive in skeleton"),
- at_directive_name ? at_directive_name : "@gettext");
- }
+
+{
+ <> complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);
}
%%
+static void
+at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun)
+{
+ *at_ptr = fun;
+ yytext[yyleng-1] = '\0';
+ obstack_grow (&obstack_for_string, yytext, yyleng);
+ argv[(*argc)++] = obstack_finish (&obstack_for_string);
+ BEGIN SC_AT_DIRECTIVE_ARGS;
+}
+
/*------------------------.
| Scan a Bison skeleton. |
`------------------------*/
@@ -207,140 +167,105 @@ scan_skel (FILE *in)
skel_in = in;
skel__flex_debug = trace_flag & trace_skeleton;
skel_lex ();
- /* Reclaim Flex's buffers. */
- yylex_destroy ();
}
void
skel_scanner_free (void)
{
obstack_free (&obstack_for_string, 0);
+ /* Reclaim Flex's buffers. */
+ yylex_destroy ();
}
-static
-void at_directive_perform (char **outnamep, int *out_linenop)
+static inline warnings
+flag (const char *arg)
{
- 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"))
+ /* compare with values issued from b4_error */
+ if (STREQ (arg, "complain"))
+ return complaint;
+ else if (STREQ (arg, "deprecated"))
+ return Wdeprecated;
+ else if (STREQ (arg, "fatal"))
+ return fatal;
+ else if (STREQ (arg, "note"))
+ return silent | complaint | no_caret;
+ else if (STREQ (arg, "warn"))
+ return Wother;
+ else
+ abort ();
+}
+
+static void
+at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)
+{
+ (void) out_namep;
+ (void) out_linenop;
+ if (2 < argc)
+ fail_for_at_directive_too_many_args (argv[0]);
+ fputs (last_component (argv[1]), yyout);
+}
+
+static void
+at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
+{
+ static unsigned indent;
+ warnings w = flag (argv[1]);
+ location loc;
+ location *locp = NULL;
+
+ (void) out_namep;
+ (void) out_linenop;
+
+ if (argc < 4)
+ fail_for_at_directive_too_few_args (argv[0]);
+ if (argv[2] && argv[2][0])
{
- 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;
- }
+ boundary_set_from_string (&loc.start, argv[2]);
+ boundary_set_from_string (&loc.end, argv[3]);
+ locp = &loc;
}
- else if (0 == strcmp (at_directive_name, "@output"))
+ if (w & silent)
+ indent += SUB_INDENT;
+ else
+ indent = 0;
+ complain_args (locp, w, &indent, argc - 4, argv + 4);
+ if (w & silent)
+ indent -= SUB_INDENT;
+}
+
+static void
+at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
+{
+ if (2 < argc)
+ fail_for_at_directive_too_many_args (argv[0]);
+ if (*out_namep)
{
- 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;
+ free (*out_namep);
+ xfclose (yyout);
}
- else
- fail_for_invalid_at (at_directive_name);
+ *out_namep = xstrdup (argv[1]);
+ output_file_name_check (out_namep, true);
+ /* If there were errors, do not generate the output. */
+ yyout = xfopen (complaint_status ? "/dev/null" : *out_namep, "w");
+ *out_linenop = 1;
}
static void
-fail_for_at_directive_too_few_args (void)
+fail_for_at_directive_too_few_args (char const *at_directive_name)
{
- fatal (_("too few arguments for %s directive in skeleton"),
- 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 (void)
+fail_for_at_directive_too_many_args (char const *at_directive_name)
{
- fatal (_("too many arguments for %s directive in skeleton"),
- 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)
{
- fatal ("invalid @ in skeleton: %s", at);
+ complain (NULL, fatal, "invalid @ in skeleton: %s", at);
}