version 1.51, 2009/02/22 14:31:08 |
version 1.53, 2009/02/23 22:51:10 |
Line 34 typedef int (*v_post)(struct mdoc *); |
|
Line 34 typedef int (*v_post)(struct mdoc *); |
|
|
|
/* 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: .Ef arguments */ |
|
/* FIXME: math symbols. */ |
/* FIXME: math symbols. */ |
/* FIXME: valid character-escape checks. */ |
/* FIXME: valid character-escape checks. */ |
/* FIXME: .Fd only in synopsis section. */ |
/* FIXME: .Fd only in synopsis section. */ |
Line 140 static v_post posts_bl[] = { herr_eq0, bwarn_ge1, post |
|
Line 139 static v_post posts_bl[] = { herr_eq0, bwarn_ge1, post |
|
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_in[] = { ewarn_eq1, NULL }; |
static v_post posts_in[] = { ewarn_eq1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
|
static v_post posts_pf[] = { eerr_eq1, NULL }; |
static v_post posts_pp[] = { ewarn_eq0, NULL }; |
static v_post posts_pp[] = { ewarn_eq0, NULL }; |
static v_post posts_ex[] = { eerr_le1, post_ex, NULL }; |
static v_post posts_ex[] = { eerr_le1, post_ex, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
Line 231 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 231 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pf */ |
{ NULL, posts_pf }, /* Pf */ |
{ NULL, NULL }, /* Po */ |
{ NULL, NULL }, /* Po */ |
{ NULL, posts_wline }, /* Pq */ |
{ NULL, posts_wline }, /* Pq */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, NULL }, /* Qc */ |
Line 291 count_child(struct mdoc *mdoc) |
|
Line 291 count_child(struct mdoc *mdoc) |
|
|
|
for (i = 0, n = mdoc->last->child; n; n = n->next, i++) |
for (i = 0, n = mdoc->last->child; n; n = n->next, i++) |
/* Do nothing */ ; |
/* Do nothing */ ; |
|
|
return(i); |
return(i); |
} |
} |
|
|
|
|
static int |
/* |
warn_child_gt(struct mdoc *mdoc, const char *p, int sz) |
* Build these up with macros because they're basically the same check |
{ |
* for different inequalities. Yes, this could be done with functions, |
int i; |
* but this is reasonable for now. |
|
*/ |
|
|
if ((i = count_child(mdoc)) > sz) |
#define CHECK_CHILD_DEFN(lvl, name, ineq) \ |
return(1); |
static int \ |
return(warn_count(mdoc, ">", sz, p, i)); |
lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) \ |
|
{ \ |
|
int i; \ |
|
if ((i = count_child(mdoc)) ineq sz) \ |
|
return(1); \ |
|
return(lvl##_count(mdoc, #ineq, sz, p, i)); \ |
} |
} |
|
|
|
#define CHECK_BODY_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
err_child_gt(struct mdoc *mdoc, const char *p, int sz) |
b##lvl##_##name(struct mdoc *mdoc) \ |
{ |
{ \ |
int i; |
if (MDOC_BODY != mdoc->last->type) \ |
|
return(1); \ |
if ((i = count_child(mdoc)) > sz) |
return(func(mdoc, "multiline parameters", (num))); \ |
return(1); |
|
return(err_count(mdoc, ">", sz, p, i)); |
|
} |
} |
|
|
|
#define CHECK_ELEM_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
warn_child_eq(struct mdoc *mdoc, const char *p, int sz) |
e##lvl##_##name(struct mdoc *mdoc) \ |
{ |
{ \ |
int i; |
assert(MDOC_ELEM == mdoc->last->type); \ |
|
return(func(mdoc, "line parameters", (num))); \ |
if ((i = count_child(mdoc)) == sz) |
|
return(1); |
|
return(warn_count(mdoc, "==", sz, p, i)); |
|
} |
} |
|
|
|
#define CHECK_HEAD_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
err_child_eq(struct mdoc *mdoc, const char *p, int sz) |
h##lvl##_##name(struct mdoc *mdoc) \ |
{ |
{ \ |
int i; |
if (MDOC_HEAD != mdoc->last->type) \ |
|
return(1); \ |
if ((i = count_child(mdoc)) == sz) |
return(func(mdoc, "multiline parameters", (num))); \ |
return(1); |
|
return(err_count(mdoc, "==", sz, p, i)); |
|
} |
} |
|
|
|
|
static int |
CHECK_CHILD_DEFN(warn, gt, >) /* warn_child_gt() */ |
err_child_lt(struct mdoc *mdoc, const char *p, int sz) |
CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ |
{ |
CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */ |
int i; |
CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */ |
|
CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */ |
|
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(eq0, warn, warn_child_eq, 0) /* ewarn_eq0() */ |
|
CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */ |
|
CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */ |
|
CHECK_ELEM_DEFN(le2, err, err_child_lt, 3) /* eerr_le2() */ |
|
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(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
|
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(ge1, err, err_child_gt, 0) /* herr_ge1() */ |
|
|
if ((i = count_child(mdoc)) < sz) |
|
return(1); |
|
return(err_count(mdoc, "<", sz, p, i)); |
|
} |
|
|
|
|
|
static int |
static int |
check_stdarg(struct mdoc *mdoc, struct mdoc_node *node) |
check_stdarg(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
Line 359 check_stdarg(struct mdoc *mdoc, struct mdoc_node *node |
|
Line 367 check_stdarg(struct mdoc *mdoc, struct mdoc_node *node |
|
return(1); |
return(1); |
|
|
return(mdoc_nwarn(mdoc, node, WARN_COMPAT, |
return(mdoc_nwarn(mdoc, node, WARN_COMPAT, |
"macro suggests single `%s' argument", |
"one argument suggested")); |
mdoc_argnames[MDOC_Std])); |
|
} |
} |
|
|
|
|
Line 373 check_msec(struct mdoc *mdoc, struct mdoc_node *node, |
|
Line 380 check_msec(struct mdoc *mdoc, struct mdoc_node *node, |
|
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |
if (msecs[i] == mdoc->meta.msec) |
if (msecs[i] == mdoc->meta.msec) |
return(1); |
return(1); |
return(mdoc_nwarn(mdoc, node, WARN_COMPAT, "macro not " |
return(mdoc_nwarn(mdoc, node, WARN_COMPAT, |
"appropriate for manual section")); |
"wrong manual section")); |
} |
} |
|
|
|
|
static int |
static int |
check_parent(struct mdoc *mdoc, struct mdoc_node *n, |
|
int tok, enum mdoc_type t) |
|
{ |
|
|
|
assert(n->parent); |
|
if ((MDOC_ROOT == t || tok == n->parent->tok) && |
|
(t == n->parent->type)) |
|
return(1); |
|
|
|
return(mdoc_nerr(mdoc, n, "require parent %s (have %s)", |
|
MDOC_ROOT == t ? "<root>" : |
|
mdoc_macronames[tok], |
|
MDOC_ROOT == n->parent->type ? "<root>" : |
|
mdoc_macronames[n->parent->type])); |
|
} |
|
|
|
|
|
static int |
|
bwarn_ge1(struct mdoc *mdoc) |
|
{ |
|
|
|
if (MDOC_BODY != mdoc->last->type) |
|
return(1); |
|
return(warn_child_gt(mdoc, "multi-line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
ewarn_eq1(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(warn_child_eq(mdoc, "line parameters", 1)); |
|
} |
|
|
|
|
|
static int |
|
ewarn_eq0(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(warn_child_eq(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
ewarn_ge1(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(warn_child_gt(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
eerr_eq1(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(err_child_eq(mdoc, "line parameters", 1)); |
|
} |
|
|
|
|
|
static int |
|
eerr_le2(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(err_child_lt(mdoc, "line parameters", 3)); |
|
} |
|
|
|
|
|
static int |
|
eerr_le1(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(err_child_lt(mdoc, "line parameters", 2)); |
|
} |
|
|
|
|
|
static int |
|
eerr_eq0(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(err_child_eq(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
eerr_ge1(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
return(err_child_gt(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
herr_eq0(struct mdoc *mdoc) |
|
{ |
|
|
|
if (MDOC_HEAD != mdoc->last->type) |
|
return(1); |
|
return(err_child_eq(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
herr_le1(struct mdoc *mdoc) |
|
{ |
|
if (MDOC_HEAD != mdoc->last->type) |
|
return(1); |
|
return(err_child_lt(mdoc, "line parameters", 2)); |
|
} |
|
|
|
|
|
static int |
|
herr_ge1(struct mdoc *mdoc) |
|
{ |
|
|
|
if (MDOC_HEAD != mdoc->last->type) |
|
return(1); |
|
return(err_child_gt(mdoc, "line parameters", 0)); |
|
} |
|
|
|
|
|
static int |
|
pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
|
/* Display elements (`Bd', `D1'...) cannot be nested. */ |
|
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
|
|
assert(mdoc->last); |
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last->parent; n; n = n->parent) |
for (n = mdoc->last->parent; n; n = n->parent) |
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
Line 523 pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 402 pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
|
break; |
break; |
if (NULL == n) |
if (NULL == n) |
return(1); |
return(1); |
|
|
return(mdoc_nerr(mdoc, node, "displays may not be nested")); |
return(mdoc_nerr(mdoc, node, "displays may not be nested")); |
} |
} |
|
|
Line 530 pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 410 pre_display(struct mdoc *mdoc, struct mdoc_node *node) |
|
static int |
static int |
pre_bl(struct mdoc *mdoc, struct mdoc_node *node) |
pre_bl(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
int type, err; |
int type, err, i; |
struct mdoc_arg *argv; |
struct mdoc_arg *argv; |
size_t i, argc; |
size_t argc; |
|
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
assert(MDOC_Bl == node->tok); |
|
|
|
argv = NULL; |
|
argc = node->data.block.argc; |
argc = node->data.block.argc; |
|
|
|
/* Make sure that only one type of list is specified. */ |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = type = err = 0; i < argc; i++) { |
for (i = 0, type = err = 0; i < (int)argc; i++) { |
argv = &node->data.block.argv[(int)i]; |
argv = &node->data.block.argv[i]; |
assert(argv); |
|
switch (argv->arg) { |
switch (argv->arg) { |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 567 pre_bl(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 447 pre_bl(struct mdoc *mdoc, struct mdoc_node *node) |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Column): |
case (MDOC_Column): |
if (type) |
if (0 == type++) |
err++; |
break; |
type++; |
return(mdoc_perr(mdoc, argv->line, argv->pos, |
break; |
"multiple types specified")); |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (0 == type) |
|
return(mdoc_err(mdoc, "no list type specified")); |
if (type) |
if (0 == err) |
|
return(1); |
return(1); |
assert(argv); |
return(mdoc_err(mdoc, "no type specified")); |
return(mdoc_perr(mdoc, argv->line, |
|
argv->pos, "only one list type possible")); |
|
} |
} |
|
|
|
|
static int |
static int |
pre_bd(struct mdoc *mdoc, struct mdoc_node *node) |
pre_bd(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
int type, err; |
int type, err, i; |
struct mdoc_arg *argv; |
struct mdoc_arg *argv; |
size_t i, argc; |
size_t argc; |
|
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
assert(MDOC_Bd == node->tok); |
|
|
|
argv = NULL; |
|
argc = node->data.block.argc; |
argc = node->data.block.argc; |
|
|
|
/* Make sure that only one type of display is specified. */ |
|
|
/* LINTED */ |
/* LINTED */ |
for (err = i = type = 0; 0 == err && i < argc; i++) { |
for (i = 0, err = type = 0; ! err && i < (int)argc; i++) { |
argv = &node->data.block.argv[(int)i]; |
argv = &node->data.block.argv[i]; |
assert(argv); |
|
switch (argv->arg) { |
switch (argv->arg) { |
case (MDOC_Ragged): |
case (MDOC_Ragged): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 613 pre_bd(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 490 pre_bd(struct mdoc *mdoc, struct mdoc_node *node) |
|
case (MDOC_Literal): |
case (MDOC_Literal): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_File): |
case (MDOC_File): |
if (type) |
if (0 == type++) |
err++; |
break; |
type++; |
return(mdoc_perr(mdoc, argv->line, argv->pos, |
break; |
"multiple types specified")); |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (0 == type) |
|
return(mdoc_err(mdoc, "no display type specified")); |
if (type) |
if (0 == err) |
|
return(1); |
return(1); |
assert(argv); |
return(mdoc_err(mdoc, "no type specified")); |
return(mdoc_perr(mdoc, argv->line, |
|
argv->pos, "only one display type possible")); |
|
} |
} |
|
|
|
|
Line 652 pre_sh(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 526 pre_sh(struct mdoc *mdoc, struct mdoc_node *node) |
|
|
|
|
|
static int |
static int |
|
pre_it(struct mdoc *mdoc, struct mdoc_node *node) |
|
{ |
|
|
|
/* TODO: -width attribute must be specified for -tag. */ |
|
/* TODO: children too big for -width? */ |
|
|
|
if (MDOC_BLOCK != node->type) |
|
return(1); |
|
return(check_parent(mdoc, node, MDOC_Bl, MDOC_BODY)); |
|
} |
|
|
|
|
|
static int |
pre_st(struct mdoc *mdoc, struct mdoc_node *node) |
pre_st(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
|
|
assert(MDOC_ELEM == node->type); |
|
assert(MDOC_St == node->tok); |
|
if (1 == node->data.elem.argc) |
if (1 == node->data.elem.argc) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, node, "macro must have one argument")); |
return(mdoc_nerr(mdoc, node, "one argument required")); |
} |
} |
|
|
|
|
|
|
pre_an(struct mdoc *mdoc, struct mdoc_node *node) |
pre_an(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
|
|
assert(MDOC_ELEM == node->type); |
|
assert(MDOC_An == node->tok); |
|
if (1 >= node->data.elem.argc) |
if (1 >= node->data.elem.argc) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, node, "macro may only have one argument")); |
return(mdoc_nerr(mdoc, node, "one argument allowed")); |
} |
} |
|
|
|
|
static int |
static int |
pre_rv(struct mdoc *mdoc, struct mdoc_node *node) |
pre_rv(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
enum mdoc_msec msecs[2]; |
enum mdoc_msec msecs[] = { MSEC_2, MSEC_3 }; |
|
|
assert(MDOC_ELEM == node->type); |
|
assert(MDOC_Rv == node->tok); |
|
|
|
msecs[0] = MSEC_2; |
|
msecs[1] = MSEC_3; |
|
if ( ! check_msec(mdoc, node, 2, msecs)) |
if ( ! check_msec(mdoc, node, 2, msecs)) |
return(0); |
return(0); |
return(check_stdarg(mdoc, node)); |
return(check_stdarg(mdoc, node)); |
Line 694 pre_rv(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 572 pre_rv(struct mdoc *mdoc, struct mdoc_node *node) |
|
static int |
static int |
pre_ex(struct mdoc *mdoc, struct mdoc_node *node) |
pre_ex(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
enum mdoc_msec msecs[3]; |
enum mdoc_msec msecs[] = { MSEC_1, MSEC_6, MSEC_8 }; |
|
|
assert(MDOC_ELEM == node->type); |
|
assert(MDOC_Ex == node->tok); |
|
|
|
msecs[0] = MSEC_1; |
|
msecs[1] = MSEC_6; |
|
msecs[2] = MSEC_8; |
|
if ( ! check_msec(mdoc, node, 3, msecs)) |
if ( ! check_msec(mdoc, node, 3, msecs)) |
return(0); |
return(0); |
return(check_stdarg(mdoc, node)); |
return(check_stdarg(mdoc, node)); |
Line 711 pre_ex(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 583 pre_ex(struct mdoc *mdoc, struct mdoc_node *node) |
|
static int |
static int |
pre_er(struct mdoc *mdoc, struct mdoc_node *node) |
pre_er(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
enum mdoc_msec msecs[1]; |
enum mdoc_msec msecs[] = { MSEC_2 }; |
|
|
msecs[0] = MSEC_2; |
|
return(check_msec(mdoc, node, 1, msecs)); |
return(check_msec(mdoc, node, 1, msecs)); |
} |
} |
|
|
Line 721 pre_er(struct mdoc *mdoc, struct mdoc_node *node) |
|
Line 592 pre_er(struct mdoc *mdoc, struct mdoc_node *node) |
|
static int |
static int |
pre_cd(struct mdoc *mdoc, struct mdoc_node *node) |
pre_cd(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
enum mdoc_msec msecs[1]; |
enum mdoc_msec msecs[] = { MSEC_4 }; |
|
|
msecs[0] = MSEC_4; |
|
return(check_msec(mdoc, node, 1, msecs)); |
return(check_msec(mdoc, node, 1, msecs)); |
} |
} |
|
|
|
|
static int |
static int |
pre_it(struct mdoc *mdoc, struct mdoc_node *node) |
|
{ |
|
|
|
/* TODO: -width attribute must be specified for -tag. */ |
|
/* TODO: children too big for -width? */ |
|
|
|
if (MDOC_BLOCK != node->type) |
|
return(1); |
|
return(check_parent(mdoc, node, MDOC_Bl, MDOC_BODY)); |
|
} |
|
|
|
|
|
static int |
|
pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) |
pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
|
|
if (SEC_PROLOGUE != mdoc->lastnamed) |
if (SEC_PROLOGUE != mdoc->lastnamed) |
return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue")); |
return(mdoc_nerr(mdoc, node, "prologue only")); |
assert(MDOC_ELEM == node->type); |
|
|
|
/* Check for ordering. */ |
/* Check for ordering. */ |
|
|
Line 755 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node |
|
Line 611 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node |
|
case (MDOC_Os): |
case (MDOC_Os): |
if (mdoc->meta.title && mdoc->meta.date) |
if (mdoc->meta.title && mdoc->meta.date) |
break; |
break; |
return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); |
return(mdoc_nerr(mdoc, node, |
|
"prologue out-of-order")); |
case (MDOC_Dt): |
case (MDOC_Dt): |
if (NULL == mdoc->meta.title && mdoc->meta.date) |
if (NULL == mdoc->meta.title && mdoc->meta.date) |
break; |
break; |
return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); |
return(mdoc_nerr(mdoc, node, |
|
"prologue out-of-order")); |
case (MDOC_Dd): |
case (MDOC_Dd): |
if (NULL == mdoc->meta.title && 0 == mdoc->meta.date) |
if (NULL == mdoc->meta.title && 0 == mdoc->meta.date) |
break; |
break; |
return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); |
return(mdoc_nerr(mdoc, node, |
|
"prologue out-of-order")); |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
Line 789 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node |
|
Line 648 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
return(mdoc_nerr(mdoc, node, "prologue macro repeated")); |
return(mdoc_nerr(mdoc, node, "prologue repetition")); |
} |
} |
|
|
|
|
Line 801 post_bf(struct mdoc *mdoc) |
|
Line 660 post_bf(struct mdoc *mdoc) |
|
|
|
if (MDOC_BLOCK != mdoc->last->type) |
if (MDOC_BLOCK != mdoc->last->type) |
return(1); |
return(1); |
assert(MDOC_Bf == mdoc->last->tok); |
|
head = mdoc->last->data.block.head; |
head = mdoc->last->data.block.head; |
assert(head); |
|
|
|
if (0 == mdoc->last->data.block.argc) { |
if (0 == mdoc->last->data.block.argc) { |
if (head->child) { |
if (NULL == head->child) |
assert(MDOC_TEXT == head->child->type); |
return(mdoc_err(mdoc, "argument expected")); |
p = head->child->data.text.string; |
|
if (xstrcmp(p, "Em")) |
p = head->child->data.text.string; |
return(1); |
if (xstrcmp(p, "Em")) |
else if (xstrcmp(p, "Li")) |
return(1); |
return(1); |
else if (xstrcmp(p, "Li")) |
else if (xstrcmp(p, "Sm")) |
return(1); |
return(1); |
else if (xstrcmp(p, "Sm")) |
return(mdoc_nerr(mdoc, head->child, "invalid font mode")); |
return(1); |
} |
return(mdoc_nerr(mdoc, head->child, "invalid font")); |
return(mdoc_err(mdoc, "macro expects an argument or parameter")); |
|
} |
} |
|
|
if (head->child) |
if (head->child) |
return(mdoc_err(mdoc, "macro expects an argument or parameter")); |
return(mdoc_err(mdoc, "argument expected")); |
|
|
if (1 == mdoc->last->data.block.argc) |
if (1 == mdoc->last->data.block.argc) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro expects an argument or parameter")); |
return(mdoc_err(mdoc, "argument expected")); |
} |
} |
|
|
|
|
|
|
post_nm(struct mdoc *mdoc) |
post_nm(struct mdoc *mdoc) |
{ |
{ |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
assert(MDOC_Nm == mdoc->last->tok); |
|
if (mdoc->last->child) |
if (mdoc->last->child) |
return(1); |
return(1); |
if (mdoc->meta.name) |
if (mdoc->meta.name) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro `%s' has not been invoked with a name", |
return(mdoc_err(mdoc, "not yet invoked with name")); |
mdoc_macronames[MDOC_Nm])); |
|
} |
} |
|
|
|
|
Line 847 post_xr(struct mdoc *mdoc) |
|
Line 703 post_xr(struct mdoc *mdoc) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
assert(MDOC_Xr == mdoc->last->tok); |
|
assert(mdoc->last->child); |
|
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
|
if (NULL == (n = mdoc->last->child->next)) |
if (NULL == (n = mdoc->last->child->next)) |
return(1); |
return(1); |
assert(MDOC_TEXT == n->type); |
|
if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string)) |
if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string)) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, n, "invalid manual section")); |
return(mdoc_nerr(mdoc, n, "invalid manual section")); |
|
|
post_at(struct mdoc *mdoc) |
post_at(struct mdoc *mdoc) |
{ |
{ |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
assert(MDOC_At == mdoc->last->tok); |
|
|
|
if (NULL == mdoc->last->child) |
if (NULL == mdoc->last->child) |
return(1); |
return(1); |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
|
if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string)) |
if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string)) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro expects a valid AT&T version symbol")); |
return(mdoc_err(mdoc, "require valid symbol")); |
} |
} |
|
|
|
|
|
|
post_an(struct mdoc *mdoc) |
post_an(struct mdoc *mdoc) |
{ |
{ |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
assert(MDOC_An == mdoc->last->tok); |
|
|
|
if (0 != mdoc->last->data.elem.argc) { |
if (0 != mdoc->last->data.elem.argc) { |
if (NULL == mdoc->last->child) |
if (NULL == mdoc->last->child) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro expects either argument or parameters")); |
return(mdoc_err(mdoc, "argument(s) expected")); |
} |
} |
|
|
if (mdoc->last->child) |
if (mdoc->last->child) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro expects either argument or parameters")); |
return(mdoc_err(mdoc, "argument(s) expected")); |
} |
} |
|
|
|
|
|
|
post_ex(struct mdoc *mdoc) |
post_ex(struct mdoc *mdoc) |
{ |
{ |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
assert(MDOC_Ex == mdoc->last->tok); |
|
|
|
if (0 == mdoc->last->data.elem.argc) { |
if (0 == mdoc->last->data.elem.argc) { |
if (mdoc->last->child) |
if (mdoc->last->child) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "macro expects `%s' or a single child", |
return(mdoc_err(mdoc, "argument(s) expected")); |
mdoc_argnames[MDOC_Std])); |
|
} |
} |
if (mdoc->last->child) |
if (mdoc->last->child) |
return(mdoc_err(mdoc, "macro expects `%s' or a single child", |
return(mdoc_err(mdoc, "argument(s) expected")); |
mdoc_argnames[MDOC_Std])); |
|
if (1 != mdoc->last->data.elem.argc) |
if (1 != mdoc->last->data.elem.argc) |
return(mdoc_err(mdoc, "macro expects `%s' or a single child", |
return(mdoc_err(mdoc, "argument(s) expected")); |
mdoc_argnames[MDOC_Std])); |
|
if (MDOC_Std != mdoc->last->data.elem.argv[0].arg) |
if (MDOC_Std != mdoc->last->data.elem.argv[0].arg) |
return(mdoc_err(mdoc, "macro expects `%s' or a single child", |
return(mdoc_err(mdoc, "argument(s) expected")); |
mdoc_argnames[MDOC_Std])); |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* Warn if `Bl' type-specific syntax isn't reflected in items. */ |
|
static int |
static int |
post_it(struct mdoc *mdoc) |
post_it(struct mdoc *mdoc) |
{ |
{ |
int type, sv; |
int type, sv, i; |
#define TYPE_NONE (0) |
#define TYPE_NONE (0) |
#define TYPE_BODY (1) |
#define TYPE_BODY (1) |
#define TYPE_HEAD (2) |
#define TYPE_HEAD (2) |
#define TYPE_OHEAD (3) |
#define TYPE_OHEAD (3) |
size_t i, argc; |
size_t argc; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
if (MDOC_BLOCK != mdoc->last->type) |
return(1); |
return(1); |
|
|
assert(MDOC_It == mdoc->last->tok); |
n = mdoc->last->parent->parent; |
|
|
n = mdoc->last->parent; |
|
assert(n); |
|
assert(MDOC_Bl == n->tok); |
|
|
|
n = n->parent; |
|
assert(MDOC_BLOCK == n->type); |
|
assert(MDOC_Bl == n->tok); |
|
|
|
argc = n->data.block.argc; |
argc = n->data.block.argc; |
type = TYPE_NONE; |
type = TYPE_NONE; |
sv = -1; |
sv = -1; |
Line 955 post_it(struct mdoc *mdoc) |
|
Line 782 post_it(struct mdoc *mdoc) |
|
/* Some types require block-head, some not. */ |
/* Some types require block-head, some not. */ |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; TYPE_NONE == type && i < argc; i++) |
for (i = 0; TYPE_NONE == type && i < (int)argc; i++) |
switch (n->data.block.argv[(int)i].arg) { |
switch (n->data.block.argv[i].arg) { |
case (MDOC_Tag): |
case (MDOC_Tag): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Diag): |
case (MDOC_Diag): |
Line 967 post_it(struct mdoc *mdoc) |
|
Line 794 post_it(struct mdoc *mdoc) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (MDOC_Inset): |
type = TYPE_HEAD; |
type = TYPE_HEAD; |
sv = n->data.block.argv[(int)i].arg; |
sv = n->data.block.argv[i].arg; |
break; |
break; |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 979 post_it(struct mdoc *mdoc) |
|
Line 806 post_it(struct mdoc *mdoc) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (MDOC_Item): |
type = TYPE_BODY; |
type = TYPE_BODY; |
sv = n->data.block.argv[(int)i].arg; |
sv = n->data.block.argv[i].arg; |
break; |
break; |
case (MDOC_Column): |
case (MDOC_Column): |
type = TYPE_OHEAD; |
type = TYPE_OHEAD; |
sv = n->data.block.argv[(int)i].arg; |
sv = n->data.block.argv[i].arg; |
break; |
break; |
default: |
default: |
break; |
break; |
Line 992 post_it(struct mdoc *mdoc) |
|
Line 819 post_it(struct mdoc *mdoc) |
|
assert(TYPE_NONE != type); |
assert(TYPE_NONE != type); |
|
|
n = mdoc->last->data.block.head; |
n = mdoc->last->data.block.head; |
assert(n); |
|
|
|
if (TYPE_HEAD == type) { |
if (TYPE_HEAD == type) { |
if (NULL == n->child) |
if (NULL == n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"argument(s) suggested")) |
return(0); |
return(0); |
|
|
n = mdoc->last->data.block.body; |
n = mdoc->last->data.block.body; |
assert(n); |
|
if (NULL == n->child) |
if (NULL == n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"multiline body suggested")) |
return(0); |
return(0); |
|
|
} else if (TYPE_BODY == type) { |
} else if (TYPE_BODY == type) { |
if (n->child) |
if (n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no line parameters")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"no argument suggested")) |
return(0); |
return(0); |
|
|
n = mdoc->last->data.block.body; |
n = mdoc->last->data.block.body; |
assert(n); |
|
if (NULL == n->child) |
if (NULL == n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"multiline body suggested")) |
return(0); |
return(0); |
} else { |
} else { |
if (NULL == n->child) |
if (NULL == n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"argument(s) suggested")) |
return(0); |
return(0); |
|
|
n = mdoc->last->data.block.body; |
n = mdoc->last->data.block.body; |
assert(n); |
|
if (n->child) |
if (n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
|
"no multiline body suggested")) |
return(0); |
return(0); |
} |
} |
|
|
if (MDOC_Column != sv) |
if (MDOC_Column != sv) |
return(1); |
return(1); |
|
|
/* Make sure the number of columns is sane. */ |
|
|
|
argc = mdoc->last->parent->parent->data.block.argv->sz; |
argc = mdoc->last->parent->parent->data.block.argv->sz; |
n = mdoc->last->data.block.head->child; |
n = mdoc->last->data.block.head->child; |
|
|
for (i = 0; n; n = n->next) |
for (i = 0; n; n = n->next) |
i++; |
i++; |
|
|
if (i == argc) |
if (i == (int)argc) |
return(1); |
return(1); |
return(mdoc_err(mdoc, "expected %zu list columns, have %zu", argc, i)); |
|
|
return(mdoc_err(mdoc, "need %zu columns (have %d)", argc, i)); |
#undef TYPE_NONE |
#undef TYPE_NONE |
#undef TYPE_BODY |
#undef TYPE_BODY |
#undef TYPE_HEAD |
#undef TYPE_HEAD |
Line 1051 post_it(struct mdoc *mdoc) |
|
Line 879 post_it(struct mdoc *mdoc) |
|
static int |
static int |
post_bl(struct mdoc *mdoc) |
post_bl(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
assert(MDOC_Bl == mdoc->last->tok); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
Line 1064 post_bl(struct mdoc *mdoc) |
|
Line 891 post_bl(struct mdoc *mdoc) |
|
continue; |
continue; |
break; |
break; |
} |
} |
|
|
if (NULL == n) |
if (NULL == n) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, n, "invalid child of parent macro `Bl'")); |
|
|
return(mdoc_nerr(mdoc, n, "bad child of parent list")); |
} |
} |
|
|
|
|
Line 1075 ebool(struct mdoc *mdoc) |
|
Line 904 ebool(struct mdoc *mdoc) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(MDOC_ELEM == mdoc->last->type); |
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type) |
Line 1086 ebool(struct mdoc *mdoc) |
|
Line 914 ebool(struct mdoc *mdoc) |
|
continue; |
continue; |
break; |
break; |
} |
} |
|
|
if (NULL == n) |
if (NULL == n) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, n, "expected boolean value")); |
return(mdoc_nerr(mdoc, n, "expected boolean")); |
} |
} |
|
|
|
|
Line 1097 post_root(struct mdoc *mdoc) |
|
Line 926 post_root(struct mdoc *mdoc) |
|
{ |
{ |
|
|
if (NULL == mdoc->first->child) |
if (NULL == mdoc->first->child) |
return(mdoc_err(mdoc, "document has no data")); |
return(mdoc_err(mdoc, "document lacks data")); |
if (SEC_PROLOGUE == mdoc->lastnamed) |
if (SEC_PROLOGUE == mdoc->lastnamed) |
return(mdoc_err(mdoc, "document has incomplete prologue")); |
return(mdoc_err(mdoc, "document lacks prologue")); |
|
|
if (MDOC_BLOCK != mdoc->first->child->type) |
if (MDOC_BLOCK != mdoc->first->child->type) |
return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh])); |
return(mdoc_err(mdoc, "lacking post-prologue `%s'", |
|
mdoc_macronames[MDOC_Sh])); |
if (MDOC_Sh != mdoc->first->child->tok) |
if (MDOC_Sh != mdoc->first->child->tok) |
return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh])); |
return(mdoc_err(mdoc, "lacking post-prologue `%s'", |
|
mdoc_macronames[MDOC_Sh])); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1116 post_sh(struct mdoc *mdoc) |
|
Line 949 post_sh(struct mdoc *mdoc) |
|
return(post_sh_head(mdoc)); |
return(post_sh_head(mdoc)); |
if (MDOC_BODY == mdoc->last->type) |
if (MDOC_BODY == mdoc->last->type) |
return(post_sh_body(mdoc)); |
return(post_sh_body(mdoc)); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1125 post_sh_body(struct mdoc *mdoc) |
|
Line 959 post_sh_body(struct mdoc *mdoc) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(MDOC_Sh == mdoc->last->tok); |
|
assert(MDOC_BODY == mdoc->last->type); |
|
if (SEC_NAME != mdoc->lastnamed) |
if (SEC_NAME != mdoc->lastnamed) |
return(1); |
return(1); |
|
|