version 1.151, 2014/11/28 04:47:03 |
version 1.161, 2014/12/22 23:27:32 |
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 366 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 363 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* When starting to rewind, skip plain text |
* When starting to rewind, skip plain text |
* and nodes that have already been rewound. |
* and nodes that have already been rewound. |
*/ |
*/ |
if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) |
if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK)) |
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
/* |
/* |
Line 481 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 478 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
for (breaker = broken->parent; breaker; breaker = breaker->parent) { |
for (breaker = broken->parent; breaker; breaker = breaker->parent) { |
|
|
/* |
/* |
* If the *broken block had already been broken before |
* If the *broken block (Z) is already broken and we |
* and we encounter its breaker, make the tok block |
* encounter its breaker (B), make the tok block (A) |
* pending on the inner breaker. |
* pending on that inner breaker (B). |
* Graphically, "[A breaker=[B broken=[C->B B] tok=A] C]" |
* Graphically, [A breaker=[B! broken=[Z->B B] tok=A] Z] |
* becomes "[A broken=[B [C->B B] tok=A] C]" |
* becomes breaker=[A broken=[B! [Z->B B] tok=A] Z] |
* and finally "[A [B->A [C->B B] A] C]". |
* and finally [A! [B!->A [Z->B B] A] Z]. |
|
* In these graphics, "->" indicates the "pending" |
|
* pointer and "!" indicates the MDOC_BREAK flag. |
|
* Each of the cases gets one additional pointer (B->A) |
|
* and one additional flag (A!). |
*/ |
*/ |
if (breaker == broken->pending) { |
if (breaker == broken->pending) { |
broken = breaker; |
broken = breaker; |
Line 500 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 501 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
|
|
/* |
/* |
* Found the breaker. |
* Found the breaker. |
* If another, outer breaker is already pending on |
* If another, outer breaker (X) is already pending on |
* the *broken block, we must not clobber the link |
* the *broken block (B), we must not clobber the link |
* to the outer breaker, but make it pending on the |
* to the outer breaker, but make it pending on the |
* new, now inner breaker. |
* new, now inner breaker (A). |
* Graphically, "[A breaker=[B broken=[C->A A] tok=B] C]" |
* Graphically, [X! breaker=[A broken=[B->X X] tok=A] B] |
* becomes "[A breaker=[B->A broken=[C A] tok=B] C]" |
* becomes [X! breaker=[A->X broken=[B X] tok=A] B] |
* and finally "[A [B->A [C->B A] B] C]". |
* and finally [X! [A!->X [B->A X] A] B]. |
*/ |
*/ |
if (broken->pending) { |
if (broken->pending) { |
struct mdoc_node *taker; |
struct mdoc_node *taker; |
|
|
/* |
/* |
* If the breaker had also been broken before, |
* If the inner breaker (A) is already broken, |
* it cannot take on the outer breaker itself, |
* too, it cannot take on the outer breaker (X) |
* but must hand it on to its own breakers. |
* but must hand it on to its own breakers (Y): |
* Graphically, this is the following situation: |
* [X! [Y! breaker=[A->Y Y] broken=[B->X X] tok=A] B] |
* "[A [B breaker=[C->B B] broken=[D->A A] tok=C] D]" |
* [X! take=[Y!->X brea=[A->Y Y] brok=[B X] tok=A] B] |
* "[A taker=[B->A breaker=[C->B B] [D->C A] C] D]" |
* and finally [X! [Y!->X [A!->Y Y] [B->A X] A] B]. |
*/ |
*/ |
taker = breaker; |
taker = breaker; |
while (taker->pending) |
while (taker->pending) |
taker = taker->pending; |
taker = taker->pending; |
taker->pending = broken->pending; |
taker->pending = broken->pending; |
} |
} |
|
|
|
/* |
|
* Now we have reduced the situation to the simplest |
|
* case, which is just breaker=[A broken=[B tok=A] B] |
|
* and becomes [A! [B->A A] B]. |
|
*/ |
broken->pending = breaker; |
broken->pending = breaker; |
|
breaker->flags |= MDOC_BREAK; |
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
"%s breaks %s", mdoc_macronames[tok], |
"%s breaks %s", mdoc_macronames[tok], |
mdoc_macronames[broken->tok]); |
mdoc_macronames[broken->tok]); |
|
|
rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
enum mdoct tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n, *to; |
|
|
|
to = NULL; |
n = mdoc->last; |
n = mdoc->last; |
while (n) { |
while (n) { |
switch (rew_dohalt(tok, t, n)) { |
switch (rew_dohalt(tok, t, n)) { |
case REWIND_NONE: |
case REWIND_NONE: |
return; |
if (to == NULL) |
|
return; |
|
n = to; |
|
break; |
case REWIND_THIS: |
case REWIND_THIS: |
n->lastline = line - |
n->lastline = line - |
(mdoc->flags & MDOC_NEWLINE && |
(mdoc->flags & MDOC_NEWLINE && |
Line 563 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
Line 575 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
case REWIND_MORE: |
case REWIND_MORE: |
n->lastline = line - |
n->lastline = line - |
(mdoc->flags & MDOC_NEWLINE ? 1 : 0); |
(mdoc->flags & MDOC_NEWLINE ? 1 : 0); |
|
to = n; |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
case REWIND_LATER: |
case REWIND_LATER: |
Line 633 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 646 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 676 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 675 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 718 blk_exp_close(MACRO_PROT_ARGS) |
|
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *n; /* For searching backwards. */ |
struct mdoc_node *n; /* For searching backwards. */ |
|
|
int j, lastarg, maxargs, flushed, nl; |
int flushed, have_it, j, lastarg, maxargs, nl; |
enum margserr ac; |
enum margserr ac; |
enum mdoct atok, ntok; |
enum mdoct atok, ntok; |
char *p; |
char *p; |
Line 699 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 742 blk_exp_close(MACRO_PROT_ARGS) |
|
* both of our own and of pending sub-blocks. |
* both of our own and of pending sub-blocks. |
*/ |
*/ |
|
|
|
have_it = 0; |
atok = rew_alt(tok); |
atok = rew_alt(tok); |
body = endbody = later = NULL; |
body = endbody = later = NULL; |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (n->flags & MDOC_VALID) |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
continue; |
continue; |
|
|
/* Remember the start of our own body. */ |
/* Remember the start of our own body. */ |
Line 715 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 759 blk_exp_close(MACRO_PROT_ARGS) |
|
|
|
if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm) |
if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm) |
continue; |
continue; |
|
|
|
if (n->tok == MDOC_It) { |
|
have_it = 1; |
|
continue; |
|
} |
|
|
if (atok == n->tok) { |
if (atok == n->tok) { |
assert(body); |
assert(body); |
|
|
Line 724 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 774 blk_exp_close(MACRO_PROT_ARGS) |
|
* just proceed to closing out. |
* just proceed to closing out. |
*/ |
*/ |
|
|
if (later == NULL) |
if (later == NULL || |
|
(tok == MDOC_El && !have_it)) |
break; |
break; |
|
|
/* |
/* |
Line 763 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 814 blk_exp_close(MACRO_PROT_ARGS) |
|
* implicit ones, the first open implicit block. |
* implicit ones, the first open implicit block. |
*/ |
*/ |
|
|
if (later && |
if (later == NULL || |
mdoc_macros[later->tok].flags & MDOC_EXPLICIT) |
! (mdoc_macros[later->tok].flags & MDOC_EXPLICIT)) |
continue; |
|
if (n->tok != MDOC_It) |
|
later = n; |
later = n; |
} |
} |
rew_sub(MDOC_BODY, mdoc, tok, line, ppos); |
rew_sub(MDOC_BODY, mdoc, tok, line, ppos); |
Line 809 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 858 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, |
|
|
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
enum margverr av; |
|
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
enum mdelim d; |
enum mdelim d; |
Line 876 in_line(MACRO_PROT_ARGS) |
|
Line 925 in_line(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
for (arg = NULL;; ) { |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
la = *pos; |
|
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
if (av == ARGV_ARG) |
|
continue; |
|
if (av == ARGV_WORD) |
|
*pos = la; |
|
break; |
|
} |
|
|
|
d = DELIM_NONE; |
d = DELIM_NONE; |
firstarg = 1; |
firstarg = 1; |
Line 919 in_line(MACRO_PROT_ARGS) |
|
Line 960 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 1034 in_line(MACRO_PROT_ARGS) |
|
Line 1075 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; |
enum margverr av; |
|
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
Line 1050 blk_full(MACRO_PROT_ARGS) |
|
Line 1089 blk_full(MACRO_PROT_ARGS) |
|
|
|
if (tok == MDOC_It) { |
if (tok == MDOC_It) { |
for (n = mdoc->last; n; n = n->parent) |
for (n = mdoc->last; n; n = n->parent) |
if (n->tok == MDOC_Bl && |
if (n->tok == MDOC_Bl && n->type == MDOC_BLOCK && |
! (n->flags & MDOC_VALID)) |
! (n->flags & (MDOC_VALID | MDOC_BREAK))) |
break; |
break; |
if (n == NULL) { |
if (n == NULL) { |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
Line 1078 blk_full(MACRO_PROT_ARGS) |
|
Line 1117 blk_full(MACRO_PROT_ARGS) |
|
* regular child nodes. |
* regular child nodes. |
*/ |
*/ |
|
|
for (arg = NULL;; ) { |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
la = *pos; |
|
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
if (av == ARGV_ARG) |
|
continue; |
|
if (av == ARGV_WORD) |
|
*pos = la; |
|
break; |
|
} |
|
|
|
mdoc_block_alloc(mdoc, line, ppos, tok, arg); |
mdoc_block_alloc(mdoc, line, ppos, tok, arg); |
head = body = NULL; |
head = body = NULL; |
|
|
Line 1096 blk_full(MACRO_PROT_ARGS) |
|
Line 1126 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 1179 blk_full(MACRO_PROT_ARGS) |
|
Line 1209 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 1276 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1298 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 1327 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1343 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 1375 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1390 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 1402 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1412 in_line_argn(MACRO_PROT_ARGS) |
|
{ |
{ |
int la, flushed, j, maxargs, nl; |
int la, flushed, j, maxargs, nl; |
enum margserr ac; |
enum margserr ac; |
enum margverr av; |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
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 1437 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1446 in_line_argn(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
for (arg = NULL; ; ) { |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
la = *pos; |
|
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
if (av == ARGV_ARG) |
|
continue; |
|
if (av == ARGV_WORD) |
|
*pos = la; |
|
break; |
|
} |
|
|
|
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 1466 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1474 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 1489 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1498 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 1500 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1512 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; |
|
enum margverr av; |
|
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); |
|
|
/* Parse macro arguments. */ |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
for (arg = NULL; ; ) { |
|
la = *pos; |
|
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
if (av == ARGV_ARG) |
|
continue; |
|
if (av == ARGV_WORD) |
|
*pos = la; |
|
break; |
|
} |
|
|
|
/* Open element scope. */ |
|
|
|
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 1572 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1563 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. */ |
|
|
n = mdoc->last; |
n = mdoc->last; |
while (n != NULL && n->tok != MDOC_Bl) |
while (n != NULL && |
|
(n->tok != MDOC_Bl || n->flags & (MDOC_VALID | MDOC_BREAK))) |
n = n->parent; |
n = n->parent; |
if (n == NULL || n->norm->Bl.type != LIST_column) { |
if (n == NULL || n->norm->Bl.type != LIST_column) { |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
Line 1621 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1583 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); |
|
} |
|
} |
} |