=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.2 retrieving revision 1.112 diff -u -p -r1.2 -r1.112 --- mandoc/mdoc.c 2008/12/15 02:23:12 1.2 +++ mandoc/mdoc.c 2009/10/27 08:26:12 1.112 @@ -1,37 +1,88 @@ -/* $Id: mdoc.c,v 1.2 2008/12/15 02:23:12 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.112 2009/10/27 08:26:12 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include -#include #include -#include #include +#include #include -#include "private.h" +#include "libmdoc.h" -extern int macro_text(struct mdoc *, int, int, int *, char *); -extern int macro_scoped_implicit(struct mdoc *, - int, int, int *, char *); +const char *const __mdoc_merrnames[MERRMAX] = { + "trailing whitespace", /* ETAILWS */ + "unexpected quoted parameter", /* EQUOTPARM */ + "unterminated quoted parameter", /* EQUOTTERM */ + "system: malloc error", /* EMALLOC */ + "argument parameter suggested", /* EARGVAL */ + "macro disallowed in prologue", /* EBODYPROL */ + "macro disallowed in body", /* EPROLBODY */ + "text disallowed in prologue", /* ETEXTPROL */ + "blank line disallowed", /* ENOBLANK */ + "text parameter too long", /* ETOOLONG */ + "invalid escape sequence", /* EESCAPE */ + "invalid character", /* EPRINT */ + "document has no body", /* ENODAT */ + "document has no prologue", /* ENOPROLOGUE */ + "expected line arguments", /* ELINE */ + "invalid AT&T argument", /* EATT */ + "default name not yet set", /* ENAME */ + "missing list type", /* ELISTTYPE */ + "missing display type", /* EDISPTYPE */ + "too many display types", /* EMULTIDISP */ + "too many list types", /* EMULTILIST */ + "NAME section must be first", /* ESECNAME */ + "badly-formed NAME section", /* ENAMESECINC */ + "argument repeated", /* EARGREP */ + "expected boolean parameter", /* EBOOL */ + "inconsistent column syntax", /* ECOLMIS */ + "nested display invalid", /* ENESTDISP */ + "width argument missing", /* EMISSWIDTH */ + "invalid section for this manual section", /* EWRONGMSEC */ + "section out of conventional order", /* ESECOOO */ + "section repeated", /* ESECREP */ + "invalid standard argument", /* EBADSTAND */ + "multi-line arguments discouraged", /* ENOMULTILINE */ + "multi-line arguments suggested", /* EMULTILINE */ + "line arguments discouraged", /* ENOLINE */ + "prologue macro out of conventional order", /* EPROLOOO */ + "prologue macro repeated", /* EPROLREP */ + "invalid manual section", /* EBADMSEC */ + "invalid section", /* EBADSEC */ + "invalid font mode", /* EFONT */ + "invalid date syntax", /* EBADDATE */ + "invalid number format", /* ENUMFMT */ + "superfluous width argument", /* ENOWIDTH */ + "system: utsname error", /* EUTSNAME */ + "obsolete macro", /* EOBS */ + "end-of-line scope violation", /* EIMPBRK */ + "empty macro ignored", /* EIGNE */ + "unclosed explicit scope", /* EOPEN */ + "unterminated quoted phrase", /* EQUOTPHR */ + "closure macro without prior context", /* ENOCTX */ + "no description found for library", /* ELIB */ + "bad child for parent context", /* EBADCHILD */ + "list arguments preceding type", /* ENOTYPE */ +}; const char *const __mdoc_macronames[MDOC_MAX] = { - "\\\"", "Dd", "Dt", "Os", + "Ap", "Dd", "Dt", "Os", "Sh", "Ss", "Pp", "D1", "Dl", "Bd", "Ed", "Bl", "El", "It", "Ad", "An", @@ -60,7 +111,14 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Tn", "Ux", "Xc", "Xo", "Fo", "Fc", "Oo", "Oc", "Bk", "Ek", "Bt", "Hf", - "Fr", "Ud", + "Fr", "Ud", "Lb", "Lp", + "Lk", "Mt", "Brq", "Bro", + /* LINTED */ + "Brc", "\%C", "Es", "En", + /* LINTED */ + "Dx", "\%Q", "br", "sp", + /* LINTED */ + "\%U" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -71,565 +129,450 @@ 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", "nested", "centered" }; -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 mdoc_free1(struct mdoc *); +static int mdoc_alloc1(struct mdoc *); +static struct mdoc_node *node_alloc(struct mdoc *, int, int, + int, enum mdoc_type); +static int 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 *); +static int pstring(struct mdoc *, int, int, + const char *, size_t); -static void *xcalloc(size_t, size_t); -static char *xstrdup(const char *); +#ifdef __linux__ +extern size_t strlcpy(char *, const char *, size_t); +#endif -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, - struct mdoc_node *); -static void mdoc_elem_free(struct mdoc_elem *); -static void mdoc_text_free(struct mdoc_text *); +const struct mdoc_node * +mdoc_node(const struct mdoc *m) +{ + return(MDOC_HALT & m->flags ? NULL : m->first); +} -const struct mdoc_node * -mdoc_result(struct mdoc *mdoc) + +const struct mdoc_meta * +mdoc_meta(const struct mdoc *m) { - return(mdoc->first); + return(MDOC_HALT & m->flags ? NULL : &m->meta); } -void -mdoc_free(struct mdoc *mdoc) +/* + * Frees volatile resources (parse tree, meta-data, fields). + */ +static void +mdoc_free1(struct mdoc *mdoc) { if (mdoc->first) mdoc_node_freelist(mdoc->first); - if (mdoc->htab) - mdoc_hash_free(mdoc->htab); - - free(mdoc); + 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); } -struct mdoc * -mdoc_alloc(void *data, const struct mdoc_cb *cb) +/* + * Allocate all volatile resources (parse tree, meta-data, fields). + */ +static int +mdoc_alloc1(struct mdoc *mdoc) { - struct mdoc *p; - p = xcalloc(1, sizeof(struct mdoc)); + memset(&mdoc->meta, 0, sizeof(struct mdoc_meta)); + mdoc->flags = 0; + mdoc->lastnamed = mdoc->lastsec = SEC_NONE; + mdoc->last = calloc(1, sizeof(struct mdoc_node)); + if (NULL == mdoc->last) + return(0); - p->data = data; - (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - - p->htab = mdoc_hash_alloc(); - return(p); + mdoc->first = mdoc->last; + mdoc->last->type = MDOC_ROOT; + mdoc->next = MDOC_NEXT_CHILD; + return(1); } -static void * -xcalloc(size_t num, size_t sz) +/* + * Free up volatile resources (see mdoc_free1()) then re-initialises the + * data with mdoc_alloc1(). After invocation, parse data has been reset + * and the parser is ready for re-invocation on a new tree; however, + * cross-parse non-volatile data is kept intact. + */ +int +mdoc_reset(struct mdoc *mdoc) { - void *p; - if (NULL == (p = calloc(num, sz))) - err(EXIT_FAILURE, "calloc"); - return(p); + mdoc_free1(mdoc); + return(mdoc_alloc1(mdoc)); } -static char * -xstrdup(const char *p) +/* + * Completely free up all volatile and non-volatile parse resources. + * After invocation, the pointer is no longer usable. + */ +void +mdoc_free(struct mdoc *mdoc) { - char *pp; - if (NULL == (pp = strdup(p))) - err(EXIT_FAILURE, "strdup"); - return(pp); + mdoc_free1(mdoc); + free(mdoc); } -int -mdoc_parseln(struct mdoc *mdoc, char *buf) +/* + * Allocate volatile and non-volatile parse resources. + */ +struct mdoc * +mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb) { - int c, i; - char tmp[5]; + struct mdoc *p; - if ('.' != *buf) { - /* TODO. */ - return(1); - } + if (NULL == (p = calloc(1, sizeof(struct mdoc)))) + return(NULL); + if (cb) + (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - if (buf[1] && '\\' == buf[1]) - if (buf[2] && '\"' == buf[2]) - return(1); + mdoc_hash_init(); - i = 1; - while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp)) - i++; + p->data = data; + p->pflags = pflags; - 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 (mdoc_alloc1(p)) + return(p); - i--; + free(p); + return(NULL); +} - (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)); +/* + * Climb back up the parse tree, validating open scopes. Mostly calls + * through to macro_end() in macro.c. + */ +int +mdoc_endparse(struct mdoc *m) +{ - while (buf[i] && isspace(buf[i])) - i++; + if (MDOC_HALT & m->flags) + return(0); + else if (mdoc_macroend(m)) + return(1); + m->flags |= MDOC_HALT; + return(0); +} - if (NULL == (mdoc_macros[c].fp)) { - (void)mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP); + +/* + * Main parse routine. Parses a single line -- really just hands off to + * the macro (parsemacro()) or text parser (parsetext()). + */ +int +mdoc_parseln(struct mdoc *m, int ln, char *buf) +{ + + 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, ...) +int +mdoc_verr(struct mdoc *mdoc, int ln, int pos, + const char *fmt, ...) { - va_list ap; char buf[256]; + va_list ap; - if (NULL == mdoc->cb.mdoc_msg) - return; + if (NULL == mdoc->cb.mdoc_err) + return(0); 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); + return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf)); } int -mdoc_err(struct mdoc *mdoc, int tok, int pos, enum mdoc_err type) +mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) { + char buf[256]; + va_list ap; - if (NULL == mdoc->cb.mdoc_err) + if (NULL == mdoc->cb.mdoc_warn) 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_warn)(mdoc->data, ln, pos, buf)); } int -mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum mdoc_warn type) +mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type) { + const char *p; - if (NULL == mdoc->cb.mdoc_warn) - return(0); - return((*mdoc->cb.mdoc_warn)(mdoc->data, tok, pos, type)); + p = __mdoc_merrnames[(int)type]; + assert(p); + + if (iserr) + return(mdoc_verr(m, line, pos, p)); + + return(mdoc_vwarn(m, line, pos, p)); } 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 we're in the prologue, deny "body" macros. Similarly, if + * we're in the body, deny prologue calls. + */ + if (MDOC_PROLOGUE & mdoc_macros[tok].flags && + MDOC_PBODY & m->flags) + return(mdoc_perr(m, ln, pp, EPROLBODY)); + if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && + ! (MDOC_PBODY & m->flags)) + return(mdoc_perr(m, ln, pp, EBODYPROL)); - 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); - } - - return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); + 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 +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; - } + p->parent->nchild++; - 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; + if ( ! mdoc_valid_pre(mdoc, p)) + return(0); + if ( ! mdoc_action_pre(mdoc, p)) + return(0); + + 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; + case (MDOC_BODY): + assert(MDOC_BLOCK == p->parent->type); + p->parent->body = p; + break; default: - abort(); - /* NOTREACHED */ + break; } + mdoc->last = p; + 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 */ - } + case (MDOC_TEXT): + if ( ! mdoc_valid_post(mdoc)) + return(0); + if ( ! mdoc_action_post(mdoc)) + return(0); 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 * +node_alloc(struct mdoc *m, int line, + int pos, int tok, enum mdoc_type type) { struct mdoc_node *p; - assert(mdoc->first); - assert(mdoc->last); - assert(mdoc->last->type == MDOC_BLOCK); - assert(mdoc->last->data.block.tok == tok); + if (NULL == (p = calloc(1, sizeof(struct mdoc_node)))) { + (void)mdoc_nerr(m, m->last, EMALLOC); + return(NULL); + } - 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 = m->lastsec; + p->line = line; + p->pos = pos; + p->tok = tok; + if (MDOC_TEXT != (p->type = type)) + assert(p->tok >= 0); - 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 *m, 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->type = MDOC_BODY; - p->data.body.tok = tok; - - mdoc_node_append(mdoc, pos, p); + p = node_alloc(m, line, pos, tok, MDOC_TAIL); + if (NULL == p) + return(0); + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_CHILD; + return(1); } -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 *m, int line, int pos, int tok) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + assert(m->first); + assert(m->last); - 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); + p = node_alloc(m, line, pos, tok, MDOC_HEAD); + if (NULL == p) + return(0); + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_CHILD; + return(1); } -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 *m, 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); - - mdoc_node_append(mdoc, pos, p); + p = node_alloc(m, line, pos, tok, MDOC_BODY); + if (NULL == p) + return(0); + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_CHILD; + return(1); } -void -mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word) +int +mdoc_block_alloc(struct mdoc *m, int line, int pos, + int tok, struct mdoc_arg *args) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); - p->type = MDOC_TEXT; - p->data.text.string = xstrdup(word); - - mdoc_node_append(mdoc, pos, p); + p = node_alloc(m, line, pos, tok, MDOC_BLOCK); + if (NULL == p) + return(0); + p->args = args; + if (p->args) + (args->refcnt)++; + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_CHILD; + return(1); } -static void -argfree(size_t sz, struct mdoc_arg *p) +int +mdoc_elem_alloc(struct mdoc *m, int line, int pos, + int tok, struct mdoc_arg *args) { - int i, j; + struct mdoc_node *p; - if (0 == sz) - return; - - assert(p); - /* LINTED */ - for (i = 0; i < (int)sz; i++) - if (p[i].sz > 0) { - assert(p[i].value); - /* LINTED */ - for (j = 0; j < (int)p[i].sz; j++) - free(p[i].value[j]); - } - free(p); + p = node_alloc(m, line, pos, tok, MDOC_ELEM); + if (NULL == p) + return(0); + p->args = args; + if (p->args) + (args->refcnt)++; + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_CHILD; + return(1); } -static void -mdoc_elem_free(struct mdoc_elem *p) +static int +pstring(struct mdoc *m, int line, int pos, const char *p, size_t len) { + struct mdoc_node *n; + size_t sv; - paramfree(p->sz, p->args); - argfree(p->argc, p->argv); -} + n = node_alloc(m, line, pos, -1, MDOC_TEXT); + if (NULL == n) + return(mdoc_nerr(m, m->last, EMALLOC)); + n->string = malloc(len + 1); + if (NULL == n->string) { + free(n); + return(mdoc_nerr(m, m->last, EMALLOC)); + } -static void -mdoc_block_free(struct mdoc_block *p) -{ + sv = strlcpy(n->string, p, len + 1); - argfree(p->argc, p->argv); -} + /* Prohibit truncation. */ + assert(sv < len + 1); - -static void -mdoc_text_free(struct mdoc_text *p) -{ - - if (p->string) - free(p->string); + if ( ! node_append(m, n)) + return(0); + m->next = MDOC_NEXT_SIBLING; + return(1); } -static void -mdoc_head_free(struct mdoc_head *p) +int +mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) { - paramfree(p->sz, p->args); + return(pstring(m, line, pos, p, strlen(p))); } @@ -637,28 +580,17 @@ 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->parent) + p->parent->nchild--; + 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) { @@ -667,77 +599,158 @@ mdoc_node_freelist(struct mdoc_node *p) if (p->next) mdoc_node_freelist(p->next); + assert(0 == p->nchild); mdoc_node_free(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 *m, int line, char *buf) { + int i, j; - return(mdoc_hash_find(mdoc->htab, key)); + if (SEC_NONE == m->lastnamed) + return(mdoc_perr(m, line, 0, ETEXTPROL)); + + /* + * If in literal mode, then pass the buffer directly to the + * back-end, as it should be preserved as a single term. + */ + + if (MDOC_LITERAL & m->flags) + return(mdoc_word_alloc(m, line, 0, buf)); + + /* Disallow blank/white-space lines in non-literal mode. */ + + for (i = 0; ' ' == buf[i]; i++) + /* Skip leading whitespace. */ ; + if (0 == buf[i]) + return(mdoc_perr(m, line, 0, ENOBLANK)); + + /* + * Break apart a free-form line into tokens. Spaces are + * stripped out of the input. + */ + + for (j = i; buf[i]; i++) { + if (' ' != buf[i]) + continue; + + /* Escaped whitespace. */ + if (i && ' ' == buf[i] && '\\' == buf[i - 1]) + continue; + + buf[i++] = 0; + if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) + return(0); + + for ( ; ' ' == buf[i]; i++) + /* Skip trailing whitespace. */ ; + + j = i; + if (0 == buf[i]) + break; + } + + if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) + return(0); + + m->next = MDOC_NEXT_SIBLING; + return(1); } -static void -argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src) -{ - int i; - dst->arg = src->arg; - if (0 == (dst->sz = src->sz)) - return; - dst->value = xcalloc(dst->sz, sizeof(char *)); - for (i = 0; i < (int)dst->sz; i++) - dst->value[i] = xstrdup(src->value[i]); +static int +macrowarn(struct mdoc *m, int ln, const char *buf) +{ + if ( ! (MDOC_IGN_MACRO & m->pflags)) + return(mdoc_verr(m, ln, 0, + "unknown macro: %s%s", + buf, strlen(buf) > 3 ? "..." : "")); + return(mdoc_vwarn(m, ln, 0, "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; - int i; + int i, j, c; + char mac[5]; - if (0 == argsz) - return(NULL); + /* Empty lines are ignored. */ - pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg)); - for (i = 0; i < (int)argsz; i++) - argcpy(&pp[i], &args[i]); + if (0 == buf[1]) + return(1); - return(pp); -} + i = 1; + /* Accept whitespace after the initial control char. */ -static void -paramfree(size_t sz, char **p) -{ - int i; + if (' ' == buf[i]) { + i++; + while (buf[i] && ' ' == buf[i]) + i++; + if (0 == buf[i]) + return(1); + } - if (0 == sz) - return; + /* Copy the first word into a nil-terminated buffer. */ - assert(p); - /* LINTED */ - for (i = 0; i < (int)sz; i++) - free(p[i]); - free(p); -} + for (j = 0; j < 4; j++, i++) { + if (0 == (mac[j] = buf[i])) + break; + else if (' ' == buf[i]) + break; + /* Check for invalid characters. */ -static char ** -paramdup(size_t sz, const char **p) -{ - char **pp; - int i; + if (isgraph((u_char)buf[i])) + continue; + return(mdoc_perr(m, ln, i, EPRINT)); + } - if (0 == sz) - return(NULL); + mac[j] = 0; - pp = xcalloc(sz, sizeof(char *)); - for (i = 0; i < (int)sz; i++) - pp[i] = xstrdup(p[i]); + if (j == 4 || j < 2) { + if ( ! macrowarn(m, ln, mac)) + goto err; + return(1); + } + + if (MDOC_MAX == (c = mdoc_hash_find(mac))) { + if ( ! macrowarn(m, ln, mac)) + goto err; + return(1); + } - return(pp); + /* The macro is sane. Jump to the next word. */ + + while (buf[i] && ' ' == buf[i]) + i++; + + /* + * Begin recursive parse sequence. Since we're at the start of + * the line, we don't need to do callable/parseable checks. + */ + if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) + goto err; + + return(1); + +err: /* Error out. */ + + m->flags |= MDOC_HALT; + return(0); } + +