version 1.186, 2015/04/05 14:43:36 |
version 1.187, 2015/04/05 22:44:20 |
Line 42 static void in_line_argn(MACRO_PROT_ARGS); |
|
Line 42 static void in_line_argn(MACRO_PROT_ARGS); |
|
static void in_line(MACRO_PROT_ARGS); |
static void in_line(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
|
|
static void dword(struct mdoc *, int, int, const char *, |
|
enum mdelim, int); |
|
static void append_delims(struct mdoc *, int, int *, char *); |
static void append_delims(struct mdoc *, int, int *, char *); |
|
static void dword(struct mdoc *, int, int, const char *, |
|
enum mdelim, int); |
|
static int find_pending(struct mdoc *, int, int, int, |
|
struct roff_node *); |
static int lookup(struct mdoc *, int, int, int, const char *); |
static int lookup(struct mdoc *, int, int, int, const char *); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int parse_rest(struct mdoc *, int, int, int *, char *); |
static int parse_rest(struct mdoc *, int, int, int *, char *); |
Line 375 rew_elem(struct mdoc *mdoc, int tok) |
|
Line 377 rew_elem(struct mdoc *mdoc, int tok) |
|
} |
} |
|
|
/* |
/* |
|
* If there is an open sub-block of the target requiring |
|
* explicit close-out, postpone closing out the target until |
|
* the rew_pending() call closing out the sub-block. |
|
*/ |
|
static int |
|
find_pending(struct mdoc *mdoc, int tok, int line, int ppos, |
|
struct roff_node *target) |
|
{ |
|
struct roff_node *n; |
|
int irc; |
|
|
|
irc = 0; |
|
for (n = mdoc->last; n != NULL && n != target; n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
irc = 1; |
|
n->flags = MDOC_BROKEN; |
|
if (target->type == ROFFT_HEAD) |
|
target->flags = MDOC_ENDED; |
|
else if ( ! (target->flags & MDOC_ENDED)) { |
|
mandoc_vmsg(MANDOCERR_BLK_NEST, |
|
mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
mdoc_endbody_alloc(mdoc, line, ppos, |
|
tok, target, ENDBODY_NOSPACE); |
|
} |
|
} |
|
} |
|
return(irc); |
|
} |
|
|
|
/* |
* Allocate a word and check whether it's punctuation or not. |
* Allocate a word and check whether it's punctuation or not. |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
*/ |
*/ |
Line 1070 blk_full(MACRO_PROT_ARGS) |
|
Line 1110 blk_full(MACRO_PROT_ARGS) |
|
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
if (body != NULL) |
if (body != NULL) |
goto out; |
goto out; |
|
if (find_pending(mdoc, tok, line, ppos, head)) |
/* |
|
* If there is an open (i.e., unvalidated) sub-block requiring |
|
* explicit close-out, postpone switching the current block from |
|
* head to body until the rew_pending() call closing out that |
|
* sub-block. |
|
*/ |
|
for (n = mdoc->last; n && n != head; n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
n->flags = MDOC_BROKEN; |
|
head->flags = MDOC_ENDED; |
|
} |
|
} |
|
if (head->flags & MDOC_ENDED) |
|
return; |
return; |
|
|
/* Close out scopes to remain in a consistent state. */ |
/* Close out scopes to remain in a consistent state. */ |
Line 1155 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1176 blk_part_imp(MACRO_PROT_ARGS) |
|
if (body == NULL) |
if (body == NULL) |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
|
|
/* |
if (find_pending(mdoc, tok, line, ppos, body)) |
* If there is an open sub-block requiring explicit close-out, |
|
* postpone closing out the current block until the |
|
* rew_pending() call closing out the sub-block. |
|
*/ |
|
|
|
for (n = mdoc->last; n && n != body && n != blk->parent; |
|
n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
n->flags |= MDOC_BROKEN; |
|
if ( ! (body->flags & MDOC_ENDED)) { |
|
mandoc_vmsg(MANDOCERR_BLK_NEST, |
|
mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
mdoc_endbody_alloc(mdoc, line, ppos, |
|
tok, body, ENDBODY_NOSPACE); |
|
} |
|
} |
|
} |
|
assert(n == body); |
|
if (body->flags & MDOC_ENDED) |
|
return; |
return; |
|
|
rew_last(mdoc, body); |
rew_last(mdoc, body); |