version 1.41, 2010/01/30 08:42:20 |
version 1.47, 2010/03/31 07:13:53 |
Line 42 static int blk_exp_close(MACRO_PROT_ARGS); |
|
Line 42 static int blk_exp_close(MACRO_PROT_ARGS); |
|
static int blk_part_imp(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
|
|
static int phrase(struct mdoc *, int, int, char *); |
static int phrase(struct mdoc *, int, int, char *); |
static int rew_dohalt(int, enum mdoc_type, |
static int rew_dohalt(enum mdoct, enum mdoc_type, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int rew_alt(int); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_dobreak(int, const struct mdoc_node *); |
static int rew_dobreak(enum mdoct, const struct mdoc_node *); |
static int rew_elem(struct mdoc *, int); |
static int rew_elem(struct mdoc *, enum mdoct); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
static int rew_sub(enum mdoc_type, struct mdoc *, |
int, int, int); |
enum mdoct, int, int); |
static int rew_last(struct mdoc *, |
static int rew_last(struct mdoc *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int append_delims(struct mdoc *, int, int *, char *); |
static int append_delims(struct mdoc *, int, int *, char *); |
Line 100 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 100 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */ |
{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ |
{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */ |
{ in_line_eoln, 0 }, /* %A */ |
{ in_line_eoln, 0 }, /* %A */ |
{ in_line_eoln, 0 }, /* %B */ |
{ in_line_eoln, 0 }, /* %B */ |
{ in_line_eoln, 0 }, /* %D */ |
{ in_line_eoln, 0 }, /* %D */ |
Line 318 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 318 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 |
* Return the opening macro of a closing one, e.g., `Ec' has `Eo' as its |
* matching pair. |
* matching pair. |
*/ |
*/ |
static int |
static enum mdoct |
rew_alt(int tok) |
rew_alt(enum mdoct tok) |
{ |
{ |
switch (tok) { |
switch (tok) { |
case (MDOC_Ac): |
case (MDOC_Ac): |
Line 369 rew_alt(int tok) |
|
Line 369 rew_alt(int tok) |
|
* The scope-closing and so on occurs in the various rew_* routines. |
* The scope-closing and so on occurs in the various rew_* routines. |
*/ |
*/ |
static int |
static int |
rew_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p) |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
const struct mdoc_node *p) |
{ |
{ |
|
|
if (MDOC_ROOT == p->type) |
if (MDOC_ROOT == p->type) |
Line 508 rew_dohalt(int tok, enum mdoc_type type, const struct |
|
Line 509 rew_dohalt(int tok, enum mdoc_type type, const struct |
|
* REWIND_NOHALT). |
* REWIND_NOHALT). |
*/ |
*/ |
static int |
static int |
rew_dobreak(int tok, const struct mdoc_node *p) |
rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
{ |
{ |
|
|
assert(MDOC_ROOT != p->type); |
assert(MDOC_ROOT != p->type); |
Line 537 rew_dobreak(int tok, const struct mdoc_node *p) |
|
Line 538 rew_dobreak(int tok, const struct mdoc_node *p) |
|
return(1); |
return(1); |
break; |
break; |
case (MDOC_Oc): |
case (MDOC_Oc): |
/* XXX - experimental! */ |
#ifdef UGLY |
if (MDOC_Op == p->tok) |
if (MDOC_Op == p->tok) |
return(1); |
return(1); |
|
#endif |
break; |
break; |
default: |
default: |
break; |
break; |
Line 555 rew_dobreak(int tok, const struct mdoc_node *p) |
|
Line 557 rew_dobreak(int tok, const struct mdoc_node *p) |
|
|
|
|
|
static int |
static int |
rew_elem(struct mdoc *mdoc, int tok) |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
Line 571 rew_elem(struct mdoc *mdoc, int tok) |
|
Line 573 rew_elem(struct mdoc *mdoc, int tok) |
|
|
|
static int |
static int |
rew_sub(enum mdoc_type t, struct mdoc *m, |
rew_sub(enum mdoc_type t, struct mdoc *m, |
int tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
Line 595 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 597 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
} |
} |
|
|
assert(n); |
assert(n); |
return(rew_last(m, n)); |
if ( ! rew_last(m, n)) |
|
return(0); |
|
|
|
#ifdef UGLY |
|
/* |
|
* The current block extends an enclosing block beyond a line |
|
* break. Now that the current block ends, close the enclosing |
|
* block, too. |
|
*/ |
|
if (NULL != (n = n->pending)) { |
|
assert(MDOC_HEAD == n->type); |
|
if ( ! rew_last(m, n)) |
|
return(0); |
|
if ( ! mdoc_body_alloc(m, n->line, n->pos, n->tok)) |
|
return(0); |
|
} |
|
#endif |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 714 in_line(MACRO_PROT_ARGS) |
|
Line 734 in_line(MACRO_PROT_ARGS) |
|
* Whether we allow ignored elements (those without content, |
* Whether we allow ignored elements (those without content, |
* usually because of reserved words) to squeak by. |
* usually because of reserved words) to squeak by. |
*/ |
*/ |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case (MDOC_An): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 835 in_line(MACRO_PROT_ARGS) |
|
Line 856 in_line(MACRO_PROT_ARGS) |
|
* If no elements have been collected and we're allowed to have |
* If no elements have been collected and we're allowed to have |
* empties (nc), open a scope and close it out. Otherwise, |
* empties (nc), open a scope and close it out. Otherwise, |
* raise a warning. |
* raise a warning. |
* |
|
*/ |
*/ |
|
|
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
Line 857 in_line(MACRO_PROT_ARGS) |
|
Line 878 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int c, lastarg, reopen, dohead; |
int c, la; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
|
struct mdoc_node *head; /* save of head macro */ |
|
struct mdoc_node *n; |
char *p; |
char *p; |
|
|
/* |
/* Close out prior implicit scope. */ |
* Whether to process a block-head section. If this is |
|
* non-zero, then a head will be opened for all line arguments. |
|
* If not, then the head will always be empty and only a body |
|
* will be opened, which will stay open at the eoln. |
|
*/ |
|
|
|
switch (tok) { |
|
case (MDOC_Nd): |
|
dohead = 0; |
|
break; |
|
default: |
|
dohead = 1; |
|
break; |
|
} |
|
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 884 blk_full(MACRO_PROT_ARGS) |
|
Line 893 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
/* |
|
* This routine accomodates implicitly- and explicitly-scoped |
|
* macro openings. Implicit ones first close out prior scope |
|
* (seen above). Delay opening the head until necessary to |
|
* allow leading punctuation to print. Special consideration |
|
* for `It -column', which has phrase-part syntax instead of |
|
* regular child nodes. |
|
*/ |
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
lastarg = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == c) { |
*pos = lastarg; |
*pos = la; |
break; |
break; |
} |
} |
|
|
Line 905 blk_full(MACRO_PROT_ARGS) |
|
Line 923 blk_full(MACRO_PROT_ARGS) |
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
if (0 == buf[*pos]) { |
head = NULL; |
|
|
|
/* |
|
* The `Nd' macro has all arguments in its body: it's a hybrid |
|
* of block partial-explicit and full-implicit. Stupid. |
|
*/ |
|
|
|
if (MDOC_Nd == tok) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
head = m->last; |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
return(1); |
|
} |
|
|
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
|
return(0); |
|
|
|
/* Immediately close out head and enter body, if applicable. */ |
|
|
|
if (0 == dohead) { |
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
|
return(0); |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
} |
} |
|
|
for (reopen = 0;; ) { |
for (;;) { |
lastarg = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
c = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
if (ARGS_PHRASE == c) { |
|
assert(dohead); |
/* Don't emit leading punct. for phrases. */ |
if (reopen && ! mdoc_head_alloc(m, line, ppos, tok)) |
|
|
if (NULL == head && ARGS_PHRASE != c && |
|
1 == mdoc_isdelim(p)) { |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
/* |
continue; |
* Phrases are self-contained macro phrases used |
} |
* in the columnar output of a macro. They need |
|
* special handling. |
/* Always re-open head for phrases. */ |
*/ |
|
if ( ! phrase(m, line, lastarg, buf)) |
if (NULL == head || ARGS_PHRASE == c) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
head = m->last; |
|
} |
|
|
|
if (ARGS_PHRASE == c) { |
|
if ( ! phrase(m, line, la, buf)) |
|
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
reopen = 1; |
|
continue; |
continue; |
} |
} |
|
|
if (MDOC_MAX == (c = lookup(tok, p))) { |
c = lookup(tok, p); |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if (MDOC_MAX != c) { |
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
return(0); |
return(0); |
continue; |
break; |
} |
} |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
if ( ! mdoc_macro(m, c, line, lastarg, pos, buf)) |
} |
|
|
|
if (NULL == head) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
break; |
head = m->last; |
} |
} |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* If the body's already open, then just return. */ |
/* See notes on `Nd' hybrid, above. */ |
if (0 == dohead) |
|
|
if (MDOC_Nd == tok) |
return(1); |
return(1); |
|
|
|
#ifdef UGLY |
|
/* |
|
* If there is an open sub-block requiring explicit close-out, |
|
* postpone switching the current block from head to body until |
|
* the rew_sub() call closing out that sub-block. |
|
*/ |
|
for (n = m->last; n && n != head; n = n->parent) { |
|
if (MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
|
MDOC_BLOCK == n->type) { |
|
n->pending = head; |
|
return(1); |
|
} |
|
} |
|
#endif |
|
|
|
/* Close out scopes to remain in a consistent state. */ |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
Line 985 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1030 blk_part_imp(MACRO_PROT_ARGS) |
|
{ |
{ |
int la, c; |
int la, c; |
char *p; |
char *p; |
struct mdoc_node *blk, *body, *n; |
struct mdoc_node *blk; /* saved block context */ |
|
struct mdoc_node *body; /* saved body context */ |
|
struct mdoc_node *n; |
|
|
/* If applicable, close out prior scopes. */ |
/* |
|
* A macro that spans to the end of the line. This is generally |
|
* (but not necessarily) called as the first macro. The block |
|
* has a head as the immediate child, which is always empty, |
|
* followed by zero or more opening punctuation nodes, then the |
|
* body (which may be empty, depending on the macro), then zero |
|
* or more closing punctuation nodes. |
|
*/ |
|
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
return(0); |
return(0); |
/* Saved for later close-out. */ |
|
blk = m->last; |
blk = m->last; |
|
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
/* Saved for later close-out. */ |
|
body = m->last; |
|
|
|
/* Body argument processing. */ |
/* |
|
* Open the body scope "on-demand", that is, after we've |
|
* processed all our the leading delimiters (open parenthesis, |
|
* etc.). |
|
*/ |
|
|
for (;;) { |
for (body = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
c = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
assert(ARGS_PHRASE != c); |
assert(ARGS_PHRASE != c); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
|
break; |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
if (ARGS_PUNCT == c) |
|
break; |
|
|
if (MDOC_MAX == (c = lookup(tok, p))) { |
if (NULL == body && 1 == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if (NULL == body) { |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
body = m->last; |
|
} |
|
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
return(0); |
|
break; |
|
} |
|
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
|
} |
} |
|
|
|
/* Clean-ups to leave in a consistent state. */ |
|
|
|
if (NULL == body) { |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
body = m->last; |
|
} |
|
|
|
#ifdef UGLY |
/* |
/* |
* 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--XXX, deprecate in time. |
* crufty use of `Op' breakage. |
*/ |
*/ |
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (body == n) |
if (body == n) |
break; |
break; |
|
#endif |
|
|
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
return(0); |
return(0); |
|
|
if (n && ! rew_last(m, body)) |
if (n && ! rew_last(m, body)) |
return(0); |
return(0); |
|
|
Line 1058 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1137 blk_part_imp(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la, flushed, j, c, maxargs; |
int la, c; |
|
struct mdoc_node *head; /* keep track of head */ |
|
struct mdoc_node *body; /* keep track of body */ |
char *p; |
char *p; |
|
|
/* Number of head arguments. Only `Eo' has these, */ |
/* |
|
* The opening of an explicit macro having zero or more leading |
|
* punctuation nodes; a head with optional single element (the |
|
* case of `Eo'); and a body that may be empty. |
|
*/ |
|
|
switch (tok) { |
|
case (MDOC_Eo): |
|
maxargs = 1; |
|
break; |
|
default: |
|
maxargs = 0; |
|
break; |
|
} |
|
|
|
/* Begin the block scope. */ |
|
|
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
return(0); |
return(0); |
|
|
/* |
for (head = body = NULL; ; ) { |
* If no head arguments, open and then close out a head, noting |
|
* that we've flushed our terms. `flushed' means that we've |
|
* flushed out the head and the body is open. |
|
*/ |
|
|
|
if (0 == maxargs) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
|
return(0); |
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
|
return(0); |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
flushed = 1; |
|
} else { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
|
return(0); |
|
flushed = 0; |
|
} |
|
|
|
/* Process the head/head+body line arguments. */ |
|
|
|
for (j = 0; ; j++) { |
|
la = *pos; |
la = *pos; |
if (j == maxargs && ! flushed) { |
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
|
return(0); |
|
flushed = 1; |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
} |
|
|
|
c = mdoc_args(m, line, pos, buf, tok, &p); |
c = mdoc_args(m, line, pos, buf, tok, &p); |
assert(ARGS_PHRASE != c); |
|
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
Line 1119 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1162 blk_part_exp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
assert(ARGS_PHRASE != c); |
if ( ! flushed) { |
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
/* Flush out leading punctuation. */ |
return(0); |
|
flushed = 1; |
if (NULL == head && 1 == mdoc_isdelim(p)) { |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
assert(NULL == body); |
return(0); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
} |
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
return(0); |
return(0); |
break; |
continue; |
|
} |
|
|
|
if (NULL == head) { |
|
assert(NULL == body); |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
|
return(0); |
|
head = m->last; |
} |
} |
|
|
if ( ! flushed && mdoc_isdelim(p)) { |
/* |
|
* `Eo' gobbles any data into the head, but most other |
|
* macros just immediately close out and begin the body. |
|
*/ |
|
|
|
if (NULL == body) { |
|
assert(head); |
|
/* No check whether it's a macro! */ |
|
if (MDOC_Eo == tok) |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
body = m->last; |
|
|
|
if (MDOC_Eo == tok) |
|
continue; |
} |
} |
|
|
|
assert(NULL != head && NULL != body); |
|
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
return(0); |
|
break; |
|
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
} |
} |
|
|
/* Close the head and open the body, if applicable. */ |
/* Clean-up to leave in a consistent state. */ |
|
|
if ( ! flushed) { |
if (NULL == head) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
|
return(0); |
|
head = m->last; |
|
} |
|
|
|
if (NULL == body) { |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
body = m->last; |
} |
} |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
|
|
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
|
|
Line 1168 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1246 in_line_argn(MACRO_PROT_ARGS) |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
/* Fixed maximum arguments per macro, if applicable. */ |
/* |
|
* A line macro that has a fixed number of arguments (maxargs). |
|
* Only open the scope once the first non-leading-punctuation is |
|
* found (unless MDOC_IGNDELIM is noted, like in `Pf'), then |
|
* keep it open until the maximum number of arguments are |
|
* exhausted. |
|
*/ |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ap): |
case (MDOC_Ap): |
Line 1180 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1264 in_line_argn(MACRO_PROT_ARGS) |
|
case (MDOC_Ux): |
case (MDOC_Ux): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
|
case (MDOC_Xr): |
|
maxargs = 2; |
|
break; |
default: |
default: |
maxargs = 1; |
maxargs = 1; |
break; |
break; |
} |
} |
|
|
/* Macro argument processing. */ |
for (arg = NULL; ; ) { |
|
|
for (arg = NULL;; ) { |
|
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
Line 1205 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1290 in_line_argn(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
/* Open the element scope. */ |
for (flushed = j = 0; ; ) { |
|
|
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
|
return(0); |
|
|
|
/* Process element arguments. */ |
|
|
|
for (flushed = j = 0; ; j++) { |
|
la = *pos; |
la = *pos; |
|
|
if (j == maxargs && ! flushed) { |
|
if ( ! rew_elem(m, tok)) |
|
return(0); |
|
flushed = 1; |
|
} |
|
|
|
c = mdoc_args(m, line, pos, buf, tok, &p); |
c = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
Line 1230 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1301 in_line_argn(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
|
0 == j && 1 == mdoc_isdelim(p)) { |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
continue; |
|
} else if (0 == j) |
|
if ( ! mdoc_elem_alloc(m, line, la, tok, arg)) |
|
return(0); |
|
|
|
if (j == maxargs && ! flushed) { |
|
if ( ! rew_elem(m, tok)) |
|
return(0); |
|
flushed = 1; |
|
} |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
if (MDOC_MAX != (c = lookup(tok, p))) { |
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
return(0); |
return(0); |
|
j++; |
break; |
break; |
} |
} |
|
|
Line 1245 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1332 in_line_argn(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
|
|
|
/* |
|
* XXX: this is a hack to work around groff's ugliness |
|
* as regards `Xr' and extraneous arguments. It should |
|
* ideally be deprecated behaviour, but because this is |
|
* code is no here, it's unlikely to be removed. |
|
*/ |
|
|
|
#ifdef __OpenBSD__ |
|
if (MDOC_Xr == tok && j == maxargs) { |
|
if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL)) |
|
return(0); |
|
if ( ! rew_elem(m, MDOC_Ns)) |
|
return(0); |
|
} |
|
#endif |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
j++; |
} |
} |
|
|
/* Close out and append delimiters. */ |
if (0 == j && ! mdoc_elem_alloc(m, line, la, tok, arg)) |
|
return(0); |
|
|
|
/* Close out in a consistent state. */ |
|
|
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |