[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] scan-skel.l: split @directive functions
From: |
Theophile Ranquet |
Subject: |
[PATCH 4/6] scan-skel.l: split @directive functions |
Date: |
Thu, 4 Oct 2012 10:35:43 +0000 |
* src/scan-skel.l (at_directive_perform): Split as...
(at_basename, at_complain, at_output): These.
---
src/scan-skel.l | 106 ++++++++++++++++++++++++++++++--------------------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/src/scan-skel.l b/src/scan-skel.l
index 57c3f1e..e505373 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -41,8 +41,9 @@
#define YY_DECL static int skel_lex (void)
YY_DECL;
-static void at_directive_perform (int argc, char *argv[],
- char **outnamep, int *out_linenop);
+static void at_basename (int argc, char *argv[]);
+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_few_args (char const *at_directive_name);
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;
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]);
argc = 0;
BEGIN INITIAL;
@@ -169,67 +178,66 @@ static inline warnings
flag (const char *arg)
{
/* compare with values issued from b4_error */
- if (STREQ (arg, "warn"))
- return Wother;
- else if (STREQ (arg, "complain"))
+ if (STREQ (arg, "complain"))
return complaint;
else if (STREQ (arg, "fatal"))
return fatal;
else if (STREQ (arg, "note"))
return silent;
+ else if (STREQ (arg, "warn"))
+ return Wother;
else
aver (false);
}
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 (argc > 2)
- fail_for_at_directive_too_many_args (argv[0]);
- fputs (last_component (argv[1]), yyout);
- }
- else if (STREQ (argv[0], "@complain"))
+ if (argc > 2)
+ fail_for_at_directive_too_many_args (argv[0]);
+ fputs (last_component (argv[1]), yyout);
+}
+
+static void
+at_complain (int argc, char *argv[])
+{
+ static unsigned indent;
+ if (argc < 4)
+ fail_for_at_directive_too_few_args (argv[1]);
+ warnings w = flag (argv[1]);
+ if ((w & silent) != silent)
+ indent = 0;
+ location loc;
+ location *locp = NULL;
+ if (argv[2] && argv[2][0])
{
- static unsigned indent;
- if (argc < 4)
- fail_for_at_directive_too_few_args (argv[0]);
- warnings w = flag (argv[1]);
- if ((w & silent) != silent)
- indent = 0;
- location loc;
- location *locp = NULL;
- if (argv[2] && argv[2][0])
- {
- boundary_set_from_string (&loc.start, argv[2]);
- boundary_set_from_string (&loc.end, argv[3]);
- locp = &loc;
- }
- argc -= 3;
- argv += 3;
- if ((w & silent) == silent)
- indent += SUB_INDENT;
- complain_args (locp, w, &indent, argc, argv);
- if ((w & silent) == silent)
- indent -= SUB_INDENT;
+ boundary_set_from_string (&loc.start, argv[2]);
+ boundary_set_from_string (&loc.end, argv[3]);
+ locp = &loc;
}
- else if (STREQ (argv[0], "@output"))
+ argc -= 3;
+ argv += 3;
+ if ((w & silent) == silent)
+ indent += SUB_INDENT;
+ complain_args (locp, w, &indent, argc, argv);
+ if ((w & silent) == silent)
+ indent -= SUB_INDENT;
+}
+
+static void
+at_output (int argc, char *argv[], char **outnamep, int *out_linenop)
+{
+ if (argc > 2)
+ fail_for_at_directive_too_many_args (argv[0]);
+ if (*outnamep)
{
- 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;
+ free (*outnamep);
+ xfclose (yyout);
}
- else
- fail_for_invalid_at (argv[0]);
+ *outnamep = xstrdup (argv[1]);
+ output_file_name_check (outnamep);
+ yyout = xfopen (*outnamep, "w");
+ *out_linenop = 1;
}
static void
--
1.7.11.4
- [PATCH 0/6] fix a missing context indent, and scan-skel rework, Theophile Ranquet, 2012/10/04
- [PATCH 1/6] errors: pointerize complain_at_indent, Theophile Ranquet, 2012/10/04
- [PATCH 4/6] scan-skel.l: split @directive functions,
Theophile Ranquet <=
- [PATCH 2/6] errors: factor b4_error @directives, Theophile Ranquet, 2012/10/04
- [PATCH 3/6] errors: support indented context info in m4 macros, Theophile Ranquet, 2012/10/04
- [PATCH 5/6] scan-skel.l: recognize the @directives directly in scanner, Theophile Ranquet, 2012/10/04
- [PATCH 6/6] scan-skel.l: change fail_for_invalid_at prototype, Theophile Ranquet, 2012/10/04