version 1.103, 2011/03/17 11:56:17 |
version 1.104, 2011/03/20 16:02:05 |
Line 95 man_free(struct man *man) |
|
Line 95 man_free(struct man *man) |
|
|
|
|
|
struct man * |
struct man * |
man_alloc(struct regset *regs, void *data, mandocmsg msg) |
man_alloc(struct regset *regs, struct mparse *parse) |
{ |
{ |
struct man *p; |
struct man *p; |
|
|
p = mandoc_calloc(1, sizeof(struct man)); |
p = mandoc_calloc(1, sizeof(struct man)); |
|
|
man_hash_init(); |
man_hash_init(); |
p->data = data; |
p->parse = parse; |
p->msg = msg; |
|
p->regs = regs; |
p->regs = regs; |
|
|
man_alloc1(p); |
man_alloc1(p); |
Line 521 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 520 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
|
|
tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX; |
tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX; |
if (MAN_MAX == tok) { |
if (MAN_MAX == tok) { |
man_vmsg(m, MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1); |
mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln, |
|
ppos, "%s", buf + ppos - 1); |
return(1); |
return(1); |
} |
} |
|
|
Line 554 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 554 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
if (MAN_NSCOPED & man_macros[n->tok].flags) |
if (MAN_NSCOPED & man_macros[n->tok].flags) |
n = n->parent; |
n = n->parent; |
|
|
man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos, |
mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, |
"%s", man_macronames[n->tok]); |
n->pos, "%s", man_macronames[n->tok]); |
|
|
man_node_delete(m, n); |
man_node_delete(m, n); |
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
Line 620 err: /* Error out. */ |
|
Line 620 err: /* Error out. */ |
|
m->flags |= MAN_HALT; |
m->flags |= MAN_HALT; |
return(0); |
return(0); |
} |
} |
|
|
|
|
void |
|
man_vmsg(struct man *man, enum mandocerr t, |
|
int ln, int pos, const char *fmt, ...) |
|
{ |
|
char buf[256]; |
|
va_list ap; |
|
|
|
va_start(ap, fmt); |
|
vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
|
va_end(ap); |
|
(*man->msg)(t, man->data, ln, pos, buf); |
|
} |
|
|
|
|
|
/* |
/* |
* Unlink a node from its context. If "m" is provided, the last parse |
* Unlink a node from its context. If "m" is provided, the last parse |