version 1.186, 2015/04/05 14:43:36 |
version 1.189, 2015/04/18 16:06:40 |
Line 42 static void in_line_argn(MACRO_PROT_ARGS); |
|
Line 42 static void in_line_argn(MACRO_PROT_ARGS); |
|
static void in_line(MACRO_PROT_ARGS); |
static void in_line(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
|
|
static void dword(struct mdoc *, int, int, const char *, |
static void append_delims(struct roff_man *, int, int *, char *); |
enum mdelim, int); |
static void dword(struct roff_man *, int, int, const char *, |
static void append_delims(struct mdoc *, int, int *, char *); |
enum mdelim, int); |
static int lookup(struct mdoc *, int, int, int, const char *); |
static int find_pending(struct roff_man *, int, int, int, |
|
struct roff_node *); |
|
static int lookup(struct roff_man *, int, int, int, const char *); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int parse_rest(struct mdoc *, int, int, int *, char *); |
static int parse_rest(struct roff_man *, int, int, int *, char *); |
static int rew_alt(int); |
static int rew_alt(int); |
static void rew_elem(struct mdoc *, int); |
static void rew_elem(struct roff_man *, int); |
static void rew_last(struct mdoc *, const struct roff_node *); |
static void rew_last(struct roff_man *, const struct roff_node *); |
static void rew_pending(struct mdoc *, const struct roff_node *); |
static void rew_pending(struct roff_man *, |
|
const struct roff_node *); |
|
|
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 206 const struct mdoc_macro * const mdoc_macros = __mdoc_m |
|
Line 209 const struct mdoc_macro * const mdoc_macros = __mdoc_m |
|
* are errors. |
* are errors. |
*/ |
*/ |
void |
void |
mdoc_macroend(struct mdoc *mdoc) |
mdoc_macroend(struct roff_man *mdoc) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
Line 231 mdoc_macroend(struct mdoc *mdoc) |
|
Line 234 mdoc_macroend(struct mdoc *mdoc) |
|
* or as a line macro if from == MDOC_MAX. |
* or as a line macro if from == MDOC_MAX. |
*/ |
*/ |
static int |
static int |
lookup(struct mdoc *mdoc, int from, int line, int ppos, const char *p) |
lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p) |
{ |
{ |
int res; |
int res; |
|
|
Line 252 lookup(struct mdoc *mdoc, int from, int line, int ppos |
|
Line 255 lookup(struct mdoc *mdoc, int from, int line, int ppos |
|
* Rewind up to and including a specific node. |
* Rewind up to and including a specific node. |
*/ |
*/ |
static void |
static void |
rew_last(struct mdoc *mdoc, const struct roff_node *to) |
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
{ |
{ |
struct roff_node *n, *np; |
struct roff_node *n, *np; |
|
|
if (to->flags & MDOC_VALID) |
if (to->flags & MDOC_VALID) |
return; |
return; |
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
/* |
/* |
* Save the parent here, because we may delete the |
* Save the parent here, because we may delete the |
Line 281 rew_last(struct mdoc *mdoc, const struct roff_node *to |
|
Line 284 rew_last(struct mdoc *mdoc, const struct roff_node *to |
|
* Rewind up to a specific block, including all blocks that broke it. |
* Rewind up to a specific block, including all blocks that broke it. |
*/ |
*/ |
static void |
static void |
rew_pending(struct mdoc *mdoc, const struct roff_node *n) |
rew_pending(struct roff_man *mdoc, const struct roff_node *n) |
{ |
{ |
|
|
for (;;) { |
for (;;) { |
Line 362 rew_alt(int tok) |
|
Line 365 rew_alt(int tok) |
|
} |
} |
|
|
static void |
static void |
rew_elem(struct mdoc *mdoc, int tok) |
rew_elem(struct roff_man *mdoc, int tok) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
Line 375 rew_elem(struct mdoc *mdoc, int tok) |
|
Line 378 rew_elem(struct mdoc *mdoc, int tok) |
|
} |
} |
|
|
/* |
/* |
|
* If there is an open sub-block of the target requiring |
|
* explicit close-out, postpone closing out the target until |
|
* the rew_pending() call closing out the sub-block. |
|
*/ |
|
static int |
|
find_pending(struct roff_man *mdoc, int tok, int line, int ppos, |
|
struct roff_node *target) |
|
{ |
|
struct roff_node *n; |
|
int irc; |
|
|
|
irc = 0; |
|
for (n = mdoc->last; n != NULL && n != target; n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
irc = 1; |
|
n->flags = MDOC_BROKEN; |
|
if (target->type == ROFFT_HEAD) |
|
target->flags = MDOC_ENDED; |
|
else if ( ! (target->flags & MDOC_ENDED)) { |
|
mandoc_vmsg(MANDOCERR_BLK_NEST, |
|
mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
mdoc_endbody_alloc(mdoc, line, ppos, |
|
tok, target, ENDBODY_NOSPACE); |
|
} |
|
} |
|
} |
|
return(irc); |
|
} |
|
|
|
/* |
* 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(). |
*/ |
*/ |
static void |
static void |
dword(struct mdoc *mdoc, int line, int col, const char *p, |
dword(struct roff_man *mdoc, int line, int col, const char *p, |
enum mdelim d, int may_append) |
enum mdelim d, int may_append) |
{ |
{ |
|
|
Line 413 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 454 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 roff_man *mdoc, int line, int *pos, char *buf) |
{ |
{ |
char *p; |
char *p; |
int la; |
int la; |
Line 487 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 528 blk_exp_close(MACRO_PROT_ARGS) |
|
struct roff_node *itblk; /* An It block starting later. */ |
struct roff_node *itblk; /* An It block starting later. */ |
struct roff_node *later; /* A sub-block starting later. */ |
struct roff_node *later; /* A sub-block starting later. */ |
struct roff_node *n; /* Search back to our block. */ |
struct roff_node *n; /* Search back to our block. */ |
|
struct roff_node *target; /* For find_pending(). */ |
|
|
int j, lastarg, maxargs, nl; |
int j, lastarg, maxargs, nl, pending; |
enum margserr ac; |
enum margserr ac; |
int atok, ntok; |
int atok, ntok; |
char *p; |
char *p; |
Line 576 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 618 blk_exp_close(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (maxargs) |
if (maxargs) |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
break; |
break; |
} |
} |
|
|
Line 650 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 692 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
if (n != NULL) |
if (n != NULL) { |
rew_pending(mdoc, n); |
if (n != mdoc->last && n->flags & MDOC_BROKEN) { |
|
target = n; |
|
do |
|
target = target->parent; |
|
while ( ! (target->flags & MDOC_ENDED)); |
|
pending = find_pending(mdoc, ntok, line, ppos, |
|
target); |
|
} else |
|
pending = 0; |
|
if ( ! pending) |
|
rew_pending(mdoc, n); |
|
} |
if (nl) |
if (nl) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
} |
} |
Line 1070 blk_full(MACRO_PROT_ARGS) |
|
Line 1123 blk_full(MACRO_PROT_ARGS) |
|
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
if (body != NULL) |
if (body != NULL) |
goto out; |
goto out; |
|
if (find_pending(mdoc, tok, line, ppos, head)) |
/* |
|
* If there is an open (i.e., unvalidated) sub-block requiring |
|
* explicit close-out, postpone switching the current block from |
|
* head to body until the rew_pending() call closing out that |
|
* sub-block. |
|
*/ |
|
for (n = mdoc->last; n && n != head; n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
n->flags = MDOC_BROKEN; |
|
head->flags = MDOC_ENDED; |
|
} |
|
} |
|
if (head->flags & MDOC_ENDED) |
|
return; |
return; |
|
|
/* Close out scopes to remain in a consistent state. */ |
/* Close out scopes to remain in a consistent state. */ |
Line 1155 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1189 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); |
|
|
/* |
if (find_pending(mdoc, tok, line, ppos, body)) |
* If there is an open sub-block requiring explicit close-out, |
|
* postpone closing out the current block until the |
|
* rew_pending() call closing out the sub-block. |
|
*/ |
|
|
|
for (n = mdoc->last; n && n != body && n != blk->parent; |
|
n = n->parent) { |
|
if (n->flags & MDOC_ENDED) { |
|
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
|
} |
|
if (n->type == ROFFT_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
|
n->flags |= MDOC_BROKEN; |
|
if ( ! (body->flags & MDOC_ENDED)) { |
|
mandoc_vmsg(MANDOCERR_BLK_NEST, |
|
mdoc->parse, line, ppos, |
|
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
mdoc_endbody_alloc(mdoc, line, ppos, |
|
tok, body, ENDBODY_NOSPACE); |
|
} |
|
} |
|
} |
|
assert(n == body); |
|
if (body->flags & MDOC_ENDED) |
|
return; |
return; |
|
|
rew_last(mdoc, body); |
rew_last(mdoc, body); |
Line 1380 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1387 in_line_eoln(MACRO_PROT_ARGS) |
|
if ((tok == MDOC_Pp || tok == MDOC_Lp) && |
if ((tok == MDOC_Pp || tok == MDOC_Lp) && |
! (mdoc->flags & MDOC_SYNOPSIS)) { |
! (mdoc->flags & MDOC_SYNOPSIS)) { |
n = mdoc->last; |
n = mdoc->last; |
if (mdoc->next == MDOC_NEXT_SIBLING) |
if (mdoc->next == ROFF_NEXT_SIBLING) |
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); |
Line 1406 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1413 in_line_eoln(MACRO_PROT_ARGS) |
|
* or until the next macro, call that macro, and return 1. |
* or until the next macro, call that macro, and return 1. |
*/ |
*/ |
static int |
static int |
parse_rest(struct mdoc *mdoc, int tok, int line, int *pos, char *buf) |
parse_rest(struct roff_man *mdoc, int tok, int line, int *pos, char *buf) |
{ |
{ |
int la; |
int la; |
|
|