=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.3 retrieving revision 1.21 diff -u -p -r1.3 -r1.21 --- mandoc/mdoc.c 2008/12/17 17:18:38 1.3 +++ mandoc/mdoc.c 2009/01/07 15:57:14 1.21 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.3 2008/12/17 17:18:38 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.21 2009/01/07 15:57:14 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -80,115 +80,119 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "xsh5", "xns5", "xns5.2d2.0", "xcurses4.2", "susv2", "susv3", "svid4", "filled", "words", + "emphasis", "symbolic", }; const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { NULL, 0 }, /* \" */ - { macro_prologue_ddate, 0 }, /* Dd */ - { macro_prologue_dtitle, 0 }, /* Dt */ - { NULL, 0 }, /* Os */ - { macro_scoped_implicit, 0 }, /* Sh */ - { macro_scoped_implicit, 0 }, /* Ss */ - { NULL, 0 }, /* Pp */ - { NULL, 0 }, /* D1 */ - { NULL, 0 }, /* Dl */ - { NULL, 0 }, /* Bd */ - { NULL, 0 }, /* Ed */ - { NULL, 0 }, /* Bl */ - { NULL, 0 }, /* El */ - { NULL, 0 }, /* It */ - { macro_text, MDOC_CALLABLE }, /* Ad */ - { NULL, 0 }, /* An */ - { macro_text, MDOC_CALLABLE }, /* Ar */ - { NULL, 0 }, /* Cd */ - { macro_text, MDOC_CALLABLE }, /* Cm */ - { macro_text, MDOC_CALLABLE }, /* Dv */ - { macro_text, MDOC_CALLABLE }, /* Er */ - { macro_text, MDOC_CALLABLE }, /* Ev */ - { NULL, 0 }, /* Ex */ - { macro_text, MDOC_CALLABLE }, /* Fa */ - { NULL, 0 }, /* Fd */ - { macro_text, MDOC_CALLABLE }, /* Fl */ - { NULL, 0 }, /* Fn */ - { macro_text, 0 }, /* Ft */ - { macro_text, MDOC_CALLABLE }, /* Ic */ - { NULL, 0 }, /* In */ - { macro_text, MDOC_CALLABLE }, /* Li */ - { NULL, 0 }, /* Nd */ - { NULL, 0 }, /* Nm */ - { NULL, 0 }, /* Op */ - { NULL, 0 }, /* Ot */ - { macro_text, MDOC_CALLABLE }, /* Pa */ - { NULL, 0 }, /* Rv */ - { NULL, 0 }, /* St */ - { macro_text, MDOC_CALLABLE }, /* Va */ - { macro_text, MDOC_CALLABLE }, /* Vt */ - { NULL, 0 }, /* Xr */ - { NULL, 0 }, /* %A */ - { NULL, 0 }, /* %B */ - { NULL, 0 }, /* %D */ - { NULL, 0 }, /* %I */ - { NULL, 0 }, /* %J */ - { NULL, 0 }, /* %N */ - { NULL, 0 }, /* %O */ - { NULL, 0 }, /* %P */ - { NULL, 0 }, /* %R */ - { NULL, 0 }, /* %T */ - { NULL, 0 }, /* %V */ - { NULL, 0 }, /* Ac */ - { NULL, 0 }, /* Ao */ - { NULL, 0 }, /* Aq */ - { NULL, 0 }, /* At */ - { NULL, 0 }, /* Bc */ - { NULL, 0 }, /* Bf */ - { NULL, 0 }, /* Bo */ - { NULL, 0 }, /* Bq */ - { NULL, 0 }, /* Bsx */ - { NULL, 0 }, /* Bx */ - { NULL, 0 }, /* Db */ - { NULL, 0 }, /* Dc */ - { NULL, 0 }, /* Do */ - { NULL, 0 }, /* Dq */ - { NULL, 0 }, /* Ec */ - { NULL, 0 }, /* Ef */ - { macro_text, MDOC_CALLABLE }, /* Em */ - { NULL, 0 }, /* Eo */ - { NULL, 0 }, /* Fx */ - { macro_text, 0 }, /* Ms */ - { NULL, 0 }, /* No */ - { NULL, 0 }, /* Ns */ - { NULL, 0 }, /* Nx */ - { NULL, 0 }, /* Ox */ - { NULL, 0 }, /* Pc */ - { NULL, 0 }, /* Pf */ - { NULL, 0 }, /* Po */ - { NULL, 0 }, /* Pq */ - { NULL, 0 }, /* Qc */ - { NULL, 0 }, /* Ql */ - { NULL, 0 }, /* Qo */ - { NULL, 0 }, /* Qq */ - { NULL, 0 }, /* Re */ - { NULL, 0 }, /* Rs */ - { NULL, 0 }, /* Sc */ - { NULL, 0 }, /* So */ - { NULL, 0 }, /* Sq */ - { NULL, 0 }, /* Sm */ - { NULL, 0 }, /* Sx */ - { NULL, 0 }, /* Sy */ - { macro_text, MDOC_CALLABLE }, /* Tn */ - { NULL, 0 }, /* Ux */ - { NULL, 0 }, /* Xc */ - { NULL, 0 }, /* Xo */ - { NULL, 0 }, /* Fo */ - { NULL, 0 }, /* Fc */ - { NULL, 0 }, /* Oo */ - { NULL, 0 }, /* Oc */ - { NULL, 0 }, /* Bk */ - { NULL, 0 }, /* Ek */ - { NULL, 0 }, /* Bt */ - { NULL, 0 }, /* Hf */ - { NULL, 0 }, /* Fr */ - { NULL, 0 }, /* Ud */ + { macro_prologue, MDOC_PROLOGUE }, /* Dd */ + { macro_prologue, MDOC_PROLOGUE }, /* Dt */ + { macro_prologue, MDOC_PROLOGUE }, /* Os */ + { macro_scoped, 0 }, /* Sh */ + { macro_scoped, 0 }, /* Ss */ + { macro_text, 0 }, /* Pp */ + { macro_scoped_line, MDOC_PARSED }, /* D1 */ + { macro_scoped_line, MDOC_PARSED }, /* Dl */ + { macro_scoped, MDOC_EXPLICIT }, /* Bd */ + { macro_close_explicit, 0 }, /* Ed */ + { macro_scoped, MDOC_EXPLICIT }, /* Bl */ + { macro_close_explicit, 0 }, /* El */ + { macro_scoped, MDOC_NESTED | MDOC_PARSED }, /* It */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ + { macro_constant, MDOC_PARSED }, /* An */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ + { macro_constant, MDOC_QUOTABLE }, /* Cd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */ + { macro_constant, 0 }, /* Ex */ + { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fa */ + { macro_constant, 0 }, /* Fd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ + { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fn */ + { macro_text, MDOC_PARSED }, /* Ft */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ + { macro_constant, 0 }, /* In */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ + { macro_constant, 0 }, /* Nd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Op */ + { macro_obsolete, 0 }, /* Ot */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ + { macro_constant, 0 }, /* Rv */ + /* XXX - supposed to be (but isn't) callable. */ + { macro_constant_delimited, MDOC_PARSED }, /* St */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Va */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */ + { macro_constant, MDOC_QUOTABLE | MDOC_PARSED }, /* %A */ + { macro_constant, MDOC_QUOTABLE | MDOC_PARSED }, /* %B */ + { macro_constant, MDOC_QUOTABLE }, /* %D */ + { macro_constant, MDOC_QUOTABLE | MDOC_PARSED }, /* %I */ + { macro_constant, MDOC_QUOTABLE | MDOC_PARSED }, /* %J */ + { macro_constant, MDOC_QUOTABLE }, /* %N */ + { macro_constant, MDOC_QUOTABLE }, /* %O */ + { macro_constant, MDOC_QUOTABLE }, /* %P */ + { macro_constant, MDOC_QUOTABLE }, /* %R */ + { macro_constant, MDOC_QUOTABLE | MDOC_PARSED }, /* %T */ + { macro_constant, MDOC_QUOTABLE }, /* %V */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Ac */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Ao */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */ + { macro_constant, 0 }, /* At */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Bc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bf */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Bo */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */ + { macro_constant_delimited, MDOC_PARSED }, /* Bsx */ + { macro_constant_delimited, MDOC_PARSED }, /* Bx */ + { macro_constant, 0 }, /* Db */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Dc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Do */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Ec */ + { macro_close_explicit, 0 }, /* Ef */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Eo */ + { macro_constant_delimited, MDOC_PARSED }, /* Fx */ + { macro_text, MDOC_PARSED }, /* Ms */ + { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */ + { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ + { macro_constant_delimited, MDOC_PARSED }, /* Nx */ + { macro_constant_delimited, MDOC_PARSED }, /* Ox */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ + { macro_constant, MDOC_PARSED }, /* Pf */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Po */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Qc */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Qo */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */ + { macro_close_explicit, 0 }, /* Re */ + { macro_scoped, MDOC_EXPLICIT }, /* Rs */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Sc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* So */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */ + { macro_constant, 0 }, /* Sm */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ + { macro_constant_delimited, MDOC_PARSED }, /* Ux */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Xc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Xo */ + /* XXX - .Fo supposed to be (but isn't) callable. */ + { macro_scoped, MDOC_EXPLICIT | MDOC_PARSED }, /* Fo */ + /* XXX - .Fc supposed to be (but isn't) callable. */ + { macro_close_explicit, MDOC_PARSED }, /* Fc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Oo */ + { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Oc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bk */ + { macro_close_explicit, 0 }, /* Ek */ + { macro_constant, 0 }, /* Bt */ + { macro_constant, 0 }, /* Hf */ + { macro_obsolete, 0 }, /* Fr */ + { macro_constant, 0 }, /* Ud */ }; const char * const *mdoc_macronames = __mdoc_macronames; @@ -196,15 +200,10 @@ const char * const *mdoc_argnames = __mdoc_argnames; const struct mdoc_macro * const mdoc_macros = __mdoc_macros; -static void *xcalloc(size_t, size_t); -static char *xstrdup(const char *); - static struct mdoc_arg *argdup(size_t, const struct mdoc_arg *); static void argfree(size_t, struct mdoc_arg *); static void argcpy(struct mdoc_arg *, const struct mdoc_arg *); -static char **paramdup(size_t, const char **); -static void paramfree(size_t, char **); static void mdoc_node_freelist(struct mdoc_node *); static void mdoc_node_append(struct mdoc *, int, @@ -228,7 +227,7 @@ mdoc_free(struct mdoc *mdoc) if (mdoc->first) mdoc_node_freelist(mdoc->first); if (mdoc->htab) - mdoc_hash_free(mdoc->htab); + mdoc_tokhash_free(mdoc->htab); free(mdoc); } @@ -244,42 +243,44 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb) p->data = data; (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - p->htab = mdoc_hash_alloc(); + p->htab = mdoc_tokhash_alloc(); return(p); } -static void * -xcalloc(size_t num, size_t sz) +int +mdoc_endparse(struct mdoc *mdoc) { - void *p; - if (NULL == (p = calloc(num, sz))) - err(EXIT_FAILURE, "calloc"); - return(p); -} + if (MDOC_HALT & mdoc->flags) + return(0); + if (NULL == mdoc->first) + return(1); - -static char * -xstrdup(const char *p) -{ - char *pp; - - if (NULL == (pp = strdup(p))) - err(EXIT_FAILURE, "strdup"); - return(pp); + assert(mdoc->last); + if ( ! macro_end(mdoc)) { + mdoc->flags |= MDOC_HALT; + return(0); + } + return(1); } int -mdoc_parseln(struct mdoc *mdoc, char *buf) +mdoc_parseln(struct mdoc *mdoc, int line, char *buf) { int c, i; char tmp[5]; - if ('.' != *buf) { - /* TODO. */ - return(1); + if (MDOC_HALT & mdoc->flags) + return(0); + + if ('.' != *buf) { + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, -1, 0, ERR_SYNTAX_NOTEXT)); + mdoc_word_alloc(mdoc, 0, buf); + mdoc->next = MDOC_NEXT_SIBLING; + return(1); } if (buf[1] && '\\' == buf[1]) @@ -290,23 +291,32 @@ mdoc_parseln(struct mdoc *mdoc, char *buf) while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp)) i++; - if (i == (int)sizeof(tmp)) + if (i == (int)sizeof(tmp)) { + mdoc->flags |= MDOC_HALT; return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP)); - else if (i <= 2) + } else if (i <= 2) { + mdoc->flags |= MDOC_HALT; return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP)); + } i--; (void)memcpy(tmp, buf + 1, (size_t)i); tmp[i++] = 0; - if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) + if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) { + mdoc->flags |= MDOC_HALT; return(mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP)); + } while (buf[i] && isspace(buf[i])) i++; - return(mdoc_macro(mdoc, c, 1, &i, buf)); + if ( ! mdoc_macro(mdoc, c, line, 1, &i, buf)) { + mdoc->flags |= MDOC_HALT; + return(0); + } + return(1); } @@ -348,9 +358,14 @@ mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum md int -mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) +mdoc_macro(struct mdoc *mdoc, int tok, + int line, int ppos, int *pos, char *buf) { + if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && + SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (NULL == (mdoc_macros[tok].fp)) { (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP); return(0); @@ -361,7 +376,7 @@ mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int * return(0); } - return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); + return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); } @@ -372,7 +387,7 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md switch (p->type) { case (MDOC_TEXT): - nn = ""; + nn = p->data.text.string; nt = "text"; break; case (MDOC_BODY): @@ -387,6 +402,10 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md nn = mdoc_macronames[p->data.head.tok]; nt = "head"; break; + case (MDOC_TAIL): + nn = mdoc_macronames[p->data.tail.tok]; + nt = "tail"; + break; case (MDOC_BLOCK): nn = mdoc_macronames[p->data.block.tok]; nt = "block"; @@ -421,6 +440,10 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md on = mdoc_macronames[mdoc->last->data.head.tok]; ot = "head"; break; + case (MDOC_TAIL): + on = mdoc_macronames[mdoc->last->data.tail.tok]; + ot = "tail"; + break; case (MDOC_BLOCK): on = mdoc_macronames[mdoc->last->data.block.tok]; ot = "block"; @@ -430,70 +453,59 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md /* NOTREACHED */ } - switch (p->type) { - case (MDOC_BODY): - switch (mdoc->last->type) { - case (MDOC_BLOCK): - p->parent = mdoc->last; - mdoc->last->child = p; - act = "child"; - break; - case (MDOC_HEAD): - p->parent = mdoc->last->parent; - mdoc->last->next = p; - act = "sibling"; - break; - default: - abort(); - /* NOTREACHED */ - } + switch (mdoc->next) { + case (MDOC_NEXT_SIBLING): + mdoc->last->next = p; + p->prev = mdoc->last; + p->parent = mdoc->last->parent; + act = "sibling"; break; - case (MDOC_HEAD): - assert(mdoc->last->type == MDOC_BLOCK); - p->parent = mdoc->last; + case (MDOC_NEXT_CHILD): mdoc->last->child = p; + p->parent = mdoc->last; act = "child"; break; default: - switch (mdoc->last->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - p->parent = mdoc->last->parent; - mdoc->last->child = p; - act = "child"; - break; - default: - p->parent = mdoc->last->parent; - mdoc->last->next = p; - act = "sibling"; - break; - } - break; + abort(); + /* NOTREACHED */ } - mdoc_msg(mdoc, pos, "parse: %s `%s' %s %s `%s'", + mdoc_msg(mdoc, pos, "parse: %s `%s' %s of %s `%s'", nt, nn, act, ot, on); + mdoc->last = p; } void -mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, - size_t paramsz, const char **params) +mdoc_tail_alloc(struct mdoc *mdoc, int pos, int tok) { struct mdoc_node *p; assert(mdoc->first); assert(mdoc->last); - assert(mdoc->last->type == MDOC_BLOCK); - assert(mdoc->last->data.block.tok == tok); p = xcalloc(1, sizeof(struct mdoc_node)); + + p->type = MDOC_TAIL; + p->data.tail.tok = tok; + + mdoc_node_append(mdoc, pos, p); +} + + +void +mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok) +{ + struct mdoc_node *p; + + assert(mdoc->first); + assert(mdoc->last); + + p = xcalloc(1, sizeof(struct mdoc_node)); + p->type = MDOC_HEAD; p->data.head.tok = tok; - p->data.head.sz = paramsz; - p->data.head.args = paramdup(paramsz, params); mdoc_node_append(mdoc, pos, p); } @@ -506,12 +518,6 @@ mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok) assert(mdoc->first); assert(mdoc->last); - assert((mdoc->last->type == MDOC_BLOCK) || - (mdoc->last->type == MDOC_HEAD)); - if (mdoc->last->type == MDOC_BLOCK) - assert(mdoc->last->data.block.tok == tok); - else - assert(mdoc->last->data.head.tok == tok); p = xcalloc(1, sizeof(struct mdoc_node)); @@ -541,16 +547,13 @@ mdoc_block_alloc(struct mdoc *mdoc, int pos, int tok, void mdoc_elem_alloc(struct mdoc *mdoc, int pos, int tok, - size_t argsz, const struct mdoc_arg *args, - size_t paramsz, const char **params) + size_t argsz, const struct mdoc_arg *args) { struct mdoc_node *p; p = xcalloc(1, sizeof(struct mdoc_node)); p->type = MDOC_ELEM; p->data.elem.tok = tok; - p->data.elem.sz = paramsz; - p->data.elem.args = paramdup(paramsz, params); p->data.elem.argc = argsz; p->data.elem.argv = argdup(argsz, args); @@ -587,6 +590,7 @@ argfree(size_t sz, struct mdoc_arg *p) /* LINTED */ for (j = 0; j < (int)p[i].sz; j++) free(p[i].value[j]); + free(p[i].value); } free(p); } @@ -596,7 +600,6 @@ static void mdoc_elem_free(struct mdoc_elem *p) { - paramfree(p->sz, p->args); argfree(p->argc, p->argv); } @@ -618,14 +621,6 @@ mdoc_text_free(struct mdoc_text *p) } -static void -mdoc_head_free(struct mdoc_head *p) -{ - - paramfree(p->sz, p->args); -} - - void mdoc_node_free(struct mdoc_node *p) { @@ -640,9 +635,6 @@ mdoc_node_free(struct mdoc_node *p) case (MDOC_BLOCK): mdoc_block_free(&p->data.block); break; - case (MDOC_HEAD): - mdoc_head_free(&p->data.head); - break; default: break; } @@ -668,7 +660,7 @@ int mdoc_find(const struct mdoc *mdoc, const char *key) { - return(mdoc_hash_find(mdoc->htab, key)); + return(mdoc_tokhash_find(mdoc->htab, key)); } @@ -702,35 +694,3 @@ argdup(size_t argsz, const struct mdoc_arg *args) return(pp); } - -static void -paramfree(size_t sz, char **p) -{ - int i; - - if (0 == sz) - return; - - assert(p); - /* LINTED */ - for (i = 0; i < (int)sz; i++) - free(p[i]); - free(p); -} - - -static char ** -paramdup(size_t sz, const char **p) -{ - char **pp; - int i; - - if (0 == sz) - return(NULL); - - pp = xcalloc(sz, sizeof(char *)); - for (i = 0; i < (int)sz; i++) - pp[i] = xstrdup(p[i]); - - return(pp); -}