summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-11-29 04:31:35 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-11-29 04:31:35 +0000
commit189a8d328ad3183232385bd1ceea6a0557c5cc1b (patch)
tree0e8228bae66927cc42e25fc3a674fa2519140470
parent3d06fba36aaf6d0e66e60fba15af8837414b9ff9 (diff)
downloadmandoc-189a8d328ad3183232385bd1ceea6a0557c5cc1b.tar.gz
Reduce code duplication by reusing the same argument parser
for in_line_eoln() macros and .Bl -column phrases. No functional change.
-rw-r--r--mdoc_macro.c38
1 files changed, 20 insertions, 18 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 11dbf844..47ec5b8a 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -57,7 +57,8 @@ static enum mdoct lookup(enum mdoct, const char *);
static int macro_or_word(MACRO_PROT_ARGS, int);
static int make_pending(struct mdoc_node *, enum mdoct,
struct mdoc *, int, int);
-static void phrase(struct mdoc *, int, int *, char *);
+static int parse_rest(struct mdoc *, enum mdoct,
+ int, int *, char *);
static enum mdoct rew_alt(enum mdoct);
static enum rew rew_dohalt(enum mdoct, enum mdoc_type,
const struct mdoc_node *);
@@ -1181,7 +1182,7 @@ blk_full(MACRO_PROT_ARGS)
mdoc->flags |= MDOC_PPHRASE;
if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
mdoc->flags |= MDOC_PPHRASE;
- phrase(mdoc, line, &la, buf);
+ parse_rest(mdoc, MDOC_MAX, line, &la, buf);
mdoc->flags &= ~MDOC_PPHRASE;
continue;
}
@@ -1473,7 +1474,6 @@ in_line_argn(MACRO_PROT_ARGS)
static void
in_line_eoln(MACRO_PROT_ARGS)
{
- int la;
struct mdoc_arg *arg;
if (tok == MDOC_Pp)
@@ -1481,15 +1481,28 @@ in_line_eoln(MACRO_PROT_ARGS)
mdoc_argv(mdoc, line, tok, &arg, pos, buf);
mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+ if (parse_rest(mdoc, tok, line, pos, buf))
+ return;
+ rew_elem(mdoc, tok);
+}
+
+/*
+ * The simplest argument parser available: Parse the remaining
+ * words until the end of the phrase or line and return 0
+ * or until the next macro, call that macro, and return 1.
+ */
+static int
+parse_rest(struct mdoc *mdoc, enum mdoct tok, int line, int *pos, char *buf)
+{
+ int la;
for (;;) {
la = *pos;
if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)
- break;
+ return(0);
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
- return;
+ return(1);
}
- rew_elem(mdoc, tok);
}
static void
@@ -1512,17 +1525,6 @@ ctx_synopsis(MACRO_PROT_ARGS)
* macro is encountered.
*/
static void
-phrase(struct mdoc *mdoc, int line, int *pos, char *buf)
-{
- int la;
-
- do
- la = *pos;
- while (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, NULL) != ARGS_EOLN &&
- !macro_or_word(mdoc, MDOC_MAX, line, la, pos, buf, 1));
-}
-
-static void
phrase_ta(MACRO_PROT_ARGS)
{
struct mdoc_node *n;
@@ -1542,5 +1544,5 @@ phrase_ta(MACRO_PROT_ARGS)
rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos);
mdoc_body_alloc(mdoc, line, ppos, MDOC_It);
- phrase(mdoc, line, pos, buf);
+ parse_rest(mdoc, MDOC_MAX, line, pos, buf);
}