From 402f3efa27669efc0b793dbed0c7e590ee577ef3 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 30 Jul 2014 23:01:39 +0000 Subject: 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. --- man_macro.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'man_macro.c') 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 * Copyright (c) 2012, 2013 Ingo Schwarze @@ -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. -- cgit v1.2.3