mandoc/man_validate.c - diff

Return to man_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man_validate.c between version 1.66 and 1.73

version 1.66, 2011/03/22 14:33:05

version 1.73, 2011/09/04 09:49:46

Line 46 struct man_valid {

static int check_bline(CHKARGS);

static int check_eq0(CHKARGS);

static int check_ft(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 void check_text(CHKARGS);

static int check_text(CHKARGS);

static int post_AT(CHKARGS);

static int post_vs(CHKARGS);

static int post_fi(CHKARGS);

static int post_ft(CHKARGS);

static int post_nf(CHKARGS);

static int post_sec(CHKARGS);

static int post_TH(CHKARGS);

static int post_UC(CHKARGS);

static int pre_sec(CHKARGS);

static v_check posts_at[] = { post_AT, NULL };

static v_check posts_br[] = { post_vs, check_eq0, NULL };

static v_check posts_eq0[] = { check_eq0, NULL };

static v_check posts_fi[] = { check_eq0, post_fi, NULL };

static v_check posts_le1[] = { check_le1, NULL };

static v_check posts_ft[] = { post_ft, NULL };

static v_check posts_ft[] = { check_ft, NULL };

static v_check posts_nf[] = { check_eq0, post_nf, 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_sec[] = { post_sec, NULL };

static v_check posts_sp[] = { post_vs, check_le1, NULL };

static v_check posts_th[] = { check_ge2, check_le5, post_TH, NULL };

static v_check posts_uc[] = { post_UC, NULL };

static v_check pres_bline[] = { check_bline, NULL };

static v_check pres_sec[] = { check_bline, pre_sec, NULL};

static const struct man_valid man_valids[MAN_MAX] = {

{ NULL, posts_eq0 }, /* br */

{ NULL, posts_br }, /* br */

{ pres_bline, posts_th }, /* TH */

{ pres_bline, posts_sec }, /* SH */

{ pres_sec, posts_sec }, /* SH */

{ pres_bline, posts_sec }, /* SS */

{ pres_sec, posts_sec }, /* SS */

{ pres_bline, NULL }, /* TP */

{ pres_bline, posts_par }, /* LP */

{ pres_bline, posts_par }, /* PP */

Line 99 static const struct man_valid man_valids[MAN_MAX] = {

Line 102 static const struct man_valid man_valids[MAN_MAX] = {

{ NULL, NULL }, /* IR */

{ NULL, NULL }, /* RI */

{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */

{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */

{ NULL, posts_sp }, /* sp */ /* FIXME: should warn only. */

{ pres_bline, posts_nf }, /* nf */

{ pres_bline, posts_fi }, /* fi */

{ NULL, NULL }, /* RE */

Line 151 man_valid_post(struct man *m)

Line 154 man_valid_post(struct man *m)

switch (m->last->type) {

case (MAN_TEXT):

return(check_text(m, m->last));

check_text(m, m->last);

return(1);

case (MAN_ROOT):

return(check_root(m, m->last));

case (MAN_EQN):

Line 204 check_root(CHKARGS)

Line 208 check_root(CHKARGS)

return(1);

}

static void

static int

check_text(CHKARGS)

{

char *p;

char *cp, *p;

int pos, c;

size_t sz;

for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {

cp = p = n->string;

sz = strcspn(p, "\t\\");

for (cp = p; NULL != (p = strchr(p, '\t')); p++) {

p += (int)sz;

if (MAN_LITERAL & m->flags)

if ('\0' == *p)

break;

pos += (int)sz;

if ('\t' == *p) {

if (MAN_LITERAL & m->flags)

continue;

man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);

continue;

}

man_pmsg(m, n->line, (int)(p - cp), MANDOCERR_BADTAB);

/* Check the special character. */

c = mandoc_special(p);

if (c) {

p += c - 1;

pos += c - 1;

} else

man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);

}

return(1);

}

#define INEQ_DEFINE(x, ineq, name) \

static int \

check_##name(CHKARGS) \

Line 260 INEQ_DEFINE(2, >=, ge2)

Line 239 INEQ_DEFINE(2, >=, ge2)

INEQ_DEFINE(5, <=, le5)

static int

check_ft(CHKARGS)

post_ft(CHKARGS)

{

char *cp;

int ok;

Line 316 check_ft(CHKARGS)

Line 295 check_ft(CHKARGS)

}

static int

check_sec(CHKARGS)

pre_sec(CHKARGS)

{

if (MAN_HEAD == n->type && 0 == n->nchild) {

if (MAN_BLOCK == n->type)

man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);

m->flags &= ~MAN_LITERAL;

return(0);

} else if (MAN_BODY == n->type && 0 == n->nchild)

man_nmsg(m, n, MANDOCERR_NOBODY);

return(1);

}

static int

post_sec(CHKARGS)

{

if ( ! (MAN_HEAD == n->type && 0 == n->nchild))

return(1);

man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);

return(0);

}

static int

check_part(CHKARGS)

{

if (MAN_BODY == n->type && 0 == n->nchild)

man_nmsg(m, n, MANDOCERR_NOBODY);

mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line,

n->pos, "want children (have none)");

return(1);

}

Line 406 post_TH(CHKARGS)

Line 392 post_TH(CHKARGS)

if (n && n->string) {

for (p = n->string; '\0' != *p; p++) {

/* Only warn about this once... */

if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {

if (isalpha((unsigned char)*p) &&

! isupper((unsigned char)*p)) {

man_nmsg(m, n, MANDOCERR_UPPERCASE);

break;

}

Line 551 post_AT(CHKARGS)

Line 538 post_AT(CHKARGS)

free(m->meta.source);

m->meta.source = mandoc_strdup(p);

return(1);

}

static int

post_vs(CHKARGS)

{

* Don't warn about this because it occurs in pod2man and would

* cause considerable (unfixable) warnage.

if (NULL == n->prev && MAN_ROOT == n->parent->type)

man_node_delete(m, n);

return(1);

}

CVSweb