version 1.58, 2009/02/24 16:16:45 |
version 1.65, 2009/02/28 14:40:07 |
|
|
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_post)(POST_ARGS); |
typedef int (*v_post)(POST_ARGS); |
|
|
/* FIXME: some sections should only occur in specific msecs. */ |
/* TODO: ignoring Pp (it's superfluous in some invocations). */ |
/* FIXME: ignoring Pp. */ |
|
/* FIXME: math symbols. */ |
|
|
|
struct valids { |
struct valids { |
v_pre *pre; |
v_pre *pre; |
Line 52 static int check_msec(PRE_ARGS, int, enum mdoc_msec *) |
|
Line 50 static int check_msec(PRE_ARGS, int, enum mdoc_msec *) |
|
static int check_stdarg(PRE_ARGS); |
static int check_stdarg(PRE_ARGS); |
|
|
static int check_text(struct mdoc *, |
static int check_text(struct mdoc *, |
size_t, size_t, const char *); |
int, int, 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 89 static int pre_prologue(PRE_ARGS); |
|
Line 88 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 153 static v_post posts_an[] = { post_an, NULL }; |
|
Line 152 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[] = { hwarn_eq1, 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 }; |
Line 277 mdoc_valid_pre(struct mdoc *mdoc, |
|
Line 276 mdoc_valid_pre(struct mdoc *mdoc, |
|
{ |
{ |
v_pre *p; |
v_pre *p; |
struct mdoc_arg *argv; |
struct mdoc_arg *argv; |
size_t argc, i, j, line, pos; |
size_t argc; |
|
int line, pos, i, j; |
const char *tp; |
const char *tp; |
|
|
if (MDOC_TEXT == node->type) { |
if (MDOC_TEXT == node->type) { |
Line 295 mdoc_valid_pre(struct mdoc *mdoc, |
|
Line 295 mdoc_valid_pre(struct mdoc *mdoc, |
|
node->data.block.argc : |
node->data.block.argc : |
node->data.elem.argc; |
node->data.elem.argc; |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < (int)argc; i++) { |
if (0 == argv[i].sz) |
if (0 == argv[i].sz) |
continue; |
continue; |
for (j = 0; j < argv[i].sz; j++) { |
for (j = 0; j < (int)argv[i].sz; j++) { |
tp = argv[i].value[j]; |
tp = argv[i].value[j]; |
line = argv[i].line; |
line = argv[i].line; |
pos = argv[i].pos; |
pos = argv[i].pos; |
Line 432 CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ |
|
Line 432 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 442 CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1 |
|
Line 443 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() */ |
CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1) /* hwarn_eq1() */ |
|
|
Line 474 check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs) |
|
Line 475 check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs) |
|
|
|
|
|
static int |
static int |
check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p) |
check_text(struct mdoc *mdoc, int line, int pos, const char *p) |
{ |
{ |
size_t c; |
size_t c; |
|
|
|
/* XXX - indicate deprecated escapes \*(xx and \*x. */ |
|
|
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) |
continue; |
continue; |
if ((c = mdoc_isescape(p))) { |
if ((c = mdoc_isescape(p))) { |
p += (c - 1); |
p += (int)c - 1; |
continue; |
continue; |
} |
} |
return(mdoc_perr(mdoc, line, pos, |
return(mdoc_perr(mdoc, line, pos, |
"invalid escape sequence")); |
"invalid escape sequence")); |
} |
} |
|
|
return(1); |
return(1); |
Line 538 pre_display(PRE_ARGS) |
|
Line 541 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 549 pre_bl(PRE_ARGS) |
|
Line 552 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 575 pre_bl(PRE_ARGS) |
|
Line 580 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 && ! mdoc_nwarn(mdoc, n, WARN_SYNTAX, |
|
"suggest -%s argument", |
|
mdoc_argnames[MDOC_Width])) |
|
return(0); |
|
break; |
|
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? */ |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
Line 1008 post_bl(POST_ARGS) |
|
Line 1052 post_bl(POST_ARGS) |
|
|
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
|
if (NULL == (mdoc->last->child)) |
|
return(1); |
|
|
|
/* |
|
* Only allow `It' macros to be the immediate descendants of the |
|
* `Bl' list. |
|
*/ |
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
if (MDOC_It == n->tok) |
if (MDOC_It == n->tok) |
continue; |
continue; |
break; |
|
|
return(mdoc_nerr(mdoc, n, "bad child of parent %s", |
|
mdoc_macronames[mdoc->last->tok])); |
} |
} |
|
|
if (NULL == n) |
return(1); |
return(1); |
|
|
|
return(mdoc_nerr(mdoc, n, "bad child of parent list")); |
|
} |
} |
|
|
|
|