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.82 and 1.90

version 1.82, 2010/05/25 12:44:53

version 1.90, 2010/05/31 23:40:25

Line 83 static int post_at(POST_ARGS);

static int post_bf(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_dt(POST_ARGS);

static int post_it(POST_ARGS);

static int post_lb(POST_ARGS);

static int post_nm(POST_ARGS);

Line 92 static int post_sh(POST_ARGS);

Line 93 static int post_sh(POST_ARGS);

static int post_sh_body(POST_ARGS);

static int post_sh_head(POST_ARGS);

static int post_st(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 111 static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NU

Line 113 static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NU

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 };

static v_post posts_eoln[] = { post_eoln, NULL };

static v_post posts_dt[] = { post_dt, NULL };

static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };

static v_post posts_it[] = { post_it, NULL };

static v_post posts_lb[] = { eerr_eq1, post_lb, NULL };

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

Line 131 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[] = { 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 138 static v_pre pres_er[] = { NULL, NULL };

Line 141 static v_pre pres_er[] = { NULL, NULL };

static v_pre pres_ex[] = { NULL, NULL };

static v_pre pres_fd[] = { NULL, NULL };

static v_pre pres_it[] = { pre_it, NULL };

static v_pre pres_lb[] = { NULL, NULL };

static v_pre pres_os[] = { pre_os, NULL };

static v_pre pres_rv[] = { pre_rv, NULL };

static v_pre pres_sh[] = { pre_sh, NULL };

Line 147 static v_pre pres_ss[] = { pre_ss, NULL };

Line 149 static v_pre pres_ss[] = { pre_ss, NULL };

const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ap */

{ pres_dd, posts_text }, /* Dd */

{ pres_dt, NULL }, /* Dt */

{ pres_dt, posts_dt }, /* Dt */

{ pres_os, NULL }, /* Os */

{ pres_sh, posts_sh }, /* Sh */

{ pres_ss, posts_ss }, /* Ss */

Line 185 const struct valids mdoc_valids[MDOC_MAX] = {

Line 187 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

{ NULL, posts_xr }, /* Xr */

{ NULL, posts_wtext }, /* Xr */

{ NULL, posts_text }, /* %A */

{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */

{ NULL, posts_text }, /* %D */ /* FIXME: check date with mandoc_a2time(). */

Line 247 const struct valids mdoc_valids[MDOC_MAX] = {

Line 249 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Oc */

{ NULL, posts_wline }, /* Bk */

{ NULL, NULL }, /* Ek */

{ NULL, posts_notext }, /* Bt */

{ NULL, posts_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

{ NULL, NULL }, /* Fr */

{ NULL, posts_notext }, /* Ud */

{ NULL, posts_eoln }, /* Ud */

{ pres_lb, posts_lb }, /* Lb */

{ NULL, posts_lb }, /* Lb */

{ NULL, posts_notext }, /* Lp */

{ NULL, posts_text }, /* Lk */

{ NULL, posts_text }, /* Mt */

Line 266 const struct valids mdoc_valids[MDOC_MAX] = {

Line 268 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_notext }, /* br */

{ NULL, posts_sp }, /* sp */

{ NULL, posts_text1 }, /* %U */

{ NULL, NULL }, /* Ta */

};

Line 392 CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */

Line 395 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_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1() */

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

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

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

CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1() */

CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */

Line 738 pre_rv(PRE_ARGS)

Line 741 pre_rv(PRE_ARGS)

static int

pre_dt(PRE_ARGS)

post_dt(POST_ARGS)

{

const struct mdoc_node *nn;

const char *p;

/* FIXME: make sure is capitalised. */

if (NULL != (nn = mdoc->last->child))

for (p = nn->string; *p; p++) {

if (toupper((u_char)*p) == *p)

continue;

if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE))

return(0);

break;

}

return(1);

}

static int

pre_dt(PRE_ARGS)

{

if (0 == mdoc->meta.date || mdoc->meta.os)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))

return(0);

Line 830 post_lb(POST_ARGS)

Line 850 post_lb(POST_ARGS)

static int

post_eoln(POST_ARGS)

{

if (NULL == mdoc->last->child)

return(1);

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST));

}

static int

post_vt(POST_ARGS)

{

const struct mdoc_node *n;

Line 899 post_an(POST_ARGS)

Line 929 post_an(POST_ARGS)

static int

post_it(POST_ARGS)

{

int type, i, cols;

int i, cols, rc;

enum mdoc_list lt;

struct mdoc_node *n, *c;

enum mandocerr er;

if (MDOC_BLOCK != mdoc->last->type)

return(1);

n = mdoc->last->parent->parent;

if (NULL == n->args) {

lt = n->data.list;

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);

return(0);

}

/* Some types require block-head, some not. */

if (LIST__NONE == lt) {

/* LINTED */

for (cols = type = -1, i = 0; -1 == type &&

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

switch (n->args->argv[i].arg) {

case (MDOC_Tag):

/* FALLTHROUGH */

case (MDOC_Diag):

/* FALLTHROUGH */

case (MDOC_Hang):

/* FALLTHROUGH */

case (MDOC_Ohang):

/* FALLTHROUGH */

case (MDOC_Inset):

/* FALLTHROUGH */

case (MDOC_Bullet):

/* FALLTHROUGH */

case (MDOC_Dash):

/* FALLTHROUGH */

case (MDOC_Enum):

/* FALLTHROUGH */

case (MDOC_Hyphen):

/* FALLTHROUGH */

case (MDOC_Item):

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

break;

case (MDOC_Column):

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

cols = (int)n->args->argv[i].sz;

break;

default:

break;

}

if (-1 == type) {

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);

return(0);

}

switch (type) {

switch (lt) {

case (MDOC_Tag):

case (LIST_tag):

if (NULL == mdoc->last->head->child)

if (mdoc->last->head->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

break;

return(0);

/* FIXME: give this a dummy value. */

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

return(0);

break;

case (MDOC_Hang):

case (LIST_hang):

/* FALLTHROUGH */

case (MDOC_Ohang):

case (LIST_ohang):

/* FALLTHROUGH */

case (MDOC_Inset):

case (LIST_inset):

/* FALLTHROUGH */

case (MDOC_Diag):

case (LIST_diag):

if (NULL == mdoc->last->head->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

return(0);

Line 971 post_it(POST_ARGS)

Line 967 post_it(POST_ARGS)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

return(0);

break;

case (MDOC_Bullet):

case (LIST_bullet):

/* FALLTHROUGH */

case (MDOC_Dash):

case (LIST_dash):

/* FALLTHROUGH */

case (MDOC_Enum):

case (LIST_enum):

/* FALLTHROUGH */

case (MDOC_Hyphen):

case (LIST_hyphen):

/* FALLTHROUGH */

case (MDOC_Item):

case (LIST_item):

if (mdoc->last->head->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))

return(0);

Line 987 post_it(POST_ARGS)

Line 983 post_it(POST_ARGS)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

return(0);

break;

case (MDOC_Column):

case (LIST_column):

if (NULL == mdoc->last->head->child)

cols = -1;

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

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

return(0);

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

if (mdoc->last->body->child)

cols = (int)n->args->argv[i].sz;

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BODYLOST))

break;

return(0);

}

c = mdoc->last->child;

for (i = 0; c && MDOC_HEAD == c->type; c = c->next)

i++;

if (i < cols) {

assert(-1 != cols);

if ( ! mdoc_vmsg(mdoc, MANDOCERR_ARGCOUNT,

assert(NULL == mdoc->last->head->child);

mdoc->last->line,

mdoc->last->pos,

if (NULL == mdoc->last->body->child)

"columns == %d (have %d)",

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

cols, i))

return(0);

for (i = 0, c = mdoc->last->child; c; c = c->next)

if (MDOC_BODY == c->type)

i++;

if (i < cols)

er = MANDOCERR_ARGCOUNT;

else if (i == cols || i == cols + 1)

break;

} else if (i == cols || i == cols + 1)

else

break;

er = MANDOCERR_SYNTARGCOUNT;

mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT,

rc = mdoc_vmsg(mdoc, er,

mdoc->last->line, mdoc->last->pos,

"columns == %d (have %d)", cols, i);

return(0);

return(rc);

default:

break;

}

Line 1024 post_it(POST_ARGS)

static int

post_bl_head(POST_ARGS)

{

int i;

const struct mdoc_node *n;

struct mdoc_node *n;

const struct mdoc_argv *a;

assert(mdoc->last->parent);

n = mdoc->last->parent;

assert(n->args);

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

if (LIST_column == n->data.list) {

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

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

if (a->arg == MDOC_Column) {

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

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

break;

return(mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS));

assert(i < (int)n->args->argc);

return(1);

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

mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);

return(0);

}

return(1);

}

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

CVSweb