=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.6 retrieving revision 1.31 diff -u -p -r1.6 -r1.31 --- mandoc/Attic/validate.c 2008/11/30 20:53:34 1.6 +++ mandoc/Attic/validate.c 2009/01/16 11:50:54 1.31 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.6 2008/11/30 20:53:34 kristaps Exp $ */ +/* $Id: validate.c,v 1.31 2009/01/16 11:50:54 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,455 +16,684 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#include - #include -#include -#include -#include #include -#include -#include "libmdocml.h" #include "private.h" -#define INDENT 4 -#define COLUMNS 72 -#ifdef __linux__ /* FIXME */ -#define strlcat strncat -#endif +typedef int (*v_pre)(struct mdoc *, struct mdoc_node *); +typedef int (*v_post)(struct mdoc *); -enum md_tok { - MD_BLKIN, - MD_BLKOUT, - MD_IN, - MD_OUT, - MD_TEXT + +struct valids { + v_pre *pre; + v_post *post; }; -struct md_valid { - const struct md_args *args; - const struct md_rbuf *rbuf; - struct md_mbuf *mbuf; - struct rofftree *tree; - size_t indent; - size_t pos; - enum md_tok last; - int flags; -#define MD_LITERAL (1 << 0) /* FIXME */ -}; +static int pre_display(struct mdoc *, struct mdoc_node *); +static int pre_bd(struct mdoc *, struct mdoc_node *); +static int pre_bl(struct mdoc *, struct mdoc_node *); +static int pre_it(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); -static void roffmsg(void *arg, enum roffmsg, - const char *, const char *, char *); -static int roffhead(void *); -static int rofftail(void *); -static int roffin(void *, int, int, int *, char **); -static int roffdata(void *, int, char *); -static int roffout(void *, int); -static int roffblkin(void *, int, int *, char **); -static int roffblkout(void *, int); -static int roffspecial(void *, int); +static int headchild_err_ge1(struct mdoc *); +static int headchild_warn_ge1(struct mdoc *); +static int headchild_err_eq0(struct mdoc *); +static int elemchild_err_eq0(struct mdoc *); +static int elemchild_err_ge1(struct mdoc *); +static int elemchild_warn_eq0(struct mdoc *); +static int bodychild_warn_ge1(struct mdoc *); +static int bodychild_err_eq0(struct mdoc *); +static int elemchild_warn_ge1(struct mdoc *); +static int post_sh(struct mdoc *); +static int post_bl(struct mdoc *); +static int post_it(struct mdoc *); -static int mbuf_newline(struct md_valid *); -static int mbuf_indent(struct md_valid *); -static int mbuf_data(struct md_valid *, int, char *); -static int mbuf_putstring(struct md_valid *, - const char *); -static int mbuf_nputstring(struct md_valid *, - const char *, size_t); +static v_pre pres_prologue[] = { pre_prologue, NULL }; +static v_pre pres_d1[] = { pre_display, NULL }; +static v_pre pres_bd[] = { pre_display, pre_bd, NULL }; +static v_pre pres_bl[] = { pre_bl, NULL }; +static v_pre pres_it[] = { pre_it, NULL }; +static v_post posts_bd[] = { headchild_err_eq0, bodychild_warn_ge1, NULL }; +static v_post posts_text[] = { elemchild_err_ge1, NULL }; +static v_post posts_wtext[] = { elemchild_warn_ge1, NULL }; +static v_post posts_notext[] = { elemchild_err_eq0, NULL }; +static v_post posts_wline[] = { headchild_warn_ge1, bodychild_err_eq0, NULL }; +static v_post posts_sh[] = { headchild_err_ge1, bodychild_warn_ge1, post_sh, NULL }; +static v_post posts_bl[] = { headchild_err_eq0, bodychild_warn_ge1, post_bl, NULL }; +static v_post posts_it[] = { post_it, NULL }; +static v_post posts_ss[] = { headchild_err_ge1, NULL }; +static v_post posts_pp[] = { elemchild_warn_eq0, NULL }; +static v_post posts_d1[] = { headchild_err_ge1, NULL }; + +const struct valids mdoc_valids[MDOC_MAX] = { + { NULL, NULL }, /* \" */ + { pres_prologue, posts_text }, /* Dd */ + { pres_prologue, NULL }, /* Dt */ + { pres_prologue, NULL }, /* Os */ + /* FIXME: preceding Pp. */ + /* FIXME: NAME section internal ordering. */ + /* FIXME: can only be a child of root. */ + { NULL, posts_sh }, /* Sh */ + /* FIXME: preceding Pp. */ + /* FIXME: can only be a child of Sh. */ + { NULL, posts_ss }, /* Ss */ + /* FIXME: proceeding... */ + { NULL, posts_pp }, /* Pp */ + { pres_d1, posts_d1 }, /* D1 */ + { pres_d1, posts_d1 }, /* Dl */ + /* FIXME: preceding Pp. */ + { pres_bd, posts_bd }, /* Bd */ + { NULL, NULL }, /* Ed */ + /* FIXME: preceding Pp. */ + { pres_bl, posts_bl }, /* Bl */ + { NULL, NULL }, /* El */ + { pres_it, posts_it }, /* It */ + { NULL, posts_text }, /* Ad */ + /* FIXME */ + { NULL, NULL }, /* An */ + { NULL, NULL }, /* Ar */ + + { NULL, posts_text }, /* Cd */ /* FIXME: section 4 only. */ + { NULL, NULL }, /* Cm */ + { NULL, posts_text }, /* Dv */ + { NULL, posts_text }, /* Er */ /* FIXME: section 2 only. */ + { NULL, posts_text }, /* Ev */ + { NULL, posts_notext }, /* Ex */ /* FIXME: sections 1,6,8 only. */ /* -std required */ + { NULL, posts_text }, /* Fa */ + { NULL, NULL }, /* Fd */ /* FIXME: SYNOPSIS section. */ + { NULL, NULL }, /* Fl */ + { NULL, posts_text }, /* Fn */ + { NULL, NULL }, /* Ft */ + { NULL, posts_text }, /* Ic */ + { NULL, posts_wtext }, /* In */ + { NULL, posts_text }, /* Li */ + { NULL, posts_wtext }, /* Nd */ + { NULL, NULL }, /* Nm */ /* FIXME: If name not set? */ + { NULL, posts_wline }, /* Op */ + { NULL, NULL }, /* Ot */ + { NULL, NULL }, /* Pa */ + { NULL, posts_notext }, /* Rv */ /* -std required */ + { NULL, posts_notext }, /* St */ /* arg required */ + { NULL, posts_text }, /* Va */ + { NULL, posts_text }, /* Vt */ + { NULL, NULL }, /* Xr */ /* FIXME */ + { NULL, posts_text }, /* %A */ + { NULL, posts_text }, /* %B */ + { NULL, posts_text }, /* %D */ + { NULL, posts_text }, /* %I */ + { NULL, posts_text }, /* %J */ + { NULL, posts_text }, /* %N */ + { NULL, posts_text }, /* %O */ + { NULL, posts_text }, /* %P */ + { NULL, posts_text }, /* %R */ + { NULL, posts_text }, /* %T */ + { NULL, posts_text }, /* %V */ + { NULL, NULL }, /* Ac */ + { NULL, NULL }, /* Ao */ + { NULL, posts_wline }, /* Aq */ + { NULL, NULL }, /* At */ /* FIXME */ + { NULL, NULL }, /* Bc */ + { NULL, NULL }, /* Bf */ + { NULL, NULL }, /* Bo */ + { NULL, posts_wline }, /* Bq */ + { NULL, NULL }, /* Bsx */ + { NULL, NULL }, /* Bx */ + { NULL, NULL }, /* Db */ /* FIXME: boolean */ + { NULL, NULL }, /* Dc */ + { NULL, NULL }, /* Do */ + { NULL, posts_wline }, /* Dq */ + { NULL, NULL }, /* Ec */ + { NULL, NULL }, /* Ef */ /* -symbolic, etc. */ + { NULL, posts_text }, /* Em */ + { NULL, NULL }, /* Eo */ + { NULL, NULL }, /* Fx */ + { NULL, posts_text }, /* Ms */ /* FIXME: which symbols? */ + { NULL, posts_notext }, /* No */ + { NULL, posts_notext }, /* Ns */ + { NULL, NULL }, /* Nx */ + { NULL, NULL }, /* Ox */ + { NULL, NULL }, /* Pc */ + { NULL, NULL }, /* Pf */ /* FIXME: 2 or more arguments */ + { NULL, NULL }, /* Po */ + { NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */ + { NULL, NULL }, /* Qc */ + { NULL, posts_wline }, /* Ql */ + { NULL, NULL }, /* Qo */ + { NULL, posts_wline }, /* Qq */ + { NULL, NULL }, /* Re */ + { NULL, NULL }, /* Rs */ + { NULL, NULL }, /* Sc */ + { NULL, NULL }, /* So */ + { NULL, posts_wline }, /* Sq */ + { NULL, NULL }, /* Sm */ /* FIXME: boolean */ + { NULL, posts_text }, /* Sx */ + { NULL, posts_text }, /* Sy */ + { NULL, posts_text }, /* Tn */ + { NULL, NULL }, /* Ux */ + { NULL, NULL }, /* Xc */ + { NULL, NULL }, /* Xo */ + { NULL, NULL }, /* Fo */ + { NULL, NULL }, /* Fc */ + { NULL, NULL }, /* Oo */ + { NULL, NULL }, /* Oc */ + { NULL, NULL }, /* Bk */ + { NULL, NULL }, /* Ek */ + { NULL, posts_notext }, /* Bt */ + { NULL, NULL }, /* Hf */ + { NULL, NULL }, /* Fr */ + { NULL, posts_notext }, /* Ud */ +}; + + static int -mbuf_putstring(struct md_valid *p, const char *buf) +bodychild_err_eq0(struct mdoc *mdoc) { - return(mbuf_nputstring(p, buf, strlen(buf))); + if (MDOC_BODY != mdoc->last->type) + return(1); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children")); } static int -mbuf_nputstring(struct md_valid *p, const char *buf, size_t sz) +bodychild_warn_ge1(struct mdoc *mdoc) { - p->pos += sz; - return(md_buf_puts(p->mbuf, buf, sz)); + if (MDOC_BODY != mdoc->last->type) + return(1); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more body children")); } static int -mbuf_indent(struct md_valid *p) +elemchild_warn_eq0(struct mdoc *mdoc) { - size_t i; - assert(p->pos == 0); - - /* LINTED */ - for (i = 0; i < MIN(p->indent, INDENT); i++) - if ( ! md_buf_putstring(p->mbuf, " ")) - return(0); - - p->pos += i * INDENT; - return(1); + assert(MDOC_ELEM == mdoc->last->type); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_pwarn(mdoc, mdoc->last->child->line, + mdoc->last->child->pos, WARN_SYNTAX, "macro suggests no parameters")); } static int -mbuf_newline(struct md_valid *p) +elemchild_warn_ge1(struct mdoc *mdoc) { - if ( ! md_buf_putchar(p->mbuf, '\n')) - return(0); - - p->pos = 0; - return(1); + assert(MDOC_ELEM == mdoc->last->type); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters")); } static int -mbuf_data(struct md_valid *p, int space, char *buf) +elemchild_err_eq0(struct mdoc *mdoc) { - size_t sz; - char *bufp; - assert(p->mbuf); - assert(0 != p->indent); + assert(MDOC_ELEM == mdoc->last->type); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects no parameters")); +} - /* - * FIXME: punctuation/no-space stuff shouldn't have a newline - * before it. - */ - if (MD_LITERAL & p->flags) - return(mbuf_putstring(p, buf)); +static int +elemchild_err_ge1(struct mdoc *mdoc) +{ - while (*buf) { - while (*buf && isspace(*buf)) - buf++; + assert(MDOC_ELEM == mdoc->last->type); + if (mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects one or more parameters")); +} - if (0 == *buf) - break; - bufp = buf; - while (*buf && ! isspace(*buf)) - buf++; +static int +headchild_err_eq0(struct mdoc *mdoc) +{ - if (0 != *buf) - *buf++ = 0; + if (MDOC_HEAD != mdoc->last->type) + return(1); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_perr(mdoc, mdoc->last->child->line, + mdoc->last->child->pos, "macro expects no parameters")); +} - sz = strlen(bufp); - if (0 == p->pos) { - if ( ! mbuf_indent(p)) - return(0); - if ( ! mbuf_nputstring(p, bufp, sz)) - return(0); - if (p->indent * INDENT + sz >= COLUMNS) { - if ( ! mbuf_newline(p)) - return(0); - continue; - } - continue; - } +static int +headchild_warn_ge1(struct mdoc *mdoc) +{ - if (sz + p->pos >= COLUMNS) { - if ( ! mbuf_newline(p)) - return(0); - if ( ! mbuf_indent(p)) - return(0); - } else if (space) - if ( ! mbuf_nputstring(p, " ", 1)) - return(0); - - if ( ! mbuf_nputstring(p, bufp, sz)) - return(0); - } - - return(1); + if (MDOC_HEAD != mdoc->last->type) + return(1); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters")); } -int -md_line_valid(void *arg, char *buf) +static int +headchild_err_ge1(struct mdoc *mdoc) { - struct md_valid *p; - p = (struct md_valid *)arg; - return(roff_engine(p->tree, buf)); + if (MDOC_HEAD != mdoc->last->type) + return(1); + if (mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects one or more parameters")); } -int -md_exit_valid(void *data, int flush) +static int +pre_display(struct mdoc *mdoc, struct mdoc_node *node) { - int c; - struct md_valid *p; + struct mdoc_node *n; - p = (struct md_valid *)data; - c = roff_free(p->tree, flush); - free(p); + if (MDOC_BLOCK != node->type) + return(1); - return(c); + for (n = mdoc->last; n; n = n->parent) + if (MDOC_BLOCK == n->type) + if (MDOC_Bd == n->tok) + break; + if (NULL == n) + return(1); + return(mdoc_nerr(mdoc, node, "displays may not be nested")); } -void * -md_init_valid(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) +static int +pre_bl(struct mdoc *mdoc, struct mdoc_node *node) { - struct roffcb cb; - struct md_valid *p; + int type, err; + struct mdoc_arg *argv; + size_t i, argc; - cb.roffhead = roffhead; - cb.rofftail = rofftail; - cb.roffin = roffin; - cb.roffout = roffout; - cb.roffblkin = roffblkin; - cb.roffblkout = roffblkout; - cb.roffspecial = roffspecial; - cb.roffmsg = roffmsg; - cb.roffdata = roffdata; + if (MDOC_BLOCK != node->type) + return(1); + assert(MDOC_Bl == node->tok); - if (NULL == (p = calloc(1, sizeof(struct md_valid)))) - err(1, "malloc"); + argv = NULL; + argc = node->data.block.argc; - p->args = args; - p->mbuf = mbuf; - p->rbuf = rbuf; - - assert(mbuf); - - if (NULL == (p->tree = roff_alloc(&cb, p))) { - free(p); - return(NULL); + for (i = type = err = 0; i < argc; i++) { + argv = &node->data.block.argv[(int)i]; + assert(argv); + switch (argv->arg) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Ohang): + /* FALLTHROUGH */ + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Column): + if (type) + err++; + type++; + break; + default: + break; + } } - - return(p); + if (0 == type) + return(mdoc_err(mdoc, "no list type specified")); + if (0 == err) + return(1); + assert(argv); + return(mdoc_perr(mdoc, argv->line, + argv->pos, "only one list type possible")); } -/* ARGSUSED */ static int -roffhead(void *arg) +pre_bd(struct mdoc *mdoc, struct mdoc_node *node) { - struct md_valid *p; + int type, err; + struct mdoc_arg *argv; + size_t i, argc; - assert(arg); - p = (struct md_valid *)arg; + if (MDOC_BLOCK != node->type) + return(1); + assert(MDOC_Bd == node->tok); - if ( ! mbuf_putstring(p, "\n")) - return(0); - if ( ! mbuf_nputstring(p, "", 6)) - return(0); + argv = NULL; + argc = node->data.block.argc; - p->indent++; - return(mbuf_newline(p)); + for (err = i = type = 0; 0 == err && i < argc; i++) { + argv = &node->data.block.argv[(int)i]; + assert(argv); + switch (argv->arg) { + case (MDOC_Ragged): + /* FALLTHROUGH */ + case (MDOC_Unfilled): + /* FALLTHROUGH */ + case (MDOC_Filled): + /* FALLTHROUGH */ + case (MDOC_Literal): + /* FALLTHROUGH */ + case (MDOC_File): + if (type) + err++; + type++; + break; + default: + break; + } + } + if (0 == type) + return(mdoc_err(mdoc, "no display type specified")); + if (0 == err) + return(1); + assert(argv); + return(mdoc_perr(mdoc, argv->line, + argv->pos, "only one display type possible")); } static int -rofftail(void *arg) +pre_it(struct mdoc *mdoc, struct mdoc_node *node) { - struct md_valid *p; - assert(arg); - p = (struct md_valid *)arg; + if (MDOC_BLOCK != mdoc->last->type) + return(1); + assert(MDOC_It == mdoc->last->tok); - if (0 != p->pos && ! mbuf_newline(p)) - return(0); + if (MDOC_BODY != mdoc->last->parent->type) + return(mdoc_nerr(mdoc, node, "invalid macro parent `%s'", mdoc_macronames[mdoc->last->parent->tok])); + if (MDOC_Bl != mdoc->last->parent->tok) + return(mdoc_nerr(mdoc, node, "invalid macro parent `%s'", mdoc_macronames[mdoc->last->parent->tok])); - if ( ! mbuf_nputstring(p, "", 7)) - return(0); - return(mbuf_newline(p)); + return(1); } -/* ARGSUSED */ static int -roffspecial(void *arg, int tok) +pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) { - return(1); + if (SEC_PROLOGUE != mdoc->sec_lastn) + return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue")); + assert(MDOC_ELEM == node->type); + + /* Check for ordering. */ + + switch (node->tok) { + case (MDOC_Os): + if (mdoc->meta.title[0] && mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); + case (MDOC_Dt): + if (0 == mdoc->meta.title[0] && mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); + case (MDOC_Dd): + if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); + default: + abort(); + /* NOTREACHED */ + } + + /* Check for repetition. */ + + switch (node->tok) { + case (MDOC_Os): + if (0 == mdoc->meta.os[0]) + return(1); + break; + case (MDOC_Dd): + if (0 == mdoc->meta.date) + return(1); + break; + case (MDOC_Dt): + if (0 == mdoc->meta.title[0]) + return(1); + break; + default: + abort(); + /* NOTREACHED */ + } + + return(mdoc_nerr(mdoc, node, "prologue macro repeated")); } +/* Warn if `Bl' type-specific syntax isn't reflected in items. */ static int -roffblkin(void *arg, int tok, int *argc, char **argv) +post_it(struct mdoc *mdoc) { - struct md_valid *p; - int i; + int type, sv; +#define TYPE_NONE (0) +#define TYPE_BODY (1) +#define TYPE_HEAD (2) + size_t i, argc; + struct mdoc_node *n; - assert(arg); - p = (struct md_valid *)arg; + if (MDOC_BLOCK != mdoc->last->type) + return(1); - if (0 != p->pos) { - if ( ! mbuf_newline(p)) - return(0); - if ( ! mbuf_indent(p)) - return(0); - } else if ( ! mbuf_indent(p)) - return(0); + assert(MDOC_It == mdoc->last->tok); - if ( ! mbuf_nputstring(p, "<", 1)) - return(0); - if ( ! mbuf_putstring(p, toknames[tok])) - return(0); + n = mdoc->last->parent; + assert(n); + assert(MDOC_Bl == n->tok); - for (i = 0; ROFF_ARGMAX != argc[i]; i++) { - if ( ! mbuf_nputstring(p, " ", 1)) - return(0); - if ( ! mbuf_putstring(p, tokargnames[argc[i]])) - return(0); - if ( ! mbuf_nputstring(p, "=\"", 2)) - return(0); - if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) - return(0); - if ( ! mbuf_nputstring(p, "\"", 1)) - return(0); - } + n = n->parent; + assert(MDOC_BLOCK == n->type); + assert(MDOC_Bl == n->tok); - if ( ! mbuf_nputstring(p, ">", 1)) - return(0); - if ( ! mbuf_newline(p)) - return(0); + argc = n->data.block.argc; + type = TYPE_NONE; + + /* Some types require block-head, some not. */ - p->indent++; - return(1); -} + for (i = 0; TYPE_NONE == type && i < argc; i++) + switch (n->data.block.argv[(int)i].arg) { + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Ohang): + /* FALLTHROUGH */ + case (MDOC_Inset): + type = TYPE_HEAD; + sv = n->data.block.argv[(int)i].arg; + break; + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Column): + type = TYPE_BODY; + sv = n->data.block.argv[(int)i].arg; + break; + default: + break; + } + assert(TYPE_NONE != type); -static int -roffblkout(void *arg, int tok) -{ - struct md_valid *p; + if (TYPE_HEAD == type) { + if (NULL == (n = mdoc->last->data.block.head)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); - assert(arg); - p = (struct md_valid *)arg; + if (NULL == (n = mdoc->last->data.block.body)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) + return(0); + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) + return(0); - p->indent--; + return(1); + } - if (0 != p->pos) { - if ( ! mbuf_newline(p)) + if (NULL == (n = mdoc->last->data.block.head)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) return(0); - if ( ! mbuf_indent(p)) + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) return(0); - } else if ( ! mbuf_indent(p)) - return(0); - if ( ! mbuf_nputstring(p, "", 1)) - return(0); - if ( ! mbuf_newline(p)) - return(0); + if ((n = mdoc->last->data.block.body) && n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) + return(0); - return(1); -} + if (MDOC_Column != sv) + return(1); + /* Make sure the number of columns is sane. */ -static int -roffin(void *arg, int tok, int space, int *argc, char **argv) -{ - struct md_valid *p; - int i; + sv = mdoc->last->parent->parent->data.block.argv->sz; + n = mdoc->last->data.block.head->child; - assert(arg); - p = (struct md_valid *)arg; + for (i = 0; n; n = n->next) + i++; - if (0 == p->pos && ! mbuf_indent(p)) - return(0); + if (i == (size_t)sv) + return(1); + return(mdoc_err(mdoc, "expected %d list columns, have %d", sv, (int)i)); - /* - * FIXME: put into a buffer before writing (check line length). - */ +#undef TYPE_NONE +#undef TYPE_BODY +#undef TYPE_HEAD +} - if (space && ! mbuf_nputstring(p, " ", 1)) - return(0); - if ( ! mbuf_nputstring(p, "<", 1)) - return(0); - if ( ! mbuf_putstring(p, toknames[tok])) - return(0); - for (i = 0; ROFF_ARGMAX != argc[i]; i++) { - if ( ! mbuf_nputstring(p, " ", 1)) - return(0); - if ( ! mbuf_putstring(p, tokargnames[argc[i]])) - return(0); - if ( ! mbuf_nputstring(p, "=\"", 2)) - return(0); - if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) - return(0); - if ( ! mbuf_nputstring(p, "\"", 1)) - return(0); - } +/* Make sure that only `It' macros are our body-children. */ +static int +post_bl(struct mdoc *mdoc) +{ + struct mdoc_node *n; - return(mbuf_nputstring(p, ">", 1)); + if (MDOC_BODY != mdoc->last->type) + return(1); + assert(MDOC_Bl == mdoc->last->tok); + + for (n = mdoc->last->child; n; n = n->next) { + if (MDOC_BLOCK == n->type) + if (MDOC_It == n->tok) + continue; + break; + } + if (NULL == n) + return(1); + return(mdoc_nerr(mdoc, n, "invalid child of parent macro `Bl'")); } +/* Warn if conventional sections are out of order. */ static int -roffout(void *arg, int tok) +post_sh(struct mdoc *mdoc) { - struct md_valid *p; + enum mdoc_sec sec; + int i; + struct mdoc_node *n; + char *args[MDOC_LINEARG_MAX]; - assert(arg); - p = (struct md_valid *)arg; + if (MDOC_HEAD != mdoc->last->type) + return(1); + + assert(MDOC_Sh == mdoc->last->tok); - if (0 == p->pos && ! mbuf_indent(p)) - return(0); + n = mdoc->last->child; + assert(n); - if ( ! mbuf_nputstring(p, "", 1)); + for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) { + assert(MDOC_TEXT == n->type); + assert(NULL == n->child); + assert(n->data.text.string); + args[i] = n->data.text.string; + } + + sec = mdoc_atosec((size_t)i, (const char **)args); + if (SEC_CUSTOM == sec) + return(1); + if (sec > mdoc->sec_lastn) + return(1); + + if (sec == mdoc->sec_lastn) + return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated")); + return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order")); } -static void -roffmsg(void *arg, enum roffmsg lvl, - const char *buf, const char *pos, char *msg) +int +mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node) { - char *level; - struct md_valid *p; + v_pre *p; - assert(arg); - p = (struct md_valid *)arg; + /* TODO: character-escape checks. */ - switch (lvl) { - case (ROFF_WARN): - if ( ! (MD_WARN_ALL & p->args->warnings)) - return; - level = "warning"; - break; - case (ROFF_ERROR): - level = "error"; - break; - default: - abort(); - } - - if (pos) - (void)fprintf(stderr, "%s:%zu: %s: %s (column %zu)\n", - p->rbuf->name, p->rbuf->line, level, - msg, pos - buf); - else - (void)fprintf(stderr, "%s: %s: %s\n", - p->rbuf->name, level, msg); + if (MDOC_TEXT == node->type) + return(1); + assert(MDOC_ROOT != node->type); + if (NULL == mdoc_valids[node->tok].pre) + return(1); + for (p = mdoc_valids[node->tok].pre; *p; p++) + if ( ! (*p)(mdoc, node)) + return(0); + return(1); } -static int -roffdata(void *arg, int space, char *buf) +int +mdoc_valid_post(struct mdoc *mdoc) { - struct md_valid *p; + v_post *p; - assert(arg); - p = (struct md_valid *)arg; - return(mbuf_data(p, space, buf)); + if (MDOC_TEXT == mdoc->last->type) + return(1); + if (MDOC_ROOT == mdoc->last->type) + return(1); + + if (NULL == mdoc_valids[mdoc->last->tok].post) + return(1); + for (p = mdoc_valids[mdoc->last->tok].post; *p; p++) + if ( ! (*p)(mdoc)) + return(0); + + return(1); } +