version 1.129, 2011/03/22 09:50:11 |
version 1.130, 2011/03/29 09:00:48 |
|
|
|
|
#define RSTACK_MAX 128 |
#define RSTACK_MAX 128 |
|
|
#define ROFF_CTL(c) \ |
|
('.' == (c) || '\'' == (c)) |
|
|
|
enum rofft { |
enum rofft { |
ROFF_ad, |
ROFF_ad, |
ROFF_am, |
ROFF_am, |
Line 476 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 473 roff_parseln(struct roff *r, int ln, char **bufp, |
|
{ |
{ |
enum rofft t; |
enum rofft t; |
enum rofferr e; |
enum rofferr e; |
int ppos; |
int ppos, ctl; |
|
|
/* |
/* |
* Run the reserved-word filter only if we have some reserved |
* Run the reserved-word filter only if we have some reserved |
Line 486 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 483 roff_parseln(struct roff *r, int ln, char **bufp, |
|
if (r->first_string && ! roff_res(r, bufp, szp, pos)) |
if (r->first_string && ! roff_res(r, bufp, szp, pos)) |
return(ROFF_REPARSE); |
return(ROFF_REPARSE); |
|
|
|
ppos = pos; |
|
ctl = mandoc_getcontrol(*bufp, &pos); |
|
|
/* |
/* |
* First, if a scope is open and we're not a macro, pass the |
* First, if a scope is open and we're not a macro, pass the |
* text through the macro's filter. If a scope isn't open and |
* text through the macro's filter. If a scope isn't open and |
Line 494 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 494 roff_parseln(struct roff *r, int ln, char **bufp, |
|
* no matter our state. |
* no matter our state. |
*/ |
*/ |
|
|
if (r->last && ! ROFF_CTL((*bufp)[pos])) { |
if (r->last && ! ctl) { |
t = r->last->tok; |
t = r->last->tok; |
assert(roffs[t].text); |
assert(roffs[t].text); |
e = (*roffs[t].text) |
e = (*roffs[t].text) |
Line 503 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 503 roff_parseln(struct roff *r, int ln, char **bufp, |
|
if (ROFF_CONT != e) |
if (ROFF_CONT != e) |
return(e); |
return(e); |
if (r->eqn) |
if (r->eqn) |
return(eqn_read(&r->eqn, ln, *bufp, *offs)); |
return(eqn_read(&r->eqn, ln, *bufp, pos)); |
if (r->tbl) |
if (r->tbl) |
return(tbl_read(r->tbl, ln, *bufp, *offs)); |
return(tbl_read(r->tbl, ln, *bufp, pos)); |
return(ROFF_CONT); |
return(ROFF_CONT); |
} else if ( ! ROFF_CTL((*bufp)[pos])) { |
} else if ( ! ctl) { |
if (r->eqn) |
if (r->eqn) |
return(eqn_read(&r->eqn, ln, *bufp, *offs)); |
return(eqn_read(&r->eqn, ln, *bufp, pos)); |
if (r->tbl) |
if (r->tbl) |
return(tbl_read(r->tbl, ln, *bufp, *offs)); |
return(tbl_read(r->tbl, ln, *bufp, pos)); |
return(ROFF_CONT); |
return(ROFF_CONT); |
} else if (r->eqn) |
} else if (r->eqn) |
return(eqn_read(&r->eqn, ln, *bufp, *offs)); |
return(eqn_read(&r->eqn, ln, *bufp, ppos)); |
|
|
/* |
/* |
* If a scope is open, go to the child handler for that macro, |
* If a scope is open, go to the child handler for that macro, |
Line 527 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 527 roff_parseln(struct roff *r, int ln, char **bufp, |
|
assert(roffs[t].sub); |
assert(roffs[t].sub); |
return((*roffs[t].sub) |
return((*roffs[t].sub) |
(r, t, bufp, szp, |
(r, t, bufp, szp, |
ln, pos, pos, offs)); |
ln, ppos, pos, offs)); |
} |
} |
|
|
/* |
/* |
Line 536 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 536 roff_parseln(struct roff *r, int ln, char **bufp, |
|
* the compilers handle it. |
* the compilers handle it. |
*/ |
*/ |
|
|
ppos = pos; |
|
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) |
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) |
return(ROFF_CONT); |
return(ROFF_CONT); |
|
|
Line 570 roff_endparse(struct roff *r) |
|
Line 569 roff_endparse(struct roff *r) |
|
} |
} |
} |
} |
|
|
|
|
/* |
/* |
* Parse a roff node's type from the input buffer. This must be in the |
* Parse a roff node's type from the input buffer. This must be in the |
* form of ".foo xxx" in the usual way. |
* form of ".foo xxx" in the usual way. |
Line 582 roff_parse(struct roff *r, const char *buf, int *pos) |
|
Line 580 roff_parse(struct roff *r, const char *buf, int *pos) |
|
size_t maclen; |
size_t maclen; |
enum rofft t; |
enum rofft t; |
|
|
assert(ROFF_CTL(buf[*pos])); |
if ('\0' == buf[*pos] || '"' == buf[*pos]) |
(*pos)++; |
|
|
|
while (' ' == buf[*pos] || '\t' == buf[*pos]) |
|
(*pos)++; |
|
|
|
if ('\0' == buf[*pos]) |
|
return(ROFF_MAX); |
return(ROFF_MAX); |
|
|
mac = buf + *pos; |
mac = buf + *pos; |
Line 598 roff_parse(struct roff *r, const char *buf, int *pos) |
|
Line 590 roff_parse(struct roff *r, const char *buf, int *pos) |
|
? ROFF_USERDEF : roff_hash_find(mac, maclen); |
? ROFF_USERDEF : roff_hash_find(mac, maclen); |
|
|
*pos += (int)maclen; |
*pos += (int)maclen; |
|
|
while (buf[*pos] && ' ' == buf[*pos]) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
Line 816 roff_block_sub(ROFF_ARGS) |
|
Line 809 roff_block_sub(ROFF_ARGS) |
|
*/ |
*/ |
|
|
if (r->last->end) { |
if (r->last->end) { |
i = pos + 1; |
for (i = pos, j = 0; r->last->end[j]; j++, i++) |
while (' ' == (*bufp)[i] || '\t' == (*bufp)[i]) |
|
i++; |
|
|
|
for (j = 0; r->last->end[j]; j++, i++) |
|
if ((*bufp)[i] != r->last->end[j]) |
if ((*bufp)[i] != r->last->end[j]) |
break; |
break; |
|
|
Line 831 roff_block_sub(ROFF_ARGS) |
|
Line 820 roff_block_sub(ROFF_ARGS) |
|
roffnode_pop(r); |
roffnode_pop(r); |
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
|
|
|
while (' ' == (*bufp)[i] || '\t' == (*bufp)[i]) |
|
i++; |
|
|
|
pos = i; |
if (ROFF_MAX != roff_parse(r, *bufp, &pos)) |
if (ROFF_MAX != roff_parse(r, *bufp, &pos)) |
return(ROFF_RERUN); |
return(ROFF_RERUN); |
return(ROFF_IGN); |
return(ROFF_IGN); |
Line 842 roff_block_sub(ROFF_ARGS) |
|
Line 835 roff_block_sub(ROFF_ARGS) |
|
* pulling it out of the hashtable. |
* pulling it out of the hashtable. |
*/ |
*/ |
|
|
ppos = pos; |
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) |
t = roff_parse(r, *bufp, &pos); |
return(ROFF_IGN); |
|
|
/* |
/* |
* Macros other than block-end are only significant |
* Macros other than block-end are only significant |
Line 880 roff_cond_sub(ROFF_ARGS) |
|
Line 873 roff_cond_sub(ROFF_ARGS) |
|
enum rofft t; |
enum rofft t; |
enum roffrule rr; |
enum roffrule rr; |
|
|
ppos = pos; |
|
rr = r->last->rule; |
rr = r->last->rule; |
|
|
/* |
/* |