version 1.33, 2009/01/03 22:10:22 |
version 1.36, 2009/01/07 15:53:00 |
Line 206 print_node(const struct mdoc_node *n, int indent) |
|
Line 206 print_node(const struct mdoc_node *n, int indent) |
|
p = mdoc_macronames[n->data.head.tok]; |
p = mdoc_macronames[n->data.head.tok]; |
t = "block-head"; |
t = "block-head"; |
break; |
break; |
|
case (MDOC_TAIL): |
|
p = mdoc_macronames[n->data.tail.tok]; |
|
t = "block-tail"; |
|
break; |
case (MDOC_ELEM): |
case (MDOC_ELEM): |
p = mdoc_macronames[n->data.elem.tok]; |
p = mdoc_macronames[n->data.elem.tok]; |
t = "element"; |
t = "element"; |
argv = n->data.elem.argv; |
argv = n->data.elem.argv; |
argc = n->data.elem.argc; |
argc = n->data.elem.argc; |
params = n->data.elem.args; |
|
sz = n->data.elem.sz; |
|
break; |
break; |
case (MDOC_BLOCK): |
case (MDOC_BLOCK): |
p = mdoc_macronames[n->data.block.tok]; |
p = mdoc_macronames[n->data.block.tok]; |
Line 252 parse_leave(struct md_parse *p, int code) |
|
Line 254 parse_leave(struct md_parse *p, int code) |
|
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (p->mdoc) { |
if (NULL == p->mdoc) |
if ((n = mdoc_result(p->mdoc))) |
return(code); |
print_node(n, 0); |
|
mdoc_free(p->mdoc); |
if ( ! mdoc_endparse(p->mdoc)) |
} |
code = 0; |
|
if ((n = mdoc_result(p->mdoc))) |
|
print_node(n, 0); |
|
|
return(code); |
return(code); |
} |
} |
|
|
Line 300 parse_begin(struct md_parse *p) |
|
Line 305 parse_begin(struct md_parse *p) |
|
} |
} |
|
|
line[(int)pos] = sv[(int)pos] = 0; |
line[(int)pos] = sv[(int)pos] = 0; |
if ( ! mdoc_parseln(p->mdoc, line)) |
if ( ! mdoc_parseln(p->mdoc, p->lnn, line)) |
return(parse_leave(p, 0)); |
return(parse_leave(p, 0)); |
|
|
p->lnn++; |
p->lnn++; |
Line 324 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
Line 329 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
fmt = lit = NULL; |
fmt = lit = NULL; |
|
|
switch (type) { |
switch (type) { |
|
case (ERR_SYNTAX_NOTEXT): |
|
lit = "syntax: context-free text disallowed"; |
|
break; |
case (ERR_SYNTAX_QUOTE): |
case (ERR_SYNTAX_QUOTE): |
lit = "syntax: disallowed argument quotation"; |
lit = "syntax: disallowed argument quotation"; |
break; |
break; |
Line 353 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
Line 361 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
fmt = "scope: macro `%s' may not be nested in the current context"; |
fmt = "scope: macro `%s' may not be nested in the current context"; |
break; |
break; |
case (ERR_MACRO_NOTSUP): |
case (ERR_MACRO_NOTSUP): |
fmt = "macro `%s' not supported"; |
lit = "macro not supported"; |
break; |
break; |
case (ERR_MACRO_NOTCALL): |
case (ERR_MACRO_NOTCALL): |
fmt = "macro `%s' not callable"; |
fmt = "macro `%s' not callable"; |
Line 376 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
Line 384 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
case (ERR_ARGS_LE2): |
case (ERR_ARGS_LE2): |
fmt = "macro `%s' expects two or fewer arguments"; |
fmt = "macro `%s' expects two or fewer arguments"; |
break; |
break; |
|
case (ERR_ARGS_LE8): |
|
fmt = "macro `%s' expects eight or fewer arguments"; |
|
break; |
case (ERR_ARGS_MANY): |
case (ERR_ARGS_MANY): |
fmt = "macro `%s' has too many arguments"; |
fmt = "macro `%s' has too many arguments"; |
break; |
break; |
Line 427 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
Line 438 msg_err(void *arg, int tok, int col, enum mdoc_err typ |
|
(void)fprintf(stderr, " (column %d)\n", col); |
(void)fprintf(stderr, " (column %d)\n", col); |
return(0); |
return(0); |
} else if (-1 == col) { |
} else if (-1 == col) { |
(void)fprintf(stderr, "\nFrom: %s", p->line); |
(void)fprintf(stderr, "\nFrom: %s\n", p->line); |
return(0); |
return(0); |
} |
} |
|
|
Line 534 msg_warn(void *arg, int tok, int col, enum mdoc_warn t |
|
Line 545 msg_warn(void *arg, int tok, int col, enum mdoc_warn t |
|
(void)fprintf(stderr, "%s:%d: warning: %s", |
(void)fprintf(stderr, "%s:%d: warning: %s", |
p->name, p->lnn, lit); |
p->name, p->lnn, lit); |
|
|
if (p->dbg >= 1) { |
if (col >= 0 && p->dbg >= 1) { |
(void)fprintf(stderr, "\nFrom: %s\n ", p->line); |
(void)fprintf(stderr, "\nFrom: %s\n ", p->line); |
for (i = 0; i < col; i++) |
for (i = 0; i < col; i++) |
(void)fprintf(stderr, " "); |
(void)fprintf(stderr, " "); |
(void)fprintf(stderr, "^\n"); |
(void)fprintf(stderr, "^\n"); |
} else |
} else if (col >= 0) |
(void)fprintf(stderr, " (column %d)\n", col); |
(void)fprintf(stderr, " (column %d)\n", col); |
|
else |
|
(void)fprintf(stderr, "\n"); |
|
|
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 " |