version 1.318, 2017/07/04 22:52:00 |
version 1.321, 2017/07/08 17:52:50 |
|
|
struct tbl_node *first_tbl; /* first table parsed */ |
struct tbl_node *first_tbl; /* first table parsed */ |
struct tbl_node *last_tbl; /* last table parsed */ |
struct tbl_node *last_tbl; /* last table parsed */ |
struct tbl_node *tbl; /* current table being parsed */ |
struct tbl_node *tbl; /* current table being parsed */ |
struct eqn_node *last_eqn; /* last equation parsed */ |
struct eqn_node *last_eqn; /* equation parser */ |
struct eqn_node *first_eqn; /* first equation parsed */ |
struct eqn_node *eqn; /* active equation parser */ |
struct eqn_node *eqn; /* current equation being parsed */ |
|
int eqn_inline; /* current equation is inline */ |
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 */ |
Line 154 static void roffnode_cleanscope(struct roff *); |
|
Line 153 static void roffnode_cleanscope(struct roff *); |
|
static void roffnode_pop(struct roff *); |
static void roffnode_pop(struct roff *); |
static void roffnode_push(struct roff *, enum roff_tok, |
static void roffnode_push(struct roff *, enum roff_tok, |
const char *, int, int); |
const char *, int, int); |
|
static void roff_addtbl(struct roff_man *, struct tbl_node *); |
static enum rofferr roff_als(ROFF_ARGS); |
static enum rofferr roff_als(ROFF_ARGS); |
static enum rofferr roff_block(ROFF_ARGS); |
static enum rofferr roff_block(ROFF_ARGS); |
static enum rofferr roff_block_text(ROFF_ARGS); |
static enum rofferr roff_block_text(ROFF_ARGS); |
|
|
roff_free1(struct roff *r) |
roff_free1(struct roff *r) |
{ |
{ |
struct tbl_node *tbl; |
struct tbl_node *tbl; |
struct eqn_node *e; |
|
int i; |
int i; |
|
|
while (NULL != (tbl = r->first_tbl)) { |
while (NULL != (tbl = r->first_tbl)) { |
Line 704 roff_free1(struct roff *r) |
|
Line 703 roff_free1(struct roff *r) |
|
} |
} |
r->first_tbl = r->last_tbl = r->tbl = NULL; |
r->first_tbl = r->last_tbl = r->tbl = NULL; |
|
|
while (NULL != (e = r->first_eqn)) { |
if (r->last_eqn != NULL) |
r->first_eqn = e->next; |
eqn_free(r->last_eqn); |
eqn_free(e); |
r->last_eqn = r->eqn = NULL; |
} |
|
r->first_eqn = r->last_eqn = r->eqn = NULL; |
|
|
|
while (r->last) |
while (r->last) |
roffnode_pop(r); |
roffnode_pop(r); |
Line 983 roff_body_alloc(struct roff_man *man, int line, int po |
|
Line 980 roff_body_alloc(struct roff_man *man, int line, int po |
|
return n; |
return n; |
} |
} |
|
|
void |
static void |
roff_addeqn(struct roff_man *man, const struct eqn *eqn) |
roff_addtbl(struct roff_man *man, struct tbl_node *tbl) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
const struct tbl_span *span; |
|
|
n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE); |
|
n->eqn = eqn; |
|
if (eqn->ln > man->last->line) |
|
n->flags |= NODE_LINE; |
|
roff_node_append(man, n); |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
|
|
|
void |
|
roff_addtbl(struct roff_man *man, const struct tbl_span *tbl) |
|
{ |
|
struct roff_node *n; |
|
|
|
if (man->macroset == MACROSET_MAN) |
if (man->macroset == MACROSET_MAN) |
man_breakscope(man, ROFF_TS); |
man_breakscope(man, ROFF_TS); |
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
while ((span = tbl_span(tbl)) != NULL) { |
n->span = tbl; |
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
roff_node_append(man, n); |
n->span = span; |
n->flags |= NODE_VALID | NODE_ENDED; |
roff_node_append(man, n); |
man->next = ROFF_NEXT_SIBLING; |
n->flags |= NODE_VALID | NODE_ENDED; |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
} |
} |
|
|
void |
void |
Line 1055 roff_node_free(struct roff_node *n) |
|
Line 1042 roff_node_free(struct roff_node *n) |
|
mdoc_argv_free(n->args); |
mdoc_argv_free(n->args); |
if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM) |
if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM) |
free(n->norm); |
free(n->norm); |
|
if (n->eqn != NULL) |
|
eqn_box_free(n->eqn); |
free(n->string); |
free(n->string); |
free(n); |
free(n); |
} |
} |
Line 1512 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1501 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
return e; |
return e; |
assert(e == ROFF_CONT); |
assert(e == ROFF_CONT); |
} |
} |
if (r->eqn != NULL) |
if (r->eqn != NULL && strncmp(buf->buf + ppos, ".EN", 3)) { |
return eqn_read(&r->eqn, ln, buf->buf, ppos, offs); |
eqn_read(r->eqn, buf->buf + ppos); |
if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0')) |
return ROFF_IGN; |
return tbl_read(r->tbl, ln, buf->buf, ppos); |
} |
|
if (r->tbl != NULL && (ctl == 0 || buf->buf[pos] == '\0')) { |
|
tbl_read(r->tbl, ln, buf->buf, ppos); |
|
roff_addtbl(r->man, r->tbl); |
|
return ROFF_IGN; |
|
} |
if ( ! ctl) |
if ( ! ctl) |
return roff_parsetext(r, buf, pos, offs); |
return roff_parsetext(r, buf, pos, offs); |
|
|
Line 1556 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1550 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
pos++; |
pos++; |
while (buf->buf[pos] == ' ') |
while (buf->buf[pos] == ' ') |
pos++; |
pos++; |
return tbl_read(r->tbl, ln, buf->buf, pos); |
tbl_read(r->tbl, ln, buf->buf, pos); |
|
roff_addtbl(r->man, r->tbl); |
|
return ROFF_IGN; |
} |
} |
|
|
/* For now, let high level macros abort .ce mode. */ |
/* For now, let high level macros abort .ce mode. */ |
Line 1585 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1581 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
void |
void |
roff_endparse(struct roff *r) |
roff_endparse(struct roff *r) |
{ |
{ |
|
if (r->last != NULL) |
if (r->last) |
|
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->last->line, r->last->col, |
r->last->line, r->last->col, |
roff_name[r->last->tok]); |
roff_name[r->last->tok]); |
|
|
if (r->eqn) { |
if (r->eqn != NULL) { |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->eqn->eqn.ln, r->eqn->eqn.pos, "EQ"); |
r->eqn->node->line, r->eqn->node->pos, "EQ"); |
eqn_end(&r->eqn); |
eqn_parse(r->eqn); |
|
r->eqn = NULL; |
} |
} |
|
|
if (r->tbl) { |
if (r->tbl != NULL) { |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->tbl->line, r->tbl->pos, "TS"); |
r->tbl->line, r->tbl->pos, "TS"); |
tbl_end(&r->tbl); |
tbl_end(r->tbl); |
|
r->tbl = NULL; |
} |
} |
} |
} |
|
|
Line 2782 roff_Dd(ROFF_ARGS) |
|
Line 2779 roff_Dd(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_TE(ROFF_ARGS) |
roff_TE(ROFF_ARGS) |
{ |
{ |
|
if (r->tbl == NULL) { |
if (NULL == r->tbl) |
|
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
ln, ppos, "TE"); |
ln, ppos, "TE"); |
else if ( ! tbl_end(&r->tbl)) { |
return ROFF_IGN; |
|
} |
|
if (tbl_end(r->tbl) == 0) { |
|
r->tbl = NULL; |
free(buf->buf); |
free(buf->buf); |
buf->buf = mandoc_strdup(".sp"); |
buf->buf = mandoc_strdup(".sp"); |
buf->sz = 4; |
buf->sz = 4; |
return ROFF_REPARSE; |
return ROFF_REPARSE; |
} |
} |
|
r->tbl = NULL; |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 2877 roff_eqndelim(struct roff *r, struct buf *buf, int pos |
|
Line 2877 roff_eqndelim(struct roff *r, struct buf *buf, int pos |
|
static enum rofferr |
static enum rofferr |
roff_EQ(ROFF_ARGS) |
roff_EQ(ROFF_ARGS) |
{ |
{ |
struct eqn_node *e; |
struct roff_node *n; |
|
|
|
n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE); |
|
if (ln > r->man->last->line) |
|
n->flags |= NODE_LINE; |
|
n->eqn = mandoc_calloc(1, sizeof(*n->eqn)); |
|
n->eqn->expectargs = UINT_MAX; |
|
roff_node_append(r->man, n); |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
|
assert(r->eqn == NULL); |
assert(r->eqn == NULL); |
e = eqn_alloc(ppos, ln, r->parse); |
if (r->last_eqn == NULL) |
|
r->last_eqn = eqn_alloc(r->parse); |
|
else |
|
eqn_reset(r->last_eqn); |
|
r->eqn = r->last_eqn; |
|
r->eqn->node = n; |
|
|
if (r->last_eqn) { |
|
r->last_eqn->next = e; |
|
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->eqn = r->last_eqn = e; |
|
|
|
if (buf->buf[pos] != '\0') |
if (buf->buf[pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
".EQ %s", buf->buf + pos); |
".EQ %s", buf->buf + pos); |
Line 2902 roff_EQ(ROFF_ARGS) |
|
Line 2905 roff_EQ(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_EN(ROFF_ARGS) |
roff_EN(ROFF_ARGS) |
{ |
{ |
|
if (r->eqn != NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN"); |
eqn_parse(r->eqn); |
|
r->eqn = NULL; |
|
} else |
|
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN"); |
|
if (buf->buf[pos] != '\0') |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
|
"EN %s", buf->buf + pos); |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
static enum rofferr |
static enum rofferr |
roff_TS(ROFF_ARGS) |
roff_TS(ROFF_ARGS) |
{ |
{ |
struct tbl_node *tbl; |
if (r->tbl != NULL) { |
|
|
if (r->tbl) { |
|
mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse, |
mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse, |
ln, ppos, "TS breaks TS"); |
ln, ppos, "TS breaks TS"); |
tbl_end(&r->tbl); |
tbl_end(r->tbl); |
} |
} |
|
r->tbl = tbl_alloc(ppos, ln, r->parse); |
tbl = tbl_alloc(ppos, ln, r->parse); |
|
|
|
if (r->last_tbl) |
if (r->last_tbl) |
r->last_tbl->next = tbl; |
r->last_tbl->next = r->tbl; |
else |
else |
r->first_tbl = r->last_tbl = tbl; |
r->first_tbl = r->tbl; |
|
r->last_tbl = r->tbl; |
r->tbl = r->last_tbl = tbl; |
|
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 2937 roff_onearg(ROFF_ARGS) |
|
Line 2941 roff_onearg(ROFF_ARGS) |
|
int npos; |
int npos; |
|
|
if (r->man->flags & (MAN_BLINE | MAN_ELINE) && |
if (r->man->flags & (MAN_BLINE | MAN_ELINE) && |
(tok == ROFF_sp || tok == ROFF_ti)) |
(tok == ROFF_ce || tok == ROFF_rj || tok == ROFF_sp || |
|
tok == ROFF_ti)) |
man_breakscope(r->man, tok); |
man_breakscope(r->man, tok); |
|
|
if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) { |
if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) { |
Line 3602 roff_freestr(struct roffkv *r) |
|
Line 3607 roff_freestr(struct roffkv *r) |
|
} |
} |
|
|
/* --- accessors and utility functions ------------------------------------ */ |
/* --- accessors and utility functions ------------------------------------ */ |
|
|
const struct tbl_span * |
|
roff_span(const struct roff *r) |
|
{ |
|
|
|
return r->tbl ? tbl_span(r->tbl) : NULL; |
|
} |
|
|
|
const struct eqn * |
|
roff_eqn(const struct roff *r) |
|
{ |
|
|
|
return r->last_eqn ? &r->last_eqn->eqn : NULL; |
|
} |
|
|
|
/* |
/* |
* Duplicate an input string, making the appropriate character |
* Duplicate an input string, making the appropriate character |