version 1.53, 2010/05/07 05:34:56 |
version 1.63, 2010/05/14 13:31:20 |
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); |
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); |
|
|
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
{ |
{ |
int lastarg; |
int lastarg; |
enum margerr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
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 653 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, lastarg, maxargs, flushed; |
int j, lastarg, maxargs, flushed, nl; |
enum margerr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ec): |
case (MDOC_Ec): |
maxargs = 1; |
maxargs = 1; |
Line 702 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 704 blk_exp_close(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (MDOC_MAX != (ntok = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
if ( ! flushed) { |
|
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if (MDOC_MAX == ntok) { |
return(0); |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
flushed = 1; |
|
} |
|
if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf)) |
|
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if ( ! flushed) { |
|
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
|
return(0); |
|
flushed = 1; |
|
} |
|
if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 729 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 734 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, cnt, d, nc; |
int la, lastpunct, cnt, d, nc, nl; |
|
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr ac; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* 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. |
Line 761 in_line(MACRO_PROT_ARGS) |
|
Line 769 in_line(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 787 in_line(MACRO_PROT_ARGS) |
|
Line 795 in_line(MACRO_PROT_ARGS) |
|
if (ARGS_PUNCT == ac) |
if (ARGS_PUNCT == ac) |
break; |
break; |
|
|
/* Quoted words shouldn't be looked-up. */ |
|
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
Line 813 in_line(MACRO_PROT_ARGS) |
|
Line 819 in_line(MACRO_PROT_ARGS) |
|
} |
} |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 873 in_line(MACRO_PROT_ARGS) |
|
Line 879 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 882 in_line(MACRO_PROT_ARGS) |
|
Line 888 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int c, la; |
int la, nl; |
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 890 blk_full(MACRO_PROT_ARGS) |
|
Line 896 blk_full(MACRO_PROT_ARGS) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr ac, lac; |
|
enum margverr av; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
Line 913 blk_full(MACRO_PROT_ARGS) |
|
Line 922 blk_full(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 950 blk_full(MACRO_PROT_ARGS) |
|
Line 959 blk_full(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
for (;;) { |
ac = ARGS_ERROR; |
|
|
|
for ( ; ; ) { |
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 961 blk_full(MACRO_PROT_ARGS) |
|
Line 973 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 971 blk_full(MACRO_PROT_ARGS) |
|
Line 986 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)) |
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); |
continue; |
continue; |
} |
} |
|
|
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1002 blk_full(MACRO_PROT_ARGS) |
|
Line 1035 blk_full(MACRO_PROT_ARGS) |
|
head = m->last; |
head = m->last; |
} |
} |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* If we've already opened our body, exit now. */ |
/* If we've already opened our body, exit now. */ |
Line 1042 blk_full(MACRO_PROT_ARGS) |
|
Line 1075 blk_full(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, nl; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr 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 */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A macro that spans to the end of the line. This is generally |
* A macro that spans to the end of the line. This is generally |
* (but not necessarily) called as the first macro. The block |
* (but not necessarily) called as the first macro. The block |
Line 1079 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1114 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 1101 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1134 blk_part_imp(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1125 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1160 blk_part_imp(MACRO_PROT_ARGS) |
|
* 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) |
for (n = m->last; n; n = n->parent) |
if (body == n) |
if (body == n) |
Line 1138 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1175 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
Line 1153 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1190 blk_part_imp(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, nl; |
enum margerr ac; |
enum margserr 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; |
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* The opening of an explicit macro having zero or more leading |
* The opening of an explicit macro having zero or more leading |
* punctuation nodes; a head with optional single element (the |
* punctuation nodes; a head with optional single element (the |
Line 1180 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1219 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 1223 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1260 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
assert(NULL != head && NULL != body); |
assert(NULL != head && NULL != body); |
|
|
if (MDOC_MAX == (ntok = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1252 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1291 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
|
|
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
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, maxargs, nl; |
enum margerr ac; |
enum margserr ac; |
|
enum margverr av; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
* Only open the scope once the first non-leading-punctuation is |
* Only open the scope once the first non-leading-punctuation is |
Line 1296 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1338 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 1339 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1381 in_line_argn(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
if (MDOC_MAX != (ntok = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (MDOC_MAX != ntok) { |
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
Line 1385 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1429 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
if ( ! nl) |
if (ppos > 1) |
|
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 1395 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1438 in_line_argn(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int c, la; |
int la; |
enum margerr ac; |
enum margserr ac; |
|
enum margverr av; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
Line 1407 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1451 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 1461 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1505 in_line_eoln(MACRO_PROT_ARGS) |
|
static int |
static int |
ctx_synopsis(MACRO_PROT_ARGS) |
ctx_synopsis(MACRO_PROT_ARGS) |
{ |
{ |
|
int nl; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
if (SEC_SYNOPSIS != m->lastsec) |
if (SEC_SYNOPSIS != m->lastsec) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |
if (ppos > 1) |
if ( ! nl) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* |
/* |
Line 1495 obsolete(MACRO_PROT_ARGS) |
|
Line 1542 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 la, pos; |
int la, pos; |
enum margerr ac; |
enum margserr aac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|
|
assert(ARGS_PHRASE == ac || |
|
ARGS_PEND == ac || |
|
ARGS_PPHRASE == ac); |
|
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
/* Note: no calling context! */ |
aac = mdoc_zargs(m, line, &pos, buf, ARGS_PPHRASED, &p); |
ac = 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)) |