version 1.162, 2010/08/08 14:51:32 |
version 1.171, 2010/12/22 11:15:16 |
Line 98 static int node_append(struct mdoc *, |
|
Line 98 static int node_append(struct mdoc *, |
|
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int macrowarn(struct mdoc *, int, |
|
const char *, int); |
|
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
Line 191 mdoc_free(struct mdoc *mdoc) |
|
Line 189 mdoc_free(struct mdoc *mdoc) |
|
* Allocate volatile and non-volatile parse resources. |
* Allocate volatile and non-volatile parse resources. |
*/ |
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(struct regset *regs, void *data, |
mdoc_alloc(struct regset *regs, void *data, mandocmsg msg) |
int pflags, mandocmsg msg) |
|
{ |
{ |
struct mdoc *p; |
struct mdoc *p; |
|
|
Line 200 mdoc_alloc(struct regset *regs, void *data, |
|
Line 197 mdoc_alloc(struct regset *regs, void *data, |
|
|
|
p->msg = msg; |
p->msg = msg; |
p->data = data; |
p->data = data; |
p->pflags = pflags; |
|
p->regs = regs; |
p->regs = regs; |
|
|
mdoc_hash_init(); |
mdoc_hash_init(); |
Line 290 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 286 mdoc_macro(MACRO_PROT_ARGS) |
|
! (MDOC_PBODY & m->flags)) { |
! (MDOC_PBODY & m->flags)) { |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
return(0); |
return(0); |
|
if (NULL == m->meta.msec) |
|
m->meta.msec = mandoc_strdup("1"); |
if (NULL == m->meta.title) |
if (NULL == m->meta.title) |
m->meta.title = mandoc_strdup("UNKNOWN"); |
m->meta.title = mandoc_strdup("UNKNOWN"); |
if (NULL == m->meta.vol) |
if (NULL == m->meta.vol) |
Line 332 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 330 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
if ( ! mdoc_valid_pre(mdoc, p)) |
if ( ! mdoc_valid_pre(mdoc, p)) |
return(0); |
return(0); |
if ( ! mdoc_action_pre(mdoc, p)) |
|
return(0); |
|
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
Line 360 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 356 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
case (MDOC_TEXT): |
case (MDOC_TEXT): |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
|
return(0); |
|
break; |
break; |
default: |
default: |
break; |
break; |
|
|
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 558 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 625 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 634 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 695 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 678 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
return(0); |
return(0); |
|
|
/* |
/* |
* Insert a `Pp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
* blank lines aren't allowed, but enough manuals assume this |
* blank lines aren't allowed, but enough manuals assume this |
* behaviour that we want to work around it. |
* behaviour that we want to work around it. |
*/ |
*/ |
if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL)) |
if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
m->next = MDOC_NEXT_SIBLING; |
Line 727 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 710 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
} |
} |
|
|
|
|
static int |
|
macrowarn(struct mdoc *m, int ln, const char *buf, int offs) |
|
{ |
|
int rc; |
|
|
|
rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, |
|
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : ""); |
|
|
|
/* FIXME: logic should be in driver. */ |
|
/* FIXME: broken, will error out and not omit a message. */ |
|
return(MDOC_IGN_MACRO & m->pflags ? rc : 0); |
|
} |
|
|
|
|
|
/* |
/* |
* Parse a macro line, that is, a line beginning with the control |
* Parse a macro line, that is, a line beginning with the control |
* character. |
* character. |
Line 785 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 753 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
mac[j++] = buf[i++]; |
mac[j++] = buf[i++]; |
mac[j] = '\0'; |
mac[j] = '\0'; |
|
|
if (j == 4 || j < 2) { |
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
if ( ! macrowarn(m, ln, mac, sv)) |
if (MDOC_MAX == tok) { |
goto err; |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); |
return(1); |
return(1); |
} |
|
|
|
if (MDOC_MAX == (tok = mdoc_hash_find(mac))) { |
|
if ( ! macrowarn(m, ln, mac, sv)) |
|
goto err; |
|
return(1); |
|
} |
} |
|
|
/* Disregard the first trailing tab, if applicable. */ |
/* Disregard the first trailing tab, if applicable. */ |
Line 836 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 852 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; |