version 1.152, 2014/11/28 23:21:32 |
version 1.157, 2014/12/13 13:14:39 |
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, |
static enum mdoct lookup_raw(const char *); |
int, int, const char *); |
|
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); |
static void phrase(struct mdoc *, int, int, char *); |
static int parse_rest(struct mdoc *, enum mdoct, |
|
int, int *, char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
const struct mdoc_node *); |
const struct mdoc_node *); |
Line 240 mdoc_macroend(struct mdoc *mdoc) |
|
Line 242 mdoc_macroend(struct mdoc *mdoc) |
|
} |
} |
|
|
/* |
/* |
* Look up a macro from within a subsequent context. |
* Look up the macro at *p called by "from", |
|
* 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) |
{ |
{ |
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
|
return(MDOC_MAX); |
|
return(lookup_raw(p)); |
|
} |
|
|
|
/* |
|
* Lookup a macro following the initial line macro. |
|
*/ |
|
static enum mdoct |
|
lookup_raw(const char *p) |
|
{ |
|
enum mdoct res; |
enum mdoct res; |
|
|
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { |
return(MDOC_MAX); |
res = mdoc_hash_find(p); |
if (MDOC_CALLABLE & mdoc_macros[res].flags) |
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 633 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 630 dword(struct mdoc *mdoc, int line, int col, const char |
|
static void |
static void |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
{ |
{ |
int la; |
|
enum margserr ac; |
|
char *p; |
char *p; |
|
int la; |
|
|
if (buf[*pos] == '\0') |
if (buf[*pos] == '\0') |
return; |
return; |
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(mdoc, line, pos, buf, &p); |
if (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, &p) == ARGS_EOLN) |
if (ac == ARGS_EOLN) |
|
break; |
break; |
dword(mdoc, line, la, p, DELIM_MAX, 1); |
dword(mdoc, line, la, p, DELIM_MAX, 1); |
|
|
Line 665 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 660 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
} |
} |
|
|
/* |
/* |
|
* Parse one word. |
|
* If it is a macro, call it and return 1. |
|
* Otherwise, allocate it and return 0. |
|
*/ |
|
static int |
|
macro_or_word(MACRO_PROT_ARGS, int parsed) |
|
{ |
|
char *p; |
|
enum mdoct ntok; |
|
|
|
p = buf + ppos; |
|
ntok = MDOC_MAX; |
|
if (*p == '"') |
|
p++; |
|
else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT)) |
|
ntok = lookup(mdoc, tok, line, ppos, p); |
|
|
|
if (ntok == MDOC_MAX) { |
|
dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || |
|
mdoc_macros[tok].flags & MDOC_JOIN); |
|
return(0); |
|
} else { |
|
if (mdoc_macros[tok].fp == in_line_eoln) |
|
rew_elem(mdoc, tok); |
|
mdoc_macro(mdoc, ntok, line, ppos, pos, buf); |
|
if (tok == MDOC_MAX) |
|
append_delims(mdoc, line, pos, buf); |
|
return(1); |
|
} |
|
} |
|
|
|
/* |
* Close out block partial/full explicit. |
* Close out block partial/full explicit. |
*/ |
*/ |
static void |
static void |
Line 809 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 836 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 910 in_line(MACRO_PROT_ARGS) |
|
Line 938 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 1025 in_line(MACRO_PROT_ARGS) |
|
Line 1053 in_line(MACRO_PROT_ARGS) |
|
static void |
static void |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la, nl, nparsed; |
int la, nl, parsed; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *body; /* save of body macro */ |
struct mdoc_node *body; /* save of body macro */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
enum mdoct ntok; |
|
enum margserr ac, lac; |
enum margserr ac, lac; |
char *p; |
char *p; |
|
|
Line 1077 blk_full(MACRO_PROT_ARGS) |
|
Line 1104 blk_full(MACRO_PROT_ARGS) |
|
* parsed, even though `It' macros in general are parsed. |
* parsed, even though `It' macros in general are parsed. |
*/ |
*/ |
|
|
nparsed = tok == MDOC_It && |
parsed = tok != MDOC_It || |
mdoc->last->parent->tok == MDOC_Bl && |
mdoc->last->parent->tok != MDOC_Bl || |
mdoc->last->parent->norm->Bl.type == LIST_diag; |
mdoc->last->parent->norm->Bl.type != LIST_diag; |
|
|
/* |
/* |
* The `Nd' macro has all arguments in its body: it's a hybrid |
* The `Nd' macro has all arguments in its body: it's a hybrid |
Line 1160 blk_full(MACRO_PROT_ARGS) |
|
Line 1187 blk_full(MACRO_PROT_ARGS) |
|
mdoc->flags |= MDOC_PPHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
if (ac == ARGS_PEND && lac == ARGS_PPHRASE) |
if (ac == ARGS_PEND && lac == ARGS_PPHRASE) |
mdoc->flags |= MDOC_PPHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
phrase(mdoc, line, la, buf); |
parse_rest(mdoc, MDOC_MAX, line, &la, buf); |
mdoc->flags &= ~MDOC_PPHRASE; |
mdoc->flags &= ~MDOC_PPHRASE; |
continue; |
continue; |
} |
} |
|
|
ntok = nparsed || ac == ARGS_QWORD ? |
if (macro_or_word(mdoc, tok, line, la, pos, buf, parsed)) |
MDOC_MAX : lookup(tok, p); |
|
|
|
if (ntok != MDOC_MAX) { |
|
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
|
break; |
break; |
} |
|
dword(mdoc, line, la, p, DELIM_MAX, |
|
MDOC_JOIN & mdoc_macros[tok].flags); |
|
} |
} |
|
|
if (head == NULL) |
if (head == NULL) |
|
|
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
int la, nl; |
int la, nl; |
enum mdoct ntok; |
|
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *blk; /* saved block context */ |
Line 1257 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1276 blk_part_imp(MACRO_PROT_ARGS) |
|
if (body == NULL) |
if (body == NULL) |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
|
|
if (ntok != MDOC_MAX) { |
|
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
|
break; |
break; |
} |
|
dword(mdoc, line, la, p, DELIM_MAX, |
|
MDOC_JOIN & mdoc_macros[tok].flags); |
|
} |
} |
if (body == NULL) |
if (body == NULL) |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
Line 1308 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1321 blk_part_exp(MACRO_PROT_ARGS) |
|
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *body; /* keep track of body */ |
struct mdoc_node *body; /* keep track of body */ |
char *p; |
char *p; |
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
Line 1356 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1368 blk_part_exp(MACRO_PROT_ARGS) |
|
} |
} |
assert(head != NULL && body != NULL); |
assert(head != NULL && body != NULL); |
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
if (ntok != MDOC_MAX) { |
|
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
|
break; |
break; |
} |
|
dword(mdoc, line, la, p, DELIM_MAX, |
|
MDOC_JOIN & mdoc_macros[tok].flags); |
|
} |
} |
|
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
Line 1387 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1394 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 1419 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1426 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 1438 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1452 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 1461 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1476 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) |
Line 1472 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1490 in_line_argn(MACRO_PROT_ARGS) |
|
static void |
static void |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
|
enum margserr ac; |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
|
enum mdoct ntok; |
|
|
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
|
if (tok == MDOC_Pp) |
if (tok == MDOC_Pp) |
rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); |
rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); |
|
|
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
|
if (parse_rest(mdoc, tok, line, pos, buf)) |
|
return; |
|
rew_elem(mdoc, tok); |
|
} |
|
|
/* Parse argument terms. */ |
/* |
|
* The simplest argument parser available: Parse the remaining |
|
* words until the end of the phrase or line and return 0 |
|
* or until the next macro, call that macro, and return 1. |
|
*/ |
|
static int |
|
parse_rest(struct mdoc *mdoc, enum mdoct tok, int line, int *pos, char *buf) |
|
{ |
|
int la; |
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN) |
if (ac == ARGS_EOLN) |
return(0); |
break; |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
|
return(1); |
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (ntok != MDOC_MAX) { |
|
rew_elem(mdoc, tok); |
|
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
|
return; |
|
} |
|
dword(mdoc, line, la, p, DELIM_MAX, |
|
MDOC_JOIN & mdoc_macros[tok].flags); |
|
} |
} |
|
|
/* Close out (no delimiters). */ |
|
|
|
rew_elem(mdoc, tok); |
|
} |
} |
|
|
static void |
static void |
Line 1530 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1541 ctx_synopsis(MACRO_PROT_ARGS) |
|
* macro is encountered. |
* macro is encountered. |
*/ |
*/ |
static void |
static void |
phrase(struct mdoc *mdoc, int line, int ppos, char *buf) |
|
{ |
|
int la, pos; |
|
enum margserr ac; |
|
enum mdoct ntok; |
|
char *p; |
|
|
|
for (pos = ppos; ; ) { |
|
la = pos; |
|
|
|
ac = mdoc_zargs(mdoc, line, &pos, buf, &p); |
|
if (ac == ARGS_EOLN) |
|
break; |
|
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p); |
|
|
|
if (ntok != MDOC_MAX) { |
|
mdoc_macro(mdoc, ntok, line, la, &pos, buf); |
|
append_delims(mdoc, line, &pos, buf); |
|
return; |
|
} |
|
dword(mdoc, line, la, p, DELIM_MAX, 1); |
|
} |
|
} |
|
|
|
static void |
|
phrase_ta(MACRO_PROT_ARGS) |
phrase_ta(MACRO_PROT_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int la; |
|
enum mdoct ntok; |
|
enum margserr ac; |
|
char *p; |
|
|
|
/* Make sure we are in a column list or ignore this macro. */ |
/* Make sure we are in a column list or ignore this macro. */ |
|
|
Line 1579 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1560 phrase_ta(MACRO_PROT_ARGS) |
|
|
|
rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); |
rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); |
mdoc_body_alloc(mdoc, line, ppos, MDOC_It); |
mdoc_body_alloc(mdoc, line, ppos, MDOC_It); |
|
parse_rest(mdoc, MDOC_MAX, line, pos, buf); |
for (;;) { |
|
la = *pos; |
|
ac = mdoc_zargs(mdoc, line, pos, buf, &p); |
|
if (ac == ARGS_EOLN) |
|
break; |
|
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p); |
|
|
|
if (ntok != MDOC_MAX) { |
|
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
|
append_delims(mdoc, line, pos, buf); |
|
return; |
|
} |
|
dword(mdoc, line, la, p, DELIM_MAX, |
|
MDOC_JOIN & mdoc_macros[tok].flags); |
|
} |
|
} |
} |