version 1.154, 2014/11/29 04:31:35 |
version 1.156, 2014/11/30 05:29:00 |
Line 53 static void phrase_ta(MACRO_PROT_ARGS); |
|
Line 53 static void phrase_ta(MACRO_PROT_ARGS); |
|
static void dword(struct mdoc *, int, int, const char *, |
static void dword(struct mdoc *, int, int, const char *, |
enum mdelim, int); |
enum mdelim, int); |
static void append_delims(struct mdoc *, int, int *, char *); |
static void append_delims(struct mdoc *, int, int *, char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(struct mdoc *, enum mdoct, |
|
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 int make_pending(struct mdoc_node *, enum mdoct, |
struct mdoc *, int, int); |
struct mdoc *, int, int); |
Line 245 mdoc_macroend(struct mdoc *mdoc) |
|
Line 246 mdoc_macroend(struct mdoc *mdoc) |
|
* or as a line macro if from == MDOC_MAX. |
* or as a line macro if from == MDOC_MAX. |
*/ |
*/ |
static enum mdoct |
static enum mdoct |
lookup(enum mdoct from, const char *p) |
lookup(struct mdoc *mdoc, enum mdoct from, int line, int ppos, const char *p) |
{ |
{ |
enum mdoct res; |
enum mdoct res; |
|
|
if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { |
if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { |
res = mdoc_hash_find(p); |
res = mdoc_hash_find(p); |
if (res != MDOC_MAX && mdoc_macros[res].flags & MDOC_CALLABLE) |
if (res != MDOC_MAX) { |
return(res); |
if (mdoc_macros[res].flags & MDOC_CALLABLE) |
|
return(res); |
|
if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll) |
|
mandoc_msg(MANDOCERR_MACRO_CALL, |
|
mdoc->parse, line, ppos, p); |
|
} |
} |
} |
return(MDOC_MAX); |
return(MDOC_MAX); |
} |
} |
Line 671 macro_or_word(MACRO_PROT_ARGS, int parsed) |
|
Line 677 macro_or_word(MACRO_PROT_ARGS, int parsed) |
|
else if (*p == '"') |
else if (*p == '"') |
p++; |
p++; |
else if (parsed) |
else if (parsed) |
ntok = lookup(tok, p); |
ntok = lookup(mdoc, tok, line, ppos, p); |
|
|
if (ntok == MDOC_MAX) { |
if (ntok == MDOC_MAX) { |
dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || |
dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || |
Line 832 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 838 blk_exp_close(MACRO_PROT_ARGS) |
|
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
break; |
break; |
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); |
ntok = ac == ARGS_QWORD ? MDOC_MAX : |
|
lookup(mdoc, tok, line, lastarg, p); |
|
|
if (ntok == MDOC_MAX) { |
if (ntok == MDOC_MAX) { |
dword(mdoc, line, lastarg, p, DELIM_MAX, |
dword(mdoc, line, lastarg, p, DELIM_MAX, |
Line 933 in_line(MACRO_PROT_ARGS) |
|
Line 940 in_line(MACRO_PROT_ARGS) |
|
} |
} |
|
|
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
MDOC_MAX : lookup(tok, p); |
MDOC_MAX : lookup(mdoc, tok, line, la, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 1389 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1396 in_line_argn(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = mdoc->flags & MDOC_NEWLINE; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
Line 1421 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1428 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
for (flushed = j = 0; ; ) { |
p = NULL; |
|
flushed = j = 0; |
|
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) { |
|
if (j < 2 && tok == MDOC_Pf) |
|
mandoc_vmsg(MANDOCERR_PF_SKIP, |
|
mdoc->parse, line, ppos, "Pf %s", |
|
p == NULL ? "at eol" : p); |
break; |
break; |
|
} |
|
|
if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) && |
if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) && |
ac != ARGS_QWORD && j == 0 && |
ac != ARGS_QWORD && j == 0 && |
Line 1440 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1454 in_line_argn(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && j == 0)) ? |
|
MDOC_MAX : lookup(mdoc, tok, line, la, p); |
|
|
if (ntok != MDOC_MAX) { |
if (ntok != MDOC_MAX) { |
if ( ! flushed) |
if ( ! flushed) |
Line 1463 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1478 in_line_argn(MACRO_PROT_ARGS) |
|
j++; |
j++; |
} |
} |
|
|
if (j == 0) |
if (j == 0) { |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
|
if (ac == ARGS_PUNCT && tok == MDOC_Pf) |
|
append_delims(mdoc, line, pos, buf); |
|
} |
if ( ! flushed) |
if ( ! flushed) |
rew_elem(mdoc, tok); |
rew_elem(mdoc, tok); |
if (nl) |
if (nl) |