version 1.167, 2010/12/01 16:38:57 |
version 1.171, 2010/12/22 11:15:16 |
|
|
mdoc_node_free(struct mdoc_node *p) |
mdoc_node_free(struct mdoc_node *p) |
{ |
{ |
|
|
/* |
if (p->norm && 0 == --(p->norm->refcnt)) |
* XXX: if these end up being problematic in terms of memory |
free(p->norm); |
* management and dereferencing freed blocks, then make them |
|
* into reference-counted double-pointers. |
|
*/ |
|
|
|
if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type) |
|
if (p->data.Bd) |
|
free(p->data.Bd); |
|
if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type) |
|
if (p->data.Bl) |
|
free(p->data.Bl); |
|
if (MDOC_Bf == p->tok && MDOC_HEAD == p->type) |
|
if (p->data.Bf) |
|
free(p->data.Bf); |
|
|
|
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->args) |
if (p->args) |
Line 552 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
Line 539 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
n->parent->nchild--; |
n->parent->nchild--; |
if (n->parent->child == n) |
if (n->parent->child == n) |
n->parent->child = n->prev ? n->prev : n->next; |
n->parent->child = n->prev ? n->prev : n->next; |
|
if (n->parent->last == n) |
|
n->parent->last = n->prev ? n->prev : NULL; |
} |
} |
|
|
/* Adjust parse point, if applicable. */ |
/* Adjust parse point, if applicable. */ |
Line 619 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 608 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl->type) { |
LIST_column == n->norm->d.Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
Line 628 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 617 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl->type) { |
LIST_column == n->parent->norm->d.Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
Line 766 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 755 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
|
|
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); |
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : ""); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 811 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 798 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl->type) { |
LIST_column == n->norm->d.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
Line 827 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 814 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl->type) { |
LIST_column == n->parent->norm->d.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |