version 1.84, 2009/06/17 07:59:47 |
version 1.87, 2009/07/06 09:21:24 |
Line 113 mdoc_meta(const struct mdoc *m) |
|
Line 113 mdoc_meta(const struct mdoc *m) |
|
} |
} |
|
|
|
|
|
/* |
|
* Frees volatile resources (parse tree, meta-data, fields). |
|
*/ |
static void |
static void |
mdoc_free1(struct mdoc *mdoc) |
mdoc_free1(struct mdoc *mdoc) |
{ |
{ |
Line 132 mdoc_free1(struct mdoc *mdoc) |
|
Line 135 mdoc_free1(struct mdoc *mdoc) |
|
} |
} |
|
|
|
|
|
/* |
|
* Allocate all volatile resources (parse tree, meta-data, fields). |
|
*/ |
static int |
static int |
mdoc_alloc1(struct mdoc *mdoc) |
mdoc_alloc1(struct mdoc *mdoc) |
{ |
{ |
|
|
bzero(&mdoc->meta, sizeof(struct mdoc_meta)); |
bzero(&mdoc->meta, sizeof(struct mdoc_meta)); |
mdoc->flags = 0; |
mdoc->flags = 0; |
mdoc->lastnamed = mdoc->lastsec = 0; |
mdoc->lastnamed = mdoc->lastsec = SEC_NONE; |
mdoc->last = calloc(1, sizeof(struct mdoc_node)); |
mdoc->last = calloc(1, sizeof(struct mdoc_node)); |
if (NULL == mdoc->last) |
if (NULL == mdoc->last) |
return(0); |
return(0); |
Line 151 mdoc_alloc1(struct mdoc *mdoc) |
|
Line 157 mdoc_alloc1(struct mdoc *mdoc) |
|
|
|
|
|
/* |
/* |
* Free up all resources contributed by a parse: the node tree, |
* Free up volatile resources (see mdoc_free1()) then re-initialises the |
* meta-data and so on. Then reallocate the root node for another |
* data with mdoc_alloc1(). After invocation, parse data has been reset |
* parse. |
* and the parser is ready for re-invocation on a new tree; however, |
|
* cross-parse non-volatile data is kept intact. |
*/ |
*/ |
int |
int |
mdoc_reset(struct mdoc *mdoc) |
mdoc_reset(struct mdoc *mdoc) |
Line 165 mdoc_reset(struct mdoc *mdoc) |
|
Line 172 mdoc_reset(struct mdoc *mdoc) |
|
|
|
|
|
/* |
/* |
* Completely free up all resources. |
* Completely free up all volatile and non-volatile parse resources. |
|
* After invocation, the pointer is no longer usable. |
*/ |
*/ |
void |
void |
mdoc_free(struct mdoc *mdoc) |
mdoc_free(struct mdoc *mdoc) |
Line 178 mdoc_free(struct mdoc *mdoc) |
|
Line 186 mdoc_free(struct mdoc *mdoc) |
|
} |
} |
|
|
|
|
|
/* |
|
* Allocate volatile and non-volatile parse resources. |
|
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb) |
mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb) |
{ |
{ |
Line 204 mdoc_alloc(void *data, int pflags, const struct mdoc_c |
|
Line 215 mdoc_alloc(void *data, int pflags, const struct mdoc_c |
|
|
|
/* |
/* |
* Climb back up the parse tree, validating open scopes. Mostly calls |
* Climb back up the parse tree, validating open scopes. Mostly calls |
* through to macro_end in macro.c. |
* through to macro_end() in macro.c. |
*/ |
*/ |
int |
int |
mdoc_endparse(struct mdoc *m) |
mdoc_endparse(struct mdoc *m) |
Line 221 mdoc_endparse(struct mdoc *m) |
|
Line 232 mdoc_endparse(struct mdoc *m) |
|
|
|
/* |
/* |
* Main parse routine. Parses a single line -- really just hands off to |
* Main parse routine. Parses a single line -- really just hands off to |
* the macro or text parser. |
* the macro (parsemacro()) or text parser (parsetext()). |
*/ |
*/ |
int |
int |
mdoc_parseln(struct mdoc *m, int ln, char *buf) |
mdoc_parseln(struct mdoc *m, int ln, char *buf) |
Line 253 mdoc_verr(struct mdoc *mdoc, int ln, int pos, |
|
Line 264 mdoc_verr(struct mdoc *mdoc, int ln, int pos, |
|
|
|
|
|
int |
int |
mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) |
enum mdoc_warn type, const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 265 mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
|
Line 275 mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf)); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf)); |
} |
} |
|
|
|
|
Line 288 mdoc_nerr(struct mdoc *mdoc, const struct mdoc_node *n |
|
Line 298 mdoc_nerr(struct mdoc *mdoc, const struct mdoc_node *n |
|
|
|
|
|
int |
int |
mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
mdoc_warn(struct mdoc *mdoc, const char *fmt, ...) |
const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 300 mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
|
Line 309 mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, mdoc->last->line, |
return((*mdoc->cb.mdoc_warn)(mdoc->data, mdoc->last->line, |
mdoc->last->pos, type, buf)); |
mdoc->last->pos, buf)); |
} |
} |
|
|
|
|
Line 323 mdoc_err(struct mdoc *mdoc, const char *fmt, ...) |
|
Line 332 mdoc_err(struct mdoc *mdoc, const char *fmt, ...) |
|
|
|
|
|
int |
int |
mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum mdoc_warn type, |
mdoc_pwarn(struct mdoc *mdoc, int line, int pos, const char *fmt, ...) |
const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 335 mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum |
|
Line 343 mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, |
return((*mdoc->cb.mdoc_warn)(mdoc->data, line, pos, buf)); |
line, pos, type, buf)); |
|
} |
} |
|
|
int |
int |
Line 360 mdoc_macro(struct mdoc *m, int tok, |
|
Line 367 mdoc_macro(struct mdoc *m, int tok, |
|
int ln, int pp, int *pos, char *buf) |
int ln, int pp, int *pos, char *buf) |
{ |
{ |
|
|
/* FIXME - these should happen during validation. */ |
|
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
SEC_PROLOGUE != m->lastnamed) |
MDOC_PBODY & m->flags) |
return(perr(m, ln, pp, EPROLBODY)); |
return(perr(m, ln, pp, EPROLBODY)); |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
SEC_PROLOGUE == m->lastnamed) |
! (MDOC_PBODY & m->flags)) |
return(perr(m, ln, pp, EBODYPROL)); |
return(perr(m, ln, pp, EBODYPROL)); |
|
|
if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) |
if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) |
Line 434 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 438 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
p->parent->nchild++; |
|
|
if ( ! mdoc_valid_pre(mdoc, p)) |
if ( ! mdoc_valid_pre(mdoc, p)) |
return(0); |
return(0); |
if ( ! mdoc_action_pre(mdoc, p)) |
if ( ! mdoc_action_pre(mdoc, p)) |
|
|
mdoc_node_free(struct mdoc_node *p) |
mdoc_node_free(struct mdoc_node *p) |
{ |
{ |
|
|
|
if (p->parent) |
|
p->parent->nchild--; |
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->args) |
if (p->args) |
Line 606 mdoc_node_freelist(struct mdoc_node *p) |
|
Line 614 mdoc_node_freelist(struct mdoc_node *p) |
|
if (p->next) |
if (p->next) |
mdoc_node_freelist(p->next); |
mdoc_node_freelist(p->next); |
|
|
|
assert(0 == p->nchild); |
mdoc_node_free(p); |
mdoc_node_free(p); |
} |
} |
|
|
|
|
parsetext(struct mdoc *m, int line, char *buf) |
parsetext(struct mdoc *m, int line, char *buf) |
{ |
{ |
|
|
if (SEC_PROLOGUE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) |
return(perr(m, line, 0, ETEXTPROL)); |
return(perr(m, line, 0, ETEXTPROL)); |
|
|
if (0 == buf[0] && ! (MDOC_LITERAL & m->flags)) |
if (0 == buf[0] && ! (MDOC_LITERAL & m->flags)) |
Line 639 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
Line 648 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
return(mdoc_perr(m, ln, 1, |
return(mdoc_perr(m, ln, 1, |
"unknown macro: %s%s", |
"unknown macro: %s%s", |
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX, |
return(mdoc_pwarn(m, ln, 1, "unknown macro: %s%s", |
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
} |
} |
|
|