version 1.228, 2014/09/06 23:24:32 |
version 1.234, 2014/10/20 19:04:45 |
|
|
ROFF_nh, |
ROFF_nh, |
ROFF_nr, |
ROFF_nr, |
ROFF_ns, |
ROFF_ns, |
|
ROFF_pl, |
ROFF_ps, |
ROFF_ps, |
ROFF_rm, |
ROFF_rm, |
ROFF_rr, |
ROFF_rr, |
|
|
struct eqn_node *last_eqn; /* last equation parsed */ |
struct eqn_node *last_eqn; /* last equation parsed */ |
struct eqn_node *first_eqn; /* first equation parsed */ |
struct eqn_node *first_eqn; /* first equation parsed */ |
struct eqn_node *eqn; /* current equation being parsed */ |
struct eqn_node *eqn; /* current equation being parsed */ |
|
int eqn_inline; /* current equation is inline */ |
int options; /* parse options */ |
int options; /* parse options */ |
int rstacksz; /* current size limit of rstack */ |
int rstacksz; /* current size limit of rstack */ |
int rstackpos; /* position in rstack */ |
int rstackpos; /* position in rstack */ |
Line 182 static enum rofferr roff_cond(ROFF_ARGS); |
|
Line 184 static enum rofferr roff_cond(ROFF_ARGS); |
|
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
static enum rofferr roff_ds(ROFF_ARGS); |
static enum rofferr roff_ds(ROFF_ARGS); |
static int roff_evalcond(const char *, int *); |
static enum rofferr roff_eqndelim(struct roff *, |
static int roff_evalnum(const char *, int *, int *, int); |
char **, size_t *, int); |
static int roff_evalpar(const char *, int *, int *); |
static int roff_evalcond(struct roff *r, int, |
|
const char *, int *); |
|
static int roff_evalnum(struct roff *, int, |
|
const char *, int *, int *, int); |
|
static int roff_evalpar(struct roff *, int, |
|
const char *, int *, int *); |
static int roff_evalstrcond(const char *, int *); |
static int roff_evalstrcond(const char *, int *); |
static void roff_free1(struct roff *); |
static void roff_free1(struct roff *); |
static void roff_freereg(struct roffreg *); |
static void roff_freereg(struct roffreg *); |
Line 256 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 263 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nr", roff_nr, NULL, NULL, 0, NULL }, |
{ "nr", roff_nr, NULL, NULL, 0, NULL }, |
{ "ns", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ns", roff_line_ignore, NULL, NULL, 0, NULL }, |
|
{ "pl", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ps", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ps", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "rm", roff_rm, NULL, NULL, 0, NULL }, |
{ "rm", roff_rm, NULL, NULL, 0, NULL }, |
{ "rr", roff_rr, NULL, NULL, 0, NULL }, |
{ "rr", roff_rr, NULL, NULL, 0, NULL }, |
Line 617 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 625 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
case 'B': |
case 'B': |
npos = 0; |
npos = 0; |
ubuf[0] = arg_complete && |
ubuf[0] = arg_complete && |
roff_evalnum(stnam, &npos, NULL, 0) && |
roff_evalnum(r, ln, stnam, &npos, NULL, 0) && |
stnam + npos + 1 == cp ? '1' : '0'; |
stnam + npos + 1 == cp ? '1' : '0'; |
ubuf[1] = '\0'; |
ubuf[1] = '\0'; |
break; |
break; |
Line 722 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 730 roff_parseln(struct roff *r, int ln, char **bufp, |
|
enum rofferr e; |
enum rofferr e; |
int ppos, ctl; |
int ppos, ctl; |
|
|
/* |
/* Handle in-line equation delimiters. */ |
* Run the reserved-word filter only if we have some reserved |
|
* words to fill in. |
|
*/ |
|
|
|
|
if (r->last_eqn != NULL && r->last_eqn->delim && |
|
(r->eqn == NULL || r->eqn_inline)) { |
|
e = roff_eqndelim(r, bufp, szp, pos); |
|
if (e == ROFF_REPARSE) |
|
return(e); |
|
assert(e == ROFF_CONT); |
|
} |
|
|
|
/* Expand some escape sequences. */ |
|
|
e = roff_res(r, bufp, szp, ln, pos); |
e = roff_res(r, bufp, szp, ln, pos); |
if (ROFF_IGN == e) |
if (ROFF_IGN == e) |
return(e); |
return(e); |
|
|
* or string condition. |
* or string condition. |
*/ |
*/ |
static int |
static int |
roff_evalcond(const char *v, int *pos) |
roff_evalcond(struct roff *r, int ln, const char *v, int *pos) |
{ |
{ |
int wanttrue, number; |
int wanttrue, number; |
|
|
Line 1259 roff_evalcond(const char *v, int *pos) |
|
Line 1274 roff_evalcond(const char *v, int *pos) |
|
break; |
break; |
} |
} |
|
|
if (roff_evalnum(v, pos, &number, 0)) |
if (roff_evalnum(r, ln, v, pos, &number, 0)) |
return((number > 0) == wanttrue); |
return((number > 0) == wanttrue); |
else |
else |
return(roff_evalstrcond(v, pos) == wanttrue); |
return(roff_evalstrcond(v, pos) == wanttrue); |
Line 1288 roff_cond(ROFF_ARGS) |
|
Line 1303 roff_cond(ROFF_ARGS) |
|
|
|
r->last->rule = ROFF_el == tok ? |
r->last->rule = ROFF_el == tok ? |
(r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) : |
(r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) : |
roff_evalcond(*bufp, &pos); |
roff_evalcond(r, ln, *bufp, &pos); |
|
|
/* |
/* |
* An if-else will put the NEGATION of the current evaluated |
* An if-else will put the NEGATION of the current evaluated |
Line 1454 roff_getop(const char *v, int *pos, char *res) |
|
Line 1469 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(const char *v, int *pos, int *res) |
roff_evalpar(struct roff *r, int ln, |
|
const char *v, int *pos, int *res) |
{ |
{ |
|
|
if ('(' != v[*pos]) |
if ('(' != v[*pos]) |
return(roff_getnum(v, pos, res)); |
return(roff_getnum(v, pos, res)); |
|
|
(*pos)++; |
(*pos)++; |
if ( ! roff_evalnum(v, pos, res, 1)) |
if ( ! roff_evalnum(r, ln, v, pos, res, 1)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 1483 roff_evalpar(const char *v, int *pos, int *res) |
|
Line 1499 roff_evalpar(const char *v, int *pos, int *res) |
|
* 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(const char *v, int *pos, int *res, int skipwhite) |
roff_evalnum(struct roff *r, int ln, const char *v, |
|
int *pos, int *res, int skipwhite) |
{ |
{ |
int mypos, operand2; |
int mypos, operand2; |
char operator; |
char operator; |
Line 1497 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
Line 1514 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
while (isspace((unsigned char)v[*pos])) |
while (isspace((unsigned char)v[*pos])) |
(*pos)++; |
(*pos)++; |
|
|
if ( ! roff_evalpar(v, pos, res)) |
if ( ! roff_evalpar(r, ln, v, pos, res)) |
return(0); |
return(0); |
|
|
while (1) { |
while (1) { |
Line 1512 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
Line 1529 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
while (isspace((unsigned char)v[*pos])) |
while (isspace((unsigned char)v[*pos])) |
(*pos)++; |
(*pos)++; |
|
|
if ( ! roff_evalpar(v, pos, &operand2)) |
if ( ! roff_evalpar(r, ln, v, pos, &operand2)) |
return(0); |
return(0); |
|
|
if (skipwhite) |
if (skipwhite) |
Line 1533 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
Line 1550 roff_evalnum(const char *v, int *pos, int *res, int sk |
|
*res *= operand2; |
*res *= operand2; |
break; |
break; |
case '/': |
case '/': |
|
if (0 == operand2) { |
|
mandoc_msg(MANDOCERR_DIVZERO, |
|
r->parse, ln, *pos, v); |
|
*res = 0; |
|
break; |
|
} |
*res /= operand2; |
*res /= operand2; |
break; |
break; |
case '%': |
case '%': |
Line 1707 roff_nr(ROFF_ARGS) |
|
Line 1730 roff_nr(ROFF_ARGS) |
|
if ('+' == sign || '-' == sign) |
if ('+' == sign || '-' == sign) |
val++; |
val++; |
|
|
if (roff_evalnum(val, NULL, &iv, 0)) |
if (roff_evalnum(r, ln, val, NULL, &iv, 0)) |
roff_setreg(r, key, iv, sign); |
roff_setreg(r, key, iv, sign); |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |
Line 1839 roff_T_(ROFF_ARGS) |
|
Line 1862 roff_T_(ROFF_ARGS) |
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
#if 0 |
/* |
static int |
* Handle in-line equation delimiters. |
roff_closeeqn(struct roff *r) |
*/ |
|
static enum rofferr |
|
roff_eqndelim(struct roff *r, char **bufp, size_t *szp, int pos) |
{ |
{ |
|
char *cp1, *cp2; |
|
const char *bef_pr, *bef_nl, *mac, *aft_nl, *aft_pr; |
|
|
return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0); |
/* |
|
* Outside equations, look for an opening delimiter. |
|
* If we are inside an equation, we already know it is |
|
* in-line, or this function wouldn't have been called; |
|
* so look for a closing delimiter. |
|
*/ |
|
|
|
cp1 = *bufp + pos; |
|
cp2 = strchr(cp1, r->eqn == NULL ? |
|
r->last_eqn->odelim : r->last_eqn->cdelim); |
|
if (cp2 == NULL) |
|
return(ROFF_CONT); |
|
|
|
*cp2++ = '\0'; |
|
bef_pr = bef_nl = aft_nl = aft_pr = ""; |
|
|
|
/* Handle preceding text, protecting whitespace. */ |
|
|
|
if (**bufp != '\0') { |
|
if (r->eqn == NULL) |
|
bef_pr = "\\&"; |
|
bef_nl = "\n"; |
|
} |
|
|
|
/* |
|
* Prepare replacing the delimiter with an equation macro |
|
* and drop leading white space from the equation. |
|
*/ |
|
|
|
if (r->eqn == NULL) { |
|
while (*cp2 == ' ') |
|
cp2++; |
|
mac = ".EQ"; |
|
} else |
|
mac = ".EN"; |
|
|
|
/* Handle following text, protecting whitespace. */ |
|
|
|
if (*cp2 != '\0') { |
|
aft_nl = "\n"; |
|
if (r->eqn != NULL) |
|
aft_pr = "\\&"; |
|
} |
|
|
|
/* Do the actual replacement. */ |
|
|
|
*szp = mandoc_asprintf(&cp1, "%s%s%s%s%s%s%s", *bufp, |
|
bef_pr, bef_nl, mac, aft_nl, aft_pr, cp2) + 1; |
|
free(*bufp); |
|
*bufp = cp1; |
|
|
|
/* Toggle the in-line state of the eqn subsystem. */ |
|
|
|
r->eqn_inline = r->eqn == NULL; |
|
return(ROFF_REPARSE); |
} |
} |
#endif |
|
|
|
static void |
static void |
roff_openeqn(struct roff *r, const char *name, int line, |
roff_openeqn(struct roff *r, const char *name, int line, |
Line 1858 roff_openeqn(struct roff *r, const char *name, int lin |
|
Line 1938 roff_openeqn(struct roff *r, const char *name, int lin |
|
assert(NULL == r->eqn); |
assert(NULL == r->eqn); |
e = eqn_alloc(name, offs, line, r->parse); |
e = eqn_alloc(name, offs, line, r->parse); |
|
|
if (r->last_eqn) |
if (r->last_eqn) { |
r->last_eqn->next = e; |
r->last_eqn->next = e; |
else |
e->delim = r->last_eqn->delim; |
|
e->odelim = r->last_eqn->odelim; |
|
e->cdelim = r->last_eqn->cdelim; |
|
} else |
r->first_eqn = r->last_eqn = e; |
r->first_eqn = r->last_eqn = e; |
|
|
r->eqn = r->last_eqn = e; |
r->eqn = r->last_eqn = e; |