version 1.318, 2017/07/04 22:52:00 |
version 1.335, 2018/08/18 22:05:43 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#define ROFFDEF_STD (1 << 4) /* mdoc(7) or man(7) macro. */ |
#define ROFFDEF_STD (1 << 4) /* mdoc(7) or man(7) macro. */ |
#define ROFFDEF_ANY (ROFFDEF_USER | ROFFDEF_PRE | \ |
#define ROFFDEF_ANY (ROFFDEF_USER | ROFFDEF_PRE | \ |
ROFFDEF_REN | ROFFDEF_STD) |
ROFFDEF_REN | ROFFDEF_STD) |
|
#define ROFFDEF_UNDEF (1 << 5) /* Completely undefined. */ |
|
|
/* --- data types --------------------------------------------------------- */ |
/* --- data types --------------------------------------------------------- */ |
|
|
|
|
struct roffreg { |
struct roffreg { |
struct roffstr key; |
struct roffstr key; |
int val; |
int val; |
|
int step; |
struct roffreg *next; |
struct roffreg *next; |
}; |
}; |
|
|
|
|
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 155 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); |
Line 181 static void roff_freestr(struct roffkv *); |
|
Line 183 static void roff_freestr(struct roffkv *); |
|
static size_t roff_getname(struct roff *, char **, int, int); |
static size_t roff_getname(struct roff *, char **, int, int); |
static int roff_getnum(const char *, int *, int *, int); |
static int roff_getnum(const char *, int *, int *, int); |
static int roff_getop(const char *, int *, char *); |
static int roff_getop(const char *, int *, char *); |
static int roff_getregn(const struct roff *, |
static int roff_getregn(struct roff *, |
const char *, size_t); |
const char *, size_t, char); |
static int roff_getregro(const struct roff *, |
static int roff_getregro(const struct roff *, |
const char *name); |
const char *name); |
static const char *roff_getstrn(const struct roff *, |
static const char *roff_getstrn(struct roff *, |
const char *, size_t, int *); |
const char *, size_t, int *); |
static int roff_hasregn(const struct roff *, |
static int roff_hasregn(const struct roff *, |
const char *, size_t); |
const char *, size_t); |
Line 195 static enum rofferr roff_line_ignore(ROFF_ARGS); |
|
Line 197 static enum rofferr roff_line_ignore(ROFF_ARGS); |
|
static void roff_man_alloc1(struct roff_man *); |
static void roff_man_alloc1(struct roff_man *); |
static void roff_man_free1(struct roff_man *); |
static void roff_man_free1(struct roff_man *); |
static enum rofferr roff_manyarg(ROFF_ARGS); |
static enum rofferr roff_manyarg(ROFF_ARGS); |
|
static enum rofferr roff_nop(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_onearg(ROFF_ARGS); |
static enum rofferr roff_onearg(ROFF_ARGS); |
static enum roff_tok roff_parse(struct roff *, char *, int *, |
static enum roff_tok roff_parse(struct roff *, char *, int *, |
Line 206 static enum rofferr roff_res(struct roff *, struct bu |
|
Line 209 static enum rofferr roff_res(struct roff *, struct bu |
|
static enum rofferr roff_rm(ROFF_ARGS); |
static enum rofferr roff_rm(ROFF_ARGS); |
static enum rofferr roff_rn(ROFF_ARGS); |
static enum rofferr roff_rn(ROFF_ARGS); |
static enum rofferr roff_rr(ROFF_ARGS); |
static enum rofferr roff_rr(ROFF_ARGS); |
|
static void roff_setregn(struct roff *, const char *, |
|
size_t, int, char, int); |
static void roff_setstr(struct roff *, |
static void roff_setstr(struct roff *, |
const char *, const char *, int); |
const char *, const char *, int); |
static void roff_setstrn(struct roffkv **, const char *, |
static void roff_setstrn(struct roffkv **, const char *, |
Line 322 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 327 const char *__roff_name[MAN_MAX + 1] = { |
|
"Dx", "%Q", "%U", "Ta", |
"Dx", "%Q", "%U", "Ta", |
NULL, |
NULL, |
"TH", "SH", "SS", "TP", |
"TH", "SH", "SS", "TP", |
|
"TQ", |
"LP", "PP", "P", "IP", |
"LP", "PP", "P", "IP", |
"HP", "SM", "SB", "BI", |
"HP", "SM", "SB", "BI", |
"IB", "BR", "RB", "R", |
"IB", "BR", "RB", "R", |
Line 329 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 335 const char *__roff_name[MAN_MAX + 1] = { |
|
"nf", "fi", |
"nf", "fi", |
"RE", "RS", "DT", "UC", |
"RE", "RS", "DT", "UC", |
"PD", "AT", "in", |
"PD", "AT", "in", |
"OP", "EX", "EE", "UR", |
"SY", "YS", "OP", |
|
"EX", "EE", "UR", |
"UE", "MT", "ME", NULL |
"UE", "MT", "ME", NULL |
}; |
}; |
const char *const *roff_name = __roff_name; |
const char *const *roff_name = __roff_name; |
Line 486 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 493 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* nhychar */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* nhychar */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nm */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nm */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nop */ |
{ roff_nop, NULL, NULL, 0 }, /* nop */ |
{ roff_nr, NULL, NULL, 0 }, /* nr */ |
{ roff_nr, NULL, NULL, 0 }, /* nr */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nrf */ |
{ roff_unsupp, NULL, NULL, 0 }, /* nrf */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* nroff */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* nroff */ |
|
|
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 710 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 761 roff_alloc(struct mparse *parse, int options) |
|
Line 765 roff_alloc(struct mparse *parse, int options) |
|
|
|
r = mandoc_calloc(1, sizeof(struct roff)); |
r = mandoc_calloc(1, sizeof(struct roff)); |
r->parse = parse; |
r->parse = parse; |
r->reqtab = roffhash_alloc(0, ROFF_USERDEF); |
r->reqtab = roffhash_alloc(0, ROFF_RENAMED); |
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 983 roff_body_alloc(struct roff_man *man, int line, int po |
|
Line 987 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 1049 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 1129 static enum rofferr |
|
Line 1125 static enum rofferr |
|
roff_res(struct roff *r, struct buf *buf, int ln, int pos) |
roff_res(struct roff *r, struct buf *buf, int ln, int pos) |
{ |
{ |
char ubuf[24]; /* buffer to print the number */ |
char ubuf[24]; /* buffer to print the number */ |
|
struct roff_node *n; /* used for header comments */ |
const char *start; /* start of the string to process */ |
const char *start; /* start of the string to process */ |
char *stesc; /* start of an escape sequence ('\\') */ |
char *stesc; /* start of an escape sequence ('\\') */ |
|
char *ep; /* end of comment string */ |
const char *stnam; /* start of the name, after "[(*" */ |
const char *stnam; /* start of the name, after "[(*" */ |
const char *cp; /* end of the name, e.g. before ']' */ |
const char *cp; /* end of the name, e.g. before ']' */ |
const char *res; /* the string to be substituted */ |
const char *res; /* the string to be substituted */ |
Line 1138 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1136 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
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 */ |
enum mandoc_esc esc; /* type of the escape sequence */ |
enum mandoc_os os_e; /* kind of RCS id seen */ |
|
int inaml; /* length returned from mandoc_escape() */ |
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 */ |
int done; /* no more input available */ |
int done; /* no more input available */ |
int deftype; /* type of definition to paste */ |
int deftype; /* type of definition to paste */ |
|
int rcsid; /* kind of RCS id seen */ |
|
char sign; /* increment number register */ |
char term; /* character terminating the escape */ |
char term; /* character terminating the escape */ |
|
|
/* Search forward for comments. */ |
/* Search forward for comments. */ |
Line 1160 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1159 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
|
|
/* Comment found, look for RCS id. */ |
/* Comment found, look for RCS id. */ |
|
|
|
rcsid = 0; |
if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) { |
if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) { |
os_e = MANDOC_OS_OPENBSD; |
rcsid = 1 << MANDOC_OS_OPENBSD; |
cp += 8; |
cp += 8; |
} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) { |
} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) { |
os_e = MANDOC_OS_NETBSD; |
rcsid = 1 << MANDOC_OS_NETBSD; |
cp += 7; |
cp += 7; |
} |
} |
if (cp != NULL && |
if (cp != NULL && |
isalnum((unsigned char)*cp) == 0 && |
isalnum((unsigned char)*cp) == 0 && |
strchr(cp, '$') != NULL) { |
strchr(cp, '$') != NULL) { |
if (r->man->meta.rcsids & (1 << os_e)) |
if (r->man->meta.rcsids & rcsid) |
mandoc_msg(MANDOCERR_RCS_REP, r->parse, |
mandoc_msg(MANDOCERR_RCS_REP, r->parse, |
ln, stesc + 1 - buf->buf, stesc + 1); |
ln, stesc + 1 - buf->buf, stesc + 1); |
r->man->meta.rcsids |= 1 << os_e; |
r->man->meta.rcsids |= rcsid; |
} |
} |
|
|
/* Handle trailing whitespace. */ |
/* Handle trailing whitespace. */ |
|
|
cp = strchr(stesc--, '\0') - 1; |
ep = strchr(stesc--, '\0') - 1; |
if (*cp == '\n') { |
if (*ep == '\n') { |
done = 1; |
done = 1; |
cp--; |
ep--; |
} |
} |
if (*cp == ' ' || *cp == '\t') |
if (*ep == ' ' || *ep == '\t') |
mandoc_msg(MANDOCERR_SPACE_EOL, r->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, r->parse, |
ln, cp - buf->buf, NULL); |
ln, ep - buf->buf, NULL); |
while (stesc > start && stesc[-1] == ' ') |
|
|
/* |
|
* Save comments preceding the title macro |
|
* in the syntax tree. |
|
*/ |
|
|
|
if (r->format == 0) { |
|
while (*ep == ' ' || *ep == '\t') |
|
ep--; |
|
ep[1] = '\0'; |
|
n = roff_node_alloc(r->man, |
|
ln, stesc + 1 - buf->buf, |
|
ROFFT_COMMENT, TOKEN_NONE); |
|
n->string = mandoc_strdup(stesc + 2); |
|
roff_node_append(r->man, n); |
|
n->flags |= NODE_VALID | NODE_ENDED; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
} |
|
|
|
/* Line continuation with comment. */ |
|
|
|
if (stesc[1] == '#') { |
|
*stesc = '\0'; |
|
return ROFF_APPEND; |
|
} |
|
|
|
/* Discard normal comments. */ |
|
|
|
while (stesc > start && stesc[-1] == ' ' && |
|
(stesc == start + 1 || stesc[-2] != '\\')) |
stesc--; |
stesc--; |
*stesc = '\0'; |
*stesc = '\0'; |
break; |
break; |
Line 1254 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1283 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
term = cp[1]; |
term = cp[1]; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'n': |
case 'n': |
|
sign = cp[1]; |
|
if (sign == '+' || sign == '-') |
|
cp++; |
res = ubuf; |
res = ubuf; |
break; |
break; |
default: |
default: |
Line 1345 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1377 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
if (arg_complete) { |
if (arg_complete) { |
deftype = ROFFDEF_USER | ROFFDEF_PRE; |
deftype = ROFFDEF_USER | ROFFDEF_PRE; |
res = roff_getstrn(r, stnam, naml, &deftype); |
res = roff_getstrn(r, stnam, naml, &deftype); |
|
|
|
/* |
|
* If not overriden, let \*(.T |
|
* through to the formatters. |
|
*/ |
|
|
|
if (res == NULL && naml == 2 && |
|
stnam[0] == '.' && stnam[1] == 'T') { |
|
roff_setstrn(&r->strtab, |
|
".T", 2, NULL, 0, 0); |
|
stesc--; |
|
continue; |
|
} |
} |
} |
break; |
break; |
case 'B': |
case 'B': |
Line 1358 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1403 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
case 'n': |
case 'n': |
if (arg_complete) |
if (arg_complete) |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
roff_getregn(r, stnam, naml)); |
roff_getregn(r, stnam, naml, sign)); |
else |
else |
ubuf[0] = '\0'; |
ubuf[0] = '\0'; |
break; |
break; |
Line 1512 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1557 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 1606 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. */ |
|
|
if (ctl && roffce_node != NULL && |
if (ctl && roffce_node != NULL && |
(t == TOKEN_NONE || t == ROFF_EQ || t == ROFF_TS)) { |
(t == TOKEN_NONE || t == ROFF_Dd || t == ROFF_EQ || |
|
t == ROFF_TH || t == ROFF_TS)) { |
r->man->last = roffce_node; |
r->man->last = roffce_node; |
r->man->next = ROFF_NEXT_SIBLING; |
r->man->next = ROFF_NEXT_SIBLING; |
roffce_lines = 0; |
roffce_lines = 0; |
Line 1585 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1638 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 1640 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
Line 1694 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
} |
} |
if (t != TOKEN_NONE) |
if (t != TOKEN_NONE) |
*pos = cp - buf; |
*pos = cp - buf; |
|
else if (deftype == ROFFDEF_UNDEF) { |
|
/* Using an undefined macro defines it to be empty. */ |
|
roff_setstrn(&r->strtab, mac, maclen, "", 0, 0); |
|
roff_setstrn(&r->rentab, mac, maclen, NULL, 0, 0); |
|
} |
return t; |
return t; |
} |
} |
|
|
Line 2516 roff_evalnum(struct roff *r, int ln, const char *v, |
|
Line 2575 roff_evalnum(struct roff *r, int ln, const char *v, |
|
void |
void |
roff_setreg(struct roff *r, const char *name, int val, char sign) |
roff_setreg(struct roff *r, const char *name, int val, char sign) |
{ |
{ |
|
roff_setregn(r, name, strlen(name), val, sign, INT_MIN); |
|
} |
|
|
|
static void |
|
roff_setregn(struct roff *r, const char *name, size_t len, |
|
int val, char sign, int step) |
|
{ |
struct roffreg *reg; |
struct roffreg *reg; |
|
|
/* Search for an existing register with the same name. */ |
/* Search for an existing register with the same name. */ |
reg = r->regtab; |
reg = r->regtab; |
|
|
while (reg && strcmp(name, reg->key.p)) |
while (reg != NULL && (reg->key.sz != len || |
|
strncmp(reg->key.p, name, len) != 0)) |
reg = reg->next; |
reg = reg->next; |
|
|
if (NULL == reg) { |
if (NULL == reg) { |
/* Create a new register. */ |
/* Create a new register. */ |
reg = mandoc_malloc(sizeof(struct roffreg)); |
reg = mandoc_malloc(sizeof(struct roffreg)); |
reg->key.p = mandoc_strdup(name); |
reg->key.p = mandoc_strndup(name, len); |
reg->key.sz = strlen(name); |
reg->key.sz = len; |
reg->val = 0; |
reg->val = 0; |
|
reg->step = 0; |
reg->next = r->regtab; |
reg->next = r->regtab; |
r->regtab = reg; |
r->regtab = reg; |
} |
} |
Line 2540 roff_setreg(struct roff *r, const char *name, int val, |
|
Line 2608 roff_setreg(struct roff *r, const char *name, int val, |
|
reg->val -= val; |
reg->val -= val; |
else |
else |
reg->val = val; |
reg->val = val; |
|
if (step != INT_MIN) |
|
reg->step = step; |
} |
} |
|
|
/* |
/* |
Line 2573 roff_getregro(const struct roff *r, const char *name) |
|
Line 2643 roff_getregro(const struct roff *r, const char *name) |
|
} |
} |
|
|
int |
int |
roff_getreg(const struct roff *r, const char *name) |
roff_getreg(struct roff *r, const char *name) |
{ |
{ |
struct roffreg *reg; |
return roff_getregn(r, name, strlen(name), '\0'); |
int val; |
|
|
|
if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) { |
|
val = roff_getregro(r, name + 1); |
|
if (-1 != val) |
|
return val; |
|
} |
|
|
|
for (reg = r->regtab; reg; reg = reg->next) |
|
if (0 == strcmp(name, reg->key.p)) |
|
return reg->val; |
|
|
|
return 0; |
|
} |
} |
|
|
static int |
static int |
roff_getregn(const struct roff *r, const char *name, size_t len) |
roff_getregn(struct roff *r, const char *name, size_t len, char sign) |
{ |
{ |
struct roffreg *reg; |
struct roffreg *reg; |
int val; |
int val; |
Line 2603 roff_getregn(const struct roff *r, const char *name, s |
|
Line 2660 roff_getregn(const struct roff *r, const char *name, s |
|
return val; |
return val; |
} |
} |
|
|
for (reg = r->regtab; reg; reg = reg->next) |
for (reg = r->regtab; reg; reg = reg->next) { |
if (len == reg->key.sz && |
if (len == reg->key.sz && |
0 == strncmp(name, reg->key.p, len)) |
0 == strncmp(name, reg->key.p, len)) { |
|
switch (sign) { |
|
case '+': |
|
reg->val += reg->step; |
|
break; |
|
case '-': |
|
reg->val -= reg->step; |
|
break; |
|
default: |
|
break; |
|
} |
return reg->val; |
return reg->val; |
|
} |
|
} |
|
|
|
roff_setregn(r, name, len, 0, '\0', INT_MIN); |
return 0; |
return 0; |
} |
} |
|
|
Line 2647 roff_freereg(struct roffreg *reg) |
|
Line 2717 roff_freereg(struct roffreg *reg) |
|
static enum rofferr |
static enum rofferr |
roff_nr(ROFF_ARGS) |
roff_nr(ROFF_ARGS) |
{ |
{ |
char *key, *val; |
char *key, *val, *step; |
size_t keysz; |
size_t keysz; |
int iv; |
int iv, is, len; |
char sign; |
char sign; |
|
|
key = val = buf->buf + pos; |
key = val = buf->buf + pos; |
Line 2659 roff_nr(ROFF_ARGS) |
|
Line 2729 roff_nr(ROFF_ARGS) |
|
keysz = roff_getname(r, &val, ln, pos); |
keysz = roff_getname(r, &val, ln, pos); |
if (key[keysz] == '\\') |
if (key[keysz] == '\\') |
return ROFF_IGN; |
return ROFF_IGN; |
key[keysz] = '\0'; |
|
|
|
sign = *val; |
sign = *val; |
if (sign == '+' || sign == '-') |
if (sign == '+' || sign == '-') |
val++; |
val++; |
|
|
if (roff_evalnum(r, ln, val, NULL, &iv, ROFFNUM_SCALE)) |
len = 0; |
roff_setreg(r, key, iv, sign); |
if (roff_evalnum(r, ln, val, &len, &iv, ROFFNUM_SCALE) == 0) |
|
return ROFF_IGN; |
|
|
|
step = val + len; |
|
while (isspace((unsigned char)*step)) |
|
step++; |
|
if (roff_evalnum(r, ln, step, NULL, &is, 0) == 0) |
|
is = INT_MIN; |
|
|
|
roff_setregn(r, key, keysz, iv, sign, is); |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 2782 roff_Dd(ROFF_ARGS) |
|
Line 2859 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; |
|
*offs = 0; |
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 2958 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; |
|
|
|
if (r->man->macroset == MACROSET_MAN) |
|
man_breakscope(r->man, ROFF_EQ); |
|
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 2988 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 3024 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 3097 roff_eo(ROFF_ARGS) |
|
Line 3185 roff_eo(ROFF_ARGS) |
|
} |
} |
|
|
static enum rofferr |
static enum rofferr |
|
roff_nop(ROFF_ARGS) |
|
{ |
|
while (buf->buf[pos] == ' ') |
|
pos++; |
|
*offs = pos; |
|
return ROFF_RERUN; |
|
} |
|
|
|
static enum rofferr |
roff_tr(ROFF_ARGS) |
roff_tr(ROFF_ARGS) |
{ |
{ |
const char *p, *first, *second; |
const char *p, *first, *second; |
Line 3301 roff_userdef(ROFF_ARGS) |
|
Line 3398 roff_userdef(ROFF_ARGS) |
|
ln, (int)(cp - n1), NULL); |
ln, (int)(cp - n1), NULL); |
free(buf->buf); |
free(buf->buf); |
buf->buf = n1; |
buf->buf = n1; |
|
*offs = 0; |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 3395 roff_renamed(ROFF_ARGS) |
|
Line 3493 roff_renamed(ROFF_ARGS) |
|
buf->buf[pos] == '\0' ? "" : " ", buf->buf + pos) + 1; |
buf->buf[pos] == '\0' ? "" : " ", buf->buf + pos) + 1; |
free(buf->buf); |
free(buf->buf); |
buf->buf = nbuf; |
buf->buf = nbuf; |
|
*offs = 0; |
return ROFF_CONT; |
return ROFF_CONT; |
} |
} |
|
|
Line 3528 roff_setstrn(struct roffkv **r, const char *name, size |
|
Line 3627 roff_setstrn(struct roffkv **r, const char *name, size |
|
} |
} |
|
|
static const char * |
static const char * |
roff_getstrn(const struct roff *r, const char *name, size_t len, |
roff_getstrn(struct roff *r, const char *name, size_t len, |
int *deftype) |
int *deftype) |
{ |
{ |
const struct roffkv *n; |
const struct roffkv *n; |
int i; |
int found, i; |
enum roff_tok tok; |
enum roff_tok tok; |
|
|
if (*deftype & ROFFDEF_USER) { |
found = 0; |
for (n = r->strtab; n != NULL; n = n->next) { |
for (n = r->strtab; n != NULL; n = n->next) { |
if (strncmp(name, n->key.p, len) == 0 && |
if (strncmp(name, n->key.p, len) != 0 || |
n->key.p[len] == '\0' && |
n->key.p[len] != '\0' || n->val.p == NULL) |
n->val.p != NULL) { |
continue; |
*deftype = ROFFDEF_USER; |
if (*deftype & ROFFDEF_USER) { |
return n->val.p; |
*deftype = ROFFDEF_USER; |
} |
return n->val.p; |
|
} else { |
|
found = 1; |
|
break; |
} |
} |
} |
} |
if (*deftype & ROFFDEF_PRE) { |
for (n = r->rentab; n != NULL; n = n->next) { |
for (i = 0; i < PREDEFS_MAX; i++) { |
if (strncmp(name, n->key.p, len) != 0 || |
if (strncmp(name, predefs[i].name, len) == 0 && |
n->key.p[len] != '\0' || n->val.p == NULL) |
predefs[i].name[len] == '\0') { |
continue; |
*deftype = ROFFDEF_PRE; |
if (*deftype & ROFFDEF_REN) { |
return predefs[i].str; |
*deftype = ROFFDEF_REN; |
} |
return n->val.p; |
|
} else { |
|
found = 1; |
|
break; |
} |
} |
} |
} |
if (*deftype & ROFFDEF_REN) { |
for (i = 0; i < PREDEFS_MAX; i++) { |
for (n = r->rentab; n != NULL; n = n->next) { |
if (strncmp(name, predefs[i].name, len) != 0 || |
if (strncmp(name, n->key.p, len) == 0 && |
predefs[i].name[len] != '\0') |
n->key.p[len] == '\0' && |
continue; |
n->val.p != NULL) { |
if (*deftype & ROFFDEF_PRE) { |
*deftype = ROFFDEF_REN; |
*deftype = ROFFDEF_PRE; |
return n->val.p; |
return predefs[i].str; |
} |
} else { |
|
found = 1; |
|
break; |
} |
} |
} |
} |
if (*deftype & ROFFDEF_STD) { |
if (r->man->macroset != MACROSET_MAN) { |
if (r->man->macroset != MACROSET_MAN) { |
for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) { |
for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) { |
if (strncmp(name, roff_name[tok], len) != 0 || |
if (strncmp(name, roff_name[tok], len) == 0 && |
roff_name[tok][len] != '\0') |
roff_name[tok][len] == '\0') { |
continue; |
*deftype = ROFFDEF_STD; |
if (*deftype & ROFFDEF_STD) { |
return NULL; |
*deftype = ROFFDEF_STD; |
} |
return NULL; |
|
} else { |
|
found = 1; |
|
break; |
} |
} |
} |
} |
if (r->man->macroset != MACROSET_MDOC) { |
} |
for (tok = MAN_TH; tok < MAN_MAX; tok++) { |
if (r->man->macroset != MACROSET_MDOC) { |
if (strncmp(name, roff_name[tok], len) == 0 && |
for (tok = MAN_TH; tok < MAN_MAX; tok++) { |
roff_name[tok][len] == '\0') { |
if (strncmp(name, roff_name[tok], len) != 0 || |
*deftype = ROFFDEF_STD; |
roff_name[tok][len] != '\0') |
return NULL; |
continue; |
} |
if (*deftype & ROFFDEF_STD) { |
|
*deftype = ROFFDEF_STD; |
|
return NULL; |
|
} else { |
|
found = 1; |
|
break; |
} |
} |
} |
} |
} |
} |
|
|
|
if (found == 0 && *deftype != ROFFDEF_ANY) { |
|
if (*deftype & ROFFDEF_REN) { |
|
/* |
|
* This might still be a request, |
|
* so do not treat it as undefined yet. |
|
*/ |
|
*deftype = ROFFDEF_UNDEF; |
|
return NULL; |
|
} |
|
|
|
/* Using an undefined string defines it to be empty. */ |
|
|
|
roff_setstrn(&r->strtab, name, len, "", 0, 0); |
|
roff_setstrn(&r->rentab, name, len, NULL, 0, 0); |
|
} |
|
|
*deftype = 0; |
*deftype = 0; |
return NULL; |
return NULL; |
} |
} |
Line 3602 roff_freestr(struct roffkv *r) |
|
Line 3734 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 |