version 1.52, 2010/12/05 16:14:16 |
version 1.58, 2011/01/12 15:50:42 |
Line 44 struct man_valid { |
|
Line 44 struct man_valid { |
|
|
|
static int check_bline(CHKARGS); |
static int check_bline(CHKARGS); |
static int check_eq0(CHKARGS); |
static int check_eq0(CHKARGS); |
|
static int check_ft(CHKARGS); |
static int check_le1(CHKARGS); |
static int check_le1(CHKARGS); |
static int check_ge2(CHKARGS); |
static int check_ge2(CHKARGS); |
static int check_le5(CHKARGS); |
static int check_le5(CHKARGS); |
Line 64 static v_check posts_at[] = { post_AT, NULL }; |
|
Line 65 static v_check posts_at[] = { post_AT, NULL }; |
|
static v_check posts_eq0[] = { 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_fi[] = { check_eq0, post_fi, NULL }; |
static v_check posts_le1[] = { check_le1, NULL }; |
static v_check posts_le1[] = { check_le1, NULL }; |
|
static v_check posts_ft[] = { check_ft, NULL }; |
static v_check posts_nf[] = { check_eq0, post_nf, NULL }; |
static v_check posts_nf[] = { check_eq0, post_nf, NULL }; |
static v_check posts_par[] = { check_par, NULL }; |
static v_check posts_par[] = { check_par, NULL }; |
static v_check posts_part[] = { check_part, NULL }; |
static v_check posts_part[] = { check_part, NULL }; |
Line 96 static const struct man_valid man_valids[MAN_MAX] = { |
|
Line 98 static const struct man_valid man_valids[MAN_MAX] = { |
|
{ NULL, NULL }, /* IR */ |
{ NULL, NULL }, /* IR */ |
{ NULL, NULL }, /* RI */ |
{ NULL, NULL }, /* RI */ |
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */ |
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */ |
{ NULL, NULL }, /* i */ |
|
{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */ |
{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */ |
{ pres_bline, posts_nf }, /* nf */ |
{ pres_bline, posts_nf }, /* nf */ |
{ pres_bline, posts_fi }, /* fi */ |
{ pres_bline, posts_fi }, /* fi */ |
{ NULL, NULL }, /* r */ |
|
{ NULL, NULL }, /* RE */ |
{ NULL, NULL }, /* RE */ |
{ NULL, posts_part }, /* RS */ |
{ NULL, posts_part }, /* RS */ |
{ NULL, NULL }, /* DT */ |
{ NULL, NULL }, /* DT */ |
Line 108 static const struct man_valid man_valids[MAN_MAX] = { |
|
Line 108 static const struct man_valid man_valids[MAN_MAX] = { |
|
{ NULL, NULL }, /* PD */ |
{ NULL, NULL }, /* PD */ |
{ NULL, posts_at }, /* AT */ |
{ NULL, posts_at }, /* AT */ |
{ NULL, NULL }, /* in */ |
{ NULL, NULL }, /* in */ |
|
{ NULL, posts_ft }, /* ft */ |
}; |
}; |
|
|
|
|
Line 116 man_valid_pre(struct man *m, struct man_node *n) |
|
Line 117 man_valid_pre(struct man *m, struct man_node *n) |
|
{ |
{ |
v_check *cp; |
v_check *cp; |
|
|
if (MAN_TEXT == n->type) |
switch (n->type) { |
|
case (MAN_TEXT): |
|
/* FALLTHROUGH */ |
|
case (MAN_ROOT): |
|
/* FALLTHROUGH */ |
|
case (MAN_TBL): |
return(1); |
return(1); |
if (MAN_ROOT == n->type) |
default: |
return(1); |
break; |
|
} |
|
|
if (NULL == (cp = man_valids[n->tok].pres)) |
if (NULL == (cp = man_valids[n->tok].pres)) |
return(1); |
return(1); |
Line 144 man_valid_post(struct man *m) |
|
Line 151 man_valid_post(struct man *m) |
|
return(check_text(m, m->last)); |
return(check_text(m, m->last)); |
case (MAN_ROOT): |
case (MAN_ROOT): |
return(check_root(m, m->last)); |
return(check_root(m, m->last)); |
|
case (MAN_TBL): |
|
return(1); |
default: |
default: |
break; |
break; |
} |
} |
Line 163 check_root(CHKARGS) |
|
Line 172 check_root(CHKARGS) |
|
{ |
{ |
|
|
if (MAN_BLINE & m->flags) |
if (MAN_BLINE & m->flags) |
return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT)); |
man_nmsg(m, n, MANDOCERR_SCOPEEXIT); |
if (MAN_ELINE & m->flags) |
else if (MAN_ELINE & m->flags) |
return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT)); |
man_nmsg(m, n, MANDOCERR_SCOPEEXIT); |
|
|
m->flags &= ~MAN_BLINE; |
m->flags &= ~MAN_BLINE; |
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
Line 174 check_root(CHKARGS) |
|
Line 183 check_root(CHKARGS) |
|
man_nmsg(m, n, MANDOCERR_NODOCBODY); |
man_nmsg(m, n, MANDOCERR_NODOCBODY); |
return(0); |
return(0); |
} else if (NULL == m->meta.title) { |
} else if (NULL == m->meta.title) { |
if ( ! man_nmsg(m, n, MANDOCERR_NOTITLE)) |
man_nmsg(m, n, MANDOCERR_NOTITLE); |
return(0); |
|
/* |
/* |
* If a title hasn't been set, do so now (by |
* If a title hasn't been set, do so now (by |
* implication, date and section also aren't set). |
* implication, date and section also aren't set). |
* |
|
* FIXME: this should be in man_action.c. |
|
*/ |
*/ |
|
|
m->meta.title = mandoc_strdup("unknown"); |
m->meta.title = mandoc_strdup("unknown"); |
m->meta.date = time(NULL); |
m->meta.date = time(NULL); |
m->meta.msec = mandoc_strdup("1"); |
m->meta.msec = mandoc_strdup("1"); |
Line 204 check_title(CHKARGS) |
|
Line 212 check_title(CHKARGS) |
|
} |
} |
|
|
for (p = n->child->string; '\0' != *p; p++) |
for (p = n->child->string; '\0' != *p; p++) |
if (isalpha((u_char)*p) && ! isupper((u_char)*p)) |
/* Only warn about this once... */ |
if ( ! man_nmsg(m, n, MANDOCERR_UPPERCASE)) |
if (isalpha((u_char)*p) && ! isupper((u_char)*p)) { |
return(0); |
man_nmsg(m, n, MANDOCERR_UPPERCASE); |
|
break; |
|
} |
|
|
return(1); |
return(1); |
} |
} |
Line 267 INEQ_DEFINE(1, <=, le1) |
|
Line 277 INEQ_DEFINE(1, <=, le1) |
|
INEQ_DEFINE(2, >=, ge2) |
INEQ_DEFINE(2, >=, ge2) |
INEQ_DEFINE(5, <=, le5) |
INEQ_DEFINE(5, <=, le5) |
|
|
|
static int |
|
check_ft(CHKARGS) |
|
{ |
|
char *cp; |
|
int ok; |
|
|
|
if (0 == n->nchild) |
|
return(1); |
|
|
|
ok = 0; |
|
cp = n->child->string; |
|
switch (*cp) { |
|
case ('1'): |
|
/* FALLTHROUGH */ |
|
case ('2'): |
|
/* FALLTHROUGH */ |
|
case ('3'): |
|
/* FALLTHROUGH */ |
|
case ('4'): |
|
/* FALLTHROUGH */ |
|
case ('I'): |
|
/* FALLTHROUGH */ |
|
case ('P'): |
|
/* FALLTHROUGH */ |
|
case ('R'): |
|
if ('\0' == cp[1]) |
|
ok = 1; |
|
break; |
|
case ('B'): |
|
if ('\0' == cp[1] || ('I' == cp[1] && '\0' == cp[2])) |
|
ok = 1; |
|
break; |
|
case ('C'): |
|
if ('W' == cp[1] && '\0' == cp[2]) |
|
ok = 1; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
if (0 == ok) { |
|
man_vmsg(m, MANDOCERR_BADFONT, |
|
n->line, n->pos, "%s", cp); |
|
*cp = '\0'; |
|
} |
|
|
|
if (1 < n->nchild) |
|
man_vmsg(m, MANDOCERR_ARGCOUNT, n->line, n->pos, |
|
"want one child (have %d)", n->nchild); |
|
|
|
return(1); |
|
} |
|
|
static int |
static int |
check_sec(CHKARGS) |
check_sec(CHKARGS) |
{ |
{ |
Line 276 check_sec(CHKARGS) |
|
Line 338 check_sec(CHKARGS) |
|
man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT); |
man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT); |
return(0); |
return(0); |
} else if (MAN_BODY == n->type && 0 == n->nchild) |
} else if (MAN_BODY == n->type && 0 == n->nchild) |
return(man_nmsg(m, n, MANDOCERR_NOBODY)); |
man_nmsg(m, n, MANDOCERR_NOBODY); |
|
|
return(1); |
return(1); |
} |
} |
Line 287 check_part(CHKARGS) |
|
Line 349 check_part(CHKARGS) |
|
{ |
{ |
|
|
if (MAN_BODY == n->type && 0 == n->nchild) |
if (MAN_BODY == n->type && 0 == n->nchild) |
return(man_nmsg(m, n, MANDOCERR_NOBODY)); |
man_nmsg(m, n, MANDOCERR_NOBODY); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 306 check_par(CHKARGS) |
|
Line 369 check_par(CHKARGS) |
|
/* Body-less lists are ok. */ |
/* Body-less lists are ok. */ |
break; |
break; |
default: |
default: |
if (n->nchild) |
if (0 == n->nchild) |
break; |
man_nmsg(m, n, MANDOCERR_NOBODY); |
return(man_nmsg(m, n, MANDOCERR_NOBODY)); |
break; |
} |
} |
if (MAN_HEAD == n->type) |
if (MAN_HEAD == n->type) |
switch (n->tok) { |
switch (n->tok) { |
Line 317 check_par(CHKARGS) |
|
Line 380 check_par(CHKARGS) |
|
case (MAN_P): |
case (MAN_P): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MAN_LP): |
case (MAN_LP): |
if (0 == n->nchild) |
|
break; |
|
return(man_nmsg(m, n, MANDOCERR_ARGSLOST)); |
|
default: |
|
if (n->nchild) |
if (n->nchild) |
break; |
man_nmsg(m, n, MANDOCERR_ARGSLOST); |
return(man_nmsg(m, n, MANDOCERR_NOARGS)); |
break; |
|
default: |
|
break; |
} |
} |
|
|
return(1); |
return(1); |
Line 428 post_fi(CHKARGS) |
|
Line 489 post_fi(CHKARGS) |
|
{ |
{ |
|
|
if ( ! (MAN_LITERAL & m->flags)) |
if ( ! (MAN_LITERAL & m->flags)) |
man_nmsg(m, n, MANDOCERR_NOSCOPE); |
man_nmsg(m, n, MANDOCERR_WNOSCOPE); |
|
|
m->flags &= ~MAN_LITERAL; |
m->flags &= ~MAN_LITERAL; |
return(1); |
return(1); |