Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

warnings: organize variadic complaints call

Browse Source 
Move the dispatch of variadic complains to complain.c, rather than do
it in a scanner.

* src/complain.h, src/complain.c (complain_args): New.
* src/scan-skel.l (at_directive_perform): Use it.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-10-01 15:01:00 +00:00
committed by Akim Demaille
parent bb8e56ff67
commit 782e818718
3 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/complain.c
View File

@@ -161,3 +161,29 @@ complain_at_indent (location loc, warnings flags, unsigned *indent,
complains (&loc, flags, message, args);
va_end (args);
}
void
complain_args (location const *loc, warnings w, int argc, char *argv[])
{
switch (argc)
{
case 2:
complain (loc, w, "%s", _(argv[1]));
break;
case 3:
complain (loc, w, _(argv[1]), argv[2]);
break;
case 4:
complain (loc, w, _(argv[1]), argv[2], argv[3]);
break;
case 5:
complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4]);
break;
case 6:
complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
break;
default:
complain (loc, fatal, "too many arguments for complains");
break;
}
}

3
src/complain.h
View File

@@ -61,6 +61,9 @@ void warnings_print_categories (warnings warn_flags);
void complain (location const* loc, warnings flags, char const *message, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
/** Likewise, but with an \a argc/argv interface. */
void complain_args (location const *loc, warnings w, int argc, char *arg[]);
/** Make a complaint with location and some indentation. */
void complain_at_indent (location loc, warnings flags, unsigned *indent,
char const *message, ...)

71
src/scan-skel.l
View File

@@ -186,65 +186,26 @@ at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
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"))
else if (STREQ (argv[0], "@warn") || STREQ (argv[0], "@warn_at")
|| STREQ (argv[0], "@complain") || STREQ (argv[0], "@complain_at")
|| STREQ (argv[0], "@fatal") || STREQ (argv[0], "@fatal_at"))
{
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"))
{
warnings w = flag (argv[0]);
warnings w = flag (*argv);
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)
location *locp = NULL;
if (STREQ (*argv + strlen (*argv) - 3, "_at"))
{
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;
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]);
argc -= 2;
argv += 2;
locp = &loc;
}
else if (argc < 2)
fail_for_at_directive_too_few_args (argv[0]);
complain_args (locp, w, argc, argv);
}
else if (STREQ (argv[0], "@output"))
{