diff options
Diffstat (limited to 'contrib/mdocml/mdoc_macro.c')
| -rw-r--r-- | contrib/mdocml/mdoc_macro.c | 1168 |
1 files changed, 447 insertions, 721 deletions
diff --git a/contrib/mdocml/mdoc_macro.c b/contrib/mdocml/mdoc_macro.c index 0f5b557..b501d4d 100644 --- a/contrib/mdocml/mdoc_macro.c +++ b/contrib/mdocml/mdoc_macro.c @@ -1,7 +1,7 @@ -/* $Id: mdoc_macro.c,v 1.139 2014/08/01 17:27:44 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.154 2014/11/29 04:31:35 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,9 +15,9 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif + +#include <sys/types.h> #include <assert.h> #include <ctype.h> @@ -40,32 +40,31 @@ 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 int dword(struct mdoc *, int, int, const char *, +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); -static int append_delims(struct mdoc *, - int, int *, char *); +static void append_delims(struct mdoc *, int, int *, char *); static enum mdoct lookup(enum mdoct, const char *); -static enum mdoct lookup_raw(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 int 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 *); -static int rew_elem(struct mdoc *, enum mdoct); -static int rew_last(struct mdoc *, - const struct mdoc_node *); -static int rew_sub(enum mdoc_type, struct mdoc *, +static void rew_elem(struct mdoc *, enum mdoct); +static void rew_last(struct mdoc *, const struct mdoc_node *); +static void rew_sub(enum mdoc_type, struct mdoc *, enum mdoct, int, int); const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { @@ -147,8 +146,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ - { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | - MDOC_IGNDELIM | MDOC_JOIN }, /* No */ + { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ @@ -172,7 +170,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT | MDOC_JOIN }, /* So */ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */ - { in_line_eoln, 0 }, /* Sm */ + { in_line_argn, 0 }, /* Sm */ { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */ { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ @@ -210,7 +208,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { in_line_eoln, 0 }, /* sp */ { in_line_eoln, 0 }, /* %U */ { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ - { in_line_eoln, 0 }, /* ll */ + { in_line_eoln, MDOC_PROLOGUE }, /* ll */ }; const struct mdoc_macro * const mdoc_macros = __mdoc_macros; @@ -221,63 +219,51 @@ 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. */ - return(rew_last(mdoc, mdoc->first)); + rew_last(mdoc, mdoc->first); } /* - * Look up a macro from within a subsequent context. + * Look up the macro at *p called by "from", + * or as a line macro if from == MDOC_MAX. */ static enum mdoct lookup(enum mdoct from, const char *p) { - - if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) - return(MDOC_MAX); - return(lookup_raw(p)); -} - -/* - * Lookup a macro following the initial line macro. - */ -static enum mdoct -lookup_raw(const char *p) -{ enum mdoct res; - if (MDOC_MAX == (res = mdoc_hash_find(p))) - return(MDOC_MAX); - if (MDOC_CALLABLE & mdoc_macros[res].flags) - return(res); + if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { + res = mdoc_hash_find(p); + if (res != MDOC_MAX && mdoc_macros[res].flags & MDOC_CALLABLE) + return(res); + } return(MDOC_MAX); } -static int +static void rew_last(struct mdoc *mdoc, const struct mdoc_node *to) { struct mdoc_node *n, *np; assert(to); mdoc->next = MDOC_NEXT_SIBLING; - - while (mdoc->last != to) { /* * Save the parent here, because we may delete the @@ -286,15 +272,13 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to) * out to be lost. */ np = mdoc->last->parent; - if ( ! mdoc_valid_post(mdoc)) - return(0); + mdoc_valid_post(mdoc); n = mdoc->last; mdoc->last = np; assert(mdoc->last); mdoc->last->last = n; } - - return(mdoc_valid_post(mdoc)); + mdoc_valid_post(mdoc); } /* @@ -438,9 +422,11 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * Default block rewinding rules. * In particular, always skip block end markers, * and let all blocks rewind Nm children. + * Do not warn again when closing a block, + * since closing the body already warned. */ if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || - (MDOC_BLOCK == p->type && + MDOC_BLOCK == type || (MDOC_BLOCK == p->type && ! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) return(REWIND_MORE); @@ -454,7 +440,7 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, REWIND_FORCE : REWIND_LATER); } -static int +static void rew_elem(struct mdoc *mdoc, enum mdoct tok) { struct mdoc_node *n; @@ -464,8 +450,7 @@ rew_elem(struct mdoc *mdoc, enum mdoct tok) n = n->parent; assert(MDOC_ELEM == n->type); assert(tok == n->tok); - - return(rew_last(mdoc, n)); + rew_last(mdoc, n); } /* @@ -544,7 +529,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok, return(0); } -static int +static void rew_sub(enum mdoc_type t, struct mdoc *mdoc, enum mdoct tok, int line, int ppos) { @@ -554,11 +539,11 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc, while (n) { switch (rew_dohalt(tok, t, n)) { case REWIND_NONE: - return(1); + return; case REWIND_THIS: n->lastline = line - - (MDOC_NEWLINE & mdoc->flags && - ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); + (mdoc->flags & MDOC_NEWLINE && + ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)); break; case REWIND_FORCE: mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse, @@ -568,105 +553,87 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc, /* FALLTHROUGH */ case REWIND_MORE: n->lastline = line - - (MDOC_NEWLINE & mdoc->flags ? 1 : 0); + (mdoc->flags & MDOC_NEWLINE ? 1 : 0); n = n->parent; continue; case REWIND_LATER: if (make_pending(n, tok, mdoc, line, ppos) || - MDOC_BLOCK != t) - return(1); + t != MDOC_BLOCK) + return; /* FALLTHROUGH */ case REWIND_ERROR: mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, line, ppos, mdoc_macronames[tok]); - return(1); + return; } break; } - assert(n); - if ( ! rew_last(mdoc, n)) - return(0); + rew_last(mdoc, n); /* * The current block extends an enclosing block. * Now that the current block ends, close the enclosing block, too. */ - while (NULL != (n = n->pending)) { - if ( ! rew_last(mdoc, n)) - return(0); - if (MDOC_HEAD == n->type && - ! mdoc_body_alloc(mdoc, n->line, n->pos, n->tok)) - return(0); + while ((n = n->pending) != NULL) { + rew_last(mdoc, n); + if (n->type == MDOC_HEAD) + mdoc_body_alloc(mdoc, n->line, n->pos, n->tok); } - - return(1); } /* * Allocate a word and check whether it's punctuation or not. * Punctuation consists of those tokens found in mdoc_isdelim(). */ -static int +static void dword(struct mdoc *mdoc, int line, int col, const char *p, enum mdelim d, int may_append) { - if (DELIM_MAX == d) + if (d == DELIM_MAX) d = mdoc_isdelim(p); if (may_append && - ! ((MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF) & mdoc->flags) && - DELIM_NONE == d && MDOC_TEXT == mdoc->last->type && - DELIM_NONE == mdoc_isdelim(mdoc->last->string)) { + ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) && + d == DELIM_NONE && mdoc->last->type == MDOC_TEXT && + mdoc_isdelim(mdoc->last->string) == DELIM_NONE) { mdoc_word_append(mdoc, p); - return(1); + return; } - if ( ! mdoc_word_alloc(mdoc, line, col, p)) - return(0); - - if (DELIM_OPEN == d) - mdoc->last->flags |= MDOC_DELIMO; + mdoc_word_alloc(mdoc, line, col, p); /* - * Closing delimiters only suppress the preceding space - * when they follow something, not when they start a new - * block or element, and not when they follow `No'. - * - * XXX Explicitly special-casing MDOC_No here feels - * like a layering violation. Find a better way - * and solve this in the code related to `No'! + * If the word consists of a bare delimiter, + * flag the new node accordingly, + * unless doing so was vetoed by the invoking macro. + * Always clear the veto, it is only valid for one word. */ - else if (DELIM_CLOSE == d && mdoc->last->prev && - mdoc->last->prev->tok != MDOC_No && + if (d == DELIM_OPEN) + mdoc->last->flags |= MDOC_DELIMO; + else if (d == DELIM_CLOSE && + ! (mdoc->flags & MDOC_NODELIMC) && mdoc->last->parent->tok != MDOC_Fd) mdoc->last->flags |= MDOC_DELIMC; - - return(1); + mdoc->flags &= ~MDOC_NODELIMC; } -static int +static void append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) { - int la; - enum margserr ac; char *p; + int la; - if ('\0' == buf[*pos]) - return(1); + if (buf[*pos] == '\0') + return; for (;;) { la = *pos; - ac = mdoc_zargs(mdoc, line, pos, buf, &p); - - if (ARGS_ERROR == ac) - return(0); - else if (ARGS_EOLN == ac) + if (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, &p) == ARGS_EOLN) break; - dword(mdoc, line, la, p, DELIM_MAX, 1); /* @@ -680,20 +647,54 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) * knowing which symbols break this behaviour, for * example, `. ;' shouldn't propagate the double-space. */ + if (mandoc_eos(p, strlen(p))) mdoc->last->flags |= MDOC_EOS; } +} - return(1); +/* + * Parse one word. + * If it is a macro, call it and return 1. + * Otherwise, allocate it and return 0. + */ +static int +macro_or_word(MACRO_PROT_ARGS, int parsed) +{ + char *p; + enum mdoct ntok; + + p = buf + ppos; + ntok = MDOC_MAX; + if (mdoc->flags & MDOC_PHRASELIT) + /* nothing */; + else if (*p == '"') + p++; + else if (parsed) + ntok = lookup(tok, p); + + if (ntok == MDOC_MAX) { + dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || + mdoc_macros[tok].flags & MDOC_JOIN); + return(0); + } else { + if (mdoc_macros[tok].fp == in_line_eoln) + rew_elem(mdoc, tok); + mdoc_macro(mdoc, ntok, line, ppos, pos, buf); + if (tok == MDOC_MAX) + append_delims(mdoc, line, pos, buf); + return(1); + } } /* * Close out block partial/full explicit. */ -static int +static void blk_exp_close(MACRO_PROT_ARGS) { struct mdoc_node *body; /* Our own body. */ + struct mdoc_node *endbody; /* Our own end marker. */ struct mdoc_node *later; /* A sub-block starting later. */ struct mdoc_node *n; /* For searching backwards. */ @@ -710,6 +711,7 @@ blk_exp_close(MACRO_PROT_ARGS) break; case MDOC_Ek: mdoc->flags &= ~MDOC_KEEP; + /* FALLTHROUGH */ default: maxargs = 0; break; @@ -719,20 +721,22 @@ 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 = later = NULL; + body = endbody = later = NULL; for (n = mdoc->last; n; n = n->parent) { - if (MDOC_VALID & n->flags) + if (n->flags & MDOC_VALID) continue; /* Remember the start of our own body. */ - if (MDOC_BODY == n->type && atok == n->tok) { - if (ENDBODY_NOT == n->end) + + if (n->type == MDOC_BODY && atok == n->tok) { + if (n->end == ENDBODY_NOT) body = n; continue; } - if (MDOC_BLOCK != n->type || MDOC_Nm == n->tok) + if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm) continue; if (atok == n->tok) { assert(body); @@ -742,7 +746,8 @@ blk_exp_close(MACRO_PROT_ARGS) * When there is no pending sub block, * just proceed to closing out. */ - if (NULL == later) + + if (later == NULL) break; /* @@ -750,15 +755,28 @@ 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. */ - if ( ! mdoc_endbody_alloc(mdoc, line, ppos, - atok, body, ENDBODY_SPACE)) - return(0); + + 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; + } break; } @@ -767,84 +785,87 @@ 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_EXPLICIT & mdoc_macros[later->tok].flags) + mdoc_macros[later->tok].flags & MDOC_EXPLICIT) continue; - if (MDOC_It != n->tok) + if (n->tok != MDOC_It) later = n; } + rew_sub(MDOC_BODY, mdoc, tok, line, ppos); - if ( ! (MDOC_PARSED & mdoc_macros[tok].flags)) { - if ('\0' != buf[*pos]) + if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) { + if (buf[*pos] != '\0') mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, line, ppos, "%s %s", mdoc_macronames[tok], buf + *pos); - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)); + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + return; } - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - - if (NULL == later && maxargs > 0) - if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok))) - return(0); + if (maxargs && endbody == NULL) { + if (n == NULL) { + /* + * Stray .Ec without previous .Eo: + * Break the output line, ignore any arguments. + */ + mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); + rew_elem(mdoc, MDOC_br); + } else + mdoc_tail_alloc(mdoc, line, ppos, atok); + } - for (flushed = j = 0; ; j++) { + flushed = n == NULL; + for (j = 0; ; j++) { lastarg = *pos; if (j == maxargs && ! flushed) { - if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); + if (endbody == NULL) + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + else + rew_last(mdoc, endbody); flushed = 1; } ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_PUNCT == ac) - break; - if (ARGS_EOLN == ac) + if (ac == ARGS_PUNCT || ac == ARGS_EOLN) break; - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); + ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, lastarg, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); + if (ntok == MDOC_MAX) { + dword(mdoc, line, lastarg, p, DELIM_MAX, + MDOC_JOIN & mdoc_macros[tok].flags); continue; } if ( ! flushed) { - if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); + if (endbody == NULL) + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + else + 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; } - if ( ! flushed && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); - - if ( ! nl) - return(1); - return(append_delims(mdoc, line, pos, buf)); + if ( ! flushed) { + if (endbody == NULL) + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + else + rew_last(mdoc, endbody); + } + if (nl) + append_delims(mdoc, line, pos, buf); } -static int +static void in_line(MACRO_PROT_ARGS) { - int la, scope, cnt, nc, nl; - enum margverr av; + int la, scope, cnt, firstarg, mayopen, nc, nl; enum mdoct ntok; enum margserr ac; enum mdelim d; @@ -877,35 +898,42 @@ in_line(MACRO_PROT_ARGS) break; } - 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) - continue; - - mdoc_argv_free(arg); - return(0); - } + mdoc_argv(mdoc, line, tok, &arg, pos, buf); + d = DELIM_NONE; + firstarg = 1; + mayopen = 1; for (cnt = scope = 0;; ) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - if (ARGS_ERROR == ac) - return(0); - if (ARGS_EOLN == ac) + /* + * At the end of a macro line, + * opening delimiters do not suppress spacing. + */ + + if (ac == ARGS_EOLN) { + if (d == DELIM_OPEN) + mdoc->last->flags &= ~MDOC_DELIMO; break; - if (ARGS_PUNCT == ac) + } + + /* + * The rest of the macro line is only punctuation, + * to be handled by append_delims(). + * If there were no other arguments, + * do not allow the first one to suppress spacing, + * even if it turns out to be a closing one. + */ + + if (ac == ARGS_PUNCT) { + if (cnt == 0 && nc == 0) + mdoc->flags |= MDOC_NODELIMC; break; + } - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); + ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? + MDOC_MAX : lookup(tok, p); /* * In this case, we've located a submacro and must @@ -914,27 +942,22 @@ in_line(MACRO_PROT_ARGS) * or raise a warning. */ - if (MDOC_MAX != ntok) { - if (scope && ! rew_elem(mdoc, tok)) - return(0); - if (nc && 0 == cnt) { - if ( ! mdoc_elem_alloc(mdoc, - line, ppos, tok, arg)) - return(0); - if ( ! rew_last(mdoc, mdoc->last)) - return(0); - } else if ( ! nc && 0 == cnt) { + if (ntok != MDOC_MAX) { + if (scope) + rew_elem(mdoc, tok); + if (nc && ! cnt) { + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); + rew_last(mdoc, mdoc->last); + } else if ( ! nc && ! cnt) { mdoc_argv_free(arg); mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, line, ppos, mdoc_macronames[tok]); } - - if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) - return(0); - if ( ! nl) - return(1); - return(append_delims(mdoc, line, pos, buf)); + mdoc_macro(mdoc, ntok, line, la, pos, buf); + if (nl) + append_delims(mdoc, line, pos, buf); + return; } /* @@ -943,61 +966,64 @@ in_line(MACRO_PROT_ARGS) * the word. */ - d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); + d = ac == ARGS_QWORD ? DELIM_NONE : mdoc_isdelim(p); if (DELIM_NONE != d) { /* * If we encounter closing punctuation, no word - * has been omitted, no scope is open, and we're + * has been emitted, no scope is open, and we're * allowed to have an empty element, then start - * a new scope. `Ar', `Fl', and `Li', only do - * this once per invocation. There may be more - * of these (all of them?). + * a new scope. */ - if (0 == cnt && (nc || MDOC_Li == tok) && - DELIM_CLOSE == d && ! scope) { - if ( ! mdoc_elem_alloc(mdoc, - line, ppos, tok, arg)) - return(0); - if (MDOC_Ar == tok || MDOC_Li == tok || - MDOC_Fl == tok) - cnt++; + if ((d == DELIM_CLOSE || + (d == DELIM_MIDDLE && tok == MDOC_Fl)) && + !cnt && !scope && nc && mayopen) { + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); scope = 1; + cnt++; + if (tok == MDOC_Nm) + mayopen = 0; } /* * Close out our scope, if one is open, before * any punctuation. */ - if (scope && ! rew_elem(mdoc, tok)) - return(0); + if (scope) + rew_elem(mdoc, tok); scope = 0; - } else if ( ! scope) { - if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) - return(0); + if (tok == MDOC_Fn) + mayopen = 0; + } else if (mayopen && !scope) { + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); scope = 1; + cnt++; } - if (DELIM_NONE == d) - cnt++; + dword(mdoc, line, la, p, d, + MDOC_JOIN & mdoc_macros[tok].flags); - if ( ! dword(mdoc, line, la, p, d, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); + /* + * If the first argument is a closing delimiter, + * do not suppress spacing before it. + */ + + if (firstarg && d == DELIM_CLOSE && !nc) + mdoc->last->flags &= ~MDOC_DELIMC; + firstarg = 0; /* * `Fl' macros have their scope re-opened with each new * word so that the `-' can be added to each one without * having to parse out spaces. */ - if (scope && MDOC_Fl == tok) { - if ( ! rew_elem(mdoc, tok)) - return(0); + if (scope && tok == MDOC_Fl) { + rew_elem(mdoc, tok); scope = 0; } } - if (scope && ! rew_elem(mdoc, tok)) - return(0); + if (scope) + rew_elem(mdoc, tok); /* * If no elements have been collected and we're allowed to have @@ -1005,34 +1031,29 @@ in_line(MACRO_PROT_ARGS) * raise a warning. */ - if (nc && 0 == cnt) { - if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) - return(0); - if ( ! rew_last(mdoc, mdoc->last)) - return(0); - } else if ( ! nc && 0 == cnt) { - mdoc_argv_free(arg); - mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, - line, ppos, mdoc_macronames[tok]); + if ( ! cnt) { + if (nc) { + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); + rew_last(mdoc, mdoc->last); + } else { + mdoc_argv_free(arg); + mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, + line, ppos, mdoc_macronames[tok]); + } } - - if ( ! nl) - return(1); - return(append_delims(mdoc, line, pos, buf)); + if (nl) + append_delims(mdoc, line, pos, buf); } -static int +static void blk_full(MACRO_PROT_ARGS) { - int la, nl, nparsed; + int la, nl, parsed; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ struct mdoc_node *n; - enum mdoc_type mtt; - enum mdoct ntok; enum margserr ac, lac; - enum margverr av; char *p; nl = MDOC_NEWLINE & mdoc->flags; @@ -1041,25 +1062,23 @@ blk_full(MACRO_PROT_ARGS) if (tok == MDOC_It) { for (n = mdoc->last; n; n = n->parent) - if (n->tok == MDOC_Bl) + if (n->tok == MDOC_Bl && + ! (n->flags & MDOC_VALID)) break; if (n == NULL) { mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, line, ppos, "It %s", buf + *pos); - if ( ! mdoc_elem_alloc(mdoc, line, ppos, - MDOC_br, NULL)) - return(0); - return(rew_elem(mdoc, MDOC_br)); + mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); + rew_elem(mdoc, MDOC_br); + return; } } /* Close out prior implicit scope. */ - if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); + if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) { + rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); } /* @@ -1071,72 +1090,42 @@ blk_full(MACRO_PROT_ARGS) * regular child nodes. */ - 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) - continue; - - mdoc_argv_free(arg); - return(0); - } - - if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg)) - return(0); - + mdoc_argv(mdoc, line, tok, &arg, pos, buf); + mdoc_block_alloc(mdoc, line, ppos, tok, arg); head = body = NULL; /* * Exception: Heads of `It' macros in `-diag' lists are not * parsed, even though `It' macros in general are parsed. */ - nparsed = MDOC_It == tok && - MDOC_Bl == mdoc->last->parent->tok && - LIST_diag == mdoc->last->parent->norm->Bl.type; + + parsed = tok != MDOC_It || + mdoc->last->parent->tok != MDOC_Bl || + mdoc->last->parent->norm->Bl.type != LIST_diag; /* * The `Nd' macro has all arguments in its body: it's a hybrid * of block partial-explicit and full-implicit. Stupid. */ - if (MDOC_Nd == tok) { - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); - head = mdoc->last; - if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; + if (tok == MDOC_Nd) { + head = mdoc_head_alloc(mdoc, line, ppos, tok); + rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + body = mdoc_body_alloc(mdoc, line, ppos, tok); } - if (MDOC_Bk == tok) + if (tok == MDOC_Bk) mdoc->flags |= MDOC_KEEP; - ac = ARGS_ERROR; - - for ( ; ; ) { + ac = ARGS_PEND; + for (;;) { la = *pos; - /* Initialise last-phrase-type with ARGS_PEND. */ - lac = ARGS_ERROR == ac ? ARGS_PEND : ac; + lac = ac; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_PUNCT == ac) + if (ac == ARGS_PUNCT) break; - - if (ARGS_ERROR == ac) - return(0); - - if (ARGS_EOLN == ac) { - if (ARGS_PPHRASE != lac && ARGS_PHRASE != lac) + if (ac == ARGS_EOLN) { + if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE) break; /* * This is necessary: if the last token on a @@ -1145,11 +1134,8 @@ blk_full(MACRO_PROT_ARGS) * reopen our scope if the last parse was a * phrase or partial phrase. */ - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; + rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + body = mdoc_body_alloc(mdoc, line, ppos, tok); break; } @@ -1158,42 +1144,33 @@ blk_full(MACRO_PROT_ARGS) * the MDOC_HEAD) for non-phrase types. */ - if (NULL == head && - ARGS_PEND != ac && - ARGS_PHRASE != ac && - ARGS_PPHRASE != ac && - ARGS_QWORD != ac && - DELIM_OPEN == mdoc_isdelim(p)) { - if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) - return(0); + if (head == NULL && + ac != ARGS_PEND && + ac != ARGS_PHRASE && + ac != ARGS_PPHRASE && + ac != ARGS_QWORD && + mdoc_isdelim(p) == DELIM_OPEN) { + dword(mdoc, line, la, p, DELIM_OPEN, 0); continue; } /* Open a head if one hasn't been opened. */ - if (NULL == head) { - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); - head = mdoc->last; - } + if (head == NULL) + head = mdoc_head_alloc(mdoc, line, ppos, tok); + + if (ac == ARGS_PHRASE || + ac == ARGS_PEND || + ac == ARGS_PPHRASE) { - if (ARGS_PHRASE == ac || - ARGS_PEND == ac || - ARGS_PPHRASE == ac) { /* * If we haven't opened a body yet, rewind the * head; if we have, rewind that instead. */ - mtt = body ? MDOC_BODY : MDOC_HEAD; - if ( ! rew_sub(mtt, mdoc, tok, line, ppos)) - return(0); - - /* Then allocate our body context. */ - - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; + rew_sub(body ? MDOC_BODY : MDOC_HEAD, + mdoc, tok, line, ppos); + body = mdoc_body_alloc(mdoc, line, ppos, tok); /* * Process phrases: set whether we're in a @@ -1201,45 +1178,24 @@ blk_full(MACRO_PROT_ARGS) * then call down into the phrase parser. */ - if (ARGS_PPHRASE == ac) + if (ac == ARGS_PPHRASE) mdoc->flags |= MDOC_PPHRASE; - if (ARGS_PEND == ac && ARGS_PPHRASE == lac) + if (ac == ARGS_PEND && lac == ARGS_PPHRASE) mdoc->flags |= MDOC_PPHRASE; - - if ( ! phrase(mdoc, line, la, buf)) - return(0); - + parse_rest(mdoc, MDOC_MAX, line, &la, buf); mdoc->flags &= ~MDOC_PPHRASE; continue; } - ntok = nparsed || ARGS_QWORD == ac ? - MDOC_MAX : lookup(tok, p); - - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); - continue; - } - - if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) - return(0); - break; - } - - if (NULL == head) { - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); - head = mdoc->last; + if (macro_or_word(mdoc, tok, line, la, pos, buf, parsed)) + break; } - if (nl && ! append_delims(mdoc, line, pos, buf)) - return(0); - - /* If we've already opened our body, exit now. */ - - if (NULL != body) + if (head == NULL) + head = mdoc_head_alloc(mdoc, line, ppos, tok); + if (nl) + append_delims(mdoc, line, pos, buf); + if (body != NULL) goto out; /* @@ -1249,39 +1205,30 @@ 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; } } /* Close out scopes to remain in a consistent state. */ - if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - + rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + mdoc_body_alloc(mdoc, line, ppos, tok); out: - if ( ! (MDOC_FREECOL & mdoc->flags)) - return(1); - - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); - - mdoc->flags &= ~MDOC_FREECOL; - return(1); + 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; + } } -static int +static void blk_part_imp(MACRO_PROT_ARGS) { int la, nl; - enum mdoct ntok; enum margserr ac; char *p; struct mdoc_node *blk; /* saved block context */ @@ -1299,15 +1246,9 @@ blk_part_imp(MACRO_PROT_ARGS) * or more closing punctuation nodes. */ - if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) - return(0); - - blk = mdoc->last; - - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); - if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) - return(0); + blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL); + mdoc_head_alloc(mdoc, line, ppos, tok); + rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); /* * Open the body scope "on-demand", that is, after we've @@ -1318,92 +1259,56 @@ blk_part_imp(MACRO_PROT_ARGS) for (body = NULL; ; ) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_EOLN == ac) + if (ac == ARGS_EOLN || ac == ARGS_PUNCT) break; - if (ARGS_PUNCT == ac) - break; - - if (NULL == body && ARGS_QWORD != ac && - DELIM_OPEN == mdoc_isdelim(p)) { - if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) - return(0); - continue; - } - - if (NULL == body) { - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; - } - - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); + if (body == NULL && ac != ARGS_QWORD && + mdoc_isdelim(p) == DELIM_OPEN) { + dword(mdoc, line, la, p, DELIM_OPEN, 0); continue; } - if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) - return(0); - break; - } - - /* Clean-ups to leave in a consistent state. */ + if (body == NULL) + body = mdoc_body_alloc(mdoc, line, ppos, tok); - if (NULL == body) { - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; + if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) + break; } + if (body == NULL) + body = mdoc_body_alloc(mdoc, line, ppos, tok); /* * If there is an open sub-block requiring explicit close-out, * 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 (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)) { make_pending(n, tok, mdoc, line, ppos); - if ( ! mdoc_endbody_alloc(mdoc, line, ppos, - tok, body, ENDBODY_NOSPACE)) - return(0); - return(1); + mdoc_endbody_alloc(mdoc, line, ppos, + tok, body, ENDBODY_NOSPACE); + return; } } assert(n == body); - - if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) - return(0); - - /* Standard appending of delimiters. */ - - if (nl && ! append_delims(mdoc, line, pos, buf)) - return(0); - - /* Rewind scope, if applicable. */ - - if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) - return(0); + rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + if (nl) + append_delims(mdoc, line, pos, buf); + rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); /* Move trailing .Ns out of scope. */ for (n = body->child; n && n->next; n = n->next) /* Do nothing. */ ; - if (n && MDOC_Ns == n->tok) + 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; @@ -1411,7 +1316,6 @@ blk_part_exp(MACRO_PROT_ARGS) struct mdoc_node *head; /* keep track of head */ struct mdoc_node *body; /* keep track of body */ char *p; - enum mdoct ntok; nl = MDOC_NEWLINE & mdoc->flags; @@ -1421,35 +1325,25 @@ blk_part_exp(MACRO_PROT_ARGS) * case of `Eo'); and a body that may be empty. */ - if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) - return(0); - + mdoc_block_alloc(mdoc, line, ppos, tok, NULL); for (head = body = NULL; ; ) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_PUNCT == ac) - break; - if (ARGS_EOLN == ac) + if (ac == ARGS_PUNCT || ac == ARGS_EOLN) break; /* Flush out leading punctuation. */ - if (NULL == head && ARGS_QWORD != ac && - DELIM_OPEN == mdoc_isdelim(p)) { + if (head == NULL && ac != ARGS_QWORD && + mdoc_isdelim(p) == DELIM_OPEN) { assert(NULL == body); - if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) - return(0); + dword(mdoc, line, la, p, DELIM_OPEN, 0); continue; } - if (NULL == head) { - assert(NULL == body); - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); - head = mdoc->last; + if (head == NULL) { + assert(body == NULL); + head = mdoc_head_alloc(mdoc, line, ppos, tok); } /* @@ -1457,65 +1351,40 @@ blk_part_exp(MACRO_PROT_ARGS) * macros just immediately close out and begin the body. */ - if (NULL == body) { + if (body == NULL) { assert(head); /* No check whether it's a macro! */ - if (MDOC_Eo == tok) - if ( ! dword(mdoc, line, la, p, DELIM_MAX, 0)) - return(0); - - if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); - body = mdoc->last; - - if (MDOC_Eo == tok) + if (tok == MDOC_Eo) + dword(mdoc, line, la, p, DELIM_MAX, 0); + rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + body = mdoc_body_alloc(mdoc, line, ppos, tok); + if (tok == MDOC_Eo) continue; } + assert(head != NULL && body != NULL); - assert(NULL != head && NULL != body); - - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); - - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); - continue; - } - - if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) - return(0); - break; + if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) + break; } /* Clean-up to leave in a consistent state. */ - if (NULL == head) - if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) - return(0); + if (head == NULL) + mdoc_head_alloc(mdoc, line, ppos, tok); - if (NULL == body) { - if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) - return(0); + if (body == NULL) { + rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + mdoc_body_alloc(mdoc, line, ppos, tok); } - - /* Standard appending of delimiters. */ - - if ( ! nl) - return(1); - return(append_delims(mdoc, line, pos, buf)); + if (nl) + append_delims(mdoc, line, pos, buf); } -static int +static void in_line_argn(MACRO_PROT_ARGS) { int la, flushed, j, maxargs, nl; enum margserr ac; - enum margverr av; struct mdoc_arg *arg; char *p; enum mdoct ntok; @@ -1533,8 +1402,6 @@ in_line_argn(MACRO_PROT_ARGS) switch (tok) { case MDOC_Ap: /* FALLTHROUGH */ - case MDOC_No: - /* FALLTHROUGH */ case MDOC_Ns: /* FALLTHROUGH */ case MDOC_Ux: @@ -1552,183 +1419,104 @@ in_line_argn(MACRO_PROT_ARGS) break; } - 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) - continue; - - mdoc_argv_free(arg); - return(0); - } + mdoc_argv(mdoc, line, tok, &arg, pos, buf); for (flushed = j = 0; ; ) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_PUNCT == ac) - break; - if (ARGS_EOLN == ac) + if (ac == ARGS_PUNCT || ac == ARGS_EOLN) break; - if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && - ARGS_QWORD != ac && 0 == j && - DELIM_OPEN == mdoc_isdelim(p)) { - if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) - return(0); + if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) && + ac != ARGS_QWORD && j == 0 && + mdoc_isdelim(p) == DELIM_OPEN) { + dword(mdoc, line, la, p, DELIM_OPEN, 0); continue; - } else if (0 == j) - if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) - return(0); + } else if (j == 0) + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); if (j == maxargs && ! flushed) { - if ( ! rew_elem(mdoc, tok)) - return(0); + rew_elem(mdoc, tok); flushed = 1; } - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); + ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); - if (MDOC_MAX != ntok) { - if ( ! flushed && ! rew_elem(mdoc, tok)) - return(0); + if (ntok != MDOC_MAX) { + 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; } - if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && - ARGS_QWORD != ac && - ! flushed && - DELIM_NONE != mdoc_isdelim(p)) { - if ( ! rew_elem(mdoc, tok)) - return(0); + if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) && + ac != ARGS_QWORD && ! flushed && + mdoc_isdelim(p) != DELIM_NONE) { + rew_elem(mdoc, tok); flushed = 1; } - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); + dword(mdoc, line, la, p, DELIM_MAX, + MDOC_JOIN & mdoc_macros[tok].flags); j++; } - if (0 == j && ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) - return(0); - - /* Close out in a consistent state. */ - - if ( ! flushed && ! rew_elem(mdoc, tok)) - return(0); - if ( ! nl) - return(1); - return(append_delims(mdoc, line, pos, buf)); + if (j == 0) + mdoc_elem_alloc(mdoc, line, ppos, tok, arg); + if ( ! flushed) + rew_elem(mdoc, tok); + if (nl) + append_delims(mdoc, line, pos, buf); } -static int +static void in_line_eoln(MACRO_PROT_ARGS) { - int la; - enum margserr ac; - enum margverr av; struct mdoc_arg *arg; - char *p; - enum mdoct ntok; - - assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); if (tok == MDOC_Pp) rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); - /* Parse macro arguments. */ - - 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) - continue; - - mdoc_argv_free(arg); - return(0); - } - - /* Open element scope. */ - - if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) - return(0); + 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); +} - /* Parse argument terms. */ +/* + * 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; - ac = mdoc_args(mdoc, line, pos, buf, tok, &p); - - if (ARGS_ERROR == ac) + if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN) return(0); - if (ARGS_EOLN == ac) - break; - - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); - - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); - continue; - } - - if ( ! rew_elem(mdoc, tok)) - return(0); - return(mdoc_macro(mdoc, ntok, line, la, pos, buf)); + if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) + return(1); } - - /* Close out (no delimiters). */ - - return(rew_elem(mdoc, tok)); } -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); + } } /* @@ -1736,87 +1524,25 @@ ctx_synopsis(MACRO_PROT_ARGS) * They're unusual because they're basically free-form text until a * macro is encountered. */ -static int -phrase(struct mdoc *mdoc, int line, int ppos, char *buf) -{ - int la, pos; - enum margserr ac; - enum mdoct ntok; - char *p; - - for (pos = ppos; ; ) { - la = pos; - - ac = mdoc_zargs(mdoc, line, &pos, buf, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_EOLN == ac) - break; - - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); - - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, 1)) - return(0); - continue; - } - - if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf)) - return(0); - return(append_delims(mdoc, line, &pos, buf)); - } - - return(1); -} - -static int +static void phrase_ta(MACRO_PROT_ARGS) { struct mdoc_node *n; - int la; - enum mdoct ntok; - enum margserr ac; - 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. */ - if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos)) - return(0); - if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It)) - return(0); - - for (;;) { - la = *pos; - ac = mdoc_zargs(mdoc, line, pos, buf, &p); - - if (ARGS_ERROR == ac) - return(0); - if (ARGS_EOLN == ac) - break; - - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); - - if (MDOC_MAX == ntok) { - if ( ! dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags)) - return(0); - continue; - } - - if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) - return(0); - return(append_delims(mdoc, line, pos, buf)); - } - return(1); + rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); + mdoc_body_alloc(mdoc, line, ppos, MDOC_It); + parse_rest(mdoc, MDOC_MAX, line, pos, buf); } |
