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

scan-skel: split @directive functions

Browse Source 
* src/scan-skel.l (at_directive_perform): Split as...
(at_basename, at_complain, at_output): these.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-10-04 15:12:56 +02:00
committed by Akim Demaille
parent c6c8de1609
commit 896517cdf0
1 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/scan-skel.l
View File

@@ -41,8 +41,9 @@
#define YY_DECL static int skel_lex (void) #define YY_DECL static int skel_lex (void)
YY_DECL; YY_DECL;
static void at_directive_perform (int argc, char *argv[], static void at_basename (int argc, char *argv[]);
char **outnamep, int *out_linenop); static void at_complain (int argc, char *argv[]);
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_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_at_directive_too_few_args (char const *at_directive_name);
static void fail_for_invalid_at (char const *at); static void fail_for_invalid_at (char const *at);
@@ -116,7 +117,15 @@ static void fail_for_invalid_at (char const *at);
BEGIN SC_AT_DIRECTIVE_SKIP_WS; BEGIN SC_AT_DIRECTIVE_SKIP_WS;
else else
{ {
at_directive_perform (argc, argv, &outname, &out_lineno); if (STREQ (argv[0], "@basename"))
at_basename (argc, argv);
else if (STREQ (argv[0], "@complain"))
at_complain (argc, argv);
else if (STREQ (argv[0], "@output"))
at_output (argc, argv, &outname, &out_lineno);
else
fail_for_invalid_at (argv[0]);
obstack_free (&obstack_for_string, argv[0]); obstack_free (&obstack_for_string, argv[0]);
argc = 0; argc = 0;
BEGIN INITIAL; BEGIN INITIAL;
@@ -169,37 +178,36 @@ static inline warnings
flag (const char *arg) flag (const char *arg)
{ {
/* compare with values issued from b4_error */ /* compare with values issued from b4_error */
if (STREQ (arg, "warn")) if (STREQ (arg, "complain"))
return Wother;
else if (STREQ (arg, "complain"))
return complaint; return complaint;
else if (STREQ (arg, "fatal")) else if (STREQ (arg, "fatal"))
return fatal; return fatal;
else if (STREQ (arg, "note")) else if (STREQ (arg, "note"))
return silent; return silent;
else if (STREQ (arg, "warn"))
return Wother;
else else
aver (false); aver (false);
} }
static void static void
at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop) at_basename (int argc, char *argv[])
{ {
if (STREQ (argv[0], "@basename")) if (2 < argc)
{
if (argc > 2)
fail_for_at_directive_too_many_args (argv[0]); fail_for_at_directive_too_many_args (argv[0]);
fputs (last_component (argv[1]), yyout); fputs (last_component (argv[1]), yyout);
} }
else if (STREQ (argv[0], "@complain"))
static void
at_complain (int argc, char *argv[])
{ {
static unsigned indent; static unsigned indent;
if (argc < 4)
fail_for_at_directive_too_few_args (argv[0]);
warnings w = flag (argv[1]); warnings w = flag (argv[1]);
if ((w & silent) != silent)
indent = 0;
location loc; location loc;
location *locp = NULL; location *locp = NULL;
if (argc < 4)
fail_for_at_directive_too_few_args (argv[1]);
if (argv[2] && argv[2][0]) if (argv[2] && argv[2][0])
{ {
boundary_set_from_string (&loc.start, argv[2]); boundary_set_from_string (&loc.start, argv[2]);
@@ -208,13 +216,17 @@ at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
} }
if (w & silent) if (w & silent)
indent += SUB_INDENT; indent += SUB_INDENT;
else
indent = 0;
complain_args (locp, w, &indent, argc - 3, argv + 3); complain_args (locp, w, &indent, argc - 3, argv + 3);
if (w & silent) if (w & silent)
indent -= SUB_INDENT; indent -= SUB_INDENT;
} }
else if (STREQ (argv[0], "@output"))
static void
at_output (int argc, char *argv[], char **outnamep, int *out_linenop)
{ {
if (argc > 2) if (2 < argc)
fail_for_at_directive_too_many_args (argv[0]); fail_for_at_directive_too_many_args (argv[0]);
if (*outnamep) if (*outnamep)
{ {
@@ -226,9 +238,6 @@ at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
yyout = xfopen (*outnamep, "w"); yyout = xfopen (*outnamep, "w");
*out_linenop = 1; *out_linenop = 1;
} }
else
fail_for_invalid_at (argv[0]);
}
static void static void
fail_for_at_directive_too_few_args (char const *at_directive_name) fail_for_at_directive_too_few_args (char const *at_directive_name)