version 1.99, 2010/12/15 23:39:40 |
version 1.102, 2011/03/17 09:16:38 |
Line 252 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; |
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); |
n = mdoc->last; |
n = mdoc->last; |
mdoc->last = mdoc->last->parent; |
mdoc->last = np; |
assert(mdoc->last); |
assert(mdoc->last); |
mdoc->last->last = n; |
mdoc->last->last = n; |
} |
} |
Line 592 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 863 in_line(MACRO_PROT_ARGS) |
|
Line 870 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 1054 blk_full(MACRO_PROT_ARGS) |
|
Line 1061 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 1217 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1224 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 1348 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1355 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 1454 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1461 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 1493 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1502 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 1522 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1531 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; |