version 1.96, 2010/11/29 13:02:47 |
version 1.103, 2011/03/17 11:30:23 |
Line 34 enum rew { /* see rew_dohalt() */ |
|
Line 34 enum rew { /* see rew_dohalt() */ |
|
REWIND_NONE, |
REWIND_NONE, |
REWIND_THIS, |
REWIND_THIS, |
REWIND_MORE, |
REWIND_MORE, |
|
REWIND_FORCE, |
REWIND_LATER, |
REWIND_LATER, |
REWIND_ERROR |
REWIND_ERROR |
}; |
}; |
Line 251 lookup_raw(const char *p) |
|
Line 252 lookup_raw(const char *p) |
|
static int |
static int |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
{ |
{ |
|
struct mdoc_node *n, *np; |
|
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
/* LINTED */ |
/* LINTED */ |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
|
/* |
|
* Save the parent here, because we may delete the |
|
* m->last node in the post-validation phase and reset |
|
* it to m->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
n = mdoc->last; |
return(0); |
mdoc->last = np; |
mdoc->last = mdoc->last->parent; |
|
assert(mdoc->last); |
assert(mdoc->last); |
|
mdoc->last->last = n; |
} |
} |
|
|
if ( ! mdoc_valid_post(mdoc)) |
return(mdoc_valid_post(mdoc)); |
return(0); |
|
return(mdoc_action_post(mdoc)); |
|
} |
} |
|
|
|
|
Line 324 rew_alt(enum mdoct tok) |
|
Line 331 rew_alt(enum mdoct tok) |
|
* inside *p, so there is no need to rewind anything at all. |
* inside *p, so there is no need to rewind anything at all. |
* 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_LATER: *p is explicit and still open, postpone rewinding. |
* REWIND_LATER: *p is explicit and still open, postpone rewinding. |
* REWIND_ERROR: No tok block is open at all. |
* REWIND_ERROR: No tok block is open at all. |
*/ |
*/ |
Line 417 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 425 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
/* |
/* |
* Partial blocks allow delayed rewinding by default. |
* By default, closing out full blocks |
|
* forces closing of broken explicit blocks, |
|
* while closing out partial blocks |
|
* allows delayed rewinding by default. |
*/ |
*/ |
if (&blk_full != mdoc_macros[tok].fp) |
return (&blk_full == mdoc_macros[tok].fp ? |
return (REWIND_LATER); |
REWIND_FORCE : REWIND_LATER); |
|
|
/* |
|
* Full blocks can only be rewound when matching |
|
* or when there is an explicit rule. |
|
*/ |
|
return(REWIND_ERROR); |
|
} |
} |
|
|
|
|
Line 517 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 522 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
/* |
/* |
* Found no matching block for tok. |
* Found no matching block for tok. |
* Are you trying to close a block that is not open? |
* Are you trying to close a block that is not open? |
* XXX Make this non-fatal. |
|
*/ |
*/ |
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
return(0); |
} |
} |
|
|
Line 537 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 540 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(1); |
return(1); |
case (REWIND_THIS): |
case (REWIND_THIS): |
break; |
break; |
|
case (REWIND_FORCE): |
|
mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
/* FALLTHROUGH */ |
case (REWIND_MORE): |
case (REWIND_MORE): |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
case (REWIND_LATER): |
case (REWIND_LATER): |
return(make_pending(n, tok, m, line, ppos)); |
if (make_pending(n, tok, m, line, ppos) || |
|
MDOC_BLOCK != t) |
|
return(1); |
|
/* FALLTHROUGH */ |
case (REWIND_ERROR): |
case (REWIND_ERROR): |
/* XXX Make this non-fatal. */ |
mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos, |
return(1); |
"%s cannot break %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
return 0; |
|
} |
} |
break; |
break; |
} |
} |
Line 591 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 599 append_delims(struct mdoc *m, int line, int *pos, char |
|
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(DELIM_NONE != mdoc_isdelim(p)); |
assert(DELIM_NONE != mandoc_isdelim(p)); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
|
Line 675 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 683 blk_exp_close(MACRO_PROT_ARGS) |
|
* postpone closing out the current block |
* postpone closing out the current block |
* until the rew_sub() closing out the sub-block. |
* until the rew_sub() closing out the sub-block. |
*/ |
*/ |
if ( ! make_pending(later, tok, m, line, ppos)) |
make_pending(later, tok, m, line, ppos); |
return(0); |
|
|
|
/* |
/* |
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
Line 696 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 703 blk_exp_close(MACRO_PROT_ARGS) |
|
if (later && |
if (later && |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
continue; |
continue; |
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) { |
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) |
assert( ! (MDOC_ACTED & n->flags)); |
|
later = n; |
later = n; |
} |
|
} |
} |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
/* FIXME: do this in validate */ |
/* FIXME: do this in validate */ |
if (buf[*pos]) |
if (buf[*pos]) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST); |
return(0); |
|
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 849 in_line(MACRO_PROT_ARGS) |
|
Line 853 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if ( ! nl) |
if ( ! nl) |
Line 865 in_line(MACRO_PROT_ARGS) |
|
Line 869 in_line(MACRO_PROT_ARGS) |
|
* the word. |
* the word. |
*/ |
*/ |
|
|
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? DELIM_NONE : mandoc_isdelim(p); |
|
|
if (DELIM_NONE != d) { |
if (DELIM_NONE != d) { |
/* |
/* |
Line 931 in_line(MACRO_PROT_ARGS) |
|
Line 935 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
Line 1056 blk_full(MACRO_PROT_ARGS) |
|
Line 1059 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PHRASE != ac && |
ARGS_PHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1143 blk_full(MACRO_PROT_ARGS) |
|
Line 1146 blk_full(MACRO_PROT_ARGS) |
|
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
assert( ! (MDOC_ACTED & n->flags)); |
|
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
Line 1220 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1222 blk_part_imp(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1281 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1283 blk_part_imp(MACRO_PROT_ARGS) |
|
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
assert( ! (MDOC_ACTED & n->flags)); |
make_pending(n, tok, m, line, ppos); |
if ( ! make_pending(n, tok, m, line, ppos)) |
|
return(0); |
|
if ( ! mdoc_endbody_alloc(m, line, ppos, |
if ( ! mdoc_endbody_alloc(m, line, ppos, |
tok, body, ENDBODY_NOSPACE)) |
tok, body, ENDBODY_NOSPACE)) |
return(0); |
return(0); |
Line 1297 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1297 blk_part_imp(MACRO_PROT_ARGS) |
|
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
*/ |
*/ |
if (n != body && ! mdoc_vmsg(m, MANDOCERR_SCOPENEST, |
if (n != body) |
line, ppos, "%s broken", mdoc_macronames[tok])) |
mdoc_vmsg(m, MANDOCERR_SCOPENEST, line, ppos, |
return(0); |
"%s broken", mdoc_macronames[tok]); |
|
|
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 1353 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1353 blk_part_exp(MACRO_PROT_ARGS) |
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 1459 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1459 in_line_argn(MACRO_PROT_ARGS) |
|
case (MDOC_Ux): |
case (MDOC_Ux): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
|
case (MDOC_Bx): |
|
/* FALLTHROUGH */ |
case (MDOC_Xr): |
case (MDOC_Xr): |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
Line 1498 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1500 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
0 == j && DELIM_OPEN == mdoc_isdelim(p)) { |
0 == j && DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1527 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1529 in_line_argn(MACRO_PROT_ARGS) |
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
! flushed && |
! flushed && |
DELIM_NONE != mdoc_isdelim(p)) { |
DELIM_NONE != mandoc_isdelim(p)) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
|
|
obsolete(MACRO_PROT_ARGS) |
obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS)); |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS); |
|
return(1); |
} |
} |
|
|
|
|