version 1.52, 2010/04/06 07:17:51 |
version 1.53, 2010/05/07 05:34:56 |
|
|
REWIND_HALT |
REWIND_HALT |
}; |
}; |
|
|
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
|
|
static int phrase(struct mdoc *, int, int, char *); |
static int append_delims(struct mdoc *, |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
int, int *, char *); |
const struct mdoc_node *); |
static enum mdoct lookup(int, const char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct lookup_raw(const char *); |
static int rew_dobreak(enum mdoct, const struct mdoc_node *); |
static int phrase(struct mdoc *, int, int, char *); |
static int rew_elem(struct mdoc *, enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
static int rew_dobreak(enum mdoct, |
enum mdoct, int, int); |
const struct mdoc_node *); |
static int rew_last(struct mdoc *, |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int append_delims(struct mdoc *, int, int *, char *); |
static int rew_elem(struct mdoc *, enum mdoct); |
static int lookup(int, const char *); |
static int rew_last(struct mdoc *, |
static int lookup_raw(const char *); |
const struct mdoc_node *); |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
static int rew_sub(enum mdoc_type, struct mdoc *, |
const struct mdoc_node *); |
enum mdoct, int, int); |
|
static int swarn(struct mdoc *, enum mdoc_type, int, |
|
int, const struct mdoc_node *); |
|
|
/* Central table of library: who gets parsed how. */ |
|
|
|
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 */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
Line 266 mdoc_macroend(struct mdoc *m) |
|
Line 266 mdoc_macroend(struct mdoc *m) |
|
/* |
/* |
* Look up a macro from within a subsequent context. |
* Look up a macro from within a subsequent context. |
*/ |
*/ |
static int |
static enum mdoct |
lookup(int from, const char *p) |
lookup(int from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
/* FIXME: make -diag lists be un-PARSED. */ |
Line 280 lookup(int from, const char *p) |
|
Line 280 lookup(int from, const char *p) |
|
/* |
/* |
* Lookup a macro following the initial line macro. |
* Lookup a macro following the initial line macro. |
*/ |
*/ |
static int |
static enum mdoct |
lookup_raw(const char *p) |
lookup_raw(const char *p) |
{ |
{ |
int res; |
int res; |
Line 622 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 622 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
static int |
static int |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
{ |
{ |
int c, lastarg; |
int lastarg; |
|
enum margerr ac; |
char *p; |
char *p; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
Line 630 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 631 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
|
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
assert(ARGS_PHRASE != c); |
assert(ARGS_PHRASE != ac); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == ac) |
break; |
break; |
assert(mdoc_isdelim(p)); |
assert(mdoc_isdelim(p)); |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
Line 652 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 653 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
static int |
static int |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
int j, c, lastarg, maxargs, flushed; |
int j, lastarg, maxargs, flushed; |
|
enum margerr ac; |
|
enum mdoct ntok; |
char *p; |
char *p; |
|
|
switch (tok) { |
switch (tok) { |
Line 690 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 693 blk_exp_close(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
if (MDOC_MAX != (ntok = lookup(tok, p))) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
if ( ! mdoc_macro(m, c, line, lastarg, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 726 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 729 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, w, cnt, d, nc; |
int la, lastpunct, c, cnt, d, nc; |
struct mdoc_arg *arg; |
enum mdoct ntok; |
char *p; |
enum margerr ac; |
|
struct mdoc_arg *arg; |
|
char *p; |
|
|
/* |
/* |
* Whether we allow ignored elements (those without content, |
* Whether we allow ignored elements (those without content, |
Line 773 in_line(MACRO_PROT_ARGS) |
|
Line 778 in_line(MACRO_PROT_ARGS) |
|
|
|
for (cnt = 0, lastpunct = 1;; ) { |
for (cnt = 0, lastpunct = 1;; ) { |
la = *pos; |
la = *pos; |
w = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == ac) |
break; |
break; |
if (ARGS_PUNCT == w) |
if (ARGS_PUNCT == ac) |
break; |
break; |
|
|
/* Quoted words shouldn't be looked-up. */ |
/* Quoted words shouldn't be looked-up. */ |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 793 in_line(MACRO_PROT_ARGS) |
|
Line 798 in_line(MACRO_PROT_ARGS) |
|
* or raise a warning. |
* or raise a warning. |
*/ |
*/ |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != ntok) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (0 == lastpunct && ! rew_elem(m, tok)) |
return(0); |
return(0); |
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
Line 806 in_line(MACRO_PROT_ARGS) |
|
Line 811 in_line(MACRO_PROT_ARGS) |
|
if ( ! mdoc_pwarn(m, line, ppos, EIGNE)) |
if ( ! mdoc_pwarn(m, line, ppos, EIGNE)) |
return(0); |
return(0); |
} |
} |
c = mdoc_macro(m, c, line, la, pos, buf); |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if (0 == c) |
|
return(0); |
return(0); |
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
Line 820 in_line(MACRO_PROT_ARGS) |
|
Line 824 in_line(MACRO_PROT_ARGS) |
|
* the word. |
* the word. |
*/ |
*/ |
|
|
d = ARGS_QWORD == w ? 0 : mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? 0 : mdoc_isdelim(p); |
|
|
if (ARGS_QWORD != w && d) { |
if (ARGS_QWORD != ac && d) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (0 == lastpunct && ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
lastpunct = 1; |
Line 885 blk_full(MACRO_PROT_ARGS) |
|
Line 889 blk_full(MACRO_PROT_ARGS) |
|
#ifdef UGLY |
#ifdef UGLY |
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
|
enum mdoct ntok; |
|
enum margerr ac; |
char *p; |
char *p; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
Line 946 blk_full(MACRO_PROT_ARGS) |
|
Line 952 blk_full(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
/* Don't emit leading punct. for phrases. */ |
/* Don't emit leading punct. for phrases. */ |
|
|
if (NULL == head && ARGS_PHRASE != c && |
if (NULL == head && ARGS_PHRASE != ac && |
ARGS_QWORD != c && |
ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
1 == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 965 blk_full(MACRO_PROT_ARGS) |
|
Line 971 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Always re-open head for phrases. */ |
/* Always re-open head for phrases. */ |
|
|
if (NULL == head || ARGS_PHRASE == c) { |
if (NULL == head || ARGS_PHRASE == ac) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = m->last; |
} |
} |
|
|
if (ARGS_PHRASE == c) { |
if (ARGS_PHRASE == ac) { |
if ( ! phrase(m, line, la, buf)) |
if ( ! phrase(m, line, la, buf)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
Line 979 blk_full(MACRO_PROT_ARGS) |
|
Line 985 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
c = lookup(tok, p); |
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
if (MDOC_MAX != c) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
return(0); |
return(0); |
break; |
continue; |
} |
} |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
|
return(0); |
|
break; |
} |
} |
|
|
if (NULL == head) { |
if (NULL == head) { |
Line 1036 blk_full(MACRO_PROT_ARGS) |
|
Line 1042 blk_full(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
int la, c; |
int la; |
|
enum mdoct ntok; |
|
enum margerr ac; |
char *p; |
char *p; |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *body; /* saved body context */ |
Line 1069 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1077 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
for (body = NULL; ; ) { |
for (body = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
assert(ARGS_PHRASE != c); |
assert(ARGS_PHRASE != ac); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != c && |
if (NULL == body && ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
1 == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 1093 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1101 blk_part_imp(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
/* Clean-ups to leave in a consistent state. */ |
/* Clean-ups to leave in a consistent state. */ |
Line 1144 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1153 blk_part_imp(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la, c; |
int la; |
|
enum margerr ac; |
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; |
|
|
/* |
/* |
* The opening of an explicit macro having zero or more leading |
* The opening of an explicit macro having zero or more leading |
Line 1160 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1171 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
for (head = body = NULL; ; ) { |
for (head = body = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(ARGS_PHRASE != c); |
assert(ARGS_PHRASE != ac); |
|
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != c && |
if (NULL == head && ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
1 == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
Line 1212 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1223 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
assert(NULL != head && NULL != body); |
assert(NULL != head && NULL != body); |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
Line 1250 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1262 blk_part_exp(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
int la, flushed, j, c, maxargs; |
int la, flushed, j, c, maxargs; |
struct mdoc_arg *arg; |
enum margerr ac; |
char *p; |
struct mdoc_arg *arg; |
|
char *p; |
|
enum mdoct ntok; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
Line 1300 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1314 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (flushed = j = 0; ; ) { |
for (flushed = j = 0; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != c && |
ARGS_QWORD != ac && |
0 == j && 1 == mdoc_isdelim(p)) { |
0 == j && 1 == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 1325 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1339 in_line_argn(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
if (MDOC_MAX != (ntok = 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, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
j++; |
j++; |
break; |
break; |
} |
} |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != c && |
ARGS_QWORD != ac && |
! flushed && mdoc_isdelim(p)) { |
! flushed && mdoc_isdelim(p)) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
Line 1381 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1395 in_line_argn(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int c, w, la; |
int c, la; |
struct mdoc_arg *arg; |
enum margerr ac; |
char *p; |
struct mdoc_arg *arg; |
|
char *p; |
|
enum mdoct ntok; |
|
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
Line 1415 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1431 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX == ntok) { |
if ( ! rew_elem(m, tok)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
return(mdoc_macro(m, c, line, la, pos, buf)); |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
return(mdoc_macro(m, ntok, line, la, pos, buf)); |
} |
} |
|
|
/* Close out (no delimiters). */ |
/* Close out (no delimiters). */ |
Line 1480 obsolete(MACRO_PROT_ARGS) |
|
Line 1497 obsolete(MACRO_PROT_ARGS) |
|
static int |
static int |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
{ |
{ |
int c, w, la, pos; |
int la, pos; |
char *p; |
enum margerr ac; |
|
enum mdoct ntok; |
|
char *p; |
|
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
/* Note: no calling context! */ |
/* Note: no calling context! */ |
w = mdoc_zargs(m, line, &pos, buf, 0, &p); |
ac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_macro(m, c, line, la, &pos, buf)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
return(append_delims(m, line, &pos, buf)); |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, &pos, buf)) |
return(0); |
return(0); |
|
return(append_delims(m, line, &pos, buf)); |
} |
} |
|
|
return(1); |
return(1); |