=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.1 retrieving revision 1.61 diff -u -p -r1.1 -r1.61 --- mandoc/mdoc.c 2008/12/15 01:54:58 1.1 +++ mandoc/mdoc.c 2009/03/11 00:39:58 1.61 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.1 2008/12/15 01:54:58 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.61 2009/03/11 00:39:58 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -26,10 +26,21 @@ #include "private.h" -extern int macro_text(struct mdoc *, int, int, int *, char *); -extern int macro_scoped_implicit(struct mdoc *, - int, int, int *, char *); +/* + * Main caller in the libmdoc library. This begins the parsing routine, + * handles allocation of data, and so forth. Most of the "work" is done + * in macro.c and validate.c. + */ +static struct mdoc_node *mdoc_node_alloc(const struct mdoc *); +static int mdoc_node_append(struct mdoc *, + struct mdoc_node *); + +static int parsetext(struct mdoc *, int, char *); +static int parsemacro(struct mdoc *, int, char *); +static int macrowarn(struct mdoc *, int, const char *); + + const char *const __mdoc_macronames[MDOC_MAX] = { "\\\"", "Dd", "Dt", "Os", "Sh", "Ss", "Pp", "D1", @@ -60,7 +71,9 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Tn", "Ux", "Xc", "Xo", "Fo", "Fc", "Oo", "Oc", "Bk", "Ek", "Bt", "Hf", - "Fr", "Ud", + "Fr", "Ud", "Lb", "Ap", + "Lp", "Lk", "Mt", "Brq", + "Bro", "Brc" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -71,157 +84,27 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "tag", "diag", "hang", "ohang", "inset", "column", "width", "compact", "std", - "p1003.1-88", "p1003.1-90", "p1003.1-96", - "p1003.1-2001", "p1003.1-2004", "p1003.1", - "p1003.1b", "p1003.1b-93", "p1003.1c-95", - "p1003.1g-2000", "p1003.2-92", "p1387.2-95", - "p1003.2", "p1387.2", "isoC-90", - "isoC-amd1", "isoC-tcor1", "isoC-tcor2", - "isoC-99", "ansiC", "ansiC-89", - "ansiC-99", "ieee754", "iso8802-3", - "xpg3", "xpg4", "xpg4.2", - "xpg4.3", "xbd5", "xcu5", - "xsh5", "xns5", "xns5.2d2.0", - "xcurses4.2", "susv2", "susv3", - "svid4", "filled", "words", + "filled", "words", "emphasis", + "symbolic" }; -const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { - { NULL, 0 }, /* \" */ - { NULL, 0 }, /* Dd */ - { NULL, 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 */ -}; - const char * const *mdoc_macronames = __mdoc_macronames; 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 *); +const struct mdoc_node * +mdoc_node(const struct mdoc *mdoc) +{ -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 **); + return(mdoc->first); +} -static void mdoc_node_freelist(struct mdoc_node *); -static void mdoc_node_append(struct mdoc *, int, - struct mdoc_node *); -static void mdoc_elem_free(struct mdoc_elem *); -static void mdoc_text_free(struct mdoc_text *); - -const struct mdoc_node * -mdoc_result(struct mdoc *mdoc) +const struct mdoc_meta * +mdoc_meta(const struct mdoc *mdoc) { - return(mdoc->first); + return(&mdoc->meta); } @@ -232,396 +115,340 @@ 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); + if (mdoc->meta.title) + free(mdoc->meta.title); + if (mdoc->meta.os) + free(mdoc->meta.os); + if (mdoc->meta.name) + free(mdoc->meta.name); + if (mdoc->meta.arch) + free(mdoc->meta.arch); + if (mdoc->meta.vol) + free(mdoc->meta.vol); + free(mdoc); } struct mdoc * -mdoc_alloc(void *data, const struct mdoc_cb *cb) +mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb) { struct mdoc *p; p = xcalloc(1, sizeof(struct mdoc)); p->data = data; - (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); + if (cb) + (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - p->htab = mdoc_hash_alloc(); - return(p); -} + p->last = xcalloc(1, sizeof(struct mdoc_node)); + p->last->type = MDOC_ROOT; + p->first = p->last; + p->pflags = pflags; + p->next = MDOC_NEXT_CHILD; + p->htab = mdoc_tokhash_alloc(); - -static void * -xcalloc(size_t num, size_t sz) -{ - void *p; - - if (NULL == (p = calloc(num, sz))) - err(EXIT_FAILURE, "calloc"); return(p); } -static char * -xstrdup(const char *p) +int +mdoc_endparse(struct mdoc *mdoc) { - char *pp; - if (NULL == (pp = strdup(p))) - err(EXIT_FAILURE, "strdup"); - return(pp); + 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); } +/* + * Main parse routine. Parses a single line -- really just hands off to + * the macro or text parser. + */ int -mdoc_parseln(struct mdoc *mdoc, char *buf) +mdoc_parseln(struct mdoc *m, int ln, char *buf) { - int c, i; - char tmp[5]; - if ('.' != *buf) { - /* TODO. */ - return(1); - } + /* If in error-mode, then we parse no more. */ - if (buf[1] && '\\' == buf[1]) - if (buf[2] && '\"' == buf[2]) - return(1); - - i = 1; - 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)); - - i--; - - (void)memcpy(tmp, buf + 1, i); - tmp[i++] = 0; - - if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) - return(mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP)); - - while (buf[i] && isspace(buf[i])) - i++; - - if (NULL == (mdoc_macros[c].fp)) { - (void)mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP); + if (MDOC_HALT & m->flags) return(0); - } - return((*mdoc_macros[c].fp)(mdoc, c, 1, &i, buf)); + return('.' == *buf ? parsemacro(m, ln, buf) : + parsetext(m, ln, buf)); } void -mdoc_msg(struct mdoc *mdoc, int pos, const char *fmt, ...) +mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) { - va_list ap; - char buf[256]; + char buf[256]; + va_list ap; if (NULL == mdoc->cb.mdoc_msg) return; va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf), fmt, ap); + (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); va_end(ap); - - (*mdoc->cb.mdoc_msg)(mdoc->data, pos, buf); + (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf); } int -mdoc_err(struct mdoc *mdoc, int tok, int pos, enum mdoc_err type) +mdoc_verr(struct mdoc *mdoc, int ln, int pos, + const char *fmt, ...) { + char buf[256]; + va_list ap; if (NULL == mdoc->cb.mdoc_err) return(0); - return((*mdoc->cb.mdoc_err)(mdoc->data, tok, pos, type)); + + va_start(ap, fmt); + (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); + va_end(ap); + return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf)); } int -mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum mdoc_warn type) +mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, + enum mdoc_warn type, const char *fmt, ...) { + char buf[256]; + va_list ap; if (NULL == mdoc->cb.mdoc_warn) return(0); - return((*mdoc->cb.mdoc_warn)(mdoc->data, tok, pos, type)); + + va_start(ap, fmt); + (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); + va_end(ap); + return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf)); } int -mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) +mdoc_macro(struct mdoc *m, int tok, + int ln, int pp, int *pos, char *buf) { - if (NULL == (mdoc_macros[tok].fp)) { - (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP); - return(0); - } else if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { - (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTCALL); - return(0); - } + /* FIXME - these should happen during validation. */ - return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); + if (MDOC_PROLOGUE & mdoc_macros[tok].flags && + SEC_PROLOGUE != m->lastnamed) + return(mdoc_perr(m, ln, pp, + "disallowed in document body")); + + if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && + SEC_PROLOGUE == m->lastnamed) + return(mdoc_perr(m, ln, pp, + "disallowed in prologue")); + + if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) + return(mdoc_perr(m, ln, pp, "not callable")); + + return((*mdoc_macros[tok].fp)(m, tok, ln, pp, 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; - switch (p->type) { - case (MDOC_TEXT): - nn = ""; - nt = "text"; + assert(mdoc->last); + assert(mdoc->first); + assert(MDOC_ROOT != p->type); + + switch (mdoc->next) { + case (MDOC_NEXT_SIBLING): + mdoc->last->next = p; + p->prev = mdoc->last; + p->parent = mdoc->last->parent; break; - case (MDOC_BODY): - nn = mdoc_macronames[p->data.body.tok]; - nt = "body"; + case (MDOC_NEXT_CHILD): + mdoc->last->child = p; + p->parent = mdoc->last; 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 */ } - 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; - } + if ( ! mdoc_valid_pre(mdoc, p)) + return(0); - switch (mdoc->last->type) { - case (MDOC_TEXT): - on = ""; - ot = "text"; - break; - case (MDOC_BODY): - on = mdoc_macronames[mdoc->last->data.body.tok]; - ot = "body"; - break; - case (MDOC_ELEM): - on = mdoc_macronames[mdoc->last->data.elem.tok]; - ot = "elem"; - break; + switch (p->type) { case (MDOC_HEAD): - on = mdoc_macronames[mdoc->last->data.head.tok]; - ot = "head"; + assert(MDOC_BLOCK == p->parent->type); + p->parent->head = p; break; - case (MDOC_BLOCK): - on = mdoc_macronames[mdoc->last->data.block.tok]; - ot = "block"; + case (MDOC_TAIL): + assert(MDOC_BLOCK == p->parent->type); + p->parent->tail = p; break; - } - - 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 */ - } + assert(MDOC_BLOCK == p->parent->type); + p->parent->body = p; break; - case (MDOC_HEAD): - assert(mdoc->last->type == MDOC_BLOCK); - p->parent = mdoc->last; - mdoc->last->child = p; - 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; } - mdoc_msg(mdoc, pos, "parse: %s `%s' %s %s `%s'", - nt, nn, act, ot, on); mdoc->last = p; + return(1); } -void -mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, - size_t paramsz, const char **params) +static struct mdoc_node * +mdoc_node_alloc(const struct mdoc *mdoc) { 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_HEAD; - p->data.head.tok = tok; - p->data.head.sz = paramsz; - p->data.head.args = paramdup(paramsz, params); + p->sec = mdoc->lastsec; - mdoc_node_append(mdoc, pos, p); + return(p); } -void -mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok) +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) || - (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 = mdoc_node_alloc(mdoc); - p->type = MDOC_BODY; - p->data.body.tok = tok; + p->line = line; + p->pos = pos; + p->type = MDOC_TAIL; + p->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_head_alloc(struct mdoc *mdoc, int line, int pos, int tok) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + assert(mdoc->first); + assert(mdoc->last); - p->type = MDOC_BLOCK; - p->data.block.tok = tok; - p->data.block.argc = argsz; - p->data.block.argv = argdup(argsz, args); + p = mdoc_node_alloc(mdoc); - mdoc_node_append(mdoc, pos, p); + p->line = line; + p->pos = pos; + p->type = MDOC_HEAD; + p->tok = tok; + + 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_body_alloc(struct mdoc *mdoc, int line, int pos, int tok) { 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); + assert(mdoc->first); + assert(mdoc->last); - mdoc_node_append(mdoc, pos, p); + p = mdoc_node_alloc(mdoc); + + p->line = line; + p->pos = pos; + p->type = MDOC_BODY; + p->tok = tok; + + return(mdoc_node_append(mdoc, p)); } -void -mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word) +int +mdoc_root_alloc(struct mdoc *mdoc) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); - p->type = MDOC_TEXT; - p->data.text.string = xstrdup(word); + p = mdoc_node_alloc(mdoc); - mdoc_node_append(mdoc, pos, p); + p->type = MDOC_ROOT; + + return(mdoc_node_append(mdoc, p)); } -static void -argfree(size_t sz, struct mdoc_arg *p) +int +mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { - size_t i, j; + struct mdoc_node *p; - if (0 == sz) - return; + p = mdoc_node_alloc(mdoc); - assert(p); - for (i = 0; i < sz; i++) - if (p[i].sz > 0) { - assert(p[i].value); - for (j = 0; j < p[i].sz; j++) - free(p[i].value[j]); - } - free(p); -} + p->pos = pos; + p->line = line; + p->type = MDOC_BLOCK; + p->tok = tok; + p->args = args; + if (args) + (args->refcnt)++; -static void -mdoc_elem_free(struct mdoc_elem *p) -{ - - paramfree(p->sz, p->args); - argfree(p->argc, p->argv); + return(mdoc_node_append(mdoc, p)); } -static void -mdoc_block_free(struct mdoc_block *p) +int +mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { + struct mdoc_node *p; - argfree(p->argc, p->argv); -} + p = mdoc_node_alloc(mdoc); + p->line = line; + p->pos = pos; + p->type = MDOC_ELEM; + p->tok = tok; + p->args = args; -static void -mdoc_text_free(struct mdoc_text *p) -{ + if (args) + (args->refcnt)++; - if (p->string) - free(p->string); + return(mdoc_node_append(mdoc, p)); } -static void -mdoc_head_free(struct mdoc_head *p) +int +mdoc_word_alloc(struct mdoc *mdoc, + int line, int pos, const char *word) { + struct mdoc_node *p; - paramfree(p->sz, p->args); + p = mdoc_node_alloc(mdoc); + + p->line = line; + p->pos = pos; + p->type = MDOC_TEXT; + p->string = xstrdup(word); + + return(mdoc_node_append(mdoc, p)); } @@ -629,28 +456,15 @@ void mdoc_node_free(struct mdoc_node *p) { - switch (p->type) { - case (MDOC_TEXT): - mdoc_text_free(&p->data.text); - break; - case (MDOC_ELEM): - mdoc_elem_free(&p->data.elem); - break; - case (MDOC_BLOCK): - mdoc_block_free(&p->data.block); - break; - case (MDOC_HEAD): - mdoc_head_free(&p->data.head); - break; - default: - break; - } - + if (p->string) + free(p->string); + if (p->args) + mdoc_argv_free(p->args); free(p); } -static void +void mdoc_node_freelist(struct mdoc_node *p) { @@ -663,72 +477,94 @@ mdoc_node_freelist(struct mdoc_node *p) } -int -mdoc_find(const struct mdoc *mdoc, const char *key) +/* + * Parse free-form text, that is, a line that does not begin with the + * control character. + */ +static int +parsetext(struct mdoc *mdoc, int line, char *buf) { - return(mdoc_hash_find(mdoc->htab, key)); + if (SEC_PROLOGUE == mdoc->lastnamed) + return(mdoc_perr(mdoc, line, 0, + "text disallowed in prologue")); + + if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) + return(0); + + mdoc->next = MDOC_NEXT_SIBLING; + return(1); } -static void -argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src) +static int +macrowarn(struct mdoc *m, int ln, const char *buf) { - size_t i; - - dst->arg = src->arg; - if (0 == (dst->sz = src->sz)) - return; - dst->value = xcalloc(dst->sz, sizeof(char *)); - for (i = 0; i < dst->sz; i++) - dst->value[i] = xstrdup(src->value[i]); + if ( ! (MDOC_IGN_MACRO & m->pflags)) + return(mdoc_perr(m, ln, 1, "unknown macro: %s%s", + buf, strlen(buf) > 3 ? "..." : "")); + return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX, + "unknown macro: %s%s", + buf, strlen(buf) > 3 ? "..." : "")); } -static struct mdoc_arg * -argdup(size_t argsz, const struct mdoc_arg *args) + +/* + * Parse a macro line, that is, a line beginning with the control + * character. + */ +int +parsemacro(struct mdoc *m, int ln, char *buf) { - struct mdoc_arg *pp; - size_t i; + int i, c; + char mac[5]; - if (0 == argsz) - return(NULL); + /* Comments are quickly ignored. */ - pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg)); - for (i = 0; i < argsz; i++) - argcpy(&pp[i], &args[i]); + if (buf[1] && '\\' == buf[1]) + if (buf[2] && '\"' == buf[2]) + return(1); - return(pp); -} + /* Copy the first word into a nil-terminated buffer. */ + for (i = 1; i < 5; i++) { + if (0 == (mac[i - 1] = buf[i])) + break; + else if (isspace((unsigned char)buf[i])) + break; + } -static void -paramfree(size_t sz, char **p) -{ - size_t i; + /* FIXME: be able to skip unknown macro lines! */ - if (0 == sz) - return; + mac[i - 1] = 0; - assert(p); - for (i = 0; i < sz; i++) - free(p[i]); - free(p); -} + if (i == 5 || i <= 2) { + if ( ! macrowarn(m, ln, mac)) + goto err; + return(1); + } + + if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) { + if ( ! macrowarn(m, ln, mac)) + goto err; + return(1); + } + /* The macro is sane. Jump to the next word. */ -static char ** -paramdup(size_t sz, const char **p) -{ - char **pp; - size_t i; + while (buf[i] && isspace((unsigned char)buf[i])) + i++; - if (0 == sz) - return(NULL); + /* Begin recursive parse sequence. */ - pp = xcalloc(sz, sizeof(char *)); - for (i = 0; i < sz; i++) - pp[i] = xstrdup(p[i]); + if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) + goto err; - return(pp); + return(1); + +err: /* Error out. */ + + m->flags |= MDOC_HALT; + return(0); }