version 1.37, 2009/01/08 14:55:59 |
version 1.43, 2009/01/15 15:59:19 |
Line 42 struct md_parse { |
|
Line 42 struct md_parse { |
|
u_long bufsz; |
u_long bufsz; |
char *name; |
char *name; |
int fd; |
int fd; |
int lnn; |
|
char *line; |
|
}; |
}; |
|
|
static void usage(void); |
static void usage(void); |
Line 192 print_node(const struct mdoc_node *n, int indent) |
|
Line 190 print_node(const struct mdoc_node *n, int indent) |
|
params = NULL; |
params = NULL; |
sz = 0; |
sz = 0; |
|
|
|
t = mdoc_type2a(n->type); |
|
|
switch (n->type) { |
switch (n->type) { |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
assert(NULL == n->child); |
assert(NULL == n->child); |
p = n->data.text.string; |
p = n->data.text.string; |
t = "text"; |
|
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
p = mdoc_macronames[n->data.body.tok]; |
p = mdoc_macronames[n->tok]; |
t = "block-body"; |
|
break; |
break; |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
p = mdoc_macronames[n->data.head.tok]; |
p = mdoc_macronames[n->tok]; |
t = "block-head"; |
|
break; |
break; |
case (MDOC_TAIL): |
case (MDOC_TAIL): |
p = mdoc_macronames[n->data.tail.tok]; |
p = mdoc_macronames[n->tok]; |
t = "block-tail"; |
|
break; |
break; |
case (MDOC_ELEM): |
case (MDOC_ELEM): |
p = mdoc_macronames[n->data.elem.tok]; |
p = mdoc_macronames[n->tok]; |
t = "element"; |
|
argv = n->data.elem.argv; |
argv = n->data.elem.argv; |
argc = n->data.elem.argc; |
argc = n->data.elem.argc; |
break; |
break; |
case (MDOC_BLOCK): |
case (MDOC_BLOCK): |
p = mdoc_macronames[n->data.block.tok]; |
p = mdoc_macronames[n->tok]; |
t = "block"; |
|
argv = n->data.block.argv; |
argv = n->data.block.argv; |
argc = n->data.block.argc; |
argc = n->data.block.argc; |
break; |
break; |
|
case (MDOC_ROOT): |
|
p = "root"; |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
Line 233 print_node(const struct mdoc_node *n, int indent) |
|
Line 230 print_node(const struct mdoc_node *n, int indent) |
|
|
|
for (i = 0; i < (int)argc; i++) { |
for (i = 0; i < (int)argc; i++) { |
(void)printf(" -%s", mdoc_argnames[argv[i].arg]); |
(void)printf(" -%s", mdoc_argnames[argv[i].arg]); |
|
if (argv[i].sz > 0) |
|
(void)printf(" ["); |
for (j = 0; j < (int)argv[i].sz; j++) |
for (j = 0; j < (int)argv[i].sz; j++) |
(void)printf(" \"%s\"", argv[i].value[j]); |
(void)printf(" [%s]", argv[i].value[j]); |
|
if (argv[i].sz > 0) |
|
(void)printf(" ]"); |
} |
} |
|
|
for (i = 0; i < (int)sz; i++) |
for (i = 0; i < (int)sz; i++) |
(void)printf(" \"%s\"", params[i]); |
(void)printf(" [%s]", params[i]); |
|
|
(void)printf("\n"); |
(void)printf(" %d:%d\n", n->line, n->pos); |
|
|
if (n->child) |
if (n->child) |
print_node(n->child, indent + 1); |
print_node(n->child, indent + 1); |
Line 262 parse_leave(struct md_parse *p, int code) |
|
Line 263 parse_leave(struct md_parse *p, int code) |
|
if ((n = mdoc_result(p->mdoc))) |
if ((n = mdoc_result(p->mdoc))) |
print_node(n, 0); |
print_node(n, 0); |
|
|
|
mdoc_free(p->mdoc); |
|
|
return(code); |
return(code); |
} |
} |
|
|
Line 273 parse_begin(struct md_parse *p) |
|
Line 276 parse_begin(struct md_parse *p) |
|
size_t pos; |
size_t pos; |
char line[256], sv[256]; |
char line[256], sv[256]; |
struct mdoc_cb cb; |
struct mdoc_cb cb; |
|
int lnn; |
|
|
cb.mdoc_err = msg_err; |
cb.mdoc_err = msg_err; |
cb.mdoc_warn = msg_warn; |
cb.mdoc_warn = msg_warn; |
Line 281 parse_begin(struct md_parse *p) |
|
Line 285 parse_begin(struct md_parse *p) |
|
if (NULL == (p->mdoc = mdoc_alloc(p, &cb))) |
if (NULL == (p->mdoc = mdoc_alloc(p, &cb))) |
return(parse_leave(p, 0)); |
return(parse_leave(p, 0)); |
|
|
p->lnn = 1; |
for (lnn = 1, pos = 0; ; ) { |
p->line = sv; |
|
|
|
for (pos = 0; ; ) { |
|
if (-1 == (sz = read(p->fd, p->buf, p->bufsz))) { |
if (-1 == (sz = read(p->fd, p->buf, p->bufsz))) { |
warn("%s", p->name); |
warn("%s", p->name); |
return(parse_leave(p, 0)); |
return(parse_leave(p, 0)); |
Line 300 parse_begin(struct md_parse *p) |
|
Line 301 parse_begin(struct md_parse *p) |
|
continue; |
continue; |
} |
} |
warnx("%s: line %d too long", |
warnx("%s: line %d too long", |
p->name, p->lnn); |
p->name, lnn); |
return(parse_leave(p, 0)); |
return(parse_leave(p, 0)); |
} |
} |
|
|
line[(int)pos] = sv[(int)pos] = 0; |
line[(int)pos] = sv[(int)pos] = 0; |
if ( ! mdoc_parseln(p->mdoc, p->lnn, line)) |
if ( ! mdoc_parseln(p->mdoc, lnn, line)) |
return(parse_leave(p, 0)); |
return(parse_leave(p, 0)); |
|
|
p->lnn++; |
lnn++; |
pos = 0; |
pos = 0; |
} |
} |
} |
} |
Line 322 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
Line 323 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
{ |
{ |
char *lit; |
char *lit; |
struct md_parse *p; |
struct md_parse *p; |
int i; |
|
|
|
p = (struct md_parse *)arg; |
p = (struct md_parse *)arg; |
|
|
Line 351 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
Line 351 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
lit = "syntax: unknown argument for macro"; |
lit = "syntax: unknown argument for macro"; |
break; |
break; |
case (ERR_SCOPE_BREAK): |
case (ERR_SCOPE_BREAK): |
/* Which scope is broken? */ |
lit = "scope: macro breaks prior scope"; |
lit = "scope: macro breaks prior explicit scope"; |
|
break; |
break; |
case (ERR_SCOPE_NOCTX): |
case (ERR_SCOPE_NOCTX): |
lit = "scope: closure macro has no context"; |
lit = "scope: closure macro has no context"; |
Line 403 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
Line 402 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
lit = "syntax: expected value for macro argument"; |
lit = "syntax: expected value for macro argument"; |
break; |
break; |
case (ERR_SYNTAX_ARGBAD): |
case (ERR_SYNTAX_ARGBAD): |
lit = "syntax: invalid value for macro argument"; |
lit = "syntax: invalid value(s) for macro argument"; |
break; |
break; |
|
case (ERR_SYNTAX_ARGMISS): |
|
lit = "syntax: missing required argument(s) for macro"; |
|
break; |
case (ERR_SYNTAX_ARGMANY): |
case (ERR_SYNTAX_ARGMANY): |
lit = "syntax: too many values for macro argument"; |
lit = "syntax: too many values for macro argument"; |
break; |
break; |
|
case (ERR_SYNTAX_CHILDBAD): |
|
lit = "syntax: invalid child for parent macro"; |
|
break; |
|
case (ERR_SYNTAX_PARENTBAD): |
|
lit = "syntax: invalid parent for macro"; |
|
break; |
case (ERR_SYNTAX_CHILDHEAD): |
case (ERR_SYNTAX_CHILDHEAD): |
lit = "syntax: expected only block-header section"; |
lit = "syntax: expected only block-header section"; |
break; |
break; |
Line 425 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
Line 433 msg_err(void *arg, int line, int col, enum mdoc_err ty |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
(void)fprintf(stderr, "%s:%d: error: %s", p->name, p->lnn, lit); |
(void)fprintf(stderr, "%s:%d: error: %s (column %d)\n", |
|
p->name, line, lit, col); |
if (p->dbg < 1) { |
|
(void)fprintf(stderr, " (column %d)\n", col); |
|
return(0); |
|
} |
|
|
|
(void)fprintf(stderr, "\nFrom: %s\n ", p->line); |
|
for (i = 0; i < col; i++) |
|
(void)fprintf(stderr, " "); |
|
(void)fprintf(stderr, "^\n"); |
|
|
|
return(0); |
return(0); |
} |
} |
|
|
|
|
msg_msg(void *arg, int line, int col, const char *msg) |
msg_msg(void *arg, int line, int col, const char *msg) |
{ |
{ |
struct md_parse *p; |
struct md_parse *p; |
int i; |
|
|
|
p = (struct md_parse *)arg; |
p = (struct md_parse *)arg; |
|
|
if (p->dbg < 2) |
if (p->dbg < 2) |
return; |
return; |
|
|
(void)printf("%s:%d: %s", p->name, line, msg); |
(void)printf("%s:%d: %s (column %d)\n", |
|
p->name, line, msg, col); |
if (p->dbg < 3) { |
|
(void)printf(" (column %d)\n", col); |
|
return; |
|
} |
|
|
|
(void)printf("\nFrom: %s\n ", p->line); |
|
for (i = 0; i < col; i++) |
|
(void)printf(" "); |
|
(void)printf("^\n"); |
|
} |
} |
|
|
|
|
Line 471 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
Line 459 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
{ |
{ |
char *lit; |
char *lit; |
struct md_parse *p; |
struct md_parse *p; |
int i; |
|
extern char *__progname; |
extern char *__progname; |
|
|
p = (struct md_parse *)arg; |
p = (struct md_parse *)arg; |
Line 495 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
Line 482 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
lit = "syntax: argument-like value"; |
lit = "syntax: argument-like value"; |
break; |
break; |
case (WARN_SYNTAX_EMPTYBODY): |
case (WARN_SYNTAX_EMPTYBODY): |
lit = "syntax: empty block-body section"; |
lit = "syntax: macro suggests non-empty block-body section"; |
break; |
break; |
|
case (WARN_SYNTAX_EMPTYHEAD): |
|
lit = "syntax: macro suggests non-empty block-head section"; |
|
break; |
|
case (WARN_SYNTAX_NOBODY): |
|
lit = "syntax: macro suggests empty block-body section"; |
|
break; |
case (WARN_SEC_OO): |
case (WARN_SEC_OO): |
lit = "section is out of conventional order"; |
lit = "section is out of conventional order"; |
break; |
break; |
|
case (WARN_SEC_REP): |
|
lit = "section repeated"; |
|
break; |
case (WARN_ARGS_GE1): |
case (WARN_ARGS_GE1): |
lit = "macro suggests one or more arguments"; |
lit = "macro suggests one or more arguments"; |
break; |
break; |
Line 524 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
Line 520 msg_warn(void *arg, int line, int col, enum mdoc_warn |
|
} |
} |
|
|
|
|
(void)fprintf(stderr, "%s:%d: warning: %s", p->name, line, lit); |
(void)fprintf(stderr, "%s:%d: warning: %s (column %d)\n", |
|
p->name, line, lit, col); |
if (p->dbg >= 1) { |
|
(void)fprintf(stderr, "\nFrom: %s\n ", p->line); |
|
for (i = 0; i < col; i++) |
|
(void)fprintf(stderr, " "); |
|
(void)fprintf(stderr, "^\n"); |
|
} else |
|
(void)fprintf(stderr, " (column %d)\n", col); |
|
|
|
if (p->warn & MD_WARN_ERR) { |
if (p->warn & MD_WARN_ERR) { |
(void)fprintf(stderr, "%s: considering warnings as " |
(void)fprintf(stderr, "%s: considering warnings as " |