version 1.35, 2009/01/17 20:10:36 |
version 1.40, 2009/01/20 13:05:28 |
Line 205 static void argfree(size_t, struct mdoc_arg *); |
|
Line 205 static void argfree(size_t, struct mdoc_arg *); |
|
static void argcpy(struct mdoc_arg *, |
static void argcpy(struct mdoc_arg *, |
const struct mdoc_arg *); |
const struct mdoc_arg *); |
|
|
static void mdoc_node_freelist(struct mdoc_node *); |
|
static int mdoc_node_append(struct mdoc *, |
static int mdoc_node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static void mdoc_elem_free(struct mdoc_elem *); |
static void mdoc_elem_free(struct mdoc_elem *); |
Line 213 static void mdoc_text_free(struct mdoc_text *); |
|
Line 212 static void mdoc_text_free(struct mdoc_text *); |
|
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_result(struct mdoc *mdoc) |
mdoc_node(struct mdoc *mdoc) |
{ |
{ |
|
|
return(mdoc->first); |
return(mdoc->first); |
} |
} |
|
|
|
|
void |
const struct mdoc_meta * |
mdoc_meta_free(struct mdoc *mdoc) |
mdoc_meta(struct mdoc *mdoc) |
{ |
{ |
|
|
if (mdoc->meta.title) |
return(&mdoc->meta); |
free(mdoc->meta.title); |
|
if (mdoc->meta.os) |
|
free(mdoc->meta.os); |
|
if (mdoc->meta.name) |
|
free(mdoc->meta.name); |
|
} |
} |
|
|
|
|
Line 241 mdoc_free(struct mdoc *mdoc) |
|
Line 235 mdoc_free(struct mdoc *mdoc) |
|
mdoc_node_freelist(mdoc->first); |
mdoc_node_freelist(mdoc->first); |
if (mdoc->htab) |
if (mdoc->htab) |
mdoc_tokhash_free(mdoc->htab); |
mdoc_tokhash_free(mdoc->htab); |
|
if (mdoc->meta.title) |
|
free(mdoc->meta.title); |
|
if (mdoc->meta.os) |
|
free(mdoc->meta.os); |
|
if (mdoc->meta.name) |
|
free(mdoc->meta.name); |
|
|
free(mdoc); |
free(mdoc); |
} |
} |
|
|
Line 295 mdoc_parseln(struct mdoc *mdoc, int line, char *buf) |
|
Line 295 mdoc_parseln(struct mdoc *mdoc, int line, char *buf) |
|
if (MDOC_HALT & mdoc->flags) |
if (MDOC_HALT & mdoc->flags) |
return(0); |
return(0); |
|
|
|
mdoc->linetok = 0; |
|
|
if ('.' != *buf) { |
if ('.' != *buf) { |
if (SEC_PROLOGUE != mdoc->sec_lastn) { |
if ( ! (MDOC_BODYPARSE & mdoc->flags)) |
if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) |
return(mdoc_perr(mdoc, line, 0, "text disallowed")); |
return(0); |
if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) |
mdoc->next = MDOC_NEXT_SIBLING; |
return(0); |
return(1); |
mdoc->next = MDOC_NEXT_SIBLING; |
} |
return(1); |
return(mdoc_perr(mdoc, line, 0, "text disallowed")); |
|
} |
} |
|
|
if (buf[1] && '\\' == buf[1]) |
if (buf[1] && '\\' == buf[1]) |
Line 400 mdoc_macro(struct mdoc *mdoc, int tok, |
|
Line 401 mdoc_macro(struct mdoc *mdoc, int tok, |
|
assert(mdoc_macros[tok].fp); |
assert(mdoc_macros[tok].fp); |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
SEC_PROLOGUE == mdoc->sec_lastn) |
! (MDOC_BODYPARSE & mdoc->flags)) |
return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document prologue")); |
return(mdoc_perr(mdoc, ln, ppos, "macro disallowed: not in document body")); |
if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) |
if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) |
return(mdoc_perr(mdoc, ln, ppos, "macro not callable")); |
return(mdoc_perr(mdoc, ln, ppos, "macro not callable")); |
return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf)); |
return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf)); |
Line 417 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
Line 418 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
assert(mdoc->first); |
assert(mdoc->first); |
assert(MDOC_ROOT != p->type); |
assert(MDOC_ROOT != p->type); |
|
|
|
/* See if we exceed the suggest line-max. */ |
|
|
|
switch (p->type) { |
|
case (MDOC_TEXT): |
|
/* FALLTHROUGH */ |
|
case (MDOC_ELEM): |
|
/* FALLTHROUGH */ |
|
case (MDOC_BLOCK): |
|
mdoc->linetok++; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* This sort-of works (re-opening of text macros...). */ |
|
if (mdoc->linetok > MDOC_LINEARG_SOFTMAX) |
|
if ( ! mdoc_nwarn(mdoc, p, WARN_COMPAT, |
|
"suggested %d tokens per line exceeded (has %d)", |
|
MDOC_LINEARG_SOFTMAX, mdoc->linetok)) |
|
return(0); |
|
|
if (MDOC_TEXT == mdoc->last->type) |
if (MDOC_TEXT == mdoc->last->type) |
on = "<text>"; |
on = "<text>"; |
else if (MDOC_ROOT == mdoc->last->type) |
else if (MDOC_ROOT == mdoc->last->type) |
Line 671 mdoc_node_free(struct mdoc_node *p) |
|
Line 693 mdoc_node_free(struct mdoc_node *p) |
|
} |
} |
|
|
|
|
static void |
void |
mdoc_node_freelist(struct mdoc_node *p) |
mdoc_node_freelist(struct mdoc_node *p) |
{ |
{ |
|
|
Line 725 argdup(size_t argsz, const struct mdoc_arg *args) |
|
Line 747 argdup(size_t argsz, const struct mdoc_arg *args) |
|
} |
} |
|
|
|
|
|
/* FIXME: deprecate. */ |
char * |
char * |
mdoc_node2a(struct mdoc_node *node) |
mdoc_node2a(struct mdoc_node *node) |
{ |
{ |
Line 741 mdoc_node2a(struct mdoc_node *node) |
|
Line 764 mdoc_node2a(struct mdoc_node *node) |
|
(void)xstrlcat(buf, node->data.text.string, 64); |
(void)xstrlcat(buf, node->data.text.string, 64); |
else |
else |
(void)xstrlcat(buf, mdoc_macronames[node->tok], 64); |
(void)xstrlcat(buf, mdoc_macronames[node->tok], 64); |
|
(void)xstrlcat(buf, "'", 64); |
|
|
return(buf); |
return(buf); |
} |
} |