version 1.111, 2015/01/15 04:26:40 |
version 1.120, 2015/01/28 21:11:54 |
Line 80 static const enum mandocerr mandoclimits[MANDOCLEVEL_M |
|
Line 80 static const enum mandocerr mandoclimits[MANDOCLEVEL_M |
|
MANDOCERR_WARNING, |
MANDOCERR_WARNING, |
MANDOCERR_WARNING, |
MANDOCERR_WARNING, |
MANDOCERR_ERROR, |
MANDOCERR_ERROR, |
|
MANDOCERR_UNSUPP, |
MANDOCERR_MAX, |
MANDOCERR_MAX, |
MANDOCERR_MAX, |
|
MANDOCERR_MAX |
MANDOCERR_MAX |
}; |
}; |
|
|
Line 171 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 171 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"invalid escape sequence", |
"invalid escape sequence", |
"undefined string, using \"\"", |
"undefined string, using \"\"", |
|
|
|
/* related to tables */ |
|
"tbl line starts with span", |
|
"tbl column starts with span", |
|
"skipping vertical bar in tbl layout", |
|
|
"generic error", |
"generic error", |
|
|
/* related to equations */ |
|
"unexpected equation scope closure", |
|
"equation scope open on exit", |
|
"overlapping equation scopes", |
|
"unexpected end of equation", |
|
|
|
/* related to tables */ |
/* related to tables */ |
"bad table syntax", |
"non-alphabetic character in tbl options", |
"bad table option", |
"skipping unknown tbl option", |
"bad table layout", |
"missing tbl option argument", |
"no table layout cells specified", |
"wrong tbl option argument size", |
"no table data cells specified", |
"empty tbl layout", |
"ignore data in cell", |
"invalid character in tbl layout", |
"data block still open", |
"unmatched parenthesis in tbl layout", |
"ignoring extra data cells", |
"tbl without any data cells", |
"ignoring macro in table", |
"ignoring data in spanned tbl cell", |
|
"ignoring extra tbl data cells", |
|
"data block open at end of tbl", |
|
|
/* related to document structure and macros */ |
/* related to document structure and macros */ |
NULL, |
NULL, |
"input too large", |
|
"input stack limit exceeded, infinite loop?", |
"input stack limit exceeded, infinite loop?", |
"skipping bad character", |
"skipping bad character", |
"skipping unknown macro", |
"skipping unknown macro", |
|
"skipping insecure request", |
"skipping item outside list", |
"skipping item outside list", |
"skipping column outside column list", |
"skipping column outside column list", |
"skipping end of block that is not open", |
"skipping end of block that is not open", |
|
"fewer RS blocks open, skipping", |
"inserting missing end of block", |
"inserting missing end of block", |
"appending missing end of block", |
"appending missing end of block", |
|
|
Line 216 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 218 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"skipping all arguments", |
"skipping all arguments", |
"skipping excess arguments", |
"skipping excess arguments", |
"divide by zero", |
"divide by zero", |
|
|
|
"unsupported feature", |
|
"input too large", |
|
"unsupported control character", |
|
"unsupported roff request", |
|
"eqn delim option in tbl", |
|
"unsupported tbl layout modifier", |
|
"ignoring macro in table", |
}; |
}; |
|
|
static const char * const mandoclevels[MANDOCLEVEL_MAX] = { |
static const char * const mandoclevels[MANDOCLEVEL_MAX] = { |
Line 223 static const char * const mandoclevels[MANDOCLEVEL_MAX |
|
Line 233 static const char * const mandoclevels[MANDOCLEVEL_MAX |
|
"RESERVED", |
"RESERVED", |
"WARNING", |
"WARNING", |
"ERROR", |
"ERROR", |
"FATAL", |
"UNSUPP", |
"BADARG", |
"BADARG", |
"SYSERR" |
"SYSERR" |
}; |
}; |
Line 303 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 313 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
{ |
{ |
const struct tbl_span *span; |
const struct tbl_span *span; |
struct buf ln; |
struct buf ln; |
|
const char *save_file; |
char *cp; |
char *cp; |
size_t pos; /* byte number in the ln buffer */ |
size_t pos; /* byte number in the ln buffer */ |
enum rofferr rr; |
enum rofferr rr; |
Line 364 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 375 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
if (c & 0x80) { |
if (c & 0x80) { |
if ( ! (curp->filenc && preconv_encode( |
if ( ! (curp->filenc && preconv_encode( |
&blk, &i, &ln, &pos, &curp->filenc))) { |
&blk, &i, &ln, &pos, &curp->filenc))) { |
mandoc_vmsg(MANDOCERR_BADCHAR, |
mandoc_vmsg(MANDOCERR_CHAR_BAD, curp, |
curp, curp->line, pos, |
curp->line, pos, "0x%x", c); |
"0x%x", c); |
|
ln.buf[pos++] = '?'; |
ln.buf[pos++] = '?'; |
i++; |
i++; |
} |
} |
Line 378 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 388 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
*/ |
*/ |
|
|
if (c == 0x7f || (c < 0x20 && c != 0x09)) { |
if (c == 0x7f || (c < 0x20 && c != 0x09)) { |
mandoc_vmsg(MANDOCERR_BADCHAR, curp, |
mandoc_vmsg(c == 0x00 || c == 0x04 || |
curp->line, pos, "0x%x", c); |
c > 0x0a ? MANDOCERR_CHAR_BAD : |
|
MANDOCERR_CHAR_UNSUPP, |
|
curp, curp->line, pos, "0x%x", c); |
i++; |
i++; |
ln.buf[pos++] = '?'; |
ln.buf[pos++] = '?'; |
continue; |
continue; |
Line 435 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 447 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
|
|
if ( ! (isascii(c) && |
if ( ! (isascii(c) && |
(isgraph(c) || isblank(c)))) { |
(isgraph(c) || isblank(c)))) { |
mandoc_vmsg(MANDOCERR_BADCHAR, curp, |
mandoc_vmsg(MANDOCERR_CHAR_BAD, curp, |
curp->line, pos, "0x%x", c); |
curp->line, pos, "0x%x", c); |
i += 2; |
i += 2; |
ln.buf[pos++] = '?'; |
ln.buf[pos++] = '?'; |
|
|
*/ |
*/ |
if (curp->secondary) |
if (curp->secondary) |
curp->secondary->sz -= pos + 1; |
curp->secondary->sz -= pos + 1; |
|
save_file = curp->file; |
save_child = curp->child; |
save_child = curp->child; |
if (mparse_open(curp, &fd, ln.buf + of) == |
if (mparse_open(curp, &fd, ln.buf + of) == |
MANDOCLEVEL_OK) |
MANDOCLEVEL_OK) { |
mparse_readfd(curp, fd, ln.buf + of); |
mparse_readfd(curp, fd, ln.buf + of); |
else { |
curp->file = save_file; |
|
} else { |
|
curp->file = save_file; |
mandoc_vmsg(MANDOCERR_SO_FAIL, |
mandoc_vmsg(MANDOCERR_SO_FAIL, |
curp, curp->line, pos, |
curp, curp->line, pos, |
".so %s", ln.buf + of); |
".so %s", ln.buf + of); |
Line 958 mandoc_msg(enum mandocerr er, struct mparse *m, |
|
Line 973 mandoc_msg(enum mandocerr er, struct mparse *m, |
|
{ |
{ |
enum mandoclevel level; |
enum mandoclevel level; |
|
|
level = MANDOCLEVEL_ERROR; |
level = MANDOCLEVEL_UNSUPP; |
while (er < mandoclimits[level]) |
while (er < mandoclimits[level]) |
level--; |
level--; |
|
|