=================================================================== RCS file: /cvs/mandoc/man_validate.c,v retrieving revision 1.10 retrieving revision 1.25 diff -u -p -r1.10 -r1.25 --- mandoc/man_validate.c 2009/06/16 19:55:28 1.10 +++ mandoc/man_validate.c 2009/10/18 11:36:37 1.25 @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.10 2009/06/16 19:55:28 kristaps Exp $ */ +/* $Id: man_validate.c,v 1.25 2009/10/18 11:36:37 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,66 +18,100 @@ #include #include +#include +#include #include #include #include "libman.h" +#include "libmandoc.h" -/* FIXME: validate text. */ +#define CHKARGS struct man *m, const struct man_node *n -#define POSTARGS struct man *m, const struct man_node *n +typedef int (*v_check)(CHKARGS); -typedef int (*v_post)(POSTARGS); - struct man_valid { - v_post *posts; + v_check *pres; + v_check *posts; }; -static int count(const struct man_node *); -static int check_eq0(POSTARGS); -static int check_ge1(POSTARGS); -static int check_ge2(POSTARGS); -static int check_le1(POSTARGS); -static int check_le2(POSTARGS); -static int check_le5(POSTARGS); +static int check_bline(CHKARGS); +static int check_eq0(CHKARGS); +static int check_le1(CHKARGS); +static int check_ge2(CHKARGS); +static int check_le5(CHKARGS); +static int check_par(CHKARGS); +static int check_part(CHKARGS); +static int check_root(CHKARGS); +static int check_sec(CHKARGS); +static int check_text(CHKARGS); -static v_post posts_le1[] = { check_le1, NULL }; -static v_post posts_le2[] = { check_le2, NULL }; -static v_post posts_ge1[] = { check_ge1, NULL }; -static v_post posts_eq0[] = { check_eq0, NULL }; -static v_post posts_ge2_le5[] = { check_ge2, check_le5, NULL }; +static v_check posts_eq0[] = { check_eq0, NULL }; +static v_check posts_ge2_le5[] = { check_ge2, check_le5, NULL }; +static v_check posts_par[] = { check_par, NULL }; +static v_check posts_part[] = { check_part, NULL }; +static v_check posts_sec[] = { check_sec, NULL }; +static v_check posts_sp[] = { check_le1, NULL }; +static v_check pres_bline[] = { check_bline, NULL }; static const struct man_valid man_valids[MAN_MAX] = { - { posts_eq0 }, /* br */ - { posts_ge2_le5 }, /* TH */ - { posts_ge1 }, /* SH */ - { posts_ge1 }, /* SS */ - { NULL }, /* TP */ - { posts_eq0 }, /* LP */ - { posts_eq0 }, /* PP */ - { posts_eq0 }, /* P */ - { posts_le2 }, /* IP */ - { posts_le1 }, /* HP */ - { NULL }, /* SM */ - { NULL }, /* SB */ - { NULL }, /* BI */ - { NULL }, /* IB */ - { NULL }, /* BR */ - { NULL }, /* RB */ - { NULL }, /* R */ - { NULL }, /* B */ - { NULL }, /* I */ - { NULL }, /* IR */ - { NULL }, /* RI */ - { posts_eq0 }, /* na */ - { NULL }, /* i */ + { pres_bline, posts_eq0 }, /* br */ + { pres_bline, posts_ge2_le5 }, /* TH */ + { pres_bline, posts_sec }, /* SH */ + { pres_bline, posts_sec }, /* SS */ + { pres_bline, posts_par }, /* TP */ + { pres_bline, posts_par }, /* LP */ + { pres_bline, posts_par }, /* PP */ + { pres_bline, posts_par }, /* P */ + { pres_bline, posts_par }, /* IP */ + { pres_bline, posts_par }, /* HP */ + { NULL, NULL }, /* SM */ + { NULL, NULL }, /* SB */ + { NULL, NULL }, /* BI */ + { NULL, NULL }, /* IB */ + { NULL, NULL }, /* BR */ + { NULL, NULL }, /* RB */ + { NULL, NULL }, /* R */ + { NULL, NULL }, /* B */ + { NULL, NULL }, /* I */ + { NULL, NULL }, /* IR */ + { NULL, NULL }, /* RI */ + { pres_bline, posts_eq0 }, /* na */ + { NULL, NULL }, /* i */ + { pres_bline, posts_sp }, /* sp */ + { pres_bline, posts_eq0 }, /* nf */ + { pres_bline, posts_eq0 }, /* fi */ + { NULL, NULL }, /* r */ + { NULL, NULL }, /* RE */ + { NULL, posts_part }, /* RS */ + { NULL, NULL }, /* DT */ + { NULL, NULL }, /* UC */ }; int +man_valid_pre(struct man *m, const struct man_node *n) +{ + v_check *cp; + + if (MAN_TEXT == n->type) + return(1); + if (MAN_ROOT == n->type) + return(1); + + if (NULL == (cp = man_valids[n->tok].pres)) + return(1); + for ( ; *cp; cp++) + if ( ! (*cp)(m, n)) + return(0); + return(1); +} + + +int man_valid_post(struct man *m) { - v_post *cp; + v_check *cp; if (MAN_VALID & m->last->flags) return(1); @@ -85,9 +119,9 @@ man_valid_post(struct man *m) switch (m->last->type) { case (MAN_TEXT): - /* FALLTHROUGH */ + return(check_text(m, m->last)); case (MAN_ROOT): - return(1); + return(check_root(m, m->last)); default: break; } @@ -102,33 +136,146 @@ man_valid_post(struct man *m) } -static inline int -count(const struct man_node *n) -{ - int i; +static int +check_root(CHKARGS) +{ - for (i = 0; n; n = n->next, i++) - /* Loop. */ ; - return(i); + if (MAN_BLINE & m->flags) + return(man_nwarn(m, n, WEXITSCOPE)); + if (MAN_ELINE & m->flags) + return(man_nwarn(m, n, WEXITSCOPE)); + + m->flags &= ~MAN_BLINE; + m->flags &= ~MAN_ELINE; + + if (NULL == m->first->child) + return(man_nerr(m, n, WNODATA)); + if (NULL == m->meta.title) + return(man_nerr(m, n, WNOTITLE)); + + return(1); } +static int +check_text(CHKARGS) +{ + const char *p; + int pos, c; + + assert(n->string); + + for (p = n->string, pos = n->pos + 1; *p; p++, pos++) { + if ('\\' == *p) { + c = mandoc_special(p); + if (c) { + p += c - 1; + pos += c - 1; + continue; + } + if ( ! (MAN_IGN_ESCAPE & m->pflags)) + return(man_perr(m, n->line, pos, WESCAPE)); + if ( ! man_pwarn(m, n->line, pos, WESCAPE)) + return(0); + continue; + } + + if ('\t' == *p || isprint((u_char)*p)) + continue; + + if (MAN_IGN_CHARS & m->pflags) + return(man_pwarn(m, n->line, pos, WNPRINT)); + return(man_perr(m, n->line, pos, WNPRINT)); + } + + return(1); +} + + #define INEQ_DEFINE(x, ineq, name) \ static int \ -check_##name(POSTARGS) \ +check_##name(CHKARGS) \ { \ - int c; \ - if ((c = count(n->child)) ineq (x)) \ + if (n->nchild ineq (x)) \ return(1); \ return(man_verr(m, n->line, n->pos, \ "expected line arguments %s %d, have %d", \ - #ineq, (x), c)); \ + #ineq, (x), n->nchild)); \ } INEQ_DEFINE(0, ==, eq0) -INEQ_DEFINE(1, >=, ge1) -INEQ_DEFINE(2, >=, ge2) INEQ_DEFINE(1, <=, le1) -INEQ_DEFINE(2, <=, le2) +INEQ_DEFINE(2, >=, ge2) INEQ_DEFINE(5, <=, le5) + + +static int +check_sec(CHKARGS) +{ + + if (MAN_BODY == n->type && 0 == n->nchild) + return(man_nwarn(m, n, WBODYARGS)); + if (MAN_HEAD == n->type && 0 == n->nchild) + return(man_nerr(m, n, WHEADARGS)); + return(1); +} + + +static int +check_part(CHKARGS) +{ + + if (MAN_BODY == n->type && 0 == n->nchild) + return(man_nwarn(m, n, WBODYARGS)); + return(1); +} + + +static int +check_par(CHKARGS) +{ + + if (MAN_BODY == n->type) + switch (n->tok) { + case (MAN_IP): + /* FALLTHROUGH */ + case (MAN_HP): + /* FALLTHROUGH */ + case (MAN_TP): + /* Body-less lists are ok. */ + break; + default: + if (n->nchild) + break; + return(man_nwarn(m, n, WBODYARGS)); + } + if (MAN_HEAD == n->type) + switch (n->tok) { + case (MAN_PP): + /* FALLTHROUGH */ + case (MAN_P): + /* FALLTHROUGH */ + case (MAN_LP): + if (0 == n->nchild) + break; + return(man_nwarn(m, n, WNHEADARGS)); + default: + if (n->nchild) + break; + return(man_nwarn(m, n, WHEADARGS)); + } + + return(1); +} + + +static int +check_bline(CHKARGS) +{ + + assert( ! (MAN_ELINE & m->flags)); + if (MAN_BLINE & m->flags) + return(man_nerr(m, n, WLNSCOPE)); + return(1); +}