X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f518dbaf46eb28bd39695474de6118683d905e5f..baa423bd59767a687ad742adc66a5b7428a41dee:/src/scan-skel.l diff --git a/src/scan-skel.l b/src/scan-skel.l index e15294a1..22756267 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -1,6 +1,6 @@ /* Scan Bison Skeletons. -*- C -*- - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -41,12 +41,11 @@ #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 (int at_directive_argc, - char *at_directive_argv[], - char **outnamep, int *out_linenop); +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); @@ -59,95 +58,99 @@ static void fail_for_invalid_at (char const *at); %{ int out_lineno PACIFY_CC (= 0); - 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. at_directive_argv[0] is the directive name. */ - #define AT_DIRECTIVE_ARGC_MAX 8 - int at_directive_argc = 0; - char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX]; + 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); -"@`" /* Empty. Used by b4_cat in ../data/bison.m4. */ -@\n /* Likewise. */ +"@'" 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); +"@ofile@" fputs (quotearg_style (c_quoting_style, out_name), yyout); -@[a-z_]+"(" { - yytext[yyleng-1] = '\0'; - obstack_grow (&obstack_for_string, yytext, yyleng); - at_directive_argv[at_directive_argc++] = - obstack_finish (&obstack_for_string); - 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; } -{ - [^@]+ { STRING_GROW; } + +{ + [^@]+ STRING_GROW; - "@@" { obstack_1grow (&obstack_for_string, '@'); } - "@{" { obstack_1grow (&obstack_for_string, '['); } - "@}" { obstack_1grow (&obstack_for_string, ']'); } - "@`" /* Empty. Useful for starting an argument - that begins with whitespace. */ - @\n /* Empty. */ + "@@" 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 (at_directive_argv[0]); + 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 (at_directive_argc, at_directive_argv, - &outname, &out_lineno); - obstack_free (&obstack_for_string, at_directive_argv[0]); - at_directive_argc = 0; + aver (at_ptr); + at_ptr (argc, argv, &out_name, &out_lineno); + obstack_free (&obstack_for_string, argv[0]); + argc = 0; BEGIN INITIAL; } } - @.? { 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_argv[0]); - } + +{ + <> 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. | `------------------------*/ @@ -174,132 +177,95 @@ skel_scanner_free (void) yylex_destroy (); } +static inline warnings +flag (const char *arg) +{ + /* 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_directive_perform (int at_directive_argc, - char *at_directive_argv[], - char **outnamep, int *out_linenop) +at_basename (int argc, char *argv[], char **out_namep, int *out_linenop) { - if (STREQ (at_directive_argv[0], "@basename")) - { - if (at_directive_argc > 2) - fail_for_at_directive_too_many_args (at_directive_argv[0]); - fputs (last_component (at_directive_argv[1]), yyout); - } - else if (STREQ (at_directive_argv[0], "@warn") - || STREQ (at_directive_argv[0], "@complain") - || STREQ (at_directive_argv[0], "@fatal")) - { - void (*func)(char const *, ...); - switch (at_directive_argv[0][1]) - { - case 'w': func = warn; break; - case 'c': func = complain; break; - case 'f': func = fatal; break; - default: aver (false); break; - } - switch (at_directive_argc) - { - case 2: - func (_(at_directive_argv[1])); - break; - case 3: - func (_(at_directive_argv[1]), at_directive_argv[2]); - break; - case 4: - func (_(at_directive_argv[1]), at_directive_argv[2], - at_directive_argv[3]); - break; - case 5: - func (_(at_directive_argv[1]), at_directive_argv[2], - at_directive_argv[3], at_directive_argv[4]); - break; - case 6: - func (_(at_directive_argv[1]), at_directive_argv[2], - at_directive_argv[3], at_directive_argv[4], - at_directive_argv[5]); - break; - default: - fail_for_at_directive_too_many_args (at_directive_argv[0]); - break; - } - } - else if (STREQ (at_directive_argv[0], "@warn_at") - || STREQ (at_directive_argv[0], "@complain_at") - || STREQ (at_directive_argv[0], "@fatal_at")) + (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 < 4) - fail_for_at_directive_too_few_args (at_directive_argv[0]); - switch (at_directive_argv[0][1]) - { - case 'w': func = warn_at; break; - case 'c': func = complain_at; break; - case 'f': func = fatal_at; break; - default: aver (false); break; - } - boundary_set_from_string (&loc.start, at_directive_argv[1]); - boundary_set_from_string (&loc.end, at_directive_argv[2]); - switch (at_directive_argc) - { - case 4: - func (loc, _(at_directive_argv[3])); - break; - case 5: - func (loc, _(at_directive_argv[3]), at_directive_argv[4]); - break; - case 6: - func (loc, _(at_directive_argv[3]), at_directive_argv[4], - at_directive_argv[5]); - break; - case 7: - func (loc, _(at_directive_argv[3]), at_directive_argv[4], - at_directive_argv[5], at_directive_argv[6]); - break; - case 8: - func (loc, _(at_directive_argv[3]), at_directive_argv[4], - at_directive_argv[5], at_directive_argv[6], - at_directive_argv[7]); - break; - default: - fail_for_at_directive_too_many_args (at_directive_argv[0]); - break; - } + boundary_set_from_string (&loc.start, argv[2]); + boundary_set_from_string (&loc.end, argv[3]); + locp = &loc; } - else if (STREQ (at_directive_argv[0], "@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 > 2) - fail_for_at_directive_too_many_args (at_directive_argv[0]); - if (*outnamep) - { - free (*outnamep); - xfclose (yyout); - } - *outnamep = xstrdup (at_directive_argv[1]); - output_file_name_check (outnamep); - yyout = xfopen (*outnamep, "w"); - *out_linenop = 1; + free (*out_namep); + xfclose (yyout); } - else - fail_for_invalid_at (at_directive_argv[0]); + *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 (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 (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); }