version 1.60, 2010/05/13 06:22:11 |
version 1.63, 2010/05/14 13:31:20 |
Line 48 static int append_delims(struct mdoc *, |
|
Line 48 static int append_delims(struct mdoc *, |
|
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 phrase(struct mdoc *, int, int, |
static int phrase(struct mdoc *, int, int, |
char *, enum margserr, 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 888 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 la, pcnt; |
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 900 blk_full(MACRO_PROT_ARGS) |
|
Line 900 blk_full(MACRO_PROT_ARGS) |
|
enum margverr av; |
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 959 blk_full(MACRO_PROT_ARGS) |
|
Line 961 blk_full(MACRO_PROT_ARGS) |
|
|
|
ac = ARGS_ERROR; |
ac = ARGS_ERROR; |
|
|
for (pcnt = 0; ; ) { |
for ( ; ; ) { |
la = *pos; |
la = *pos; |
lac = ac; |
lac = ac; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
Line 1007 blk_full(MACRO_PROT_ARGS) |
|
Line 1009 blk_full(MACRO_PROT_ARGS) |
|
else if (ARGS_PEND == ac && ARGS_PHRASE == lac) |
else if (ARGS_PEND == ac && ARGS_PHRASE == lac) |
ac = ARGS_PHRASE; |
ac = ARGS_PHRASE; |
|
|
if ( ! phrase(m, line, la, buf, ac, pcnt++)) |
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); |
Line 1033 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 1073 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 margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
Line 1081 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1083 blk_part_imp(MACRO_PROT_ARGS) |
|
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 1156 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 1169 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 1291 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1297 blk_part_exp(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
Line 1535 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) |
enum margserr ac, int count) |
|
{ |
{ |
int la, pos; |
int la, pos; |
enum margserr aac; |
enum margserr aac; |
Line 1547 phrase(struct mdoc *m, int line, int ppos, char *buf, |
|
Line 1553 phrase(struct mdoc *m, int line, int ppos, char *buf, |
|
ARGS_PEND == ac || |
ARGS_PEND == ac || |
ARGS_PPHRASE == 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! */ |
aac = mdoc_zargs(m, line, &pos, buf, ARGS_PPHRASED, &p); |
aac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
|
|
|
if (ARGS_ERROR == aac) |
if (ARGS_ERROR == aac) |
return(0); |
return(0); |