=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.53 retrieving revision 1.62 diff -u -p -r1.53 -r1.62 --- mandoc/Attic/validate.c 2009/02/23 22:51:10 1.53 +++ mandoc/Attic/validate.c 2009/02/27 09:14:02 1.62 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.53 2009/02/23 22:51:10 kristaps Exp $ */ +/* $Id: validate.c,v 1.62 2009/02/27 09:14:02 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -17,6 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include "private.h" @@ -29,14 +30,15 @@ * the BLOCK case, this is the HEAD, BODY, TAIL and so on. */ -typedef int (*v_pre)(struct mdoc *, struct mdoc_node *); -typedef int (*v_post)(struct mdoc *); +#define PRE_ARGS struct mdoc *mdoc, const struct mdoc_node *n +#define POST_ARGS struct mdoc *mdoc +typedef int (*v_pre)(PRE_ARGS); +typedef int (*v_post)(POST_ARGS); + /* FIXME: some sections should only occur in specific msecs. */ /* FIXME: ignoring Pp. */ /* FIXME: math symbols. */ -/* FIXME: valid character-escape checks. */ -/* FIXME: .Fd only in synopsis section. */ struct valids { v_pre *pre; @@ -45,12 +47,15 @@ struct valids { /* Utility checks. */ -static int check_parent(struct mdoc *, struct mdoc_node *, - int, enum mdoc_type); -static int check_msec(struct mdoc *, struct mdoc_node *, - int, enum mdoc_msec *); -static int check_stdarg(struct mdoc *, struct mdoc_node *); +static int check_parent(PRE_ARGS, int, enum mdoc_type); +static int check_msec(PRE_ARGS, int, enum mdoc_msec *); +static int check_stdarg(PRE_ARGS); + +static int check_text(struct mdoc *, + size_t, size_t, const char *); + static int err_child_lt(struct mdoc *, const char *, int); +static int warn_child_lt(struct mdoc *, const char *, int); static int err_child_gt(struct mdoc *, const char *, int); static int warn_child_gt(struct mdoc *, const char *, int); static int err_child_eq(struct mdoc *, const char *, int); @@ -66,50 +71,53 @@ static inline int err_count(struct mdoc *, const char /* Specific pre-child-parse routines. */ -static int pre_display(struct mdoc *, struct mdoc_node *); -static int pre_sh(struct mdoc *, struct mdoc_node *); -static int pre_ss(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_cd(struct mdoc *, struct mdoc_node *); -static int pre_er(struct mdoc *, struct mdoc_node *); -static int pre_ex(struct mdoc *, struct mdoc_node *); -static int pre_rv(struct mdoc *, struct mdoc_node *); -static int pre_an(struct mdoc *, struct mdoc_node *); -static int pre_st(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 int pre_display(PRE_ARGS); +static int pre_sh(PRE_ARGS); +static int pre_ss(PRE_ARGS); +static int pre_bd(PRE_ARGS); +static int pre_bl(PRE_ARGS); +static int pre_it(PRE_ARGS); +static int pre_cd(PRE_ARGS); +static int pre_er(PRE_ARGS); +static int pre_ex(PRE_ARGS); +static int pre_rv(PRE_ARGS); +static int pre_an(PRE_ARGS); +static int pre_st(PRE_ARGS); +static int pre_prologue(PRE_ARGS); +static int pre_prologue(PRE_ARGS); +static int pre_prologue(PRE_ARGS); /* Specific post-child-parse routines. */ -static int herr_ge1(struct mdoc *); -static int herr_le1(struct mdoc *); -static int herr_eq0(struct mdoc *); -static int eerr_eq0(struct mdoc *); -static int eerr_le1(struct mdoc *); -static int eerr_le2(struct mdoc *); -static int eerr_eq1(struct mdoc *); -static int eerr_ge1(struct mdoc *); -static int ewarn_eq0(struct mdoc *); -static int ewarn_eq1(struct mdoc *); -static int bwarn_ge1(struct mdoc *); -static int ewarn_ge1(struct mdoc *); -static int ebool(struct mdoc *); -static int post_sh(struct mdoc *); -static int post_sh_body(struct mdoc *); -static int post_sh_head(struct mdoc *); -static int post_bl(struct mdoc *); -static int post_it(struct mdoc *); -static int post_ex(struct mdoc *); -static int post_an(struct mdoc *); -static int post_at(struct mdoc *); -static int post_xr(struct mdoc *); -static int post_nm(struct mdoc *); -static int post_bf(struct mdoc *); -static int post_root(struct mdoc *); +static int herr_ge1(POST_ARGS); +static int hwarn_le1(POST_ARGS); +static int herr_eq0(POST_ARGS); +static int eerr_eq0(POST_ARGS); +static int eerr_le1(POST_ARGS); +static int eerr_le2(POST_ARGS); +static int eerr_eq1(POST_ARGS); +static int eerr_ge1(POST_ARGS); +static int ewarn_eq0(POST_ARGS); +static int ewarn_eq1(POST_ARGS); +static int bwarn_ge1(POST_ARGS); +static int hwarn_eq1(POST_ARGS); +static int ewarn_ge1(POST_ARGS); +static int ebool(POST_ARGS); +static int post_sh(POST_ARGS); +static int post_sh_body(POST_ARGS); +static int post_sh_head(POST_ARGS); +static int post_fd(POST_ARGS); +static int post_bl(POST_ARGS); +static int post_it(POST_ARGS); +static int post_ex(POST_ARGS); +static int post_an(POST_ARGS); +static int post_at(POST_ARGS); +static int post_xr(POST_ARGS); +static int post_nm(POST_ARGS); +static int post_bf(POST_ARGS); +static int post_root(POST_ARGS); + /* Collections of pre-child-parse routines. */ static v_pre pres_prologue[] = { pre_prologue, NULL }; @@ -146,10 +154,11 @@ static v_post posts_an[] = { post_an, NULL }; static v_post posts_at[] = { post_at, NULL }; static v_post posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL }; static v_post posts_nm[] = { post_nm, NULL }; -static v_post posts_bf[] = { herr_le1, post_bf, NULL }; +static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; static v_post posts_rs[] = { herr_eq0, bwarn_ge1, NULL }; -static v_post posts_fo[] = { bwarn_ge1, NULL }; +static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; static v_post posts_bk[] = { herr_eq0, bwarn_ge1, NULL }; +static v_post posts_fd[] = { ewarn_ge1, post_fd, NULL }; /* Per-macro pre- and post-child-check routine collections. */ @@ -178,7 +187,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_text }, /* Ev */ { pres_ex, posts_ex }, /* Ex */ { NULL, posts_text }, /* Fa */ - { NULL, posts_wtext }, /* Fd */ + { NULL, posts_fd }, /* Fd */ { NULL, NULL }, /* Fl */ { NULL, posts_text }, /* Fn */ { NULL, posts_wtext }, /* Ft */ @@ -263,13 +272,93 @@ const struct valids mdoc_valids[MDOC_MAX] = { }; +int +mdoc_valid_pre(struct mdoc *mdoc, + const struct mdoc_node *node) +{ + v_pre *p; + struct mdoc_arg *argv; + size_t argc, i, j, line, pos; + const char *tp; + + if (MDOC_TEXT == node->type) { + tp = node->data.text.string; + line = node->line; + pos = node->pos; + return(check_text(mdoc, line, pos, tp)); + } + + if (MDOC_BLOCK == node->type || MDOC_ELEM == node->type) { + argv = MDOC_BLOCK == node->type ? + node->data.block.argv : + node->data.elem.argv; + argc = MDOC_BLOCK == node->type ? + node->data.block.argc : + node->data.elem.argc; + + for (i = 0; i < argc; i++) { + if (0 == argv[i].sz) + continue; + for (j = 0; j < argv[i].sz; j++) { + tp = argv[i].value[j]; + line = argv[i].line; + pos = argv[i].pos; + if ( ! check_text(mdoc, line, pos, tp)) + return(0); + } + } + } + + 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); +} + + +int +mdoc_valid_post(struct mdoc *mdoc) +{ + v_post *p; + + /* + * This check occurs after the macro's children have been filled + * in: postfix validation. Since this happens when we're + * rewinding the scope tree, it's possible to have multiple + * invocations (as by design, for now), we set bit MDOC_VALID to + * indicate that we've validated. + */ + + if (MDOC_VALID & mdoc->last->flags) + return(1); + mdoc->last->flags |= MDOC_VALID; + + if (MDOC_TEXT == mdoc->last->type) + return(1); + if (MDOC_ROOT == mdoc->last->type) + return(post_root(mdoc)); + + 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); +} + + + static inline int warn_count(struct mdoc *m, const char *k, int want, const char *v, int has) { - return(mdoc_warn(m, WARN_SYNTAX, "suggests %s %d %s " - "(has %d)", v, want, k, has)); + return(mdoc_warn(m, WARN_SYNTAX, + "suggests %s %s %d (has %d)", + v, k, want, has)); } @@ -278,8 +367,8 @@ err_count(struct mdoc *m, const char *k, int want, const char *v, int has) { - return(mdoc_err(m, "requires %s %d %s (has %d)", - v, want, k, has)); + return(mdoc_err(m, "requires %s %s %d (has %d)", + v, k, want, has)); } @@ -314,7 +403,7 @@ lvl##_child_##name(struct mdoc *mdoc, const char *p, i #define CHECK_BODY_DEFN(name, lvl, func, num) \ static int \ -b##lvl##_##name(struct mdoc *mdoc) \ +b##lvl##_##name(POST_ARGS) \ { \ if (MDOC_BODY != mdoc->last->type) \ return(1); \ @@ -323,7 +412,7 @@ b##lvl##_##name(struct mdoc *mdoc) \ #define CHECK_ELEM_DEFN(name, lvl, func, num) \ static int \ -e##lvl##_##name(struct mdoc *mdoc) \ +e##lvl##_##name(POST_ARGS) \ { \ assert(MDOC_ELEM == mdoc->last->type); \ return(func(mdoc, "line parameters", (num))); \ @@ -331,11 +420,11 @@ e##lvl##_##name(struct mdoc *mdoc) \ #define CHECK_HEAD_DEFN(name, lvl, func, num) \ static int \ -h##lvl##_##name(struct mdoc *mdoc) \ +h##lvl##_##name(POST_ARGS) \ { \ if (MDOC_HEAD != mdoc->last->type) \ return(1); \ - return(func(mdoc, "multiline parameters", (num))); \ + return(func(mdoc, "line parameters", (num))); \ } @@ -344,6 +433,7 @@ CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */ CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */ CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */ +CHECK_CHILD_DEFN(warn, lt, <) /* warn_child_lt() */ CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0) /* bwarn_ge1() */ CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1) /* ewarn_eq1() */ CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0) /* ewarn_eq0() */ @@ -354,76 +444,120 @@ CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1 CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */ CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0) /* eerr_ge1() */ CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ -CHECK_HEAD_DEFN(le1, err, err_child_lt, 2) /* herr_le1() */ +CHECK_HEAD_DEFN(le1, warn, warn_child_lt, 2) /* hwarn_le1() */ CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0) /* herr_ge1() */ +CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1) /* hwarn_eq1() */ static int -check_stdarg(struct mdoc *mdoc, struct mdoc_node *node) +check_stdarg(PRE_ARGS) { - if (MDOC_Std == node->data.elem.argv[0].arg && - 1 == node->data.elem.argc) + if (MDOC_Std == n->data.elem.argv[0].arg && + 1 == n->data.elem.argc) return(1); - return(mdoc_nwarn(mdoc, node, WARN_COMPAT, + return(mdoc_nwarn(mdoc, n, WARN_COMPAT, "one argument suggested")); } static int -check_msec(struct mdoc *mdoc, struct mdoc_node *node, - int sz, enum mdoc_msec *msecs) +check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs) { int i; for (i = 0; i < sz; i++) if (msecs[i] == mdoc->meta.msec) return(1); - return(mdoc_nwarn(mdoc, node, WARN_COMPAT, - "wrong manual section")); + return(mdoc_nwarn(mdoc, n, WARN_COMPAT, + "invalid manual section")); } static int -pre_display(struct mdoc *mdoc, struct mdoc_node *node) +check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p) { - struct mdoc_node *n; + size_t c; + /* XXX - indicate deprecated escapes \*(xx and \*x. */ + + for ( ; *p; p++) { + if ( ! isprint((int)*p) && '\t' != *p) + return(mdoc_perr(mdoc, line, pos, + "invalid characters")); + if ('\\' != *p) + continue; + if ((c = mdoc_isescape(p))) { + p += (c - 1); + continue; + } + return(mdoc_perr(mdoc, line, pos, + "invalid escape sequence")); + } + + return(1); +} + + + + +static int +check_parent(PRE_ARGS, int tok, enum mdoc_type t) +{ + + assert(n->parent); + if ((MDOC_ROOT == t || tok == n->parent->tok) && + (t == n->parent->type)) + return(1); + + return(mdoc_nerr(mdoc, n, "require parent %s", + MDOC_ROOT == t ? "" : mdoc_macronames[tok])); +} + + + +static int +pre_display(PRE_ARGS) +{ + struct mdoc_node *node; + /* Display elements (`Bd', `D1'...) cannot be nested. */ - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); /* LINTED */ - for (n = mdoc->last->parent; n; n = n->parent) - if (MDOC_BLOCK == n->type) - if (MDOC_Bd == n->tok) + for (node = mdoc->last->parent; node; node = node->parent) + if (MDOC_BLOCK == node->type) + if (MDOC_Bd == node->tok) break; - if (NULL == n) + if (NULL == node) return(1); - return(mdoc_nerr(mdoc, node, "displays may not be nested")); + return(mdoc_nerr(mdoc, n, "displays may not be nested")); } static int -pre_bl(struct mdoc *mdoc, struct mdoc_node *node) +pre_bl(PRE_ARGS) { - int type, err, i; + int type, i, width, offset; struct mdoc_arg *argv; size_t argc; - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); - argc = node->data.block.argc; + argc = n->data.block.argc; /* Make sure that only one type of list is specified. */ + type = offset = width = -1; + /* LINTED */ - for (i = 0, type = err = 0; i < (int)argc; i++) { - argv = &node->data.block.argv[i]; + for (i = 0; i < (int)argc; i++) { + argv = &n->data.block.argv[i]; switch (argv->arg) { case (MDOC_Bullet): @@ -447,38 +581,80 @@ pre_bl(struct mdoc *mdoc, struct mdoc_node *node) case (MDOC_Inset): /* FALLTHROUGH */ case (MDOC_Column): - if (0 == type++) + if (-1 == type) { + type = argv->arg; break; + } return(mdoc_perr(mdoc, argv->line, argv->pos, "multiple types specified")); + case (MDOC_Width): + if (-1 == width) { + width = argv->arg; + break; + } + return(mdoc_perr(mdoc, argv->line, argv->pos, + "multiple -%s arguments", + mdoc_argnames[MDOC_Width])); + case (MDOC_Offset): + if (-1 == offset) { + offset = argv->arg; + break; + } + return(mdoc_perr(mdoc, argv->line, argv->pos, + "multiple -%s arguments", + mdoc_argnames[MDOC_Offset])); default: break; } } - if (type) - return(1); - return(mdoc_err(mdoc, "no type specified")); + if (-1 == type) + return(mdoc_err(mdoc, "no type specified")); + + switch (type) { + case (MDOC_Column): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Item): + if (-1 == width) + break; + return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, + "superfluous -%s argument", + mdoc_argnames[MDOC_Width])); + case (MDOC_Tag): + if (-1 != width) + break; + return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, + "suggest -%s argument", + mdoc_argnames[MDOC_Width])); + default: + break; + } + + return(1); } static int -pre_bd(struct mdoc *mdoc, struct mdoc_node *node) +pre_bd(PRE_ARGS) { int type, err, i; struct mdoc_arg *argv; size_t argc; - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); - argc = node->data.block.argc; + argc = n->data.block.argc; /* Make sure that only one type of display is specified. */ /* LINTED */ for (i = 0, err = type = 0; ! err && i < (int)argc; i++) { - argv = &node->data.block.argv[i]; + argv = &n->data.block.argv[i]; switch (argv->arg) { case (MDOC_Ragged): @@ -506,123 +682,119 @@ pre_bd(struct mdoc *mdoc, struct mdoc_node *node) static int -pre_ss(struct mdoc *mdoc, struct mdoc_node *node) +pre_ss(PRE_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); - return(check_parent(mdoc, node, MDOC_Sh, MDOC_BODY)); + return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY)); } static int -pre_sh(struct mdoc *mdoc, struct mdoc_node *node) +pre_sh(PRE_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); - return(check_parent(mdoc, node, -1, MDOC_ROOT)); + return(check_parent(mdoc, n, -1, MDOC_ROOT)); } static int -pre_it(struct mdoc *mdoc, struct mdoc_node *node) +pre_it(PRE_ARGS) { - /* TODO: -width attribute must be specified for -tag. */ /* TODO: children too big for -width? */ - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); - return(check_parent(mdoc, node, MDOC_Bl, MDOC_BODY)); + return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); } static int -pre_st(struct mdoc *mdoc, struct mdoc_node *node) +pre_st(PRE_ARGS) { - if (1 == node->data.elem.argc) + if (1 == n->data.elem.argc) return(1); - return(mdoc_nerr(mdoc, node, "one argument required")); + return(mdoc_nerr(mdoc, n, "one argument required")); } static int -pre_an(struct mdoc *mdoc, struct mdoc_node *node) +pre_an(PRE_ARGS) { - if (1 >= node->data.elem.argc) + if (1 >= n->data.elem.argc) return(1); - return(mdoc_nerr(mdoc, node, "one argument allowed")); + return(mdoc_nerr(mdoc, n, "one argument allowed")); } static int -pre_rv(struct mdoc *mdoc, struct mdoc_node *node) +pre_rv(PRE_ARGS) { enum mdoc_msec msecs[] = { MSEC_2, MSEC_3 }; - if ( ! check_msec(mdoc, node, 2, msecs)) + if ( ! check_msec(mdoc, n, 2, msecs)) return(0); - return(check_stdarg(mdoc, node)); + return(check_stdarg(mdoc, n)); } static int -pre_ex(struct mdoc *mdoc, struct mdoc_node *node) +pre_ex(PRE_ARGS) { enum mdoc_msec msecs[] = { MSEC_1, MSEC_6, MSEC_8 }; - if ( ! check_msec(mdoc, node, 3, msecs)) + if ( ! check_msec(mdoc, n, 3, msecs)) return(0); - return(check_stdarg(mdoc, node)); + return(check_stdarg(mdoc, n)); } static int -pre_er(struct mdoc *mdoc, struct mdoc_node *node) +pre_er(PRE_ARGS) { enum mdoc_msec msecs[] = { MSEC_2 }; - return(check_msec(mdoc, node, 1, msecs)); + return(check_msec(mdoc, n, 1, msecs)); } static int -pre_cd(struct mdoc *mdoc, struct mdoc_node *node) +pre_cd(PRE_ARGS) { enum mdoc_msec msecs[] = { MSEC_4 }; - return(check_msec(mdoc, node, 1, msecs)); + return(check_msec(mdoc, n, 1, msecs)); } static int -pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) +pre_prologue(PRE_ARGS) { if (SEC_PROLOGUE != mdoc->lastnamed) - return(mdoc_nerr(mdoc, node, "prologue only")); + return(mdoc_nerr(mdoc, n, "prologue only")); /* Check for ordering. */ - switch (node->tok) { + switch (n->tok) { case (MDOC_Os): if (mdoc->meta.title && mdoc->meta.date) break; - return(mdoc_nerr(mdoc, node, - "prologue out-of-order")); + return(mdoc_nerr(mdoc, n, "prologue out-of-order")); case (MDOC_Dt): if (NULL == mdoc->meta.title && mdoc->meta.date) break; - return(mdoc_nerr(mdoc, node, - "prologue out-of-order")); + return(mdoc_nerr(mdoc, n, "prologue out-of-order")); case (MDOC_Dd): if (NULL == mdoc->meta.title && 0 == mdoc->meta.date) break; - return(mdoc_nerr(mdoc, node, - "prologue out-of-order")); + return(mdoc_nerr(mdoc, n, "prologue out-of-order")); default: abort(); /* NOTREACHED */ @@ -630,7 +802,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node /* Check for repetition. */ - switch (node->tok) { + switch (n->tok) { case (MDOC_Os): if (NULL == mdoc->meta.os) return(1); @@ -648,12 +820,12 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node /* NOTREACHED */ } - return(mdoc_nerr(mdoc, node, "prologue repetition")); + return(mdoc_nerr(mdoc, n, "prologue repetition")); } static int -post_bf(struct mdoc *mdoc) +post_bf(POST_ARGS) { char *p; struct mdoc_node *head; @@ -687,7 +859,7 @@ post_bf(struct mdoc *mdoc) static int -post_nm(struct mdoc *mdoc) +post_nm(POST_ARGS) { if (mdoc->last->child) @@ -699,7 +871,7 @@ post_nm(struct mdoc *mdoc) static int -post_xr(struct mdoc *mdoc) +post_xr(POST_ARGS) { struct mdoc_node *n; @@ -712,7 +884,7 @@ post_xr(struct mdoc *mdoc) static int -post_at(struct mdoc *mdoc) +post_at(POST_ARGS) { if (NULL == mdoc->last->child) @@ -724,7 +896,7 @@ post_at(struct mdoc *mdoc) static int -post_an(struct mdoc *mdoc) +post_an(POST_ARGS) { if (0 != mdoc->last->data.elem.argc) { @@ -740,7 +912,7 @@ post_an(struct mdoc *mdoc) static int -post_ex(struct mdoc *mdoc) +post_ex(POST_ARGS) { if (0 == mdoc->last->data.elem.argc) { @@ -760,7 +932,7 @@ post_ex(struct mdoc *mdoc) static int -post_it(struct mdoc *mdoc) +post_it(POST_ARGS) { int type, sv, i; #define TYPE_NONE (0) @@ -877,7 +1049,7 @@ post_it(struct mdoc *mdoc) static int -post_bl(struct mdoc *mdoc) +post_bl(POST_ARGS) { struct mdoc_node *n; @@ -922,7 +1094,7 @@ ebool(struct mdoc *mdoc) static int -post_root(struct mdoc *mdoc) +post_root(POST_ARGS) { if (NULL == mdoc->first->child) @@ -931,10 +1103,10 @@ post_root(struct mdoc *mdoc) return(mdoc_err(mdoc, "document lacks prologue")); if (MDOC_BLOCK != mdoc->first->child->type) - return(mdoc_err(mdoc, "lacking post-prologue `%s'", + return(mdoc_err(mdoc, "lacking post-prologue %s", mdoc_macronames[MDOC_Sh])); if (MDOC_Sh != mdoc->first->child->tok) - return(mdoc_err(mdoc, "lacking post-prologue `%s'", + return(mdoc_err(mdoc, "lacking post-prologue %s", mdoc_macronames[MDOC_Sh])); return(1); @@ -942,7 +1114,7 @@ post_root(struct mdoc *mdoc) static int -post_sh(struct mdoc *mdoc) +post_sh(POST_ARGS) { if (MDOC_HEAD == mdoc->last->type) @@ -955,7 +1127,7 @@ post_sh(struct mdoc *mdoc) static int -post_sh_body(struct mdoc *mdoc) +post_sh_body(POST_ARGS) { struct mdoc_node *n; @@ -969,8 +1141,8 @@ post_sh_body(struct mdoc *mdoc) */ if (NULL == (n = mdoc->last->child)) - return(mdoc_warn(mdoc, WARN_COMPAT, "section NAME " - "should contain %s and %s", + return(mdoc_warn(mdoc, WARN_SYNTAX, + "section should have %s and %s", mdoc_macronames[MDOC_Nm], mdoc_macronames[MDOC_Nd])); @@ -979,9 +1151,8 @@ post_sh_body(struct mdoc *mdoc) continue; if (MDOC_TEXT == n->type) continue; - if ( ! (mdoc_nwarn(mdoc, n, WARN_COMPAT, "section " - "NAME should contain %s as " - "initial body child", + if ( ! (mdoc_nwarn(mdoc, n, WARN_SYNTAX, + "section should have %s first", mdoc_macronames[MDOC_Nm]))) return(0); } @@ -989,76 +1160,47 @@ post_sh_body(struct mdoc *mdoc) if (MDOC_ELEM == n->type && MDOC_Nd == n->tok) return(1); - return(mdoc_warn(mdoc, WARN_COMPAT, "section NAME should " - "contain %s as the last child", + return(mdoc_warn(mdoc, WARN_SYNTAX, + "section should have %s last", mdoc_macronames[MDOC_Nd])); } static int -post_sh_head(struct mdoc *mdoc) +post_sh_head(POST_ARGS) { char buf[64]; enum mdoc_sec sec; assert(MDOC_Sh == mdoc->last->tok); - if ( ! xstrlcats(buf, mdoc->last->child, 64)) - return(mdoc_err(mdoc, "macro parameters too long")); + if ( ! xstrlcats(buf, mdoc->last->child, sizeof(buf))) + return(mdoc_err(mdoc, "argument too long")); sec = mdoc_atosec(buf); if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec) - return(mdoc_err(mdoc, "section NAME must be first")); + return(mdoc_warn(mdoc, WARN_SYNTAX, + "section NAME should be first")); if (SEC_CUSTOM == sec) return(1); if (sec == mdoc->lastnamed) - return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated")); + return(mdoc_warn(mdoc, WARN_SYNTAX, + "section repeated")); if (sec < mdoc->lastnamed) - return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order")); + return(mdoc_warn(mdoc, WARN_SYNTAX, + "section out of order")); return(1); } -int -mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node) +static int +post_fd(POST_ARGS) { - v_pre *p; - if (MDOC_TEXT == node->type) + if (SEC_SYNOPSIS == mdoc->last->sec) 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); + return(mdoc_warn(mdoc, WARN_COMPAT, + "suggested only in section SYNOPSIS")); } - - -int -mdoc_valid_post(struct mdoc *mdoc) -{ - v_post *p; - - if (MDOC_VALID & mdoc->last->flags) - return(1); - mdoc->last->flags |= MDOC_VALID; - - if (MDOC_TEXT == mdoc->last->type) - return(1); - if (MDOC_ROOT == mdoc->last->type) - return(post_root(mdoc)); - - 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); -} -