version 1.167, 2015/02/02 15:02:49 |
version 1.168, 2015/02/02 18:26:32 |
Line 54 static void append_delims(struct mdoc *, int, int *, |
|
Line 54 static void append_delims(struct mdoc *, int, int *, |
|
static enum mdoct lookup(struct mdoc *, enum mdoct, |
static enum mdoct lookup(struct mdoc *, enum mdoct, |
int, int, const char *); |
int, int, const char *); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int make_pending(struct mdoc_node *, enum mdoct, |
static void make_pending(struct mdoc *, struct mdoc_node *, |
struct mdoc *, int, int); |
struct mdoc_node *, int, int); |
static int parse_rest(struct mdoc *, enum mdoct, |
static int parse_rest(struct mdoc *, enum mdoct, |
int, int *, char *); |
int, int *, char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
Line 460 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
Line 460 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
} |
} |
|
|
/* |
/* |
* We are trying to close a block identified by tok, |
* We are trying to close the block *breaker, |
* but the child block *broken is still open. |
* but the child block *broken is still open. |
* Thus, postpone closing the tok block |
* Thus, postpone closing the *breaker |
* until the rew_pending() call closing *broken. |
* until the rew_pending() call closing *broken. |
*/ |
*/ |
static int |
static void |
make_pending(struct mdoc_node *broken, enum mdoct tok, |
make_pending(struct mdoc *mdoc, struct mdoc_node *breaker, |
struct mdoc *mdoc, int line, int ppos) |
struct mdoc_node *broken, int line, int ppos) |
{ |
{ |
struct mdoc_node *breaker; |
struct mdoc_node *n; |
|
|
/* |
/* Iterate backwards, searching for the breaker. */ |
* Iterate backwards, searching for the block matching tok, |
|
* that is, the block breaking the *broken block. |
|
*/ |
|
for (breaker = broken->parent; breaker; breaker = breaker->parent) { |
|
|
|
|
for (n = broken->parent; ; n = n->parent) { |
|
|
/* |
/* |
* If the *broken block (Z) is already broken and we |
* If the *broken block (Z) is already broken and we |
* encounter its breaker (B), make the tok block (A) |
* encounter its breaker (B), make the tok block (A) |
* pending on that inner breaker (B). |
* pending on that inner breaker (B). |
* Graphically, [A breaker=[B! broken=[Z->B B] tok=A] Z] |
* Graphically, [A n=[B! broken=[Z->B B] tok=A] Z] |
* becomes breaker=[A broken=[B! [Z->B B] tok=A] Z] |
* becomes [A broken=[B! [Z->B B] tok=A] Z] |
* and finally [A! [B!->A [Z->B B] A] Z]. |
* and finally [A! [B!->A [Z->B B] A] Z]. |
* In these graphics, "->" indicates the "pending" |
* In these graphics, "->" indicates the "pending" |
* pointer and "!" indicates the MDOC_BREAK flag. |
* pointer and "!" indicates the MDOC_BREAK flag. |
* Each of the cases gets one additional pointer (B->A) |
* Each of the cases gets one additional pointer (B->A) |
* and one additional flag (A!). |
* and one additional flag (A!). |
*/ |
*/ |
if (breaker == broken->pending) { |
if (n == broken->pending) { |
broken = breaker; |
broken = n; |
continue; |
continue; |
} |
} |
|
|
if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker)) |
if (n != breaker) |
continue; |
continue; |
if (MDOC_BODY == broken->type) |
|
broken = broken->parent; |
|
|
|
/* |
/* |
* Found the breaker. |
* Found the breaker. |
Line 536 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 532 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
if (breaker->body != NULL) |
if (breaker->body != NULL) |
breaker->body->flags |= MDOC_BREAK; |
breaker->body->flags |= MDOC_BREAK; |
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
"%s breaks %s", mdoc_macronames[tok], |
"%s breaks %s", mdoc_macronames[breaker->tok], |
mdoc_macronames[broken->tok]); |
mdoc_macronames[broken->tok]); |
return(1); |
return; |
} |
} |
|
|
/* |
|
* Found no matching block for tok. |
|
* Are you trying to close a block that is not open? |
|
*/ |
|
return(0); |
|
} |
} |
|
|
static void |
static void |
Line 769 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 759 blk_exp_close(MACRO_PROT_ARGS) |
|
* rew_pending() closing out the sub-block. |
* rew_pending() closing out the sub-block. |
*/ |
*/ |
|
|
make_pending(later, tok, mdoc, line, ppos); |
make_pending(mdoc, n, later, line, ppos); |
|
|
/* |
/* |
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
Line 1295 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1285 blk_part_imp(MACRO_PROT_ARGS) |
|
if (n->type == MDOC_BLOCK && |
if (n->type == MDOC_BLOCK && |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT && |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT && |
! (n->flags & MDOC_VALID)) { |
! (n->flags & MDOC_VALID)) { |
make_pending(n, tok, mdoc, line, ppos); |
make_pending(mdoc, blk, n, line, ppos); |
mdoc_endbody_alloc(mdoc, line, ppos, |
mdoc_endbody_alloc(mdoc, line, ppos, |
tok, body, ENDBODY_NOSPACE); |
tok, body, ENDBODY_NOSPACE); |
return; |
return; |