diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-07-30 23:01:39 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-07-30 23:01:39 +0000 |
commit | 402f3efa27669efc0b793dbed0c7e590ee577ef3 (patch) | |
tree | b56d5af04b36d64150c064d6b13d0628f1ef21a4 /man_macro.c | |
parent | 7932c52fa72df57459b3b6ec61250902a3494de1 (diff) | |
download | mandoc-402f3efa27669efc0b793dbed0c7e590ee577ef3.tar.gz mandoc-402f3efa27669efc0b793dbed0c7e590ee577ef3.tar.zst mandoc-402f3efa27669efc0b793dbed0c7e590ee577ef3.zip |
Improve handling of next-line scope broken by end of file.
Detect the condition earlier, report in the error message
which block is broken, and delete the broken block.
Consequently, empty section headers can no longer happen.
Diffstat (limited to 'man_macro.c')
-rw-r--r-- | man_macro.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/man_macro.c b/man_macro.c index c8aa4018..ea45a504 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.86 2014/07/30 21:18:24 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.87 2014/07/30 23:01:39 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> @@ -104,13 +104,35 @@ man_unscope(struct man *man, const struct man_node *to) to = to->parent; n = man->last; while (n != to) { - if (NULL == to && - MAN_BLOCK == n->type && - 0 == (MAN_VALID & n->flags) && - MAN_EXPLICIT & man_macros[n->tok].flags) - mandoc_msg(MANDOCERR_BLK_NOEND, - man->parse, n->line, n->pos, - man_macronames[n->tok]); + + /* 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]); + } + /* * We might delete the man->last node * in the post-validation phase. |