version 1.234, 2014/10/20 19:04:45 |
version 1.237, 2014/10/28 17:36:19 |
Line 107 struct roffreg { |
|
Line 107 struct roffreg { |
|
|
|
struct roff { |
struct roff { |
struct mparse *parse; /* parse point */ |
struct mparse *parse; /* parse point */ |
|
const struct mchars *mchars; /* character table */ |
struct roffnode *last; /* leaf of stack */ |
struct roffnode *last; /* leaf of stack */ |
int *rstack; /* stack of inverted `ie' values */ |
int *rstack; /* stack of inverted `ie' values */ |
struct roffreg *regtab; /* number registers */ |
struct roffreg *regtab; /* number registers */ |
Line 207 static const char *roff_getstrn(const struct roff *, |
|
Line 208 static const char *roff_getstrn(const struct roff *, |
|
static enum rofferr roff_it(ROFF_ARGS); |
static enum rofferr roff_it(ROFF_ARGS); |
static enum rofferr roff_line_ignore(ROFF_ARGS); |
static enum rofferr roff_line_ignore(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static void roff_openeqn(struct roff *, const char *, |
|
int, int, const char *); |
|
static enum rofft roff_parse(struct roff *, char *, int *, |
static enum rofft roff_parse(struct roff *, char *, int *, |
int, int); |
int, int); |
static enum rofferr roff_parsetext(char **, size_t *, int, int *); |
static enum rofferr roff_parsetext(char **, size_t *, int, int *); |
Line 478 roff_free(struct roff *r) |
|
Line 477 roff_free(struct roff *r) |
|
} |
} |
|
|
struct roff * |
struct roff * |
roff_alloc(struct mparse *parse, int options) |
roff_alloc(struct mparse *parse, const struct mchars *mchars, int options) |
{ |
{ |
struct roff *r; |
struct roff *r; |
|
|
r = mandoc_calloc(1, sizeof(struct roff)); |
r = mandoc_calloc(1, sizeof(struct roff)); |
r->parse = parse; |
r->parse = parse; |
|
r->mchars = mchars; |
r->options = options; |
r->options = options; |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->rstackpos = -1; |
r->rstackpos = -1; |
Line 510 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 510 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
char *nbuf; /* new buffer to copy bufp to */ |
char *nbuf; /* new buffer to copy bufp to */ |
size_t maxl; /* expected length of the escape name */ |
size_t maxl; /* expected length of the escape name */ |
size_t naml; /* actual length of the escape name */ |
size_t naml; /* actual length of the escape name */ |
|
enum mandoc_esc esc; /* type of the escape sequence */ |
|
int inaml; /* length returned from mandoc_escape() */ |
int expand_count; /* to avoid infinite loops */ |
int expand_count; /* to avoid infinite loops */ |
int npos; /* position in numeric expression */ |
int npos; /* position in numeric expression */ |
int arg_complete; /* argument not interrupted by eol */ |
int arg_complete; /* argument not interrupted by eol */ |
Line 553 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 555 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
res = ubuf; |
res = ubuf; |
break; |
break; |
default: |
default: |
if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL)) |
esc = mandoc_escape(&cp, &stnam, &inaml); |
|
if (esc == ESCAPE_ERROR || |
|
(esc == ESCAPE_SPECIAL && |
|
mchars_spec2cp(r->mchars, stnam, inaml) < 0)) |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
r->parse, ln, (int)(stesc - *bufp), |
r->parse, ln, (int)(stesc - *bufp), |
"%.*s", (int)(cp - stesc), stesc); |
"%.*s", (int)(cp - stesc), stesc); |
Line 732 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 737 roff_parseln(struct roff *r, int ln, char **bufp, |
|
|
|
/* Handle in-line equation delimiters. */ |
/* Handle in-line equation delimiters. */ |
|
|
if (r->last_eqn != NULL && r->last_eqn->delim && |
if (r->tbl == NULL && |
|
r->last_eqn != NULL && r->last_eqn->delim && |
(r->eqn == NULL || r->eqn_inline)) { |
(r->eqn == NULL || r->eqn_inline)) { |
e = roff_eqndelim(r, bufp, szp, pos); |
e = roff_eqndelim(r, bufp, szp, pos); |
if (e == ROFF_REPARSE) |
if (e == ROFF_REPARSE) |
Line 1469 roff_getop(const char *v, int *pos, char *res) |
|
Line 1475 roff_getop(const char *v, int *pos, char *res) |
|
* or a single signed integer number. |
* or a single signed integer number. |
*/ |
*/ |
static int |
static int |
roff_evalpar(struct roff *r, int ln, |
roff_evalpar(struct roff *r, int ln, |
const char *v, int *pos, int *res) |
const char *v, int *pos, int *res) |
{ |
{ |
|
|
Line 1499 roff_evalpar(struct roff *r, int ln, |
|
Line 1505 roff_evalpar(struct roff *r, int ln, |
|
* Proceed left to right, there is no concept of precedence. |
* Proceed left to right, there is no concept of precedence. |
*/ |
*/ |
static int |
static int |
roff_evalnum(struct roff *r, int ln, const char *v, |
roff_evalnum(struct roff *r, int ln, const char *v, |
int *pos, int *res, int skipwhite) |
int *pos, int *res, int skipwhite) |
{ |
{ |
int mypos, operand2; |
int mypos, operand2; |
Line 1551 roff_evalnum(struct roff *r, int ln, const char *v, |
|
Line 1557 roff_evalnum(struct roff *r, int ln, const char *v, |
|
break; |
break; |
case '/': |
case '/': |
if (0 == operand2) { |
if (0 == operand2) { |
mandoc_msg(MANDOCERR_DIVZERO, |
mandoc_msg(MANDOCERR_DIVZERO, |
r->parse, ln, *pos, v); |
r->parse, ln, *pos, v); |
*res = 0; |
*res = 0; |
break; |
break; |
Line 1928 roff_eqndelim(struct roff *r, char **bufp, size_t *szp |
|
Line 1934 roff_eqndelim(struct roff *r, char **bufp, size_t *szp |
|
return(ROFF_REPARSE); |
return(ROFF_REPARSE); |
} |
} |
|
|
static void |
static enum rofferr |
roff_openeqn(struct roff *r, const char *name, int line, |
roff_EQ(ROFF_ARGS) |
int offs, const char *buf) |
|
{ |
{ |
struct eqn_node *e; |
struct eqn_node *e; |
int poff; |
|
|
|
assert(NULL == r->eqn); |
assert(NULL == r->eqn); |
e = eqn_alloc(name, offs, line, r->parse); |
e = eqn_alloc(ppos, ln, r->parse); |
|
|
if (r->last_eqn) { |
if (r->last_eqn) { |
r->last_eqn->next = e; |
r->last_eqn->next = e; |
Line 1948 roff_openeqn(struct roff *r, const char *name, int lin |
|
Line 1952 roff_openeqn(struct roff *r, const char *name, int lin |
|
|
|
r->eqn = r->last_eqn = e; |
r->eqn = r->last_eqn = e; |
|
|
if (buf) { |
if ((*bufp)[pos]) |
poff = 0; |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
eqn_read(&r->eqn, line, buf, offs, &poff); |
".EQ %s", *bufp + pos); |
} |
|
} |
|
|
|
static enum rofferr |
|
roff_EQ(ROFF_ARGS) |
|
{ |
|
|
|
roff_openeqn(r, *bufp + pos, ln, ppos, NULL); |
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|