version 1.56, 2010/05/07 05:54:09 |
version 1.59, 2010/05/09 10:17:02 |
Line 45 static int obsolete(MACRO_PROT_ARGS); |
|
Line 45 static int obsolete(MACRO_PROT_ARGS); |
|
|
|
static int append_delims(struct mdoc *, |
static int append_delims(struct mdoc *, |
int, int *, char *); |
int, int *, char *); |
static enum mdoct lookup(int, 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 phrase(struct mdoc *, int, int, char *); |
static int phrase(struct mdoc *, int, int, |
|
char *, enum margserr, int); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_dobreak(enum mdoct, |
static int rew_dobreak(enum mdoct, |
const struct mdoc_node *); |
const struct mdoc_node *); |
Line 267 mdoc_macroend(struct mdoc *m) |
|
Line 268 mdoc_macroend(struct mdoc *m) |
|
* Look up a macro from within a subsequent context. |
* Look up a macro from within a subsequent context. |
*/ |
*/ |
static enum mdoct |
static enum mdoct |
lookup(int from, const char *p) |
lookup(enum mdoct from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
Line 283 lookup(int from, const char *p) |
|
Line 284 lookup(int from, const char *p) |
|
static enum mdoct |
static enum mdoct |
lookup_raw(const char *p) |
lookup_raw(const char *p) |
{ |
{ |
int res; |
enum mdoct res; |
|
|
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
return(MDOC_MAX); |
return(MDOC_MAX); |
Line 632 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 633 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
assert(ARGS_PHRASE != ac); |
|
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 884 in_line(MACRO_PROT_ARGS) |
|
Line 884 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, pcnt; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *body; /* save of body macro */ |
struct mdoc_node *body; /* save of body macro */ |
Line 892 blk_full(MACRO_PROT_ARGS) |
|
Line 892 blk_full(MACRO_PROT_ARGS) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac, lac; |
enum margverr av; |
enum margverr av; |
char *p; |
char *p; |
|
|
Line 953 blk_full(MACRO_PROT_ARGS) |
|
Line 953 blk_full(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
for (;;) { |
ac = ARGS_ERROR; |
|
|
|
for (pcnt = 0; ; ) { |
la = *pos; |
la = *pos; |
|
lac = ac; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
Line 964 blk_full(MACRO_PROT_ARGS) |
|
Line 967 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Don't emit leading punct. for phrases. */ |
/* Don't emit leading punct. for phrases. */ |
|
|
if (NULL == head && ARGS_PHRASE != ac && |
if (NULL == head && |
|
ARGS_PHRASE != ac && |
|
ARGS_PPHRASE != ac && |
|
ARGS_PEND != ac && |
ARGS_QWORD != ac && |
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)) |
Line 974 blk_full(MACRO_PROT_ARGS) |
|
Line 980 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Always re-open head for phrases. */ |
/* Always re-open head for phrases. */ |
|
|
if (NULL == head || ARGS_PHRASE == ac) { |
if (NULL == head || |
|
ARGS_PHRASE == ac || |
|
ARGS_PEND == ac || |
|
ARGS_PPHRASE == 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 == ac) { |
if (ARGS_PHRASE == ac || |
if ( ! phrase(m, line, la, buf)) |
ARGS_PEND == ac || |
|
ARGS_PPHRASE == ac) { |
|
/* |
|
* Special treatment for the last phrase. A |
|
* prior ARGS_PHRASE gets is handled as a |
|
* regular ARGS_PHRASE, but a prior ARGS_PPHRASE |
|
* has special handling. |
|
*/ |
|
if (ARGS_PEND == ac && ARGS_ERROR == lac) |
|
ac = ARGS_PHRASE; |
|
else if (ARGS_PEND == ac && ARGS_PHRASE == lac) |
|
ac = ARGS_PHRASE; |
|
|
|
if ( ! phrase(m, line, la, buf, ac, pcnt++)) |
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); |
Line 1084 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1106 blk_part_imp(MACRO_PROT_ARGS) |
|
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
assert(ARGS_PHRASE != ac); |
|
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
Line 1187 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1207 blk_part_exp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(ARGS_PHRASE != ac); |
|
|
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
Line 1508 obsolete(MACRO_PROT_ARGS) |
|
Line 1526 obsolete(MACRO_PROT_ARGS) |
|
* macro is encountered. |
* macro is encountered. |
*/ |
*/ |
static int |
static int |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
phrase(struct mdoc *m, int line, int ppos, char *buf, |
|
enum margserr ac, int count) |
{ |
{ |
int la, pos; |
int la, pos; |
enum margserr ac; |
enum margserr aac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|
|
assert(ARGS_PHRASE == ac || |
|
ARGS_PEND == ac || |
|
ARGS_PPHRASE == ac); |
|
|
|
if (count && ARGS_PPHRASE == ac) |
|
return(mdoc_word_alloc(m, line, ppos, &buf[ppos])); |
|
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
/* Note: no calling context! */ |
/* Note: no calling context! */ |
ac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
aac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == aac) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == aac) |
break; |
break; |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == aac || ARGS_PEND == ac ? |
|
MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |