version 1.170, 2015/02/03 00:48:47 |
version 1.180, 2015/02/07 16:42:33 |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
enum rew { /* see rew_dohalt() */ |
|
REWIND_NONE, |
|
REWIND_THIS, |
|
REWIND_MORE, |
|
REWIND_FORCE |
|
}; |
|
|
|
static void blk_full(MACRO_PROT_ARGS); |
static void blk_full(MACRO_PROT_ARGS); |
static void blk_exp_close(MACRO_PROT_ARGS); |
static void blk_exp_close(MACRO_PROT_ARGS); |
static void blk_part_exp(MACRO_PROT_ARGS); |
static void blk_part_exp(MACRO_PROT_ARGS); |
Line 59 static void make_pending(struct mdoc *, struct mdoc_n |
|
Line 52 static void make_pending(struct mdoc *, struct mdoc_n |
|
static int parse_rest(struct mdoc *, enum mdoct, |
static int parse_rest(struct mdoc *, enum mdoct, |
int, int *, char *); |
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, |
|
const struct mdoc_node *); |
|
static void rew_elem(struct mdoc *, enum mdoct); |
static void rew_elem(struct mdoc *, enum mdoct); |
static void rew_last(struct mdoc *, const struct mdoc_node *); |
static void rew_last(struct mdoc *, const struct mdoc_node *); |
static void rew_pending(struct mdoc *, const struct mdoc_node *); |
static void rew_pending(struct mdoc *, const struct mdoc_node *); |
static void rew_sub(enum mdoc_type, struct mdoc *, |
|
enum mdoct, int, int); |
|
|
|
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */ |
Line 273 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 262 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
if ( ! (mdoc->last->flags & MDOC_VALID)) |
|
mdoc->last->lastline = to->lastline - |
|
(mdoc->flags & MDOC_NEWLINE ? 1 : 0); |
|
/* |
/* |
* Save the parent here, because we may delete the |
* Save the parent here, because we may delete the |
* mdoc->last node in the post-validation phase and reset |
* mdoc->last node in the post-validation phase and reset |
Line 357 rew_alt(enum mdoct tok) |
|
Line 343 rew_alt(enum mdoct tok) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
/* |
|
* Rewinding to tok, how do we have to handle *p? |
|
* REWIND_NONE: *p would delimit tok, but no tok scope is open |
|
* inside *p, so there is no need to rewind anything at all. |
|
* REWIND_THIS: *p matches tok, so rewind *p and nothing else. |
|
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok. |
|
* REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p. |
|
*/ |
|
static enum rew |
|
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
const struct mdoc_node *p) |
|
{ |
|
|
|
/* |
|
* No matching token, no delimiting block, no broken block. |
|
* This can happen when full implicit macros are called for |
|
* the first time but try to rewind their previous |
|
* instance anyway. |
|
*/ |
|
if (MDOC_ROOT == p->type) |
|
return(REWIND_NONE); |
|
|
|
/* |
|
* When starting to rewind, skip plain text |
|
* and nodes that have already been rewound. |
|
*/ |
|
if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK)) |
|
return(REWIND_MORE); |
|
|
|
/* |
|
* The easiest case: Found a matching token. |
|
* This applies to both blocks and elements. |
|
*/ |
|
tok = rew_alt(tok); |
|
if (tok == p->tok) |
|
return(type == p->type ? REWIND_THIS : REWIND_MORE); |
|
|
|
/* |
|
* While elements do require rewinding for themselves, |
|
* they never affect rewinding of other nodes. |
|
*/ |
|
if (MDOC_ELEM == p->type) |
|
return(REWIND_MORE); |
|
|
|
/* |
|
* Blocks delimited by our target token get REWIND_MORE. |
|
* Blocks delimiting our target token get REWIND_NONE. |
|
*/ |
|
switch (tok) { |
|
case MDOC_It: |
|
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
|
return(REWIND_NONE); |
|
break; |
|
case MDOC_Nm: |
|
return(REWIND_NONE); |
|
case MDOC_Nd: |
|
/* FALLTHROUGH */ |
|
case MDOC_Ss: |
|
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
|
return(REWIND_NONE); |
|
/* FALLTHROUGH */ |
|
case MDOC_Sh: |
|
if (MDOC_ROOT == p->parent->type) |
|
return(REWIND_THIS); |
|
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
|
MDOC_Sh == p->tok) |
|
return(REWIND_MORE); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Default block rewinding rules. |
|
* In particular, let all blocks rewind Nm children. |
|
* Do not warn again when closing a block, |
|
* since closing the body already warned. |
|
*/ |
|
if (MDOC_Nm == p->tok || |
|
MDOC_BLOCK == type || MDOC_BLOCK == p->type) |
|
return(REWIND_MORE); |
|
|
|
/* |
|
* By default, closing out full blocks |
|
* forces closing of broken explicit blocks. |
|
*/ |
|
return (REWIND_FORCE); |
|
} |
|
|
|
static void |
static void |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
{ |
{ |
Line 531 make_pending(struct mdoc *mdoc, struct mdoc_node *brea |
|
Line 428 make_pending(struct mdoc *mdoc, struct mdoc_node *brea |
|
breaker->body->flags |= MDOC_BREAK; |
breaker->body->flags |= MDOC_BREAK; |
} |
} |
|
|
static void |
|
rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
enum mdoct tok, int line, int ppos) |
|
{ |
|
struct mdoc_node *n, *to; |
|
|
|
to = NULL; |
|
n = mdoc->last; |
|
while (n) { |
|
switch (rew_dohalt(tok, t, n)) { |
|
case REWIND_NONE: |
|
if (to == NULL) |
|
return; |
|
n = to; |
|
break; |
|
case REWIND_THIS: |
|
n->lastline = line - |
|
(mdoc->flags & MDOC_NEWLINE && |
|
! (mdoc_macros[tok].flags & MDOC_EXPLICIT)); |
|
break; |
|
case REWIND_FORCE: |
|
mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse, |
|
line, ppos, "%s breaks %s", |
|
mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
/* FALLTHROUGH */ |
|
case REWIND_MORE: |
|
n->lastline = line - |
|
(mdoc->flags & MDOC_NEWLINE ? 1 : 0); |
|
to = n; |
|
n = n->parent; |
|
continue; |
|
} |
|
break; |
|
} |
|
assert(n); |
|
rew_pending(mdoc, n); |
|
} |
|
|
|
/* |
/* |
* Allocate a word and check whether it's punctuation or not. |
* Allocate a word and check whether it's punctuation or not. |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
Line 680 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 538 blk_exp_close(MACRO_PROT_ARGS) |
|
{ |
{ |
struct mdoc_node *body; /* Our own body. */ |
struct mdoc_node *body; /* Our own body. */ |
struct mdoc_node *endbody; /* Our own end marker. */ |
struct mdoc_node *endbody; /* Our own end marker. */ |
|
struct mdoc_node *itblk; /* An It block starting later. */ |
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *n; /* Search back to our block. */ |
struct mdoc_node *n; /* Search back to our block. */ |
|
|
int have_it, j, lastarg, maxargs, nl; |
int j, lastarg, maxargs, nl; |
enum margserr ac; |
enum margserr ac; |
enum mdoct atok, ntok; |
enum mdoct atok, ntok; |
char *p; |
char *p; |
Line 707 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 566 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 = itblk = later = NULL; |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
continue; |
continue; |
Line 717 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 575 blk_exp_close(MACRO_PROT_ARGS) |
|
/* Remember the start of our own body. */ |
/* Remember the start of our own body. */ |
|
|
if (n->type == MDOC_BODY && atok == n->tok) { |
if (n->type == MDOC_BODY && atok == n->tok) { |
if (n->end == ENDBODY_NOT) { |
if (n->end == ENDBODY_NOT) |
body = n; |
body = n; |
n->lastline = line; |
|
} |
|
continue; |
continue; |
} |
} |
|
|
Line 728 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 584 blk_exp_close(MACRO_PROT_ARGS) |
|
continue; |
continue; |
|
|
if (n->tok == MDOC_It) { |
if (n->tok == MDOC_It) { |
have_it = 1; |
itblk = n; |
continue; |
continue; |
} |
} |
|
|
if (atok == n->tok) { |
if (atok == n->tok) { |
n->lastline = line; |
|
assert(body); |
assert(body); |
|
|
/* |
/* |
Line 743 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 598 blk_exp_close(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (later == NULL || |
if (later == NULL || |
(tok == MDOC_El && !have_it)) |
(tok == MDOC_El && itblk == NULL)) |
break; |
break; |
|
|
/* |
/* |
Line 753 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 608 blk_exp_close(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
make_pending(mdoc, n, later, line, ppos); |
make_pending(mdoc, n, later, line, ppos); |
|
if (tok == MDOC_El) |
|
itblk->flags |= MDOC_BREAK; |
|
|
/* |
/* |
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
Line 807 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 664 blk_exp_close(MACRO_PROT_ARGS) |
|
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"%s %s", mdoc_macronames[tok], |
"%s %s", mdoc_macronames[tok], |
buf + *pos); |
buf + *pos); |
if (endbody == NULL) |
if (endbody == NULL && n != NULL) |
rew_pending(mdoc, n); |
rew_pending(mdoc, n); |
return; |
return; |
} |
} |
Line 915 in_line(MACRO_PROT_ARGS) |
|
Line 772 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (ac == ARGS_PUNCT) { |
if (ac == ARGS_PUNCT) { |
if (cnt == 0 && nc == 0) |
if (cnt == 0 && (nc == 0 || tok == MDOC_An)) |
mdoc->flags |= MDOC_NODELIMC; |
mdoc->flags |= MDOC_NODELIMC; |
break; |
break; |
} |
} |
Line 1038 blk_full(MACRO_PROT_ARGS) |
|
Line 895 blk_full(MACRO_PROT_ARGS) |
|
{ |
{ |
int la, nl, parsed; |
int la, nl, parsed; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *blk; /* Our own block. */ |
struct mdoc_node *blk; /* Our own or a broken block. */ |
struct mdoc_node *head; /* Our own head. */ |
struct mdoc_node *head; /* Our own head. */ |
struct mdoc_node *body; /* Our own body. */ |
struct mdoc_node *body; /* Our own body. */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 1047 blk_full(MACRO_PROT_ARGS) |
|
Line 904 blk_full(MACRO_PROT_ARGS) |
|
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* Skip items outside lists. */ |
if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
|
} |
|
|
if (tok == MDOC_It) { |
if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) { |
for (n = mdoc->last; n; n = n->parent) |
|
if (n->tok == MDOC_Bl && n->type == MDOC_BLOCK && |
/* Here, tok is one of Sh Ss Nm Nd It. */ |
! (n->flags & (MDOC_VALID | MDOC_BREAK))) |
|
|
blk = NULL; |
|
for (n = mdoc->last; n != NULL; n = n->parent) { |
|
if (n->flags & (MDOC_VALID | MDOC_BREAK) || |
|
n->type != MDOC_BLOCK) |
|
continue; |
|
if (tok == MDOC_It && n->tok == MDOC_Bl) { |
|
if (blk != NULL) { |
|
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
|
mdoc->parse, line, ppos, |
|
"It breaks %s", |
|
mdoc_macronames[blk->tok]); |
|
rew_pending(mdoc, blk); |
|
} |
break; |
break; |
if (n == NULL) { |
} |
|
|
|
if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
switch (tok) { |
|
case MDOC_Sh: |
|
/* FALLTHROUGH */ |
|
case MDOC_Ss: |
|
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
|
mdoc->parse, line, ppos, |
|
"%s breaks %s", |
|
mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
rew_pending(mdoc, n); |
|
n = mdoc->last; |
|
continue; |
|
case MDOC_It: |
|
/* Delay in case it's astray. */ |
|
blk = n; |
|
continue; |
|
default: |
|
break; |
|
} |
|
break; |
|
} |
|
|
|
/* Here, n is one of Sh Ss Nm Nd It. */ |
|
|
|
if (tok != MDOC_Sh && (n->tok == MDOC_Sh || |
|
(tok != MDOC_Ss && (n->tok == MDOC_Ss || |
|
(tok != MDOC_It && n->tok == MDOC_It))))) |
|
break; |
|
|
|
/* Item breaking an explicit block. */ |
|
|
|
if (blk != NULL) { |
|
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
|
mdoc->parse, line, ppos, |
|
"It breaks %s", |
|
mdoc_macronames[blk->tok]); |
|
rew_pending(mdoc, blk); |
|
blk = NULL; |
|
} |
|
|
|
/* Close out prior implicit scopes. */ |
|
|
|
rew_last(mdoc, n); |
|
} |
|
|
|
/* Skip items outside lists. */ |
|
|
|
if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) { |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
line, ppos, "It %s", buf + *pos); |
line, ppos, "It %s", buf + *pos); |
mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); |
mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); |
Line 1063 blk_full(MACRO_PROT_ARGS) |
|
Line 987 blk_full(MACRO_PROT_ARGS) |
|
} |
} |
} |
} |
|
|
/* Close out prior implicit scope. */ |
|
|
|
if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) { |
|
rew_sub(MDOC_BODY, mdoc, tok, line, ppos); |
|
rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); |
|
} |
|
|
|
/* |
/* |
* This routine accommodates implicitly- and explicitly-scoped |
* This routine accommodates implicitly- and explicitly-scoped |
* macro openings. Implicit ones first close out prior scope |
* macro openings. Implicit ones first close out prior scope |
Line 1111 blk_full(MACRO_PROT_ARGS) |
|
Line 1028 blk_full(MACRO_PROT_ARGS) |
|
la = *pos; |
la = *pos; |
lac = ac; |
lac = ac; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ac == ARGS_PUNCT) |
|
break; |
|
if (ac == ARGS_EOLN) { |
if (ac == ARGS_EOLN) { |
if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE) |
if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE) |
break; |
break; |
Line 1128 blk_full(MACRO_PROT_ARGS) |
|
Line 1043 blk_full(MACRO_PROT_ARGS) |
|
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
break; |
break; |
} |
} |
|
if (tok == MDOC_Bd || tok == MDOC_Bk) { |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
|
mdoc->parse, line, la, "%s ... %s", |
|
mdoc_macronames[tok], buf + la); |
|
break; |
|
} |
|
if (tok == MDOC_Rs) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, |
|
line, la, "Rs %s", buf + la); |
|
break; |
|
} |
|
if (ac == ARGS_PUNCT) |
|
break; |
|
|
/* |
/* |
* Emit leading punctuation (i.e., punctuation before |
* Emit leading punctuation (i.e., punctuation before |
Line 1184 blk_full(MACRO_PROT_ARGS) |
|
Line 1112 blk_full(MACRO_PROT_ARGS) |
|
return; |
return; |
if (head == NULL) |
if (head == NULL) |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
if (nl) |
if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
if (body != NULL) |
if (body != NULL) |
goto out; |
goto out; |
Line 1446 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1374 in_line_argn(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (j == 0) { |
if (j == 0) { |
|
if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
|
} |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
if (ac == ARGS_PUNCT && tok == MDOC_Pf) |
if (ac == ARGS_PUNCT && tok == MDOC_Pf) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
Line 1469 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1402 in_line_eoln(MACRO_PROT_ARGS) |
|
n = n->parent; |
n = n->parent; |
if (n->tok == MDOC_Nm) |
if (n->tok == MDOC_Nm) |
rew_last(mdoc, mdoc->last->parent); |
rew_last(mdoc, mdoc->last->parent); |
|
} |
|
|
|
if (buf[*pos] == '\0' && |
|
(tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
} |
} |
|
|
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |