version 1.53, 2010/03/23 21:50:43 |
version 1.54, 2010/03/24 20:10:53 |
Line 49 const char *const __man_merrnames[WERRMAX] = { |
|
Line 49 const char *const __man_merrnames[WERRMAX] = { |
|
"scope open on exit", /* WEXITSCOPE */ |
"scope open on exit", /* WEXITSCOPE */ |
"no scope context", /* WNOSCOPE */ |
"no scope context", /* WNOSCOPE */ |
"literal context already open", /* WOLITERAL */ |
"literal context already open", /* WOLITERAL */ |
"no literal context open" /* WNLITERAL */ |
"no literal context open", /* WNLITERAL */ |
|
"invalid nesting of roff declarations", /* WROFFNEST */ |
}; |
}; |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
Line 61 const char *const __man_macronames[MAN_MAX] = { |
|
Line 62 const char *const __man_macronames[MAN_MAX] = { |
|
"RI", "na", "i", "sp", |
"RI", "na", "i", "sp", |
"nf", "fi", "r", "RE", |
"nf", "fi", "r", "RE", |
"RS", "DT", "UC", "PD", |
"RS", "DT", "UC", "PD", |
"Sp", "Vb", "Ve", |
"Sp", "Vb", "Ve", "de", |
|
"dei", "am", "ami", "ig", |
|
".", |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 70 static struct man_node *man_node_alloc(int, int, |
|
Line 73 static struct man_node *man_node_alloc(int, int, |
|
enum man_type, enum mant); |
enum man_type, enum mant); |
static int man_node_append(struct man *, |
static int man_node_append(struct man *, |
struct man_node *); |
struct man_node *); |
|
static void man_node_free(struct man_node *); |
|
static void man_node_unlink(struct man *, |
|
struct man_node *); |
static int man_ptext(struct man *, int, char *); |
static int man_ptext(struct man *, int, char *); |
static int man_pmacro(struct man *, int, char *); |
static int man_pmacro(struct man *, int, char *); |
static void man_free1(struct man *); |
static void man_free1(struct man *); |
Line 160 man_free1(struct man *man) |
|
Line 166 man_free1(struct man *man) |
|
{ |
{ |
|
|
if (man->first) |
if (man->first) |
man_node_freelist(man->first); |
man_node_delete(man, man->first); |
if (man->meta.title) |
if (man->meta.title) |
free(man->meta.title); |
free(man->meta.title); |
if (man->meta.source) |
if (man->meta.source) |
Line 179 man_alloc1(struct man *m) |
|
Line 185 man_alloc1(struct man *m) |
|
m->last = mandoc_calloc(1, sizeof(struct man_node)); |
m->last = mandoc_calloc(1, sizeof(struct man_node)); |
m->first = m->last; |
m->first = m->last; |
m->last->type = MAN_ROOT; |
m->last->type = MAN_ROOT; |
|
m->last->tok = MAN_MAX; |
m->next = MAN_NEXT_CHILD; |
m->next = MAN_NEXT_CHILD; |
} |
} |
|
|
Line 206 man_node_append(struct man *man, struct man_node *p) |
|
Line 213 man_node_append(struct man *man, struct man_node *p) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
assert(p->parent); |
p->parent->nchild++; |
p->parent->nchild++; |
|
|
if ( ! man_valid_pre(man, p)) |
if ( ! man_valid_pre(man, p)) |
Line 336 man_word_alloc(struct man *m, int line, int pos, const |
|
Line 344 man_word_alloc(struct man *m, int line, int pos, const |
|
} |
} |
|
|
|
|
void |
/* |
|
* Free all of the resources held by a node. This does NOT unlink a |
|
* node from its context; for that, see man_node_unlink(). |
|
*/ |
|
static void |
man_node_free(struct man_node *p) |
man_node_free(struct man_node *p) |
{ |
{ |
|
|
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->parent) |
|
p->parent->nchild--; |
|
free(p); |
free(p); |
} |
} |
|
|
|
|
void |
void |
man_node_freelist(struct man_node *p) |
man_node_delete(struct man *m, struct man_node *p) |
{ |
{ |
struct man_node *n; |
|
|
|
if (p->child) |
while (p->child) |
man_node_freelist(p->child); |
man_node_delete(m, p->child); |
assert(0 == p->nchild); |
|
n = p->next; |
man_node_unlink(m, p); |
man_node_free(p); |
man_node_free(p); |
if (n) |
|
man_node_freelist(n); |
|
} |
} |
|
|
|
|
Line 568 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 575 man_pmacro(struct man *m, int ln, char *buf) |
|
if ( ! man_nwarn(m, n, WLNSCOPE)) |
if ( ! man_nwarn(m, n, WLNSCOPE)) |
return(0); |
return(0); |
|
|
man_node_unlink(m, n); |
man_node_delete(m, n); |
man_node_free(n); |
|
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
} |
} |
|
|
|
|
/* |
/* |
* We weren't in a block-line scope when entering the |
* We weren't in a block-line scope when entering the |
* above-parsed macro, so return. |
* above-parsed macro, so return. |
|
* |
|
* FIXME: this prohibits the nesting of blocks (e.g., `de' and |
|
* family) within BLINE or ELINE systems. This is annoying. |
*/ |
*/ |
|
|
if ( ! (MAN_BLINE & fl)) { |
if ( ! (MAN_BLINE & fl)) { |
Line 672 man_err(struct man *m, int line, int pos, int iserr, e |
|
Line 681 man_err(struct man *m, int line, int pos, int iserr, e |
|
} |
} |
|
|
|
|
void |
/* |
|
* Unlink a node from its context. If "m" is provided, the last parse |
|
* point will also be adjusted accordingly. |
|
*/ |
|
static void |
man_node_unlink(struct man *m, struct man_node *n) |
man_node_unlink(struct man *m, struct man_node *n) |
{ |
{ |
|
|
if (n->prev) { |
/* Adjust siblings. */ |
|
|
|
if (n->prev) |
n->prev->next = n->next; |
n->prev->next = n->next; |
if (m->last == n) { |
if (n->next) |
assert(NULL == n->next); |
n->next->prev = n->prev; |
|
|
|
/* Adjust parent. */ |
|
|
|
if (n->parent) { |
|
n->parent->nchild--; |
|
if (n->parent->child == n) |
|
n->parent->child = n->prev ? n->prev : n->next; |
|
} |
|
|
|
/* Adjust parse point, if applicable. */ |
|
|
|
if (m && m->last == n) { |
|
/*XXX: this can occur when bailing from validation. */ |
|
/*assert(NULL == n->next);*/ |
|
if (n->prev) { |
m->last = n->prev; |
m->last = n->prev; |
m->next = MAN_NEXT_SIBLING; |
m->next = MAN_NEXT_SIBLING; |
} |
} else { |
} else { |
|
n->parent->child = n->next; |
|
if (m->last == n) { |
|
assert(NULL == n->next); |
|
m->last = n->parent; |
m->last = n->parent; |
m->next = MAN_NEXT_CHILD; |
m->next = MAN_NEXT_CHILD; |
} |
} |
} |
} |
|
|
if (n->next) |
if (m && m->first == n) |
n->next->prev = n->prev; |
m->first = NULL; |
} |
} |