version 1.166, 2015/02/02 04:26:44 |
version 1.169, 2015/02/02 19:23:23 |
Line 35 enum rew { /* see rew_dohalt() */ |
|
Line 35 enum rew { /* see rew_dohalt() */ |
|
REWIND_NONE, |
REWIND_NONE, |
REWIND_THIS, |
REWIND_THIS, |
REWIND_MORE, |
REWIND_MORE, |
REWIND_FORCE, |
REWIND_FORCE |
REWIND_LATER, |
|
REWIND_ERROR |
|
}; |
}; |
|
|
static void blk_full(MACRO_PROT_ARGS); |
static void blk_full(MACRO_PROT_ARGS); |
Line 56 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 366 rew_alt(enum mdoct tok) |
|
Line 364 rew_alt(enum mdoct tok) |
|
* REWIND_THIS: *p matches tok, so rewind *p and nothing else. |
* REWIND_THIS: *p matches tok, so rewind *p and nothing else. |
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok. |
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok. |
* REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p. |
* REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p. |
* REWIND_LATER: *p is explicit and still open, postpone rewinding. |
|
* REWIND_ERROR: No tok block is open at all. |
|
*/ |
*/ |
static enum rew |
static enum rew |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
Line 381 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 377 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* instance anyway. |
* instance anyway. |
*/ |
*/ |
if (MDOC_ROOT == p->type) |
if (MDOC_ROOT == p->type) |
return(MDOC_BLOCK == type && |
return(REWIND_NONE); |
MDOC_EXPLICIT & mdoc_macros[tok].flags ? |
|
REWIND_ERROR : REWIND_NONE); |
|
|
|
/* |
/* |
* When starting to rewind, skip plain text |
* When starting to rewind, skip plain text |
Line 398 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 392 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
*/ |
*/ |
tok = rew_alt(tok); |
tok = rew_alt(tok); |
if (tok == p->tok) |
if (tok == p->tok) |
return(p->end ? REWIND_NONE : |
return(type == p->type ? REWIND_THIS : REWIND_MORE); |
type == p->type ? REWIND_THIS : REWIND_MORE); |
|
|
|
/* |
/* |
* While elements do require rewinding for themselves, |
* While elements do require rewinding for themselves, |
Line 413 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 406 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* Blocks delimiting our target token get REWIND_NONE. |
* Blocks delimiting our target token get REWIND_NONE. |
*/ |
*/ |
switch (tok) { |
switch (tok) { |
case MDOC_Bl: |
|
if (MDOC_It == p->tok) |
|
return(REWIND_MORE); |
|
break; |
|
case MDOC_It: |
case MDOC_It: |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
return(REWIND_NONE); |
return(REWIND_NONE); |
break; |
break; |
/* |
|
* XXX Badly nested block handling still fails badly |
|
* when one block is breaking two blocks of the same type. |
|
* This is an incomplete and extremely ugly workaround, |
|
* required to let the OpenBSD tree build. |
|
*/ |
|
case MDOC_Oo: |
|
if (MDOC_Op == p->tok) |
|
return(REWIND_MORE); |
|
break; |
|
case MDOC_Nm: |
case MDOC_Nm: |
return(REWIND_NONE); |
return(REWIND_NONE); |
case MDOC_Nd: |
case MDOC_Nd: |
Line 452 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 431 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
|
|
/* |
/* |
* Default block rewinding rules. |
* Default block rewinding rules. |
* In particular, always skip block end markers, |
* In particular, let all blocks rewind Nm children. |
* and let all blocks rewind Nm children. |
|
* Do not warn again when closing a block, |
* Do not warn again when closing a block, |
* since closing the body already warned. |
* since closing the body already warned. |
*/ |
*/ |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
if (MDOC_Nm == p->tok || |
MDOC_BLOCK == type || (MDOC_BLOCK == p->type && |
MDOC_BLOCK == type || MDOC_BLOCK == p->type) |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
|
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
/* |
/* |
* By default, closing out full blocks |
* By default, closing out full blocks |
* forces closing of broken explicit blocks, |
* forces closing of broken explicit blocks. |
* while closing out partial blocks |
|
* allows delayed rewinding by default. |
|
*/ |
*/ |
return (&blk_full == mdoc_macros[tok].fp ? |
return (REWIND_FORCE); |
REWIND_FORCE : REWIND_LATER); |
|
} |
} |
|
|
static void |
static void |
Line 486 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_sub 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; |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[breaker->tok], |
|
mdoc_macronames[broken->tok]); |
|
|
/* |
/* |
* Iterate backwards, searching for the block matching tok, |
* If the *broken block (Z) is already broken by a block (B) |
* that is, the block breaking the *broken block. |
* contained in the breaker (A), make the breaker pending |
|
* on that inner breaker (B). Graphically, |
|
* |
|
* breaker=[A! broken=n=[B!->A (old broken=)[Z->B B] A] Z] |
|
* |
|
* In these graphics, "->" indicates the "pending" pointer and |
|
* "!" indicates the MDOC_BREAK flag. Each of the cases gets |
|
* one additional pointer (B->A) and one additional flag (A!). |
*/ |
*/ |
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 (n == broken->pending) |
* encounter its breaker (B), make the tok block (A) |
broken = n; |
* pending on that inner breaker (B). |
else if (n == breaker) |
* Graphically, [A breaker=[B! broken=[Z->B B] tok=A] Z] |
break; |
* becomes breaker=[A broken=[B! [Z->B B] tok=A] Z] |
|
* and finally [A! [B!->A [Z->B B] A] Z]. |
|
* In these graphics, "->" indicates the "pending" |
|
* pointer and "!" indicates the MDOC_BREAK flag. |
|
* Each of the cases gets one additional pointer (B->A) |
|
* and one additional flag (A!). |
|
*/ |
|
if (breaker == broken->pending) { |
|
broken = breaker; |
|
continue; |
|
} |
|
|
|
if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker)) |
/* |
continue; |
* Found the breaker. |
if (MDOC_BODY == broken->type) |
* |
broken = broken->parent; |
* If another, outer breaker (X) is already pending on |
|
* the *broken block (B), we must not clobber the link |
|
* to the outer breaker, but make it pending on the new, |
|
* now inner breaker (A). Graphically, |
|
* |
|
* [X! n=breaker=[A!->X broken=[B(->X)->A X] A] B]. |
|
*/ |
|
|
/* |
if (broken->pending != NULL) { |
* Found the breaker. |
n = breaker; |
* If another, outer breaker (X) is already pending on |
|
* the *broken block (B), we must not clobber the link |
|
* to the outer breaker, but make it pending on the |
|
* new, now inner breaker (A). |
|
* Graphically, [X! breaker=[A broken=[B->X X] tok=A] B] |
|
* becomes [X! breaker=[A->X broken=[B X] tok=A] B] |
|
* and finally [X! [A!->X [B->A X] A] B]. |
|
*/ |
|
if (broken->pending) { |
|
struct mdoc_node *taker; |
|
|
|
/* |
|
* If the inner breaker (A) is already broken, |
|
* too, it cannot take on the outer breaker (X) |
|
* but must hand it on to its own breakers (Y): |
|
* [X! [Y! breaker=[A->Y Y] broken=[B->X X] tok=A] B] |
|
* [X! take=[Y!->X brea=[A->Y Y] brok=[B X] tok=A] B] |
|
* and finally [X! [Y!->X [A!->Y Y] [B->A X] A] B]. |
|
*/ |
|
taker = breaker; |
|
while (taker->pending) |
|
taker = taker->pending; |
|
taker->pending = broken->pending; |
|
} |
|
|
|
/* |
/* |
* Now we have reduced the situation to the simplest |
* If the inner breaker (A) is already broken, too, |
* case, which is just breaker=[A broken=[B tok=A] B] |
* it cannot take on the outer breaker (X) but must |
* and becomes [A! [B->A A] B]. |
* hand it on to its own breakers (Y). Graphically, |
|
* |
|
* [X! n=[Y!->X breaker=[A!->Y Y] broken=[B(->X)->A X] A] B] |
*/ |
*/ |
broken->pending = breaker; |
|
breaker->flags |= MDOC_BREAK; |
while (n->pending) |
if (breaker->body != NULL) |
n = n->pending; |
breaker->body->flags |= MDOC_BREAK; |
n->pending = broken->pending; |
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[broken->tok]); |
|
return(1); |
|
} |
} |
|
|
/* |
/* |
* Found no matching block for tok. |
* Now we have reduced the situation to the simplest case: |
* Are you trying to close a block that is not open? |
* breaker=[A! broken=[B->A A] B]. |
*/ |
*/ |
return(0); |
|
|
broken->pending = breaker; |
|
breaker->flags |= MDOC_BREAK; |
|
if (breaker->body != NULL) |
|
breaker->body->flags |= MDOC_BREAK; |
} |
} |
|
|
static void |
static void |
Line 606 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
Line 563 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
to = n; |
to = n; |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
case REWIND_LATER: |
|
if (make_pending(n, tok, mdoc, line, ppos) || |
|
t != MDOC_BLOCK) |
|
return; |
|
/* FALLTHROUGH */ |
|
case REWIND_ERROR: |
|
mandoc_msg(MANDOCERR_BLK_NOTOPEN, |
|
mdoc->parse, line, ppos, |
|
mdoc_macronames[tok]); |
|
return; |
|
} |
} |
break; |
break; |
} |
} |
Line 800 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 747 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
/* |
/* |
* When there is a pending sub block, |
* When there is a pending sub block, postpone |
* postpone closing out the current block |
* closing out the current block until the |
* until the rew_sub() 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 860 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 807 blk_exp_close(MACRO_PROT_ARGS) |
|
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"%s %s", mdoc_macronames[tok], |
"%s %s", mdoc_macronames[tok], |
buf + *pos); |
buf + *pos); |
rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); |
if (endbody == NULL) |
|
rew_pending(mdoc, n); |
return; |
return; |
} |
} |
|
|
Line 1175 blk_full(MACRO_PROT_ARGS) |
|
Line 1123 blk_full(MACRO_PROT_ARGS) |
|
* reopen our scope if the last parse was a |
* reopen our scope if the last parse was a |
* phrase or partial phrase. |
* phrase or partial phrase. |
*/ |
*/ |
rew_sub(MDOC_BODY, mdoc, tok, line, ppos); |
if (body != NULL) |
|
rew_last(mdoc, body); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
break; |
break; |
} |
} |
Line 1209 blk_full(MACRO_PROT_ARGS) |
|
Line 1158 blk_full(MACRO_PROT_ARGS) |
|
* head; if we have, rewind that instead. |
* head; if we have, rewind that instead. |
*/ |
*/ |
|
|
rew_sub(body ? MDOC_BODY : MDOC_HEAD, |
rew_last(mdoc, body == NULL ? head : body); |
mdoc, tok, line, ppos); |
|
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
|
|
/* |
/* |
Line 1244 blk_full(MACRO_PROT_ARGS) |
|
Line 1192 blk_full(MACRO_PROT_ARGS) |
|
/* |
/* |
* If there is an open (i.e., unvalidated) sub-block requiring |
* If there is an open (i.e., unvalidated) sub-block requiring |
* explicit close-out, postpone switching the current block from |
* explicit close-out, postpone switching the current block from |
* head to body until the rew_sub() call closing out that |
* head to body until the rew_pending() call closing out that |
* sub-block. |
* sub-block. |
*/ |
*/ |
for (n = mdoc->last; n && n != head; n = n->parent) { |
for (n = mdoc->last; n && n != head; n = n->parent) { |
Line 1258 blk_full(MACRO_PROT_ARGS) |
|
Line 1206 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Close out scopes to remain in a consistent state. */ |
/* Close out scopes to remain in a consistent state. */ |
|
|
rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); |
rew_last(mdoc, head); |
mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
out: |
out: |
if (mdoc->flags & MDOC_FREECOL) { |
if (mdoc->flags & MDOC_FREECOL) { |
rew_sub(MDOC_BODY, mdoc, tok, line, ppos); |
rew_last(mdoc, body); |
rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); |
rew_last(mdoc, blk); |
mdoc->flags &= ~MDOC_FREECOL; |
mdoc->flags &= ~MDOC_FREECOL; |
} |
} |
} |
} |
Line 1321 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1269 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* |
/* |
* If there is an open sub-block requiring explicit close-out, |
* If there is an open sub-block requiring explicit close-out, |
* postpone closing out the current block |
* postpone closing out the current block until the |
* until the rew_sub() call closing out the sub-block. |
* rew_pending() call closing out the sub-block. |
*/ |
*/ |
|
|
for (n = mdoc->last; n && n != body && n != blk->parent; |
for (n = mdoc->last; n && n != body && n != blk->parent; |
Line 1330 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1278 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; |
Line 1564 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1512 ctx_synopsis(MACRO_PROT_ARGS) |
|
static void |
static void |
phrase_ta(MACRO_PROT_ARGS) |
phrase_ta(MACRO_PROT_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *body, *n; |
|
|
/* Make sure we are in a column list or ignore this macro. */ |
/* Make sure we are in a column list or ignore this macro. */ |
|
|
n = mdoc->last; |
body = NULL; |
while (n != NULL && |
for (n = mdoc->last; n != NULL; n = n->parent) { |
(n->tok != MDOC_Bl || n->flags & (MDOC_VALID | MDOC_BREAK))) |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
n = n->parent; |
continue; |
|
if (n->tok == MDOC_It && n->type == MDOC_BODY) |
|
body = n; |
|
if (n->tok == MDOC_Bl) |
|
break; |
|
} |
|
|
if (n == NULL || n->norm->Bl.type != LIST_column) { |
if (n == NULL || n->norm->Bl.type != LIST_column) { |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
line, ppos, "Ta"); |
line, ppos, "Ta"); |
Line 1580 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1534 phrase_ta(MACRO_PROT_ARGS) |
|
|
|
/* Advance to the next column. */ |
/* Advance to the next column. */ |
|
|
rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); |
rew_last(mdoc, body); |
mdoc_body_alloc(mdoc, line, ppos, MDOC_It); |
mdoc_body_alloc(mdoc, line, ppos, MDOC_It); |
parse_rest(mdoc, MDOC_MAX, line, pos, buf); |
parse_rest(mdoc, MDOC_MAX, line, pos, buf); |
} |
} |