diff options
| -rw-r--r-- | man_macro.c | 36 | ||||
| -rw-r--r-- | man_validate.c | 24 |
2 files changed, 32 insertions, 28 deletions
diff --git a/man_macro.c b/man_macro.c index fa971403..638e614e 100644 --- a/man_macro.c +++ b/man_macro.c @@ -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. diff --git a/man_validate.c b/man_validate.c index 3d143b9b..877b7e9d 100644 --- a/man_validate.c +++ b/man_validate.c @@ -62,7 +62,6 @@ static int post_vs(CHKARGS); static int post_fi(CHKARGS); static int post_ft(CHKARGS); static int post_nf(CHKARGS); -static int post_sec(CHKARGS); static int post_TH(CHKARGS); static int post_UC(CHKARGS); static int pre_sec(CHKARGS); @@ -78,7 +77,6 @@ static v_check posts_le1[] = { check_le1, NULL }; static v_check posts_nf[] = { check_eq0, post_nf, NULL }; static v_check posts_par[] = { check_par, NULL }; static v_check posts_part[] = { check_part, NULL }; -static v_check posts_sec[] = { post_sec, NULL }; static v_check posts_sp[] = { post_vs, check_le1, NULL }; static v_check posts_th[] = { check_ge2, check_le5, post_TH, NULL }; static v_check posts_uc[] = { post_UC, NULL }; @@ -88,8 +86,8 @@ static v_check pres_sec[] = { pre_sec, NULL }; static const struct man_valid man_valids[MAN_MAX] = { { NULL, posts_br }, /* br */ { NULL, posts_th }, /* TH */ - { pres_sec, posts_sec }, /* SH */ - { pres_sec, posts_sec }, /* SS */ + { pres_sec, NULL }, /* SH */ + { pres_sec, NULL }, /* SS */ { NULL, NULL }, /* TP */ { NULL, posts_par }, /* LP */ { NULL, posts_par }, /* PP */ @@ -190,12 +188,7 @@ static int check_root(CHKARGS) { - if ((MAN_BLINE | MAN_ELINE) & man->flags) - mandoc_msg(MANDOCERR_BLK_LINE, man->parse, - 0, 0, "at end of file"); - - man->flags &= ~MAN_BLINE; - man->flags &= ~MAN_ELINE; + assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0); if (NULL == man->first->child) man_nmsg(man, n, MANDOCERR_DOC_EMPTY); @@ -325,17 +318,6 @@ pre_sec(CHKARGS) } static int -post_sec(CHKARGS) -{ - - if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) - return(1); - - man_nmsg(man, n, MANDOCERR_SYNTARGCOUNT); - return(0); -} - -static int check_part(CHKARGS) { |