version 1.205, 2015/10/17 00:21:07 |
version 1.209, 2016/08/20 17:59:34 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 228 mdoc_endparse(struct roff_man *mdoc) |
|
Line 228 mdoc_endparse(struct roff_man *mdoc) |
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
rew_last(mdoc, mdoc->first); |
rew_last(mdoc, mdoc->first); |
|
mdoc_state_reset(mdoc); |
} |
} |
|
|
/* |
/* |
Line 262 lookup(struct roff_man *mdoc, int from, int line, int |
|
Line 263 lookup(struct roff_man *mdoc, int from, int line, int |
|
static void |
static void |
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
{ |
{ |
struct roff_node *np; |
|
|
|
if (to->flags & MDOC_VALID) |
if (to->flags & MDOC_VALID) |
return; |
return; |
|
|
while (mdoc->last != to) { |
while (mdoc->last != to) { |
/* |
mdoc_state(mdoc, mdoc->last); |
* Save the parent here, because we may delete the |
mdoc->last->flags |= MDOC_VALID | MDOC_ENDED; |
* mdoc->last node in the post-validation phase and reset |
mdoc->last = mdoc->last->parent; |
* it to mdoc->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
|
mdoc_valid_post(mdoc); |
|
mdoc->last = np; |
|
assert(mdoc->last); |
|
} |
} |
|
mdoc_state(mdoc, mdoc->last); |
|
mdoc->last->flags |= MDOC_VALID | MDOC_ENDED; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc_valid_post(mdoc); |
|
} |
} |
|
|
/* |
/* |
Line 298 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
Line 292 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
roff_body_alloc(mdoc, n->line, n->pos, |
roff_body_alloc(mdoc, n->line, n->pos, |
n->tok); |
n->tok); |
return; |
break; |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
break; |
break; |
default: |
default: |
Line 555 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 549 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
/* Search backwards for the beginning of our own body. */ |
|
|
|
atok = rew_alt(tok); |
|
body = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
|
if (n->flags & MDOC_ENDED || n->tok != atok || |
|
n->type != ROFFT_BODY || n->end != ENDBODY_NOT) |
|
continue; |
|
body = n; |
|
break; |
|
} |
|
|
/* |
/* |
* Search backwards for beginnings of blocks, |
* Search backwards for beginnings of blocks, |
* both of our own and of pending sub-blocks. |
* both of our own and of pending sub-blocks. |
*/ |
*/ |
|
|
atok = rew_alt(tok); |
endbody = itblk = later = NULL; |
body = endbody = itblk = later = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (n->flags & MDOC_ENDED) { |
if (n->flags & MDOC_ENDED) { |
if ( ! (n->flags & MDOC_VALID)) |
if ( ! (n->flags & MDOC_VALID)) |
Line 569 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 574 blk_exp_close(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
/* Remember the start of our own body. */ |
/* |
|
* Mismatching end macros can never break anything, |
|
* SYNOPSIS name blocks can never be broken, |
|
* and we only care about the breaking of BLOCKs. |
|
*/ |
|
|
if (n->type == ROFFT_BODY && atok == n->tok) { |
if (body == NULL || |
if (n->end == ENDBODY_NOT) |
n->tok == MDOC_Nm || |
body = n; |
n->type != ROFFT_BLOCK) |
continue; |
continue; |
} |
|
|
|
if (n->type != ROFFT_BLOCK || n->tok == MDOC_Nm) |
|
continue; |
|
|
|
if (n->tok == MDOC_It) { |
if (n->tok == MDOC_It) { |
itblk = n; |
itblk = n; |
continue; |
continue; |
Line 645 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 650 blk_exp_close(MACRO_PROT_ARGS) |
|
if (body == NULL) { |
if (body == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, mdoc_macronames[tok]); |
if (later != NULL) |
|
later->flags &= ~MDOC_BROKEN; |
|
if (maxargs && endbody == NULL) { |
if (maxargs && endbody == NULL) { |
/* |
/* |
* Stray .Ec without previous .Eo: |
* Stray .Ec without previous .Eo: |
Line 1465 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1468 phrase_ta(MACRO_PROT_ARGS) |
|
continue; |
continue; |
if (n->tok == MDOC_It && n->type == ROFFT_BODY) |
if (n->tok == MDOC_It && n->type == ROFFT_BODY) |
body = n; |
body = n; |
if (n->tok == MDOC_Bl) |
if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT) |
break; |
break; |
} |
} |
|
|