version 1.29, 2009/07/29 08:52:24 |
version 1.31, 2009/08/19 11:58:32 |
Line 45 static int rew_impblock(struct mdoc *, int, int, int |
|
Line 45 static int rew_impblock(struct mdoc *, int, int, int |
|
static int rew_expblock(struct mdoc *, int, int, int); |
static int rew_expblock(struct mdoc *, int, int, int); |
static int rew_subblock(enum mdoc_type, |
static int rew_subblock(enum mdoc_type, |
struct mdoc *, int, int, int); |
struct mdoc *, int, int, int); |
static int rew_last(struct mdoc *, struct mdoc_node *); |
static int rew_last(struct mdoc *, struct mdoc_node *); /* FIXME: make const */ |
static int append_delims(struct mdoc *, int, int *, char *); |
static int append_delims(struct mdoc *, int, int *, char *); |
static int lookup(struct mdoc *, int, const char *); |
static int lookup(struct mdoc *, int, const char *); |
static int lookup_raw(struct mdoc *, const char *); |
static int lookup_raw(struct mdoc *, const char *); |
Line 599 rew_expblock(struct mdoc *mdoc, int tok, int line, int |
|
Line 599 rew_expblock(struct mdoc *mdoc, int tok, int line, int |
|
} |
} |
|
|
|
|
|
/* FIXME: can this be merged with subblock? */ |
static int |
static int |
rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos) |
rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos) |
{ |
{ |
Line 644 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 645 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
assert(mdoc_isdelim(p)); |
assert(mdoc_isdelim(p)); |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(1); |
return(1); |
Line 721 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 721 blk_exp_close(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos)) |
if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos)) |
Line 851 in_line(MACRO_PROT_ARGS) |
|
Line 850 in_line(MACRO_PROT_ARGS) |
|
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
Line 995 blk_full(MACRO_PROT_ARGS) |
|
Line 993 blk_full(MACRO_PROT_ARGS) |
|
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
continue; |
continue; |
} |
} |
|
|
Line 1062 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1059 blk_part_imp(MACRO_PROT_ARGS) |
|
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
continue; |
continue; |
} |
} |
|
|
Line 1190 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1186 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed) { |
if ( ! flushed) { |
Line 1297 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1292 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed && ! rew_elem(mdoc, tok)) |
if ( ! flushed && ! rew_elem(mdoc, tok)) |
Line 1365 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1359 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(rew_elem(mdoc, tok)); |
return(rew_elem(mdoc, tok)); |
Line 1413 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
Line 1406 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(1); |
return(1); |