mandoc/mdoc_validate.c - diff

Return to mdoc_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_validate.c between version 1.57 and 1.66

version 1.57, 2010/01/30 08:42:21

version 1.66, 2010/04/06 16:27:53

Line 44 struct valids {

v_post *post;

};

static int check_parent(PRE_ARGS, int, enum mdoc_type);

static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);

static int check_msec(PRE_ARGS, ...);

static int check_sec(PRE_ARGS, ...);

static int check_stdarg(PRE_ARGS);

Line 72 static int ebool(POST_ARGS);

static int eerr_eq0(POST_ARGS);

static int eerr_eq1(POST_ARGS);

static int eerr_ge1(POST_ARGS);

static int eerr_le2(POST_ARGS);

static int eerr_le1(POST_ARGS);

static int ewarn_ge1(POST_ARGS);

static int herr_eq0(POST_ARGS);

static int herr_ge1(POST_ARGS);

static int hwarn_eq1(POST_ARGS);

static int hwarn_eq0(POST_ARGS);

static int hwarn_le1(POST_ARGS);

static int post_an(POST_ARGS);

Line 114 static int pre_ss(PRE_ARGS);

static v_post posts_an[] = { post_an, NULL };

static v_post posts_at[] = { post_at, NULL };

static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NULL };

static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bf[] = { hwarn_le1, post_bf, NULL };

static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL };

static v_post posts_bool[] = { eerr_eq1, ebool, NULL };

Line 134 static v_post posts_text1[] = { eerr_eq1, NULL };

static v_post posts_vt[] = { post_vt, NULL };

static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL };

static v_post posts_wtext[] = { ewarn_ge1, NULL };

static v_post posts_xr[] = { eerr_ge1, eerr_le2, NULL };

static v_post posts_xr[] = { ewarn_ge1, NULL };

static v_pre pres_an[] = { pre_an, NULL };

static v_pre pres_bd[] = { pre_display, pre_bd, NULL };

static v_pre pres_bl[] = { pre_bl, NULL };

Line 408 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0) /* bwarn_

CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */

CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */

CHECK_ELEM_DEFN(le2, err, err_child_lt, 3) /* eerr_le2() */

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() */

Line 416 CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0

Line 415 CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0

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() */

CHECK_HEAD_DEFN(eq0, warn, warn_child_eq, 0) /* hwarn_eq0() */

static int

Line 549 check_text(struct mdoc *mdoc, int line, int pos, const

static int

check_parent(PRE_ARGS, int tok, enum mdoc_type t)

check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)

{

assert(n->parent);

Line 623 pre_bl(PRE_ARGS)

case (MDOC_Inset):

/* FALLTHROUGH */

case (MDOC_Column):

if (type >= 0)

return(mdoc_nerr(mdoc, n, EMULTILIST));

* Note that if a duplicate is detected, we

* remove the duplicate instead of passing it

* over. If we don't do this, mdoc_action will

* become confused when it scans over multiple

* types whilst setting its bitmasks.

* FIXME: this should occur in mdoc_action.c.

if (type >= 0) {

if ( ! mdoc_nwarn(mdoc, n, EMULTILIST))

return(0);

mdoc_argn_free(n->args, pos);

break;

}

type = n->args->argv[pos].arg;

break;

case (MDOC_Compact):

Line 1084 post_bl_head(POST_ARGS)

Line 1097 post_bl_head(POST_ARGS)

{

int i;

const struct mdoc_node *n;

const struct mdoc_argv *a;

n = mdoc->last->parent;

assert(n->args);

for (i = 0; i < (int)n->args->argc; i++)

for (i = 0; i < (int)n->args->argc; i++) {

if (n->args->argv[i].arg == MDOC_Column)

a = &n->args->argv[i];

break;

if (a->arg == MDOC_Column) {

if (a->sz && mdoc->last->nchild)

return(mdoc_nerr(mdoc, n, ECOLMIS));

return(1);

}

if (i == (int)n->args->argc)

if (0 == (i = mdoc->last->nchild))

return(1);

return(warn_count(mdoc, "==", 0, "line arguments", i));

if (n->args->argv[i].sz && mdoc->last->child)

return(mdoc_nerr(mdoc, n, ECOLMIS));

return(1);

}

Line 1310 post_sh_head(POST_ARGS)

Line 1325 post_sh_head(POST_ARGS)

* non-CUSTOM has a conventional order to be followed.

if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed &&

return(mdoc_nerr(mdoc, mdoc->last, ESECNAME));

! mdoc_nwarn(mdoc, mdoc->last, ESECNAME))

return(0);

if (SEC_CUSTOM == sec)

return(1);

if (sec == mdoc->lastnamed)

CVSweb