version 1.56, 2009/02/24 13:46:54 |
version 1.61, 2009/02/26 14:56:27 |
Line 39 typedef int (*v_post)(POST_ARGS); |
|
Line 39 typedef int (*v_post)(POST_ARGS); |
|
/* FIXME: some sections should only occur in specific msecs. */ |
/* FIXME: some sections should only occur in specific msecs. */ |
/* FIXME: ignoring Pp. */ |
/* FIXME: ignoring Pp. */ |
/* FIXME: math symbols. */ |
/* FIXME: math symbols. */ |
/* FIXME: .Fd only in synopsis section. */ |
|
|
|
struct valids { |
struct valids { |
v_pre *pre; |
v_pre *pre; |
Line 56 static int check_text(struct mdoc *, |
|
Line 55 static int check_text(struct mdoc *, |
|
size_t, size_t, const char *); |
size_t, size_t, const char *); |
|
|
static int err_child_lt(struct mdoc *, const char *, int); |
static int err_child_lt(struct mdoc *, const char *, int); |
|
static int warn_child_lt(struct mdoc *, const char *, int); |
static int err_child_gt(struct mdoc *, const char *, int); |
static int err_child_gt(struct mdoc *, const char *, int); |
static int warn_child_gt(struct mdoc *, const char *, int); |
static int warn_child_gt(struct mdoc *, const char *, int); |
static int err_child_eq(struct mdoc *, const char *, int); |
static int err_child_eq(struct mdoc *, const char *, int); |
Line 90 static int pre_prologue(PRE_ARGS); |
|
Line 90 static int pre_prologue(PRE_ARGS); |
|
/* Specific post-child-parse routines. */ |
/* Specific post-child-parse routines. */ |
|
|
static int herr_ge1(POST_ARGS); |
static int herr_ge1(POST_ARGS); |
static int herr_le1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
static int herr_eq0(POST_ARGS); |
static int herr_eq0(POST_ARGS); |
static int eerr_eq0(POST_ARGS); |
static int eerr_eq0(POST_ARGS); |
static int eerr_le1(POST_ARGS); |
static int eerr_le1(POST_ARGS); |
Line 100 static int eerr_ge1(POST_ARGS); |
|
Line 100 static int eerr_ge1(POST_ARGS); |
|
static int ewarn_eq0(POST_ARGS); |
static int ewarn_eq0(POST_ARGS); |
static int ewarn_eq1(POST_ARGS); |
static int ewarn_eq1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
|
static int hwarn_eq1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int ebool(POST_ARGS); |
static int ebool(POST_ARGS); |
|
|
static int post_sh(POST_ARGS); |
static int post_sh(POST_ARGS); |
static int post_sh_body(POST_ARGS); |
static int post_sh_body(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
|
static int post_fd(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_ex(POST_ARGS); |
static int post_ex(POST_ARGS); |
Line 152 static v_post posts_an[] = { post_an, NULL }; |
|
Line 154 static v_post posts_an[] = { post_an, NULL }; |
|
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL }; |
static v_post posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_bf[] = { herr_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_rs[] = { herr_eq0, bwarn_ge1, NULL }; |
static v_post posts_rs[] = { herr_eq0, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_bk[] = { herr_eq0, bwarn_ge1, NULL }; |
static v_post posts_bk[] = { herr_eq0, bwarn_ge1, NULL }; |
|
static v_post posts_fd[] = { ewarn_ge1, post_fd, NULL }; |
|
|
/* Per-macro pre- and post-child-check routine collections. */ |
/* Per-macro pre- and post-child-check routine collections. */ |
|
|
Line 184 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 187 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_text }, /* Ev */ |
{ NULL, posts_text }, /* Ev */ |
{ pres_ex, posts_ex }, /* Ex */ |
{ pres_ex, posts_ex }, /* Ex */ |
{ NULL, posts_text }, /* Fa */ |
{ NULL, posts_text }, /* Fa */ |
{ NULL, posts_wtext }, /* Fd */ |
{ NULL, posts_fd }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, posts_text }, /* Fn */ |
{ NULL, posts_text }, /* Fn */ |
{ NULL, posts_wtext }, /* Ft */ |
{ NULL, posts_wtext }, /* Ft */ |
Line 269 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 272 const struct valids mdoc_valids[MDOC_MAX] = { |
|
}; |
}; |
|
|
|
|
|
int |
|
mdoc_valid_pre(struct mdoc *mdoc, |
|
const struct mdoc_node *node) |
|
{ |
|
v_pre *p; |
|
struct mdoc_arg *argv; |
|
size_t argc, i, j, line, pos; |
|
const char *tp; |
|
|
|
if (MDOC_TEXT == node->type) { |
|
tp = node->data.text.string; |
|
line = node->line; |
|
pos = node->pos; |
|
return(check_text(mdoc, line, pos, tp)); |
|
} |
|
|
|
if (MDOC_BLOCK == node->type || MDOC_ELEM == node->type) { |
|
argv = MDOC_BLOCK == node->type ? |
|
node->data.block.argv : |
|
node->data.elem.argv; |
|
argc = MDOC_BLOCK == node->type ? |
|
node->data.block.argc : |
|
node->data.elem.argc; |
|
|
|
for (i = 0; i < argc; i++) { |
|
if (0 == argv[i].sz) |
|
continue; |
|
for (j = 0; j < argv[i].sz; j++) { |
|
tp = argv[i].value[j]; |
|
line = argv[i].line; |
|
pos = argv[i].pos; |
|
if ( ! check_text(mdoc, line, pos, tp)) |
|
return(0); |
|
} |
|
} |
|
} |
|
|
|
if (NULL == mdoc_valids[node->tok].pre) |
|
return(1); |
|
for (p = mdoc_valids[node->tok].pre; *p; p++) |
|
if ( ! (*p)(mdoc, node)) |
|
return(0); |
|
return(1); |
|
} |
|
|
|
|
|
int |
|
mdoc_valid_post(struct mdoc *mdoc) |
|
{ |
|
v_post *p; |
|
|
|
/* |
|
* This check occurs after the macro's children have been filled |
|
* in: postfix validation. Since this happens when we're |
|
* rewinding the scope tree, it's possible to have multiple |
|
* invocations (as by design, for now), we set bit MDOC_VALID to |
|
* indicate that we've validated. |
|
*/ |
|
|
|
if (MDOC_VALID & mdoc->last->flags) |
|
return(1); |
|
mdoc->last->flags |= MDOC_VALID; |
|
|
|
if (MDOC_TEXT == mdoc->last->type) |
|
return(1); |
|
if (MDOC_ROOT == mdoc->last->type) |
|
return(post_root(mdoc)); |
|
|
|
if (NULL == mdoc_valids[mdoc->last->tok].post) |
|
return(1); |
|
for (p = mdoc_valids[mdoc->last->tok].post; *p; p++) |
|
if ( ! (*p)(mdoc)) |
|
return(0); |
|
|
|
return(1); |
|
} |
|
|
|
|
|
|
static inline int |
static inline int |
warn_count(struct mdoc *m, const char *k, |
warn_count(struct mdoc *m, const char *k, |
int want, const char *v, int has) |
int want, const char *v, int has) |
{ |
{ |
|
|
return(mdoc_warn(m, WARN_SYNTAX, |
return(mdoc_warn(m, WARN_SYNTAX, |
"suggests %s %d %s (has %d)", |
"suggests %s %s %d (has %d)", |
v, want, k, has)); |
v, k, want, has)); |
} |
} |
|
|
|
|
Line 285 err_count(struct mdoc *m, const char *k, |
|
Line 367 err_count(struct mdoc *m, const char *k, |
|
int want, const char *v, int has) |
int want, const char *v, int has) |
{ |
{ |
|
|
return(mdoc_err(m, "requires %s %d %s (has %d)", |
return(mdoc_err(m, "requires %s %s %d (has %d)", |
v, want, k, has)); |
v, k, want, has)); |
} |
} |
|
|
|
|
Line 342 h##lvl##_##name(POST_ARGS) \ |
|
Line 424 h##lvl##_##name(POST_ARGS) \ |
|
{ \ |
{ \ |
if (MDOC_HEAD != mdoc->last->type) \ |
if (MDOC_HEAD != mdoc->last->type) \ |
return(1); \ |
return(1); \ |
return(func(mdoc, "multiline parameters", (num))); \ |
return(func(mdoc, "line parameters", (num))); \ |
} |
} |
|
|
|
|
Line 351 CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ |
|
Line 433 CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ |
|
CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */ |
CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */ |
CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */ |
CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */ |
CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */ |
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, warn, warn_child_gt, 0) /* bwarn_ge1() */ |
CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1) /* ewarn_eq1() */ |
CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1) /* ewarn_eq1() */ |
CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0) /* ewarn_eq0() */ |
CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0) /* ewarn_eq0() */ |
Line 361 CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1 |
|
Line 444 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(eq0, err, err_child_eq, 0) /* eerr_eq0() */ |
CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ |
CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ |
CHECK_HEAD_DEFN(le1, err, err_child_lt, 2) /* herr_le1() */ |
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(ge1, err, err_child_gt, 0) /* herr_ge1() */ |
|
CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1) /* hwarn_eq1() */ |
|
|
|
|
static int |
static int |
Line 397 check_text(struct mdoc *mdoc, size_t line, size_t pos, |
|
Line 481 check_text(struct mdoc *mdoc, size_t line, size_t pos, |
|
size_t c; |
size_t c; |
|
|
for ( ; *p; p++) { |
for ( ; *p; p++) { |
if ( ! isprint(*p) && '\t' != *p) |
if ( ! isprint((int)*p) && '\t' != *p) |
return(mdoc_perr(mdoc, line, pos, |
return(mdoc_perr(mdoc, line, pos, |
"invalid characters")); |
"invalid characters")); |
if ('\\' != *p) |
if ('\\' != *p) |
Line 456 pre_display(PRE_ARGS) |
|
Line 540 pre_display(PRE_ARGS) |
|
static int |
static int |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
int type, err, i; |
int type, i, width, offset; |
struct mdoc_arg *argv; |
struct mdoc_arg *argv; |
size_t argc; |
size_t argc; |
|
|
Line 467 pre_bl(PRE_ARGS) |
|
Line 551 pre_bl(PRE_ARGS) |
|
|
|
/* Make sure that only one type of list is specified. */ |
/* Make sure that only one type of list is specified. */ |
|
|
|
type = offset = width = -1; |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0, type = err = 0; i < (int)argc; i++) { |
for (i = 0; i < (int)argc; i++) { |
argv = &n->data.block.argv[i]; |
argv = &n->data.block.argv[i]; |
|
|
switch (argv->arg) { |
switch (argv->arg) { |
Line 493 pre_bl(PRE_ARGS) |
|
Line 579 pre_bl(PRE_ARGS) |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Column): |
case (MDOC_Column): |
if (0 == type++) |
if (-1 == type) { |
|
type = argv->arg; |
break; |
break; |
|
} |
return(mdoc_perr(mdoc, argv->line, argv->pos, |
return(mdoc_perr(mdoc, argv->line, argv->pos, |
"multiple types specified")); |
"multiple types specified")); |
|
case (MDOC_Width): |
|
if (-1 == width) { |
|
width = argv->arg; |
|
break; |
|
} |
|
return(mdoc_perr(mdoc, argv->line, argv->pos, |
|
"multiple -%s arguments", |
|
mdoc_argnames[MDOC_Width])); |
|
case (MDOC_Offset): |
|
if (-1 == offset) { |
|
offset = argv->arg; |
|
break; |
|
} |
|
return(mdoc_perr(mdoc, argv->line, argv->pos, |
|
"multiple -%s arguments", |
|
mdoc_argnames[MDOC_Offset])); |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
|
|
if (type) |
if (-1 == type) |
return(1); |
return(mdoc_err(mdoc, "no type specified")); |
return(mdoc_err(mdoc, "no type specified")); |
|
|
switch (type) { |
|
case (MDOC_Column): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
if (-1 == width) |
|
break; |
|
return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, |
|
"superfluous -%s argument", |
|
mdoc_argnames[MDOC_Width])); |
|
case (MDOC_Tag): |
|
if (-1 != width) |
|
break; |
|
return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, |
|
"suggest -%s argument", |
|
mdoc_argnames[MDOC_Width])); |
|
default: |
|
break; |
|
} |
|
|
|
return(1); |
} |
} |
|
|
|
|
|
|
pre_it(PRE_ARGS) |
pre_it(PRE_ARGS) |
{ |
{ |
|
|
/* TODO: -width attribute must be specified for -tag. */ |
|
/* TODO: children too big for -width? */ |
/* TODO: children too big for -width? */ |
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
Line 1066 post_sh_head(POST_ARGS) |
|
Line 1193 post_sh_head(POST_ARGS) |
|
} |
} |
|
|
|
|
int |
static int |
mdoc_valid_pre(struct mdoc *mdoc, |
post_fd(POST_ARGS) |
const struct mdoc_node *node) |
|
{ |
{ |
v_pre *p; |
|
struct mdoc_arg *argv; |
|
size_t argc, i, j, line, pos; |
|
const char *tp; |
|
|
|
if (MDOC_TEXT == node->type) { |
if (SEC_SYNOPSIS == mdoc->last->sec) |
tp = node->data.text.string; |
|
line = node->line; |
|
pos = node->pos; |
|
return(check_text(mdoc, line, pos, tp)); |
|
} |
|
|
|
if (MDOC_BLOCK == node->type || MDOC_ELEM == node->type) { |
|
argv = MDOC_BLOCK == node->type ? |
|
node->data.block.argv : |
|
node->data.elem.argv; |
|
argc = MDOC_BLOCK == node->type ? |
|
node->data.block.argc : |
|
node->data.elem.argc; |
|
|
|
for (i = 0; i < argc; i++) { |
|
if (0 == argv[i].sz) |
|
continue; |
|
for (j = 0; j < argv[i].sz; j++) { |
|
tp = argv[i].value[j]; |
|
line = argv[i].line; |
|
pos = argv[i].pos; |
|
if ( ! check_text(mdoc, line, pos, tp)) |
|
return(0); |
|
} |
|
} |
|
} |
|
|
|
if (NULL == mdoc_valids[node->tok].pre) |
|
return(1); |
return(1); |
for (p = mdoc_valids[node->tok].pre; *p; p++) |
return(mdoc_warn(mdoc, WARN_COMPAT, |
if ( ! (*p)(mdoc, node)) |
"suggested only in section SYNOPSIS")); |
return(0); |
|
return(1); |
|
} |
} |
|
|
|
|
int |
|
mdoc_valid_post(struct mdoc *mdoc) |
|
{ |
|
v_post *p; |
|
|
|
/* |
|
* This check occurs after the macro's children have been filled |
|
* in: postfix validation. Since this happens when we're |
|
* rewinding the scope tree, it's possible to have multiple |
|
* invocations (as by design, for now), we set bit MDOC_VALID to |
|
* indicate that we've validated. |
|
*/ |
|
|
|
if (MDOC_VALID & mdoc->last->flags) |
|
return(1); |
|
mdoc->last->flags |= MDOC_VALID; |
|
|
|
if (MDOC_TEXT == mdoc->last->type) |
|
return(1); |
|
if (MDOC_ROOT == mdoc->last->type) |
|
return(post_root(mdoc)); |
|
|
|
if (NULL == mdoc_valids[mdoc->last->tok].post) |
|
return(1); |
|
for (p = mdoc_valids[mdoc->last->tok].post; *p; p++) |
|
if ( ! (*p)(mdoc)) |
|
return(0); |
|
|
|
return(1); |
|
} |
|
|
|