version 1.82, 2010/06/27 15:52:41 |
version 1.86, 2010/06/30 04:05:02 |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
enum rew { |
enum rew { /* see rew_dohalt() */ |
REWIND_REWIND, |
REWIND_NONE, |
REWIND_NOHALT, |
REWIND_THIS, |
REWIND_HALT |
REWIND_MORE, |
|
REWIND_LATER, |
|
REWIND_ERROR, |
}; |
}; |
|
|
static int blk_full(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
Line 50 static int append_delims(struct mdoc *, |
|
Line 52 static int append_delims(struct mdoc *, |
|
int, int *, char *); |
int, int *, char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup_raw(const char *); |
static enum mdoct lookup_raw(const char *); |
|
static int make_pending(struct mdoc_node *, enum mdoct, |
|
struct mdoc *, int, int); |
static int phrase(struct mdoc *, int, int, char *); |
static int phrase(struct mdoc *, int, int, char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_dobreak(enum mdoct, |
|
const struct mdoc_node *); |
|
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 *); |
static int rew_elem(struct mdoc *, enum mdoct); |
static int rew_elem(struct mdoc *, enum mdoct); |
Line 61 static int rew_last(struct mdoc *, |
|
Line 63 static int rew_last(struct mdoc *, |
|
const struct mdoc_node *); |
const struct mdoc_node *); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
static int rew_sub(enum mdoc_type, struct mdoc *, |
enum mdoct, int, int); |
enum mdoct, int, int); |
static int swarn(struct mdoc *, enum mdoc_type, int, |
|
int, const struct mdoc_node *); |
|
|
|
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
Line 192 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 192 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
|
|
|
|
static int |
|
swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
int line, int pos, const struct mdoc_node *p) |
|
{ |
|
const char *n, *t, *tt; |
|
enum mandocerr ec; |
|
|
|
n = t = "<root>"; |
|
tt = "block"; |
|
|
|
switch (type) { |
|
case (MDOC_BODY): |
|
tt = "multi-line"; |
|
break; |
|
case (MDOC_HEAD): |
|
tt = "line"; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
switch (p->type) { |
|
case (MDOC_BLOCK): |
|
n = mdoc_macronames[p->tok]; |
|
t = "block"; |
|
break; |
|
case (MDOC_BODY): |
|
n = mdoc_macronames[p->tok]; |
|
t = "multi-line"; |
|
break; |
|
case (MDOC_HEAD): |
|
n = mdoc_macronames[p->tok]; |
|
t = "line"; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
ec = (MDOC_IGN_SCOPE & mdoc->pflags) ? |
|
MANDOCERR_SCOPE : MANDOCERR_SYNTSCOPE; |
|
|
|
return(mdoc_vmsg(mdoc, ec, line, pos, |
|
"%s scope breaks %s of %s", |
|
tt, t, n)); |
|
} |
|
|
|
|
|
/* |
/* |
* This is called at the end of parsing. It must traverse up the tree, |
* This is called at the end of parsing. It must traverse up the tree, |
* closing out open [implicit] scopes. Obviously, open explicit scopes |
* closing out open [implicit] scopes. Obviously, open explicit scopes |
Line 322 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 275 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
|
|
|
|
/* |
/* |
* Return the opening macro of a closing one, e.g., `Ec' has `Eo' as its |
* For a block closing macro, return the corresponding opening one. |
* matching pair. |
* Otherwise, return the macro itself. |
*/ |
*/ |
static enum mdoct |
static enum mdoct |
rew_alt(enum mdoct tok) |
rew_alt(enum mdoct tok) |
Line 362 rew_alt(enum mdoct tok) |
|
Line 315 rew_alt(enum mdoct tok) |
|
case (MDOC_Xc): |
case (MDOC_Xc): |
return(MDOC_Xo); |
return(MDOC_Xo); |
default: |
default: |
break; |
return(tok); |
} |
} |
abort(); |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
|
/* |
/* |
* Rewind rules. This indicates whether to stop rewinding |
* Rewinding to tok, how do we have to handle *p? |
* (REWIND_HALT) without touching our current scope, stop rewinding and |
* REWIND_NONE: *p would delimit tok, but no tok scope is open |
* close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT). |
* inside *p, so there is no need to rewind anything at all. |
* The scope-closing and so on occurs in the various rew_* routines. |
* REWIND_THIS: *p matches tok, so rewind *p and nothing else. |
|
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok. |
|
* REWIND_LATER: *p is explicit and still open, postpone rewinding. |
|
* REWIND_ERROR: No tok block is open at all. |
*/ |
*/ |
static enum rew |
static enum rew |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
const struct mdoc_node *p) |
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) |
if (MDOC_ROOT == p->type) |
return(REWIND_HALT); |
return(MDOC_BLOCK == type && |
if (MDOC_VALID & p->flags) |
MDOC_EXPLICIT & mdoc_macros[tok].flags ? |
return(REWIND_NOHALT); |
REWIND_ERROR : REWIND_NONE); |
|
|
|
/* |
|
* When starting to rewind, skip plain text |
|
* and nodes that have already been rewound. |
|
*/ |
|
if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) |
|
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(p->end ? REWIND_NONE : |
|
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) { |
switch (tok) { |
case (MDOC_Aq): |
case (MDOC_Bl): |
/* FALLTHROUGH */ |
if (MDOC_It == p->tok) |
case (MDOC_Bq): |
return(REWIND_MORE); |
/* FALLTHROUGH */ |
|
case (MDOC_Brq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_D1): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Op): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ql): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Vt): |
|
assert(MDOC_TAIL != type); |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
break; |
break; |
case (MDOC_It): |
case (MDOC_It): |
assert(MDOC_TAIL != type); |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
return(REWIND_HALT); |
return(REWIND_NONE); |
break; |
break; |
case (MDOC_Sh): |
/* |
if (type == p->type && tok == p->tok) |
* XXX Badly nested block handling still fails badly |
return(REWIND_REWIND); |
* when one block is breaking two blocks of the same type. |
|
* This is an incomplete and extremely ugly workaround, |
|
* required to let the OpenBSD tree build. |
|
*/ |
|
case (MDOC_Oo): |
|
if (MDOC_Op == p->tok) |
|
return(REWIND_MORE); |
break; |
break; |
case (MDOC_Nd): |
case (MDOC_Nd): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ss): |
case (MDOC_Ss): |
assert(MDOC_TAIL != type); |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
return(REWIND_HALT); |
return(REWIND_NONE); |
break; |
|
case (MDOC_Ao): |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bd): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bf): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bk): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bro): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Do): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Eo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Oo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Po): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Rs): |
|
/* FALLTHROUGH */ |
|
case (MDOC_So): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Xo): |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
break; |
|
/* Multi-line explicit scope close. */ |
|
case (MDOC_Ac): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Brc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ec): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ed): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ek): |
|
/* FALLTHROUGH */ |
|
case (MDOC_El): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ef): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Oc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Re): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Xc): |
|
if (type == p->type && rew_alt(tok) == p->tok) |
|
return(REWIND_REWIND); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
return(REWIND_NOHALT); |
|
} |
|
|
|
|
|
/* |
|
* See if we can break an encountered scope (the rew_dohalt has returned |
|
* REWIND_NOHALT). |
|
*/ |
|
static int |
|
rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
{ |
|
|
|
assert(MDOC_ROOT != p->type); |
|
if (MDOC_ELEM == p->type) |
|
return(1); |
|
if (MDOC_TEXT == p->type) |
|
return(1); |
|
if (MDOC_VALID & p->flags) |
|
return(1); |
|
|
|
switch (tok) { |
|
case (MDOC_It): |
|
return(MDOC_It == p->tok); |
|
case (MDOC_Nd): |
|
return(MDOC_Nd == p->tok); |
|
case (MDOC_Ss): |
|
return(MDOC_Ss == p->tok); |
|
case (MDOC_Sh): |
case (MDOC_Sh): |
if (MDOC_Nd == p->tok) |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
return(1); |
MDOC_Sh == p->tok) |
if (MDOC_Ss == p->tok) |
return(REWIND_MORE); |
return(1); |
|
return(MDOC_Sh == p->tok); |
|
case (MDOC_El): |
|
if (MDOC_It == p->tok) |
|
return(1); |
|
break; |
break; |
case (MDOC_Oc): |
|
if (MDOC_Op == p->tok) |
|
return(1); |
|
break; |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
if (MDOC_EXPLICIT & mdoc_macros[tok].flags) |
/* |
return(p->tok == rew_alt(tok)); |
* Default block rewinding rules. |
else if (MDOC_BLOCK == p->type) |
* In particular, always skip block end markers. |
return(1); |
*/ |
|
if (p->end || (MDOC_BLOCK == p->type && |
|
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
|
return(REWIND_MORE); |
|
|
return(tok == p->tok); |
/* |
|
* Partial blocks allow delayed rewinding by default. |
|
*/ |
|
if (&blk_full != mdoc_macros[tok].fp) |
|
return (REWIND_LATER); |
|
|
|
/* |
|
* Full blocks can only be rewound when matching |
|
* or when there is an explicit rule. |
|
*/ |
|
return(REWIND_ERROR); |
} |
} |
|
|
|
|
Line 576 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
Line 444 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
} |
} |
|
|
|
|
|
/* |
|
* We are trying to close a block identified by tok, |
|
* but the child block *broken is still open. |
|
* Thus, postpone closing the tok block |
|
* until the rew_sub call closing *broken. |
|
*/ |
static int |
static int |
|
make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
struct mdoc *m, int line, int ppos) |
|
{ |
|
struct mdoc_node *breaker; |
|
|
|
/* |
|
* Iterate backwards, searching for the block matching tok, |
|
* that is, the block breaking the *broken block. |
|
*/ |
|
for (breaker = broken->parent; breaker; breaker = breaker->parent) { |
|
|
|
/* |
|
* If the *broken block had already been broken before |
|
* and we encounter its breaker, make the tok block |
|
* pending on the inner breaker. |
|
* Graphically, "[A breaker=[B broken=[C->B B] tok=A] C]" |
|
* becomes "[A broken=[B [C->B B] tok=A] C]" |
|
* and finally "[A [B->A [C->B B] A] C]". |
|
*/ |
|
if (breaker == broken->pending) { |
|
broken = breaker; |
|
continue; |
|
} |
|
|
|
if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker)) |
|
continue; |
|
if (MDOC_BODY == broken->type) |
|
broken = broken->parent; |
|
|
|
/* |
|
* Found the breaker. |
|
* If another, outer breaker is already pending on |
|
* the *broken block, we must not clobber the link |
|
* to the outer breaker, but make it pending on the |
|
* new, now inner breaker. |
|
* Graphically, "[A breaker=[B broken=[C->A A] tok=B] C]" |
|
* becomes "[A breaker=[B->A broken=[C A] tok=B] C]" |
|
* and finally "[A [B->A [C->B A] B] C]". |
|
*/ |
|
if (broken->pending) { |
|
struct mdoc_node *taker; |
|
|
|
/* |
|
* If the breaker had also been broken before, |
|
* it cannot take on the outer breaker itself, |
|
* but must hand it on to its own breakers. |
|
* Graphically, this is the following situation: |
|
* "[A [B breaker=[C->B B] broken=[D->A A] tok=C] D]" |
|
* "[A taker=[B->A breaker=[C->B B] [D->C A] C] D]" |
|
*/ |
|
taker = breaker; |
|
while (taker->pending) |
|
taker = taker->pending; |
|
taker->pending = broken->pending; |
|
} |
|
broken->pending = breaker; |
|
mdoc_vmsg(m, MANDOCERR_SCOPE, line, ppos, "%s breaks %s", |
|
mdoc_macronames[tok], mdoc_macronames[broken->tok]); |
|
return(1); |
|
} |
|
|
|
/* |
|
* Found no matching block for tok. |
|
* Are you trying to close a block that is not open? |
|
* XXX Make this non-fatal. |
|
*/ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
|
} |
|
|
|
|
|
static int |
rew_sub(enum mdoc_type t, struct mdoc *m, |
rew_sub(enum mdoc_type t, struct mdoc *m, |
enum mdoct tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
enum rew c; |
|
|
|
/* LINTED */ |
n = m->last; |
for (n = m->last; n; n = n->parent) { |
while (n) { |
c = rew_dohalt(tok, t, n); |
switch (rew_dohalt(tok, t, n)) { |
if (REWIND_HALT == c) { |
case (REWIND_NONE): |
if (MDOC_BLOCK != t) |
return(1); |
return(1); |
case (REWIND_THIS): |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
|
return(1); |
|
/* FIXME: shouldn't raise an error */ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
|
} |
|
if (REWIND_REWIND == c) |
|
break; |
break; |
else if (rew_dobreak(tok, n)) |
case (REWIND_MORE): |
|
n = n->parent; |
continue; |
continue; |
if ( ! swarn(m, t, line, ppos, n)) |
case (REWIND_LATER): |
return(0); |
return(make_pending(n, tok, m, line, ppos)); |
|
case (REWIND_ERROR): |
|
/* XXX Make this non-fatal. */ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return 0; |
|
} |
|
break; |
} |
} |
|
|
assert(n); |
assert(n); |
Line 608 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 553 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(0); |
return(0); |
|
|
/* |
/* |
* The current block extends an enclosing block beyond a line |
* The current block extends an enclosing block. |
* break. Now that the current block ends, close the enclosing |
* Now that the current block ends, close the enclosing block, too. |
* block, too. |
|
*/ |
*/ |
if (NULL != (n = n->pending)) { |
while (NULL != (n = n->pending)) { |
assert(MDOC_HEAD == n->type); |
|
if ( ! rew_last(m, n)) |
if ( ! rew_last(m, n)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, n->line, n->pos, n->tok)) |
if (MDOC_HEAD == n->type && |
|
! mdoc_body_alloc(m, n->line, n->pos, n->tok)) |
return(0); |
return(0); |
} |
} |
|
|
Line 672 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 616 append_delims(struct mdoc *m, int line, int *pos, char |
|
static int |
static int |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
|
struct mdoc_node *body; /* Our own body. */ |
|
struct mdoc_node *later; /* A sub-block starting later. */ |
|
struct mdoc_node *n; /* For searching backwards. */ |
|
|
int j, lastarg, maxargs, flushed, nl; |
int j, lastarg, maxargs, flushed, nl; |
enum margserr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum mdoct atok, ntok; |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & m->flags; |
Line 688 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 636 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
/* |
|
* Search backwards for beginnings of blocks, |
|
* both of our own and of pending sub-blocks. |
|
*/ |
|
atok = rew_alt(tok); |
|
body = later = NULL; |
|
for (n = m->last; n; n = n->parent) { |
|
if (MDOC_VALID & n->flags) |
|
continue; |
|
|
|
/* Remember the start of our own body. */ |
|
if (MDOC_BODY == n->type && atok == n->tok) { |
|
if ( ! n->end) |
|
body = n; |
|
continue; |
|
} |
|
|
|
if (MDOC_BLOCK != n->type) |
|
continue; |
|
if (atok == n->tok) { |
|
assert(body); |
|
|
|
/* |
|
* Found the start of our own block. |
|
* When there is no pending sub block, |
|
* just proceed to closing out. |
|
*/ |
|
if (NULL == later) |
|
break; |
|
|
|
/* |
|
* When there is a pending sub block, |
|
* postpone closing out the current block |
|
* until the rew_sub() closing out the sub-block. |
|
*/ |
|
if ( ! make_pending(later, tok, m, line, ppos)) |
|
return(0); |
|
|
|
/* |
|
* Mark the place where the formatting - but not |
|
* the scope - of the current block ends. |
|
*/ |
|
if ( ! mdoc_endbody_alloc(m, line, ppos, |
|
atok, body, ENDBODY_SPACE)) |
|
return(0); |
|
break; |
|
} |
|
|
|
/* |
|
* When finding an open sub block, remember the last |
|
* open explicit block, or, in case there are only |
|
* implicit ones, the first open implicit block. |
|
*/ |
|
if (later && |
|
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
|
continue; |
|
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) { |
|
assert( ! (MDOC_ACTED & n->flags)); |
|
later = n; |
|
} |
|
} |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
/* FIXME: do this in validate */ |
/* FIXME: do this in validate */ |
if (buf[*pos]) |
if (buf[*pos]) |
Line 702 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 712 blk_exp_close(MACRO_PROT_ARGS) |
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (maxargs > 0) |
if (NULL == later && maxargs > 0) |
if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok))) |
if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok))) |
return(0); |
return(0); |
|
|
Line 1255 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1265 blk_part_imp(MACRO_PROT_ARGS) |
|
body->parent->flags |= MDOC_EOS; |
body->parent->flags |= MDOC_EOS; |
} |
} |
|
|
|
/* |
|
* If there is an open sub-block requiring explicit close-out, |
|
* postpone closing out the current block |
|
* until the rew_sub() call closing out the sub-block. |
|
*/ |
|
for (n = m->last; n && n != body && n != blk->parent; n = n->parent) { |
|
if (MDOC_BLOCK == n->type && |
|
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
|
! (MDOC_VALID & n->flags)) { |
|
assert( ! (MDOC_ACTED & n->flags)); |
|
if ( ! make_pending(n, tok, m, line, ppos)) |
|
return(0); |
|
if ( ! mdoc_endbody_alloc(m, line, ppos, |
|
tok, body, ENDBODY_NOSPACE)) |
|
return(0); |
|
return(1); |
|
} |
|
} |
|
|
/* |
/* |
* If we can't rewind to our body, then our scope has already |
* If we can't rewind to our body, then our scope has already |
* been closed by another macro (like `Oc' closing `Op'). This |
* been closed by another macro (like `Oc' closing `Op'). This |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
* |
|
* FIXME - this should be ifdef'd OpenBSD? |
|
*/ |
*/ |
for (n = m->last; n; n = n->parent) |
if (n != body && ! mdoc_vmsg(m, MANDOCERR_SCOPE, line, ppos, |
if (body == n) |
"%s broken", mdoc_macronames[tok])) |
break; |
|
|
|
if (NULL == n && ! mdoc_nmsg(m, body, MANDOCERR_SCOPE)) |
|
return(0); |
return(0); |
|
|
if (n && ! rew_last(m, body)) |
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
Line 1280 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1304 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
|
|
if (n && ! rew_last(m, blk)) |
if (n && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
return(1); |
return(1); |