=================================================================== RCS file: /cvs/mandoc/man_macro.c,v retrieving revision 1.82 retrieving revision 1.88 diff -u -p -r1.82 -r1.88 --- mandoc/man_macro.c 2014/04/20 16:46:04 1.82 +++ mandoc/man_macro.c 2014/08/10 23:54:41 1.88 @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.82 2014/04/20 16:46:04 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.88 2014/08/10 23:54:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2012, 2013 Ingo Schwarze @@ -16,10 +16,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 @@ -49,8 +49,6 @@ static enum rew rew_dohalt(enum mant, enum man_type, const struct man_node *); static enum rew rew_block(enum mant, enum man_type, const struct man_node *); -static void rew_warn(struct man *, - struct man_node *, enum mandocerr); const struct man_macro __man_macros[MAN_MAX] = { { in_line_eoln, MAN_NSCOPED }, /* br */ @@ -97,57 +95,55 @@ const struct man_macro __man_macros[MAN_MAX] = { const struct man_macro * const man_macros = __man_macros; -/* - * Warn when "n" is an explicit non-roff macro. - */ -static void -rew_warn(struct man *man, struct man_node *n, enum mandocerr er) -{ - - if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) - return; - if (MAN_VALID & n->flags) - return; - if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) - return; - - assert(er < MANDOCERR_FATAL); - man_nmsg(man, n, er); -} - -/* - * Rewind scope. If a code "er" != MANDOCERR_MAX has been provided, it - * will be used if an explicit block scope is being closed out. - */ int -man_unscope(struct man *man, const struct man_node *to, - enum mandocerr er) +man_unscope(struct man *man, const struct man_node *to) { struct man_node *n; - assert(to); - man->next = MAN_NEXT_SIBLING; + to = to->parent; + n = man->last; + while (n != to) { - while (man->last != to) { + /* Reached the end of the document? */ + + if (to == NULL && ! (n->flags & MAN_VALID)) { + if (man->flags & (MAN_BLINE | MAN_ELINE) && + man_macros[n->tok].flags & MAN_SCOPED) { + mandoc_vmsg(MANDOCERR_BLK_LINE, + man->parse, n->line, n->pos, + "EOF breaks %s", + man_macronames[n->tok]); + if (man->flags & MAN_ELINE) + man->flags &= ~MAN_ELINE; + else { + assert(n->type == MAN_HEAD); + n = n->parent; + man->flags &= ~MAN_BLINE; + } + man->last = n; + n = n->parent; + man_node_delete(man, man->last); + continue; + } + if (n->type == MAN_BLOCK && + man_macros[n->tok].flags & MAN_EXPLICIT) + mandoc_msg(MANDOCERR_BLK_NOEND, + man->parse, n->line, n->pos, + man_macronames[n->tok]); + } + /* - * Save the parent here, because we may delete the - * man->last node in the post-validation phase and reset - * it to man->last->parent, causing a step in the closing - * out to be lost. + * We might delete the man->last node + * in the post-validation phase. + * Save a pointer to the parent such that + * we know where to continue the iteration. */ - n = man->last->parent; - rew_warn(man, man->last, er); + man->last = n; + n = n->parent; if ( ! man_valid_post(man)) return(0); - man->last = n; - assert(man->last); } - - rew_warn(man, man->last, er); - if ( ! man_valid_post(man)) - return(0); - return(1); } @@ -264,7 +260,7 @@ rew_scope(enum man_type type, struct man *man, enum ma */ assert(n); - return(man_unscope(man, n, MANDOCERR_MAX)); + return(man_unscope(man, n)); } @@ -294,11 +290,12 @@ blk_close(MACRO_PROT_ARGS) break; if (NULL == nn) { - man_pmsg(man, line, ppos, MANDOCERR_NOSCOPE); + mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, + line, ppos, man_macronames[tok]); if ( ! rew_scope(MAN_BLOCK, man, MAN_PP)) return(0); } else - man_unscope(man, nn, MANDOCERR_MAX); + man_unscope(man, nn); return(1); } @@ -335,7 +332,7 @@ blk_exp(MACRO_PROT_ARGS) if (n->tok != tok) continue; assert(MAN_HEAD == n->type); - man_unscope(man, n, MANDOCERR_MAX); + man_unscope(man, n); break; } @@ -440,13 +437,6 @@ in_line_eoln(MACRO_PROT_ARGS) return(1); } - /* Set ignorable context, if applicable. */ - - if (MAN_NSCOPED & man_macros[tok].flags) { - assert( ! (MAN_SCOPED & man_macros[tok].flags)); - man->flags |= MAN_ILINE; - } - assert(MAN_ROOT != man->last->type); man->next = MAN_NEXT_SIBLING; @@ -482,7 +472,7 @@ int man_macroend(struct man *man) { - return(man_unscope(man, man->first, MANDOCERR_SCOPEEXIT)); + return(man_unscope(man, man->first)); } static int