Simplify by making the mdoc parser callbacks void, and some cleanup;

no functional change, minus 50 lines of code.

diff --git a/libmdoc.h b/libmdoc.h
index aaf1448c257a1b252b8792c03229db27e3ce6b56..4e211d0756b4b1403fd70e37bea6857712d0cdce 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.91 2014/11/28 03:14:18 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.92 2014/11/28 04:47:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -56,7 +56,7 @@ struct        mdoc {
                        char *buf
 
 struct mdoc_macro {
-       int             (*fp)(MACRO_PROT_ARGS);
+       void            (*fp)(MACRO_PROT_ARGS);
        int               flags;
 #define        MDOC_CALLABLE    (1 << 0)
 #define        MDOC_PARSED      (1 << 1)
@@ -105,7 +105,7 @@ extern      const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
-int              mdoc_macro(MACRO_PROT_ARGS);
+void             mdoc_macro(MACRO_PROT_ARGS);
 void             mdoc_word_alloc(struct mdoc *, int, int, const char *);
 void             mdoc_word_append(struct mdoc *, const char *);
 void             mdoc_elem_alloc(struct mdoc *, int, int,
@@ -135,7 +135,7 @@ enum margserr         mdoc_args(struct mdoc *, int,
                        int *, char *, enum mdoct, char **);
 enum margserr    mdoc_zargs(struct mdoc *, int,
                        int *, char *, char **);
-int              mdoc_macroend(struct mdoc *);
+void             mdoc_macroend(struct mdoc *);
 enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS

diff --git a/mdoc.c b/mdoc.c
index 929d0208c7c0a718598a8268753dc58551be5a7f..9d9d356c130e8aef739dbb89d72dbea40a9a344a 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.231 2014/11/28 03:14:18 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.232 2014/11/28 04:47:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -194,7 +194,8 @@ int
 mdoc_endparse(struct mdoc *mdoc)
 {
 
-       return(mdoc_macroend(mdoc));
+       mdoc_macroend(mdoc);
+       return(1);
 }
 
 int
@@ -250,7 +251,7 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
            mdoc_ptext(mdoc, ln, buf, offs));
 }
 
-int
+void
 mdoc_macro(MACRO_PROT_ARGS)
 {
        assert(tok < MDOC_MAX);
@@ -260,7 +261,7 @@ mdoc_macro(MACRO_PROT_ARGS)
                        mandoc_vmsg(MANDOCERR_DT_LATE,
                            mdoc->parse, line, ppos,
                            "Dt %s", buf + *pos);
-                       return(1);
+                       return;
                }
        } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
                if (mdoc->meta.title == NULL) {
@@ -273,8 +274,7 @@ mdoc_macro(MACRO_PROT_ARGS)
                        mdoc->meta.vol = mandoc_strdup("LOCAL");
                mdoc->flags |= MDOC_PBODY;
        }
-
-       return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf));
+       (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 
 
@@ -606,7 +606,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
            LIST_column == n->norm->Bl.type) {
                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return(1);
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
@@ -615,7 +616,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
            LIST_column == n->parent->norm->Bl.type) {
                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return(1);
        }
 
        /*
@@ -693,7 +695,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
                mdoc->last->flags |= MDOC_EOS;
-
        return(1);
 }
 
@@ -765,8 +766,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         * into macro processing.
         */
 
-       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok)
-               return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf));
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
+               mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+               return(1);
+       }
 
        n = mdoc->last;
        assert(mdoc->last);
@@ -779,7 +782,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
            LIST_column == n->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return(1);
        }
 
        /*
@@ -793,13 +797,13 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
            MDOC_Bl == n->parent->tok &&
            LIST_column == n->parent->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return(1);
        }
 
        /* Normal processing of a macro. */
 
-       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
-               return(0);
+       mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 49ebf52590c082a2fe668b232e85705dbc05ab39..09a4de57efeb75d11b456ac7a91c781012c0ff0e 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.150 2014/11/28 03:14:18 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.151 2014/11/28 04:47:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -40,15 +40,15 @@ enum        rew {   /* see rew_dohalt() */
        REWIND_ERROR
 };
 
-static int             blk_full(MACRO_PROT_ARGS);
-static int             blk_exp_close(MACRO_PROT_ARGS);
-static int             blk_part_exp(MACRO_PROT_ARGS);
-static int             blk_part_imp(MACRO_PROT_ARGS);
-static int             ctx_synopsis(MACRO_PROT_ARGS);
-static int             in_line_eoln(MACRO_PROT_ARGS);
-static int             in_line_argn(MACRO_PROT_ARGS);
-static int             in_line(MACRO_PROT_ARGS);
-static int             phrase_ta(MACRO_PROT_ARGS);
+static void            blk_full(MACRO_PROT_ARGS);
+static void            blk_exp_close(MACRO_PROT_ARGS);
+static void            blk_part_exp(MACRO_PROT_ARGS);
+static void            blk_part_imp(MACRO_PROT_ARGS);
+static void            ctx_synopsis(MACRO_PROT_ARGS);
+static void            in_line_eoln(MACRO_PROT_ARGS);
+static void            in_line_argn(MACRO_PROT_ARGS);
+static void            in_line(MACRO_PROT_ARGS);
+static void            phrase_ta(MACRO_PROT_ARGS);
 
 static void            dword(struct mdoc *, int, int, const char *,
                                 enum mdelim, int);
@@ -57,7 +57,7 @@ static        enum mdoct      lookup(enum mdoct, const char *);
 static enum mdoct      lookup_raw(const char *);
 static int             make_pending(struct mdoc_node *, enum mdoct,
                                struct mdoc *, int, int);
-static int             phrase(struct mdoc *, int, int, char *);
+static void            phrase(struct mdoc *, int, int, char *);
 static enum mdoct      rew_alt(enum mdoct);
 static enum rew        rew_dohalt(enum mdoct, enum mdoc_type,
                                const struct mdoc_node *);
@@ -218,26 +218,25 @@ const     struct mdoc_macro * const mdoc_macros = __mdoc_macros;
  * closing out open [implicit] scopes.  Obviously, open explicit scopes
  * are errors.
  */
-int
+void
 mdoc_macroend(struct mdoc *mdoc)
 {
        struct mdoc_node *n;
 
        /* Scan for open explicit scopes. */
 
-       n = MDOC_VALID & mdoc->last->flags ?
+       n = mdoc->last->flags & MDOC_VALID ?
            mdoc->last->parent : mdoc->last;
 
        for ( ; n; n = n->parent)
-               if (MDOC_BLOCK == n->type &&
-                   MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
+               if (n->type == MDOC_BLOCK &&
+                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
                        mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
                            n->line, n->pos, mdoc_macronames[n->tok]);
 
        /* Rewind to the first. */
 
        rew_last(mdoc, mdoc->first);
-       return(1);
 }
 
 /*
@@ -668,7 +667,7 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
 /*
  * Close out block partial/full explicit.
  */
-static int
+static void
 blk_exp_close(MACRO_PROT_ARGS)
 {
        struct mdoc_node *body;         /* Our own body. */
@@ -689,6 +688,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                break;
        case MDOC_Ek:
                mdoc->flags &= ~MDOC_KEEP;
+               /* FALLTHROUGH */
        default:
                maxargs = 0;
                break;
@@ -698,6 +698,7 @@ blk_exp_close(MACRO_PROT_ARGS)
         * Search backwards for beginnings of blocks,
         * both of our own and of pending sub-blocks.
         */
+
        atok = rew_alt(tok);
        body = endbody = later = NULL;
        for (n = mdoc->last; n; n = n->parent) {
@@ -705,6 +706,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                        continue;
 
                /* Remember the start of our own body. */
+
                if (n->type == MDOC_BODY && atok == n->tok) {
                        if (n->end == ENDBODY_NOT)
                                body = n;
@@ -721,6 +723,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * When there is no pending sub block,
                         * just proceed to closing out.
                         */
+
                        if (later == NULL)
                                break;
 
@@ -729,14 +732,24 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * postpone closing out the current block
                         * until the rew_sub() closing out the sub-block.
                         */
+
                        make_pending(later, tok, mdoc, line, ppos);
 
                        /*
                         * Mark the place where the formatting - but not
                         * the scope - of the current block ends.
                         */
+
                        mdoc_endbody_alloc(mdoc, line, ppos,
                            atok, body, ENDBODY_SPACE);
+
+                       /*
+                        * If a block closing macro taking arguments
+                        * breaks another block, put the arguments
+                        * into the end marker and remeber the
+                        * end marker in order to close it out.
+                        */
+
                        if (maxargs) {
                                endbody = mdoc->last;
                                mdoc->next = MDOC_NEXT_CHILD;
@@ -749,12 +762,14 @@ blk_exp_close(MACRO_PROT_ARGS)
                 * open explicit block, or, in case there are only
                 * implicit ones, the first open implicit block.
                 */
+
                if (later &&
                    mdoc_macros[later->tok].flags & MDOC_EXPLICIT)
                        continue;
                if (n->tok != MDOC_It)
                        later = n;
        }
+       rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
 
        if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) {
                if (buf[*pos] != '\0')
@@ -762,11 +777,9 @@ blk_exp_close(MACRO_PROT_ARGS)
                            mdoc->parse, line, ppos,
                            "%s %s", mdoc_macronames[tok],
                            buf + *pos);
-               rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
                rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
-               return(1);
+               return;
        }
-       rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
 
        if (maxargs && endbody == NULL) {
                if (n == NULL) {
@@ -811,11 +824,8 @@ blk_exp_close(MACRO_PROT_ARGS)
                                rew_last(mdoc, endbody);
                        flushed = 1;
                }
-
                mdoc->flags &= ~MDOC_NEWLINE;
-
-               if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf))
-                       return(0);
+               mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);
                break;
        }
 
@@ -827,10 +837,9 @@ blk_exp_close(MACRO_PROT_ARGS)
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);
-       return(1);
 }
 
-static int
+static void
 in_line(MACRO_PROT_ARGS)
 {
        int              la, scope, cnt, firstarg, mayopen, nc, nl;
@@ -870,18 +879,11 @@ in_line(MACRO_PROT_ARGS)
        for (arg = NULL;; ) {
                la = *pos;
                av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               }
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
+               if (av == ARGV_ARG)
                        continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+               if (av == ARGV_WORD)
+                       *pos = la;
+               break;
        }
 
        d = DELIM_NONE;
@@ -938,12 +940,10 @@ in_line(MACRO_PROT_ARGS)
                                    mdoc->parse, line, ppos,
                                    mdoc_macronames[tok]);
                        }
-
-                       if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                               return(0);
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
                        if (nl)
                                append_delims(mdoc, line, pos, buf);
-                       return(1);
+                       return;
                }
 
                /*
@@ -1029,10 +1029,9 @@ in_line(MACRO_PROT_ARGS)
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);
-       return(1);
 }
 
-static int
+static void
 blk_full(MACRO_PROT_ARGS)
 {
        int               la, nl, nparsed;
@@ -1059,7 +1058,7 @@ blk_full(MACRO_PROT_ARGS)
                            line, ppos, "It %s", buf + *pos);
                        mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
                        rew_elem(mdoc, MDOC_br);
-                       return(1);
+                       return;
                }
        }
 
@@ -1082,19 +1081,11 @@ blk_full(MACRO_PROT_ARGS)
        for (arg = NULL;; ) {
                la = *pos;
                av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               }
-
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
+               if (av == ARGV_ARG)
                        continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+               if (av == ARGV_WORD)
+                       *pos = la;
+               break;
        }
 
        mdoc_block_alloc(mdoc, line, ppos, tok, arg);
@@ -1104,6 +1095,7 @@ blk_full(MACRO_PROT_ARGS)
         * Exception: Heads of `It' macros in `-diag' lists are not
         * parsed, even though `It' macros in general are parsed.
         */
+
        nparsed = tok == MDOC_It &&
            mdoc->last->parent->tok == MDOC_Bl &&
            mdoc->last->parent->norm->Bl.type == LIST_diag;
@@ -1167,6 +1159,7 @@ blk_full(MACRO_PROT_ARGS)
                if (ac == ARGS_PHRASE ||
                    ac == ARGS_PEND ||
                    ac == ARGS_PPHRASE) {
+
                        /*
                         * If we haven't opened a body yet, rewind the
                         * head; if we have, rewind that instead.
@@ -1174,9 +1167,6 @@ blk_full(MACRO_PROT_ARGS)
 
                        rew_sub(body ? MDOC_BODY : MDOC_HEAD,
                            mdoc, tok, line, ppos);
-
-                       /* Then allocate our body context. */
-
                        body = mdoc_body_alloc(mdoc, line, ppos, tok);
 
                        /*
@@ -1189,10 +1179,7 @@ blk_full(MACRO_PROT_ARGS)
                                mdoc->flags |= MDOC_PPHRASE;
                        if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
                                mdoc->flags |= MDOC_PPHRASE;
-
-                       if ( ! phrase(mdoc, line, la, buf))
-                               return(0);
-
+                       phrase(mdoc, line, la, buf);
                        mdoc->flags &= ~MDOC_PPHRASE;
                        continue;
                }
@@ -1200,25 +1187,19 @@ blk_full(MACRO_PROT_ARGS)
                ntok = nparsed || ac == ARGS_QWORD ?
                    MDOC_MAX : lookup(tok, p);
 
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       break;
                }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   MDOC_JOIN & mdoc_macros[tok].flags);
        }
 
        if (head == NULL)
                head = mdoc_head_alloc(mdoc, line, ppos, tok);
        if (nl)
                append_delims(mdoc, line, pos, buf);
-
-       /* If we've already opened our body, exit now. */
-
-       if (NULL != body)
+       if (body != NULL)
                goto out;
 
        /*
@@ -1228,11 +1209,11 @@ blk_full(MACRO_PROT_ARGS)
         * sub-block.
         */
        for (n = mdoc->last; n && n != head; n = n->parent) {
-               if (MDOC_BLOCK == n->type &&
-                   MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
-                   ! (MDOC_VALID & n->flags)) {
+               if (n->type == MDOC_BLOCK &&
+                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT &&
+                   ! (n->flags & MDOC_VALID)) {
                        n->pending = head;
-                       return(1);
+                       return;
                }
        }
 
@@ -1240,17 +1221,15 @@ blk_full(MACRO_PROT_ARGS)
 
        rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
        mdoc_body_alloc(mdoc, line, ppos, tok);
-
 out:
        if (mdoc->flags & MDOC_FREECOL) {
                rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
                rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
                mdoc->flags &= ~MDOC_FREECOL;
        }
-       return(1);
 }
 
-static int
+static void
 blk_part_imp(MACRO_PROT_ARGS)
 {
        int               la, nl;
@@ -1299,19 +1278,13 @@ blk_part_imp(MACRO_PROT_ARGS)
 
                ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
 
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       break;
                }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   MDOC_JOIN & mdoc_macros[tok].flags);
        }
-
-       /* Clean-ups to leave in a consistent state. */
-
        if (body == NULL)
                body = mdoc_body_alloc(mdoc, line, ppos, tok);
 
@@ -1320,6 +1293,7 @@ blk_part_imp(MACRO_PROT_ARGS)
         * postpone closing out the current block
         * until the rew_sub() call closing out the sub-block.
         */
+
        for (n = mdoc->last; n && n != body && n != blk->parent;
             n = n->parent) {
                if (n->type == MDOC_BLOCK &&
@@ -1328,19 +1302,13 @@ blk_part_imp(MACRO_PROT_ARGS)
                        make_pending(n, tok, mdoc, line, ppos);
                        mdoc_endbody_alloc(mdoc, line, ppos,
                            tok, body, ENDBODY_NOSPACE);
-                       return(1);
+                       return;
                }
        }
        assert(n == body);
        rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
-
-       /* Standard appending of delimiters. */
-
        if (nl)
                append_delims(mdoc, line, pos, buf);
-
-       /* Rewind scope, if applicable. */
-
        rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
 
        /* Move trailing .Ns out of scope. */
@@ -1349,11 +1317,9 @@ blk_part_imp(MACRO_PROT_ARGS)
                /* Do nothing. */ ;
        if (n && n->tok == MDOC_Ns)
                mdoc_node_relink(mdoc, n);
-
-       return(1);
 }
 
-static int
+static void
 blk_part_exp(MACRO_PROT_ARGS)
 {
        int               la, nl;
@@ -1410,14 +1376,12 @@ blk_part_exp(MACRO_PROT_ARGS)
                assert(head != NULL && body != NULL);
 
                ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       break;
                }
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   MDOC_JOIN & mdoc_macros[tok].flags);
        }
 
        /* Clean-up to leave in a consistent state. */
@@ -1429,15 +1393,11 @@ blk_part_exp(MACRO_PROT_ARGS)
                rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
                mdoc_body_alloc(mdoc, line, ppos, tok);
        }
-
-       /* Standard appending of delimiters. */
-
        if (nl)
                append_delims(mdoc, line, pos, buf);
-       return(1);
 }
 
-static int
+static void
 in_line_argn(MACRO_PROT_ARGS)
 {
        int              la, flushed, j, maxargs, nl;
@@ -1480,19 +1440,11 @@ in_line_argn(MACRO_PROT_ARGS)
        for (arg = NULL; ; ) {
                la = *pos;
                av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               }
-
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
+               if (av == ARGV_ARG)
                        continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+               if (av == ARGV_WORD)
+                       *pos = la;
+               break;
        }
 
        for (flushed = j = 0; ; ) {
@@ -1520,8 +1472,7 @@ in_line_argn(MACRO_PROT_ARGS)
                        if ( ! flushed)
                                rew_elem(mdoc, tok);
                        flushed = 1;
-                       if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                               return(0);
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
                        j++;
                        break;
                }
@@ -1540,17 +1491,13 @@ in_line_argn(MACRO_PROT_ARGS)
 
        if (j == 0)
                mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
-
-       /* Close out in a consistent state. */
-
        if ( ! flushed)
                rew_elem(mdoc, tok);
        if (nl)
                append_delims(mdoc, line, pos, buf);
-       return(1);
 }
 
-static int
+static void
 in_line_eoln(MACRO_PROT_ARGS)
 {
        int              la;
@@ -1570,18 +1517,11 @@ in_line_eoln(MACRO_PROT_ARGS)
        for (arg = NULL; ; ) {
                la = *pos;
                av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               }
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
+               if (av == ARGV_ARG)
                        continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+               if (av == ARGV_WORD)
+                       *pos = la;
+               break;
        }
 
        /* Open element scope. */
@@ -1598,45 +1538,32 @@ in_line_eoln(MACRO_PROT_ARGS)
 
                ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
 
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       rew_elem(mdoc, tok);
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       return;
                }
-               rew_elem(mdoc, tok);
-               return(mdoc_macro(mdoc, ntok, line, la, pos, buf));
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   MDOC_JOIN & mdoc_macros[tok].flags);
        }
 
        /* Close out (no delimiters). */
 
        rew_elem(mdoc, tok);
-       return(1);
 }
 
-static int
+static void
 ctx_synopsis(MACRO_PROT_ARGS)
 {
-       int              nl;
-
-       nl = MDOC_NEWLINE & mdoc->flags;
-
-       /* If we're not in the SYNOPSIS, go straight to in-line. */
-       if ( ! (MDOC_SYNOPSIS & mdoc->flags))
-               return(in_line(mdoc, tok, line, ppos, pos, buf));
 
-       /* If we're a nested call, same place. */
-       if ( ! nl)
-               return(in_line(mdoc, tok, line, ppos, pos, buf));
-
-       /*
-        * XXX: this will open a block scope; however, if later we end
-        * up formatting the block scope, then child nodes will inherit
-        * the formatting.  Be careful.
-        */
-       if (MDOC_Nm == tok)
-               return(blk_full(mdoc, tok, line, ppos, pos, buf));
-       assert(MDOC_Vt == tok);
-       return(blk_part_imp(mdoc, tok, line, ppos, pos, buf));
+       if (~mdoc->flags & (MDOC_SYNOPSIS | MDOC_NEWLINE))
+               in_line(mdoc, tok, line, ppos, pos, buf);
+       else if (tok == MDOC_Nm)
+               blk_full(mdoc, tok, line, ppos, pos, buf);
+       else {
+               assert(tok == MDOC_Vt);
+               blk_part_imp(mdoc, tok, line, ppos, pos, buf);
+       }
 }
 
 /*
@@ -1644,7 +1571,7 @@ ctx_synopsis(MACRO_PROT_ARGS)
  * They're unusual because they're basically free-form text until a
  * macro is encountered.
  */
-static int
+static void
 phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
 {
        int              la, pos;
@@ -1661,21 +1588,16 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
 
                ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p);
 
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX, 1);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       mdoc_macro(mdoc, ntok, line, la, &pos, buf);
+                       append_delims(mdoc, line, &pos, buf);
+                       return;
                }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf))
-                       return(0);
-               append_delims(mdoc, line, &pos, buf);
-               return(1);
+               dword(mdoc, line, la, p, DELIM_MAX, 1);
        }
-
-       return(1);
 }
 
-static int
+static void
 phrase_ta(MACRO_PROT_ARGS)
 {
        struct mdoc_node *n;
@@ -1685,13 +1607,14 @@ phrase_ta(MACRO_PROT_ARGS)
        char             *p;
 
        /* Make sure we are in a column list or ignore this macro. */
+
        n = mdoc->last;
-       while (NULL != n && MDOC_Bl != n->tok)
+       while (n != NULL && n->tok != MDOC_Bl)
                n = n->parent;
-       if (NULL == n || LIST_column != n->norm->Bl.type) {
+       if (n == NULL || n->norm->Bl.type != LIST_column) {
                mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
                    line, ppos, "Ta");
-               return(1);
+               return;
        }
 
        /* Advance to the next column. */
@@ -1707,17 +1630,12 @@ phrase_ta(MACRO_PROT_ARGS)
 
                ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p);
 
-               if (ntok == MDOC_MAX) {
-                       dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags);
-                       continue;
+               if (ntok != MDOC_MAX) {
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       append_delims(mdoc, line, pos, buf);
+                       return;
                }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               append_delims(mdoc, line, pos, buf);
-               return(1);
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   MDOC_JOIN & mdoc_macros[tok].flags);
        }
-
-       return(1);
 }