=================================================================== RCS file: /cvs/mandoc/mdoc_macro.c,v retrieving revision 1.129 retrieving revision 1.142 diff -u -p -r1.129 -r1.142 --- mandoc/mdoc_macro.c 2014/01/21 10:26:53 1.129 +++ mandoc/mdoc_macro.c 2014/08/21 12:57:17 1.142 @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.129 2014/01/21 10:26:53 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.142 2014/08/21 12:57:17 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013 Ingo Schwarze @@ -15,10 +15,10 @@ * 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 + #include #include #include @@ -40,33 +40,32 @@ 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 obsolete(MACRO_PROT_ARGS); -static int phrase_ta(MACRO_PROT_ARGS); +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 *, enum mdelim, int); -static int append_delims(struct mdoc *, +static int append_delims(struct mdoc *, int, int *, char *); 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 enum mdoct rew_alt(enum mdoct); -static enum rew rew_dohalt(enum mdoct, enum mdoc_type, +static int 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 *); -static int rew_elem(struct mdoc *, enum mdoct); -static int rew_last(struct mdoc *, +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 int rew_sub(enum mdoc_type, struct mdoc *, enum mdoct, int, int); const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { @@ -104,7 +103,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { blk_full, MDOC_JOIN }, /* Nd */ { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */ - { obsolete, 0 }, /* Ot */ + { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ot */ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ { in_line_eoln, 0 }, /* Rv */ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ @@ -191,7 +190,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */ { in_line_eoln, 0 }, /* Bt */ { in_line_eoln, 0 }, /* Hf */ - { obsolete, 0 }, /* Fr */ + { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fr */ { in_line_eoln, 0 }, /* Ud */ { in_line, 0 }, /* Lb */ { in_line_eoln, 0 }, /* Lp */ @@ -203,14 +202,15 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */ { in_line_eoln, MDOC_JOIN }, /* %C */ - { obsolete, 0 }, /* Es */ - { obsolete, 0 }, /* En */ + { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Es */ + { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ { in_line_eoln, MDOC_JOIN }, /* %Q */ { in_line_eoln, 0 }, /* br */ { in_line_eoln, 0 }, /* sp */ { in_line_eoln, 0 }, /* %U */ { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ + { in_line_eoln, 0 }, /* ll */ }; const struct mdoc_macro * const mdoc_macros = __mdoc_macros; @@ -229,19 +229,19 @@ mdoc_macroend(struct mdoc *mdoc) /* Scan for open explicit scopes. */ n = MDOC_VALID & mdoc->last->flags ? - mdoc->last->parent : mdoc->last; + mdoc->last->parent : mdoc->last; for ( ; n; n = n->parent) if (MDOC_BLOCK == n->type && MDOC_EXPLICIT & mdoc_macros[n->tok].flags) - mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT); + 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)); } - /* * Look up a macro from within a subsequent context. */ @@ -254,7 +254,6 @@ lookup(enum mdoct from, const char *p) return(lookup_raw(p)); } - /* * Lookup a macro following the initial line macro. */ @@ -270,7 +269,6 @@ lookup_raw(const char *p) return(MDOC_MAX); } - static int rew_last(struct mdoc *mdoc, const struct mdoc_node *to) { @@ -279,7 +277,7 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to assert(to); mdoc->next = MDOC_NEXT_SIBLING; - /* LINTED */ + while (mdoc->last != to) { /* * Save the parent here, because we may delete the @@ -299,7 +297,6 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to return(mdoc_valid_post(mdoc)); } - /* * For a block closing macro, return the corresponding opening one. * Otherwise, return the macro itself. @@ -308,37 +305,37 @@ static enum mdoct rew_alt(enum mdoct tok) { switch (tok) { - case (MDOC_Ac): + case MDOC_Ac: return(MDOC_Ao); - case (MDOC_Bc): + case MDOC_Bc: return(MDOC_Bo); - case (MDOC_Brc): + case MDOC_Brc: return(MDOC_Bro); - case (MDOC_Dc): + case MDOC_Dc: return(MDOC_Do); - case (MDOC_Ec): + case MDOC_Ec: return(MDOC_Eo); - case (MDOC_Ed): + case MDOC_Ed: return(MDOC_Bd); - case (MDOC_Ef): + case MDOC_Ef: return(MDOC_Bf); - case (MDOC_Ek): + case MDOC_Ek: return(MDOC_Bk); - case (MDOC_El): + case MDOC_El: return(MDOC_Bl); - case (MDOC_Fc): + case MDOC_Fc: return(MDOC_Fo); - case (MDOC_Oc): + case MDOC_Oc: return(MDOC_Oo); - case (MDOC_Pc): + case MDOC_Pc: return(MDOC_Po); - case (MDOC_Qc): + case MDOC_Qc: return(MDOC_Qo); - case (MDOC_Re): + case MDOC_Re: return(MDOC_Rs); - case (MDOC_Sc): + case MDOC_Sc: return(MDOC_So); - case (MDOC_Xc): + case MDOC_Xc: return(MDOC_Xo); default: return(tok); @@ -346,7 +343,6 @@ rew_alt(enum mdoct tok) /* NOTREACHED */ } - /* * Rewinding to tok, how do we have to handle *p? * REWIND_NONE: *p would delimit tok, but no tok scope is open @@ -358,7 +354,7 @@ rew_alt(enum mdoct tok) * REWIND_ERROR: No tok block is open at all. */ static enum rew -rew_dohalt(enum mdoct tok, enum mdoc_type type, +rew_dohalt(enum mdoct tok, enum mdoc_type type, const struct mdoc_node *p) { @@ -374,7 +370,7 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, REWIND_ERROR : REWIND_NONE); /* - * When starting to rewind, skip plain text + * When starting to rewind, skip plain text * and nodes that have already been rewound. */ if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) @@ -398,14 +394,14 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, /* * Blocks delimited by our target token get REWIND_MORE. - * Blocks delimiting our target token get REWIND_NONE. + * Blocks delimiting our target token get REWIND_NONE. */ switch (tok) { - case (MDOC_Bl): + case MDOC_Bl: if (MDOC_It == p->tok) return(REWIND_MORE); break; - case (MDOC_It): + case MDOC_It: if (MDOC_BODY == p->type && MDOC_Bl == p->tok) return(REWIND_NONE); break; @@ -415,19 +411,21 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * This is an incomplete and extremely ugly workaround, * required to let the OpenBSD tree build. */ - case (MDOC_Oo): + case MDOC_Oo: if (MDOC_Op == p->tok) return(REWIND_MORE); break; - case (MDOC_Nm): + case MDOC_Nm: return(REWIND_NONE); - case (MDOC_Nd): + case MDOC_Nd: /* FALLTHROUGH */ - case (MDOC_Ss): + case MDOC_Ss: if (MDOC_BODY == p->type && MDOC_Sh == p->tok) return(REWIND_NONE); /* FALLTHROUGH */ - case (MDOC_Sh): + case MDOC_Sh: + if (MDOC_ROOT == p->parent->type) + return(REWIND_THIS); if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || MDOC_Sh == p->tok) return(REWIND_MORE); @@ -456,7 +454,6 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, REWIND_FORCE : REWIND_LATER); } - static int rew_elem(struct mdoc *mdoc, enum mdoct tok) { @@ -471,7 +468,6 @@ rew_elem(struct mdoc *mdoc, enum mdoct tok) return(rew_last(mdoc, n)); } - /* * We are trying to close a block identified by tok, * but the child block *broken is still open. @@ -535,9 +531,9 @@ make_pending(struct mdoc_node *broken, enum mdoct tok, taker->pending = broken->pending; } broken->pending = breaker; - mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, - "%s breaks %s", mdoc_macronames[tok], - mdoc_macronames[broken->tok]); + mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, + "%s breaks %s", mdoc_macronames[tok], + mdoc_macronames[broken->tok]); return(1); } @@ -548,9 +544,8 @@ make_pending(struct mdoc_node *broken, enum mdoct tok, return(0); } - static int -rew_sub(enum mdoc_type t, struct mdoc *mdoc, +rew_sub(enum mdoc_type t, struct mdoc *mdoc, enum mdoct tok, int line, int ppos) { struct mdoc_node *n; @@ -558,31 +553,33 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc, n = mdoc->last; while (n) { switch (rew_dohalt(tok, t, n)) { - case (REWIND_NONE): + case REWIND_NONE: return(1); - case (REWIND_THIS): + case REWIND_THIS: n->lastline = line - (MDOC_NEWLINE & mdoc->flags && ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); break; - case (REWIND_FORCE): - mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse, - line, ppos, "%s breaks %s", - mdoc_macronames[tok], - mdoc_macronames[n->tok]); + case REWIND_FORCE: + mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse, + line, ppos, "%s breaks %s", + mdoc_macronames[tok], + mdoc_macronames[n->tok]); /* FALLTHROUGH */ - case (REWIND_MORE): + case REWIND_MORE: n->lastline = line - (MDOC_NEWLINE & mdoc->flags ? 1 : 0); n = n->parent; continue; - case (REWIND_LATER): + case REWIND_LATER: if (make_pending(n, tok, mdoc, line, ppos) || MDOC_BLOCK != t) return(1); /* FALLTHROUGH */ - case (REWIND_ERROR): - mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE); + case REWIND_ERROR: + mandoc_msg(MANDOCERR_BLK_NOTOPEN, + mdoc->parse, line, ppos, + mdoc_macronames[tok]); return(1); } break; @@ -615,7 +612,7 @@ static int dword(struct mdoc *mdoc, int line, int col, const char *p, enum mdelim d, int may_append) { - + if (DELIM_MAX == d) d = mdoc_isdelim(p); @@ -644,8 +641,8 @@ dword(struct mdoc *mdoc, int line, int col, const char */ else if (DELIM_CLOSE == d && mdoc->last->prev && - mdoc->last->prev->tok != MDOC_No && - mdoc->last->parent->tok != MDOC_Fd) + mdoc->last->prev->tok != MDOC_No && + mdoc->last->parent->tok != MDOC_Fd) mdoc->last->flags |= MDOC_DELIMC; return(1); @@ -690,9 +687,8 @@ append_delims(struct mdoc *mdoc, int line, int *pos, c return(1); } - /* - * Close out block partial/full explicit. + * Close out block partial/full explicit. */ static int blk_exp_close(MACRO_PROT_ARGS) @@ -701,7 +697,7 @@ blk_exp_close(MACRO_PROT_ARGS) struct mdoc_node *later; /* A sub-block starting later. */ struct mdoc_node *n; /* For searching backwards. */ - int j, lastarg, maxargs, flushed, nl; + int j, lastarg, maxargs, flushed, nl; enum margserr ac; enum mdoct atok, ntok; char *p; @@ -709,10 +705,10 @@ blk_exp_close(MACRO_PROT_ARGS) nl = MDOC_NEWLINE & mdoc->flags; switch (tok) { - case (MDOC_Ec): + case MDOC_Ec: maxargs = 1; break; - case (MDOC_Ek): + case MDOC_Ek: mdoc->flags &= ~MDOC_KEEP; default: maxargs = 0; @@ -749,7 +745,7 @@ blk_exp_close(MACRO_PROT_ARGS) if (NULL == later) break; - /* + /* * When there is a pending sub block, * postpone closing out the current block * until the rew_sub() closing out the sub-block. @@ -778,11 +774,12 @@ blk_exp_close(MACRO_PROT_ARGS) later = n; } - if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { - /* FIXME: do this in validate */ - if (buf[*pos]) - mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST); - + if ( ! (MDOC_PARSED & mdoc_macros[tok].flags)) { + if ('\0' != buf[*pos]) + 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)); @@ -791,7 +788,7 @@ blk_exp_close(MACRO_PROT_ARGS) if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) return(0); - if (NULL == later && maxargs > 0) + if (NULL == later && maxargs > 0) if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok))) return(0); @@ -843,11 +840,10 @@ blk_exp_close(MACRO_PROT_ARGS) return(append_delims(mdoc, line, pos, buf)); } - static int in_line(MACRO_PROT_ARGS) { - int la, scope, cnt, nc, nl; + int la, scope, cnt, mayopen, nc, nl; enum margverr av; enum mdoct ntok; enum margserr ac; @@ -863,17 +859,17 @@ in_line(MACRO_PROT_ARGS) */ switch (tok) { - case (MDOC_An): + case MDOC_An: /* FALLTHROUGH */ - case (MDOC_Ar): + case MDOC_Ar: /* FALLTHROUGH */ - case (MDOC_Fl): + case MDOC_Fl: /* FALLTHROUGH */ - case (MDOC_Mt): + case MDOC_Mt: /* FALLTHROUGH */ - case (MDOC_Nm): + case MDOC_Nm: /* FALLTHROUGH */ - case (MDOC_Pa): + case MDOC_Pa: nc = 1; break; default: @@ -888,7 +884,7 @@ in_line(MACRO_PROT_ARGS) if (ARGV_WORD == av) { *pos = la; break; - } + } if (ARGV_EOLN == av) break; if (ARGV_ARG == av) @@ -898,6 +894,7 @@ in_line(MACRO_PROT_ARGS) return(0); } + mayopen = 1; for (cnt = scope = 0;; ) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); @@ -911,7 +908,7 @@ in_line(MACRO_PROT_ARGS) ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); - /* + /* * In this case, we've located a submacro and must * execute it. Close out scope, if open. If no * elements have been generated, either create one (nc) @@ -922,15 +919,16 @@ in_line(MACRO_PROT_ARGS) if (scope && ! rew_elem(mdoc, tok)) return(0); if (nc && 0 == cnt) { - if ( ! mdoc_elem_alloc(mdoc, line, - ppos, tok, arg)) + 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); - mdoc_pmsg(mdoc, line, ppos, - MANDOCERR_MACROEMPTY); + mandoc_msg(MANDOCERR_MACRO_EMPTY, + mdoc->parse, line, ppos, + mdoc_macronames[tok]); } if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) @@ -938,12 +936,12 @@ in_line(MACRO_PROT_ARGS) if ( ! nl) return(1); return(append_delims(mdoc, line, pos, buf)); - } + } - /* + /* * Non-quote-enclosed punctuation. Set up our scope, if * a word; rewind the scope, if a delimiter; then append - * the word. + * the word. */ d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); @@ -953,19 +951,19 @@ in_line(MACRO_PROT_ARGS) * If we encounter closing punctuation, no word * has been omitted, 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)) + if ((d == DELIM_CLOSE || + (d == DELIM_MIDDLE && tok == MDOC_Fl)) && + (nc || tok == MDOC_Li) && + !scope && !cnt && mayopen) { + if ( ! mdoc_elem_alloc(mdoc, + line, ppos, tok, arg)) return(0); - if (MDOC_Ar == tok || MDOC_Li == tok || - MDOC_Fl == tok) - cnt++; scope = 1; + cnt++; + if (MDOC_Li == tok || MDOC_Nm == tok) + mayopen = 0; } /* * Close out our scope, if one is open, before @@ -974,15 +972,13 @@ in_line(MACRO_PROT_ARGS) if (scope && ! rew_elem(mdoc, tok)) return(0); scope = 0; - } else if ( ! scope) { + } else if (mayopen && !scope) { if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); scope = 1; + cnt++; } - if (DELIM_NONE == d) - cnt++; - if ( ! dword(mdoc, line, la, p, d, MDOC_JOIN & mdoc_macros[tok].flags)) return(0); @@ -1015,7 +1011,8 @@ in_line(MACRO_PROT_ARGS) return(0); } else if ( ! nc && 0 == cnt) { mdoc_argv_free(arg); - mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY); + mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, + line, ppos, mdoc_macronames[tok]); } if ( ! nl) @@ -1023,7 +1020,6 @@ in_line(MACRO_PROT_ARGS) return(append_delims(mdoc, line, pos, buf)); } - static int blk_full(MACRO_PROT_ARGS) { @@ -1040,6 +1036,23 @@ blk_full(MACRO_PROT_ARGS) nl = MDOC_NEWLINE & mdoc->flags; + /* Skip items outside lists. */ + + if (tok == MDOC_It) { + for (n = mdoc->last; n; n = n->parent) + 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)); + } + } + /* Close out prior implicit scope. */ if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { @@ -1065,7 +1078,7 @@ blk_full(MACRO_PROT_ARGS) if (ARGV_WORD == av) { *pos = la; break; - } + } if (ARGV_EOLN == av) break; @@ -1086,8 +1099,8 @@ blk_full(MACRO_PROT_ARGS) * 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; + MDOC_Bl == mdoc->last->parent->tok && + LIST_diag == mdoc->last->parent->norm->Bl.type; /* * The `Nd' macro has all arguments in its body: it's a hybrid @@ -1140,17 +1153,17 @@ blk_full(MACRO_PROT_ARGS) break; } - /* + /* * Emit leading punctuation (i.e., punctuation before * 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 (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); continue; @@ -1164,9 +1177,9 @@ blk_full(MACRO_PROT_ARGS) head = mdoc->last; } - if (ARGS_PHRASE == ac || - ARGS_PEND == ac || - ARGS_PPHRASE == ac) { + 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. @@ -1175,7 +1188,7 @@ blk_full(MACRO_PROT_ARGS) 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)) @@ -1200,8 +1213,8 @@ blk_full(MACRO_PROT_ARGS) continue; } - ntok = nparsed || ARGS_QWORD == ac ? - MDOC_MAX : lookup(tok, p); + ntok = nparsed || ARGS_QWORD == ac ? + MDOC_MAX : lookup(tok, p); if (MDOC_MAX == ntok) { if ( ! dword(mdoc, line, la, p, DELIM_MAX, @@ -1220,7 +1233,7 @@ blk_full(MACRO_PROT_ARGS) return(0); head = mdoc->last; } - + if (nl && ! append_delims(mdoc, line, pos, buf)) return(0); @@ -1236,9 +1249,9 @@ 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 (MDOC_BLOCK == n->type && + MDOC_EXPLICIT & mdoc_macros[n->tok].flags && + ! (MDOC_VALID & n->flags)) { n->pending = head; return(1); } @@ -1264,7 +1277,6 @@ out: return(1); } - static int blk_part_imp(MACRO_PROT_ARGS) { @@ -1315,7 +1327,7 @@ blk_part_imp(MACRO_PROT_ARGS) break; if (NULL == body && ARGS_QWORD != ac && - DELIM_OPEN == mdoc_isdelim(p)) { + DELIM_OPEN == mdoc_isdelim(p)) { if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) return(0); continue; @@ -1355,7 +1367,7 @@ blk_part_imp(MACRO_PROT_ARGS) * until the rew_sub() call closing out the sub-block. */ for (n = mdoc->last; n && n != body && n != blk->parent; - n = n->parent) { + n = n->parent) { if (MDOC_BLOCK == n->type && MDOC_EXPLICIT & mdoc_macros[n->tok].flags && ! (MDOC_VALID & n->flags)) { @@ -1366,18 +1378,9 @@ blk_part_imp(MACRO_PROT_ARGS) return(1); } } + assert(n == body); - /* - * If we can't rewind to our body, then our scope has already - * been closed by another macro (like `Oc' closing `Op'). This - * is ugly behaviour nodding its head to OpenBSD's overwhelming - * crufty use of `Op' breakage. - */ - if (n != body) - mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, - "%s broken", mdoc_macronames[tok]); - - if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) + if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) return(0); /* Standard appending of delimiters. */ @@ -1387,7 +1390,7 @@ blk_part_imp(MACRO_PROT_ARGS) /* Rewind scope, if applicable. */ - if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) + if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) return(0); /* Move trailing .Ns out of scope. */ @@ -1400,7 +1403,6 @@ blk_part_imp(MACRO_PROT_ARGS) return(1); } - static int blk_part_exp(MACRO_PROT_ARGS) { @@ -1420,7 +1422,7 @@ blk_part_exp(MACRO_PROT_ARGS) */ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) - return(0); + return(0); for (head = body = NULL; ; ) { la = *pos; @@ -1436,7 +1438,7 @@ blk_part_exp(MACRO_PROT_ARGS) /* Flush out leading punctuation. */ if (NULL == head && ARGS_QWORD != ac && - DELIM_OPEN == mdoc_isdelim(p)) { + DELIM_OPEN == mdoc_isdelim(p)) { assert(NULL == body); if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) return(0); @@ -1508,8 +1510,6 @@ blk_part_exp(MACRO_PROT_ARGS) return(append_delims(mdoc, line, pos, buf)); } - -/* ARGSUSED */ static int in_line_argn(MACRO_PROT_ARGS) { @@ -1531,18 +1531,20 @@ in_line_argn(MACRO_PROT_ARGS) */ switch (tok) { - case (MDOC_Ap): + case MDOC_Ap: /* FALLTHROUGH */ - case (MDOC_No): + case MDOC_No: /* FALLTHROUGH */ - case (MDOC_Ns): + case MDOC_Ns: /* FALLTHROUGH */ - case (MDOC_Ux): + case MDOC_Ux: maxargs = 0; break; - case (MDOC_Bx): + case MDOC_Bx: /* FALLTHROUGH */ - case (MDOC_Xr): + case MDOC_Es: + /* FALLTHROUGH */ + case MDOC_Xr: maxargs = 2; break; default: @@ -1557,7 +1559,7 @@ in_line_argn(MACRO_PROT_ARGS) if (ARGV_WORD == av) { *pos = la; break; - } + } if (ARGV_EOLN == av) break; @@ -1579,14 +1581,14 @@ in_line_argn(MACRO_PROT_ARGS) if (ARGS_EOLN == ac) break; - if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && - ARGS_QWORD != ac && 0 == j && - DELIM_OPEN == mdoc_isdelim(p)) { + 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); continue; } else if (0 == j) - if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) + if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); if (j == maxargs && ! flushed) { @@ -1608,9 +1610,9 @@ in_line_argn(MACRO_PROT_ARGS) } if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && - ARGS_QWORD != ac && - ! flushed && - DELIM_NONE != mdoc_isdelim(p)) { + ARGS_QWORD != ac && + ! flushed && + DELIM_NONE != mdoc_isdelim(p)) { if ( ! rew_elem(mdoc, tok)) return(0); flushed = 1; @@ -1622,7 +1624,7 @@ in_line_argn(MACRO_PROT_ARGS) j++; } - if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) + if (0 == j && ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); /* Close out in a consistent state. */ @@ -1634,7 +1636,6 @@ in_line_argn(MACRO_PROT_ARGS) return(append_delims(mdoc, line, pos, buf)); } - static int in_line_eoln(MACRO_PROT_ARGS) { @@ -1660,7 +1661,7 @@ in_line_eoln(MACRO_PROT_ARGS) *pos = la; break; } - if (ARGV_EOLN == av) + if (ARGV_EOLN == av) break; if (ARGV_ARG == av) continue; @@ -1704,8 +1705,6 @@ in_line_eoln(MACRO_PROT_ARGS) return(rew_elem(mdoc, tok)); } - -/* ARGSUSED */ static int ctx_synopsis(MACRO_PROT_ARGS) { @@ -1732,17 +1731,6 @@ ctx_synopsis(MACRO_PROT_ARGS) return(blk_part_imp(mdoc, tok, line, ppos, pos, buf)); } - -/* ARGSUSED */ -static int -obsolete(MACRO_PROT_ARGS) -{ - - mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS); - return(1); -} - - /* * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs. * They're unusual because they're basically free-form text until a @@ -1782,8 +1770,6 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *bu return(1); } - -/* ARGSUSED */ static int phrase_ta(MACRO_PROT_ARGS) { @@ -1798,7 +1784,8 @@ phrase_ta(MACRO_PROT_ARGS) while (NULL != n && MDOC_Bl != n->tok) n = n->parent; if (NULL == n || LIST_column != n->norm->Bl.type) { - mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA); + mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, + line, ppos, "Ta"); return(1); }