=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.6 retrieving revision 1.26 diff -u -p -r1.6 -r1.26 --- mandoc/mdoc.c 2008/12/28 21:25:09 1.6 +++ mandoc/mdoc.c 2009/01/12 10:31:53 1.26 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.6 2008/12/28 21:25:09 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.26 2009/01/12 10:31:53 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 */ - { macro_prologue_os, 0 }, /* Os */ - { macro_scoped_implicit, 0 }, /* Sh */ - { macro_scoped_implicit, 0 }, /* Ss */ + { macro_constant, MDOC_PROLOGUE }, /* Dd */ + { macro_constant, MDOC_PROLOGUE }, /* Dt */ + { macro_constant, MDOC_PROLOGUE }, /* Os */ + { macro_scoped, 0 }, /* Sh */ + { macro_scoped, 0 }, /* Ss */ { macro_text, 0 }, /* Pp */ - { macro_scoped_line, 0 }, /* D1 */ - { macro_scoped_line, 0 }, /* Dl */ - { macro_scoped_explicit, MDOC_EXPLICIT }, /* Bd */ - { macro_scoped_explicit, 0 }, /* Ed */ - { macro_scoped_explicit, MDOC_EXPLICIT }, /* Bl */ - { macro_scoped_explicit, 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 */ - { macro_scoped_pline, MDOC_CALLABLE }, /* 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_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 - .St 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 }, /* %A */ + { macro_constant, MDOC_QUOTABLE }, /* %B */ + { macro_constant, MDOC_QUOTABLE }, /* %D */ + { macro_constant, MDOC_QUOTABLE }, /* %I */ + { macro_constant, MDOC_QUOTABLE }, /* %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 }, /* %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; @@ -200,11 +204,9 @@ static struct mdoc_arg *argdup(size_t, const struct m 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, +static int mdoc_node_append(struct mdoc *, struct mdoc_node *); static void mdoc_elem_free(struct mdoc_elem *); static void mdoc_text_free(struct mdoc_text *); @@ -241,20 +243,52 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb) p->data = data; (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); + p->last = xcalloc(1, sizeof(struct mdoc_node)); + p->last->type = MDOC_ROOT; + p->first = p->last; + + p->next = MDOC_NEXT_CHILD; p->htab = mdoc_tokhash_alloc(); + return(p); } int -mdoc_parseln(struct mdoc *mdoc, char *buf) +mdoc_endparse(struct mdoc *mdoc) { + + if (MDOC_HALT & mdoc->flags) + return(0); + if (NULL == mdoc->first) + return(1); + + assert(mdoc->last); + if ( ! macro_end(mdoc)) { + mdoc->flags |= MDOC_HALT; + return(0); + } + return(1); +} + + +int +mdoc_parseln(struct mdoc *mdoc, int line, char *buf) +{ int c, i; char tmp[5]; + if (MDOC_HALT & mdoc->flags) + return(0); + if ('.' != *buf) { - mdoc_word_alloc(mdoc, 0, buf); - return(1); + if (SEC_PROLOGUE != mdoc->sec_lastn) { + if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) + return(0); + mdoc->next = MDOC_NEXT_SIBLING; + return(1); + } + return(mdoc_perr(mdoc, line, 0, ERR_SYNTAX_NOTEXT)); } if (buf[1] && '\\' == buf[1]) @@ -265,122 +299,106 @@ mdoc_parseln(struct mdoc *mdoc, char *buf) while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp)) i++; - if (i == (int)sizeof(tmp)) - return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP)); - else if (i <= 2) - return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP)); + if (i == (int)sizeof(tmp)) { + mdoc->flags |= MDOC_HALT; + return(mdoc_perr(mdoc, line, 1, ERR_MACRO_NOTSUP)); + } else if (i <= 2) { + mdoc->flags |= MDOC_HALT; + return(mdoc_perr(mdoc, line, 1, ERR_MACRO_NOTSUP)); + } i--; (void)memcpy(tmp, buf + 1, (size_t)i); tmp[i++] = 0; - if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) - return(mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP)); + if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) { + mdoc->flags |= MDOC_HALT; + return(mdoc_perr(mdoc, line, 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); } void -mdoc_msg(struct mdoc *mdoc, int pos, const char *fmt, ...) +mdoc_msg(struct mdoc *mdoc, const char *fmt, ...) { - va_list ap; - char buf[256]; + struct mdoc_node *n; + va_list ap; + char buf[256]; if (NULL == mdoc->cb.mdoc_msg) return; + n = mdoc->last; + assert(n); + va_start(ap, fmt); (void)vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - (*mdoc->cb.mdoc_msg)(mdoc->data, pos, buf); + (*mdoc->cb.mdoc_msg)(mdoc->data, n->line, n->pos, buf); } int -mdoc_err(struct mdoc *mdoc, int tok, int pos, enum mdoc_err type) +mdoc_perr(struct mdoc *mdoc, + int line, int pos, enum mdoc_err type) { if (NULL == mdoc->cb.mdoc_err) return(0); - return((*mdoc->cb.mdoc_err)(mdoc->data, tok, pos, type)); + return((*mdoc->cb.mdoc_err)(mdoc->data, line, pos, type)); } int -mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum mdoc_warn type) +mdoc_pwarn(struct mdoc *mdoc, + int line, int pos, enum mdoc_warn type) { if (NULL == mdoc->cb.mdoc_warn) return(0); - return((*mdoc->cb.mdoc_warn)(mdoc->data, tok, pos, type)); + return((*mdoc->cb.mdoc_warn)(mdoc->data, line, pos, type)); } int -mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) +mdoc_macro(struct mdoc *mdoc, int tok, + int ln, int ppos, int *pos, char *buf) { - if (NULL == (mdoc_macros[tok].fp)) { - (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP); - return(0); - } + if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && + SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_perr(mdoc, ln, ppos, ERR_SEC_PROLOGUE)); - if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { - (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTCALL); - return(0); - } + if (NULL == (mdoc_macros[tok].fp)) + return(mdoc_perr(mdoc, ln, ppos, ERR_MACRO_NOTSUP)); - /*mdoc_msg(mdoc, ppos, "calling `%s'", mdoc_macronames[tok]);*/ + if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) + return(mdoc_perr(mdoc, ln, ppos, ERR_MACRO_NOTCALL)); - return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); + return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf)); } -static void -mdoc_node_append(struct mdoc *mdoc, int pos, struct mdoc_node *p) +static int +mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) { - const char *nn, *on, *nt, *ot, *act; + const char *on, *ot, *act; - switch (p->type) { - case (MDOC_TEXT): - nn = p->data.text.string; - nt = "text"; - break; - case (MDOC_BODY): - nn = mdoc_macronames[p->data.body.tok]; - nt = "body"; - break; - case (MDOC_ELEM): - nn = mdoc_macronames[p->data.elem.tok]; - nt = "elem"; - break; - case (MDOC_HEAD): - nn = mdoc_macronames[p->data.head.tok]; - nt = "head"; - break; - case (MDOC_BLOCK): - nn = mdoc_macronames[p->data.block.tok]; - nt = "block"; - break; - default: - abort(); - /* NOTREACHED */ - } + assert(mdoc->last); + assert(mdoc->first); + assert(MDOC_ROOT != p->type); - if (NULL == mdoc->first) { - assert(NULL == mdoc->last); - mdoc->first = p; - mdoc->last = p; - mdoc_msg(mdoc, pos, "parse: root %s `%s'", nt, nn); - return; - } - switch (mdoc->last->type) { case (MDOC_TEXT): on = ""; @@ -398,146 +416,171 @@ 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"; break; + case (MDOC_ROOT): + on = "root"; + ot = "root"; + break; default: abort(); /* NOTREACHED */ } - switch (p->type) { - case (MDOC_BODY): - p->parent = mdoc->last->parent; + 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; - mdoc->last->child = p; - act = "child"; - break; - default: - p->parent = mdoc->last->parent; - p->prev = mdoc->last; - mdoc->last->next = p; - act = "sibling"; - break; - } - break; + abort(); + /* NOTREACHED */ } - mdoc_msg(mdoc, pos, "parse: %s `%s' %s %s `%s'", - nt, nn, act, ot, on); + if ( ! mdoc_valid_pre(mdoc, p)) + return(0); + if ( ! mdoc_action_pre(mdoc, p)) + return(0); mdoc->last = p; + mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on); + return(1); } -/* FIXME: deprecate paramsz, params. */ -void -mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, - size_t paramsz, const char **params) +int +mdoc_tail_alloc(struct mdoc *mdoc, int line, 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->line = line; + p->pos = pos; + p->type = MDOC_TAIL; + p->data.tail.tok = tok; + + return(mdoc_node_append(mdoc, p)); +} + + +int +mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok) +{ + struct mdoc_node *p; + + assert(mdoc->first); + assert(mdoc->last); + + p = xcalloc(1, sizeof(struct mdoc_node)); + + p->line = line; + p->pos = pos; 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); + return(mdoc_node_append(mdoc, p)); } -void -mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok) +int +mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok) { struct mdoc_node *p; 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)); + p->line = line; + p->pos = pos; p->type = MDOC_BODY; p->data.body.tok = tok; - mdoc_node_append(mdoc, pos, p); + return(mdoc_node_append(mdoc, p)); } -void -mdoc_block_alloc(struct mdoc *mdoc, int pos, int tok, - size_t argsz, const struct mdoc_arg *args) +int +mdoc_root_alloc(struct mdoc *mdoc) { struct mdoc_node *p; p = xcalloc(1, sizeof(struct mdoc_node)); + p->type = MDOC_ROOT; + + return(mdoc_node_append(mdoc, p)); +} + + +int +mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, + int tok, size_t argsz, const struct mdoc_arg *args) +{ + struct mdoc_node *p; + + p = xcalloc(1, sizeof(struct mdoc_node)); + + p->pos = pos; + p->line = line; p->type = MDOC_BLOCK; p->data.block.tok = tok; p->data.block.argc = argsz; p->data.block.argv = argdup(argsz, args); - mdoc_node_append(mdoc, pos, p); + return(mdoc_node_append(mdoc, p)); } -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) +int +mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, + int tok, size_t argsz, const struct mdoc_arg *args) { struct mdoc_node *p; p = xcalloc(1, sizeof(struct mdoc_node)); + + p->line = line; + p->pos = pos; 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); - mdoc_node_append(mdoc, pos, p); + return(mdoc_node_append(mdoc, p)); } -void -mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word) +int +mdoc_word_alloc(struct mdoc *mdoc, + int line, int pos, const char *word) { struct mdoc_node *p; p = xcalloc(1, sizeof(struct mdoc_node)); + p->line = line; + p->pos = pos; p->type = MDOC_TEXT; p->data.text.string = xstrdup(word); - mdoc_node_append(mdoc, pos, p); + return(mdoc_node_append(mdoc, p)); } @@ -557,6 +600,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); } @@ -566,7 +610,6 @@ static void mdoc_elem_free(struct mdoc_elem *p) { - paramfree(p->sz, p->args); argfree(p->argc, p->argv); } @@ -588,14 +631,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) { @@ -610,9 +645,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; } @@ -647,6 +679,8 @@ argcpy(struct mdoc_arg *dst, const struct mdoc_arg *sr { int i; + dst->line = src->line; + dst->pos = src->pos; dst->arg = src->arg; if (0 == (dst->sz = src->sz)) return; @@ -672,35 +706,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); -}