version 1.33, 2009/08/20 08:59:12 |
version 1.36, 2009/09/20 17:24:57 |
Line 46 static int rew_sub(enum mdoc_type, struct mdoc *, |
|
Line 46 static int rew_sub(enum mdoc_type, struct mdoc *, |
|
static int rew_last(struct mdoc *, |
static int rew_last(struct mdoc *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
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(int, const char *); |
static int lookup_raw(struct mdoc *, const char *); |
static int lookup_raw(const char *); |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
const struct mdoc_node *); |
const struct mdoc_node *); |
|
|
Line 258 mdoc_macroend(struct mdoc *m) |
|
Line 258 mdoc_macroend(struct mdoc *m) |
|
* Look up a macro from within a subsequent context. |
* Look up a macro from within a subsequent context. |
*/ |
*/ |
static int |
static int |
lookup(struct mdoc *mdoc, int from, const char *p) |
lookup(int from, const char *p) |
{ |
{ |
|
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
return(MDOC_MAX); |
return(MDOC_MAX); |
return(lookup_raw(mdoc, p)); |
return(lookup_raw(p)); |
} |
} |
|
|
|
|
Line 271 lookup(struct mdoc *mdoc, int from, const char *p) |
|
Line 272 lookup(struct mdoc *mdoc, int from, const char *p) |
|
* Lookup a macro following the initial line macro. |
* Lookup a macro following the initial line macro. |
*/ |
*/ |
static int |
static int |
lookup_raw(struct mdoc *mdoc, const char *p) |
lookup_raw(const char *p) |
{ |
{ |
int res; |
int res; |
|
|
if (MDOC_MAX == (res = mdoc_hash_find(mdoc->htab, p))) |
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
return(MDOC_MAX); |
return(MDOC_MAX); |
if (MDOC_CALLABLE & mdoc_macros[res].flags) |
if (MDOC_CALLABLE & mdoc_macros[res].flags) |
return(res); |
return(res); |
Line 669 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 670 blk_exp_close(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(m, tok, p))) { |
if (MDOC_MAX != (c = lookup(tok, p))) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 753 in_line(MACRO_PROT_ARGS) |
|
Line 754 in_line(MACRO_PROT_ARGS) |
|
|
|
/* Quoted words shouldn't be looked-up. */ |
/* Quoted words shouldn't be looked-up. */ |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(m, tok, p); |
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 932 blk_full(MACRO_PROT_ARGS) |
|
Line 933 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
if (MDOC_MAX == (c = lookup(m, tok, p))) { |
if (MDOC_MAX == (c = lookup(tok, p))) { |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 995 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 996 blk_part_imp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX == (c = lookup(m, tok, p))) { |
if (MDOC_MAX == (c = lookup(tok, p))) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1098 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1099 blk_part_exp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(m, tok, p))) { |
if (MDOC_MAX != (c = lookup(tok, p))) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 1209 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1210 in_line_argn(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(m, tok, p))) { |
if (MDOC_MAX != (c = lookup(tok, p))) { |
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
Line 1284 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1285 in_line_eoln(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == w) |
if (ARGS_EOLN == w) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(m, tok, p); |
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != c) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
Line 1333 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1334 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
if (ARGS_EOLN == w) |
if (ARGS_EOLN == w) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(m, p); |
c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != c) { |
if ( ! mdoc_macro(m, c, line, la, &pos, buf)) |
if ( ! mdoc_macro(m, c, line, la, &pos, buf)) |