mandoc/validate.c - diff

Return to validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/Attic/validate.c between version 1.34 and 1.37

version 1.34, 2009/01/16 14:15:12

version 1.37, 2009/01/17 16:47:02

Line 21

#include "private.h"

typedef int (*v_pre)(struct mdoc *, struct mdoc_node *);

typedef int (*v_post)(struct mdoc *);

/* FIXME: some sections should only occur in specific msecs. */

/* FIXME: ignoring Pp. */

/* FIXME: math symbols. */

/* FIXME: make sure prologue is complete. */

/* FIXME: valid character-escape checks. */

struct valids {

v_pre *pre;

v_post *post;

};

/* Utility checks. */

static int pre_check_parent(struct mdoc *, struct mdoc_node *,

int, enum mdoc_type);

static int pre_check_msecs(struct mdoc *, struct mdoc_node *,

int, enum mdoc_msec *);

static int pre_check_stdarg(struct mdoc *, struct mdoc_node *);

static int post_check_children_count(struct mdoc *);

static int post_check_children_lt(struct mdoc *, int);

static int post_check_children_gt(struct mdoc *, int);

static int post_check_children_eq(struct mdoc *, int);

/* Specific pre-child-parse routines. */

static int pre_display(struct mdoc *, struct mdoc_node *);

static int pre_sh(struct mdoc *, struct mdoc_node *);

static int pre_ss(struct mdoc *, struct mdoc_node *);

Line 45 static int pre_it(struct mdoc *, struct mdoc_node *);

Line 58 static int pre_it(struct mdoc *, struct mdoc_node *);

static int pre_cd(struct mdoc *, struct mdoc_node *);

static int pre_er(struct mdoc *, struct mdoc_node *);

static int pre_ex(struct mdoc *, struct mdoc_node *);

static int pre_rv(struct mdoc *, struct mdoc_node *);

static int pre_an(struct mdoc *, struct mdoc_node *);

static int pre_st(struct mdoc *, struct mdoc_node *);

static int pre_prologue(struct mdoc *, struct mdoc_node *);

static int head_err_ge1(struct mdoc *);

/* Specific post-child-parse routines. */

static int head_warn_ge1(struct mdoc *);

static int head_err_eq0(struct mdoc *);

static int herr_ge1(struct mdoc *);

static int elem_err_eq0(struct mdoc *);

static int hwarn_ge1(struct mdoc *);

static int elem_err_eq1(struct mdoc *);

static int herr_eq0(struct mdoc *);

static int elem_err_ge1(struct mdoc *);

static int eerr_eq0(struct mdoc *);

static int elem_warn_eq0(struct mdoc *);

static int eerr_le1(struct mdoc *);

static int body_warn_ge1(struct mdoc *);

static int eerr_le2(struct mdoc *);

static int body_err_eq0(struct mdoc *);

static int eerr_eq1(struct mdoc *);

static int elem_warn_ge1(struct mdoc *);

static int eerr_ge1(struct mdoc *);

static int elem_bool(struct mdoc *);

static int ewarn_eq0(struct mdoc *);

static int bwarn_ge1(struct mdoc *);

static int berr_eq0(struct mdoc *);

static int ewarn_ge1(struct mdoc *);

static int ebool(struct mdoc *);

static int post_sh(struct mdoc *);

static int post_bl(struct mdoc *);

static int post_it(struct mdoc *);

static int post_ex(struct mdoc *);

static int post_an(struct mdoc *);

static int post_at(struct mdoc *);

static int post_xr(struct mdoc *);

static int post_nm(struct mdoc *);

static int post_root(struct mdoc *);

/* Collections of pre-child-parse routines. */

static v_pre pres_prologue[] = { pre_prologue, NULL };

static v_pre pres_d1[] = { pre_display, NULL };

static v_pre pres_bd[] = { pre_display, pre_bd, NULL };

Line 74 static v_pre pres_sh[] = { pre_sh, NULL };

Line 102 static v_pre pres_sh[] = { pre_sh, NULL };

static v_pre pres_cd[] = { pre_cd, NULL };

static v_pre pres_er[] = { pre_er, NULL };

static v_pre pres_ex[] = { pre_ex, NULL };

static v_pre pres_rv[] = { pre_rv, NULL };

static v_pre pres_an[] = { pre_an, NULL };

static v_pre pres_st[] = { pre_st, NULL };

static v_post posts_bool[] = { elem_err_eq1, elem_bool, NULL };

/* Collections of post-child-parse routines. */

static v_post posts_bd[] = { head_err_eq0, body_warn_ge1, NULL };

static v_post posts_text[] = { elem_err_ge1, NULL };

static v_post posts_bool[] = { eerr_eq1, ebool, NULL };

static v_post posts_wtext[] = { elem_warn_ge1, NULL };

static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NULL };

static v_post posts_notext[] = { elem_err_eq0, NULL };

static v_post posts_text[] = { eerr_ge1, NULL };

static v_post posts_wline[] = { head_warn_ge1, body_err_eq0, NULL };

static v_post posts_wtext[] = { ewarn_ge1, NULL };

static v_post posts_sh[] = { head_err_ge1,

static v_post posts_notext[] = { eerr_eq0, NULL };

body_warn_ge1, post_sh, NULL };

static v_post posts_wline[] = { hwarn_ge1, berr_eq0, NULL };

static v_post posts_bl[] = { head_err_eq0,

static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };

body_warn_ge1, post_bl, NULL };

static v_post posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };

static v_post posts_it[] = { post_it, NULL };

static v_post posts_ss[] = { head_err_ge1, NULL };

static v_post posts_ss[] = { herr_ge1, NULL };

static v_post posts_pp[] = { elem_warn_eq0, NULL };

static v_post posts_pp[] = { ewarn_eq0, NULL };

static v_post posts_d1[] = { head_err_ge1, NULL };

static v_post posts_d1[] = { herr_ge1, NULL };

static v_post posts_ex[] = { eerr_le1, post_ex, NULL };

static v_post posts_an[] = { post_an, 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_nm[] = { post_nm, NULL };

/* Per-macro pre- and post-child-check routine collections. */

const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* \" */

{ pres_prologue, posts_text }, /* Dd */

{ pres_prologue, NULL }, /* Dt */

{ pres_prologue, NULL }, /* Os */

/* FIXME: preceding Pp. */

/* FIXME: NAME section internal ordering. */

{ pres_sh, posts_sh }, /* Sh */

/* FIXME: preceding Pp. */

{ pres_ss, posts_ss }, /* Ss */

/* FIXME: proceeding... */

{ NULL, posts_pp }, /* Pp */

{ pres_d1, posts_d1 }, /* D1 */

{ pres_d1, posts_d1 }, /* Dl */

/* FIXME: preceding Pp. */

{ pres_bd, posts_bd }, /* Bd */

{ NULL, NULL }, /* Ed */

/* FIXME: preceding Pp. */

{ pres_bl, posts_bl }, /* Bl */

{ NULL, NULL }, /* El */

{ pres_it, posts_it }, /* It */

{ NULL, posts_text }, /* Ad */

/* FIXME: argument OR parameters. */

{ pres_an, posts_an }, /* An */

{ NULL, NULL }, /* An */

{ NULL, NULL }, /* Ar */

{ pres_cd, posts_text }, /* Cd */

{ NULL, NULL }, /* Cm */

{ NULL, posts_text }, /* Dv */

{ pres_er, posts_text }, /* Er */

{ NULL, posts_text }, /* Ev */

{ pres_ex, posts_notext }, /* Ex */ /* FIXME: -std required */

{ pres_ex, posts_ex }, /* Ex */

{ NULL, posts_text }, /* Fa */

{ NULL, NULL }, /* Fd */ /* FIXME: SYNOPSIS section. */

/* FIXME: only in SYNOPSIS section. */

{ NULL, NULL }, /* Fd */

{ NULL, NULL }, /* Fl */

{ NULL, posts_text }, /* Fn */

{ NULL, NULL }, /* Ft */

Line 131 const struct valids mdoc_valids[MDOC_MAX] = {

Line 163 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_wtext }, /* In */

{ NULL, posts_text }, /* Li */

{ NULL, posts_wtext }, /* Nd */

{ NULL, NULL }, /* Nm */ /* FIXME: If name not set? */

{ NULL, posts_nm }, /* Nm */

{ NULL, posts_wline }, /* Op */

{ NULL, NULL }, /* Ot */

{ NULL, NULL }, /* Pa */

{ NULL, posts_notext }, /* Rv */ /* -std required */

{ pres_rv, posts_notext }, /* Rv */

{ NULL, posts_notext }, /* St */ /* arg required */

{ pres_st, posts_notext }, /* St */

{ NULL, posts_text }, /* Va */

{ NULL, posts_text }, /* Vt */

{ NULL, NULL }, /* Xr */ /* FIXME */

{ NULL, posts_xr }, /* Xr */

{ NULL, posts_text }, /* %A */

{ NULL, posts_text }, /* %B */

{ NULL, posts_text }, /* %D */

Line 154 const struct valids mdoc_valids[MDOC_MAX] = {

Line 186 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ac */

{ NULL, NULL }, /* Ao */

{ NULL, posts_wline }, /* Aq */

{ NULL, NULL }, /* At */ /* FIXME */

{ NULL, posts_at }, /* At */

{ NULL, NULL }, /* Bc */

{ NULL, NULL }, /* Bf */

{ NULL, NULL }, /* Bo */

Line 170 const struct valids mdoc_valids[MDOC_MAX] = {

Line 202 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_text }, /* Em */

{ NULL, NULL }, /* Eo */

{ NULL, NULL }, /* Fx */

{ NULL, posts_text }, /* Ms */ /* FIXME: which symbols? */

{ NULL, posts_text }, /* Ms */

{ NULL, posts_notext }, /* No */

{ NULL, posts_notext }, /* Ns */

{ NULL, NULL }, /* Nx */

{ NULL, NULL }, /* Ox */

{ NULL, NULL }, /* Pc */

{ NULL, NULL }, /* Pf */ /* FIXME: 2 or more arguments */ /* First should be text. */

{ NULL, NULL }, /* Pf */

{ NULL, NULL }, /* Po */

{ NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */

{ NULL, posts_wline }, /* Pq */

{ NULL, NULL }, /* Qc */

{ NULL, posts_wline }, /* Ql */

{ NULL, NULL }, /* Qo */

Line 209 const struct valids mdoc_valids[MDOC_MAX] = {

Line 241 const struct valids mdoc_valids[MDOC_MAX] = {

static int

post_check_children_count(struct mdoc *mdoc)

{

struct mdoc_node *n;

int i;

for (i = 0, n = mdoc->last->child; n; n = n->next, i++)

/* Do nothing */ ;

return(i);

}

static int

post_check_children_gt(struct mdoc *mdoc, int sz)

{

int i;

if ((i = post_check_children_count(mdoc)) > sz)

return(1);

return(mdoc_err(mdoc, "macro requires more than %d "

"parameters (have %d)", sz, i));

}

static int

post_check_children_eq(struct mdoc *mdoc, int sz)

{

int i;

if ((i = post_check_children_count(mdoc)) == sz)

return(1);

return(mdoc_err(mdoc, "macro requires %d parameters "

"(have %d)", sz, i));

}

static int

post_check_children_lt(struct mdoc *mdoc, int sz)

{

int i;

if ((i = post_check_children_count(mdoc)) < sz)

return(1);

return(mdoc_err(mdoc, "macro requires less than %d "

"parameters (have %d)", sz, i));

}

static int

pre_check_stdarg(struct mdoc *mdoc, struct mdoc_node *node)

{

if (1 == node->data.elem.argc &&

MDOC_Std == node->data.elem.argv[0].arg)

return(1);

return(mdoc_nwarn(mdoc, node, WARN_COMPAT,

"macro suggests single `%s' argument",

mdoc_argnames[MDOC_Std]));

}

static int

pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *node,

int sz, enum mdoc_msec *msecs)

{

Line 217 pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *n

Line 310 pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *n

for (i = 0; i < sz; i++)

if (msecs[i] == mdoc->meta.msec)

return(1);

return(mdoc_nwarn(mdoc, node, WARN_COMPAT,

return(mdoc_nwarn(mdoc, node, WARN_COMPAT, "macro not "

"macro is not appropriate for this manual section"));

"appropriate for manual section"));

}

Line 227 pre_check_parent(struct mdoc *mdoc, struct mdoc_node *

Line 320 pre_check_parent(struct mdoc *mdoc, struct mdoc_node *

int tok, enum mdoc_type type)

{

if (type != mdoc->last->parent->type)

if (type != node->parent->type)

return(mdoc_nerr(mdoc, node, "invalid macro parent class %s, expected %s",

mdoc_type2a(mdoc->last->parent->type),

mdoc_type2a(node->parent->type),

mdoc_type2a(type)));

if (MDOC_ROOT != type && tok == mdoc->last->parent->tok)

if (MDOC_ROOT != type && tok != node->parent->tok)

return(mdoc_nerr(mdoc, node, "invalid macro parent `%s', expected `%s'",

mdoc_macronames[mdoc->last->parent->tok],

mdoc_macronames[node->parent->tok],

mdoc_macronames[tok]));

return(1);

}

static int

body_err_eq0(struct mdoc *mdoc)

berr_eq0(struct mdoc *mdoc)

{

if (MDOC_BODY != mdoc->last->type)

Line 252 body_err_eq0(struct mdoc *mdoc)

Line 345 body_err_eq0(struct mdoc *mdoc)

static int

body_warn_ge1(struct mdoc *mdoc)

bwarn_ge1(struct mdoc *mdoc)

{

if (MDOC_BODY != mdoc->last->type)

Line 264 body_warn_ge1(struct mdoc *mdoc)

Line 357 body_warn_ge1(struct mdoc *mdoc)

static int

elem_warn_eq0(struct mdoc *mdoc)

ewarn_eq0(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

Line 276 elem_warn_eq0(struct mdoc *mdoc)

Line 369 elem_warn_eq0(struct mdoc *mdoc)

static int

elem_warn_ge1(struct mdoc *mdoc)

ewarn_ge1(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

Line 287 elem_warn_ge1(struct mdoc *mdoc)

Line 380 elem_warn_ge1(struct mdoc *mdoc)

static int

elem_err_eq1(struct mdoc *mdoc)

eerr_eq1(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

if (NULL == mdoc->last->child)

return(post_check_children_eq(mdoc, 1));

return(mdoc_err(mdoc, "macro expects one parameter"));

if (mdoc->last->child->next)

return(mdoc_err(mdoc, "macro expects one parameter"));

return(1);

}

static int

elem_err_eq0(struct mdoc *mdoc)

eerr_le2(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

if (NULL == mdoc->last->child)

return(post_check_children_lt(mdoc, 3));

return(1);

return(mdoc_err(mdoc, "macro expects no parameters"));

}

static int

elem_err_ge1(struct mdoc *mdoc)

eerr_le1(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

if (mdoc->last->child)

return(post_check_children_lt(mdoc, 2));

return(1);

return(mdoc_err(mdoc, "macro expects one or more parameters"));

}

static int

head_err_eq0(struct mdoc *mdoc)

eerr_eq0(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

return(post_check_children_eq(mdoc, 0));

}

static int

eerr_ge1(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

return(post_check_children_gt(mdoc, 0));

}

static int

herr_eq0(struct mdoc *mdoc)

{

if (MDOC_HEAD != mdoc->last->type)

return(1);

if (NULL == mdoc->last->child)

return(post_check_children_eq(mdoc, 0));

return(1);

return(mdoc_perr(mdoc, mdoc->last->child->line,

mdoc->last->child->pos, "macro expects no parameters"));

}

static int

head_warn_ge1(struct mdoc *mdoc)

hwarn_ge1(struct mdoc *mdoc)

{

if (MDOC_HEAD != mdoc->last->type)

Line 347 head_warn_ge1(struct mdoc *mdoc)

Line 447 head_warn_ge1(struct mdoc *mdoc)

static int

head_err_ge1(struct mdoc *mdoc)

herr_ge1(struct mdoc *mdoc)

{

if (MDOC_HEAD != mdoc->last->type)

return(1);

if (mdoc->last->child)

return(post_check_children_gt(mdoc, 0));

return(1);

return(mdoc_err(mdoc, "macro expects one or more parameters"));

}

Line 483 static int

Line 581 static int

pre_ss(struct mdoc *mdoc, struct mdoc_node *node)

{

if (MDOC_BLOCK != mdoc->last->type)

if (MDOC_BLOCK != node->type)

return(1);

assert(MDOC_Sh == mdoc->last->tok);

return(pre_check_parent(mdoc, node, MDOC_Sh, MDOC_BODY));

}

Line 494 static int

Line 591 static int

pre_sh(struct mdoc *mdoc, struct mdoc_node *node)

{

if (MDOC_BLOCK != mdoc->last->type)

if (MDOC_BLOCK != node->type)

return(1);

assert(MDOC_Sh == mdoc->last->tok);

return(pre_check_parent(mdoc, node, -1, MDOC_ROOT));

}

static int

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)

return(1);

return(mdoc_nerr(mdoc, node, "macro must have one argument"));

}

static int

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)

return(1);

return(mdoc_nerr(mdoc, node, "macro may only have one argument"));

}

static int

pre_rv(struct mdoc *mdoc, struct mdoc_node *node)

{

enum mdoc_msec msecs[2];

assert(MDOC_ELEM == node->type);

assert(MDOC_Rv == node->tok);

msecs[0] = MSEC_2;

msecs[1] = MSEC_3;

if ( ! pre_check_msecs(mdoc, node, 2, msecs))

return(0);

return(pre_check_stdarg(mdoc, node));

}

static int

pre_ex(struct mdoc *mdoc, struct mdoc_node *node)

{

enum mdoc_msec msecs[3];

assert(MDOC_ELEM == node->type);

assert(MDOC_Ex == node->tok);

msecs[0] = MSEC_1;

msecs[1] = MSEC_6;

msecs[2] = MSEC_8;

return(pre_check_msecs(mdoc, node, 3, msecs));

if ( ! pre_check_msecs(mdoc, node, 3, msecs))

return(0);

return(pre_check_stdarg(mdoc, node));

}

Line 537 static int

Line 678 static int

pre_it(struct mdoc *mdoc, struct mdoc_node *node)

{

if (MDOC_BLOCK != mdoc->last->type)

if (MDOC_BLOCK != node->type)

return(1);

assert(MDOC_It == mdoc->last->tok);

return(pre_check_parent(mdoc, node, MDOC_Bl, MDOC_BODY));

}

Line 556 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

Line 696 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

switch (node->tok) {

case (MDOC_Os):

if (mdoc->meta.title[0] && mdoc->meta.date)

if (mdoc->meta.title && mdoc->meta.date)

break;

return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));

case (MDOC_Dt):

if (0 == mdoc->meta.title[0] && mdoc->meta.date)

if (NULL == mdoc->meta.title && mdoc->meta.date)

break;

return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));

case (MDOC_Dd):

if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)

if (NULL == mdoc->meta.title && 0 == mdoc->meta.date)

break;

return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));

default:

Line 576 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

Line 716 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

switch (node->tok) {

case (MDOC_Os):

if (0 == mdoc->meta.os[0])

if (NULL == mdoc->meta.os)

return(1);

break;

case (MDOC_Dd):

Line 584 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

Line 724 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

return(1);

break;

case (MDOC_Dt):

if (0 == mdoc->meta.title[0])

if (NULL == mdoc->meta.title)

return(1);

break;

default:

Line 596 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

Line 736 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node

}

static int

post_nm(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

assert(MDOC_Nm == mdoc->last->tok);

if (mdoc->last->child)

return(1);

if (mdoc->meta.name)

return(1);

return(mdoc_err(mdoc, "macro `%s' has not been invoked with a name",

mdoc_macronames[MDOC_Nm]));

}

static int

post_xr(struct mdoc *mdoc)

{

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))

return(1);

assert(MDOC_TEXT == n->type);

if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string))

return(1);

return(mdoc_nerr(mdoc, n, "invalid manual section"));

}

static int

post_at(struct mdoc *mdoc)

{

assert(MDOC_ELEM == mdoc->last->type);

assert(MDOC_At == mdoc->last->tok);

if (NULL == mdoc->last->child)

return(1);

assert(MDOC_TEXT == mdoc->last->child->type);

if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string))

return(1);

return(mdoc_err(mdoc, "macro expects a valid AT&T version symbol"));

}

static int

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 (NULL == mdoc->last->child)

return(1);

return(mdoc_err(mdoc, "macro expects either argument or parameters"));

}

if (mdoc->last->child)

return(1);

return(mdoc_err(mdoc, "macro expects either argument or parameters"));

}

static int

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 (mdoc->last->child)

return(1);

return(mdoc_err(mdoc, "macro expects `%s' or a single child",

mdoc_argnames[MDOC_Std]));

}

if (mdoc->last->child)

return(mdoc_err(mdoc, "macro expects `%s' or a single child",

mdoc_argnames[MDOC_Std]));

if (1 != mdoc->last->data.elem.argc)

return(mdoc_err(mdoc, "macro expects `%s' or a single child",

mdoc_argnames[MDOC_Std]));

if (MDOC_Std != mdoc->last->data.elem.argv[0].arg)

return(mdoc_err(mdoc, "macro expects `%s' or a single child",

mdoc_argnames[MDOC_Std]));

return(1);

}

/* Warn if `Bl' type-specific syntax isn't reflected in items. */

static int

post_it(struct mdoc *mdoc)

Line 704 post_it(struct mdoc *mdoc)

Line 940 post_it(struct mdoc *mdoc)

if (i == (size_t)sv)

return(1);

return(mdoc_err(mdoc, "expected %d list columns, have %d", sv, (int)i));

#undef TYPE_NONE

#undef TYPE_BODY

#undef TYPE_HEAD

}

/* Make sure that only `It' macros are our body-children. */

static int

post_bl(struct mdoc *mdoc)

{

Line 734 post_bl(struct mdoc *mdoc)

Line 968 post_bl(struct mdoc *mdoc)

static int

elem_bool(struct mdoc *mdoc)

ebool(struct mdoc *mdoc)

{

struct mdoc_node *n;

Line 750 elem_bool(struct mdoc *mdoc)

Line 984 elem_bool(struct mdoc *mdoc)

}

if (NULL == n)

return(1);

return(mdoc_nerr(mdoc, n, "expected boolean value [on/off]"));

return(mdoc_nerr(mdoc, n, "expected boolean value"));

}

static int

post_root(struct mdoc *mdoc)

{

if (NULL == mdoc->last->child)

return(mdoc_err(mdoc, "document has no data"));

if (NULL == mdoc->meta.title)

return(mdoc_err(mdoc, "document has no incomplete prologue"));

if (NULL == mdoc->meta.os)

return(mdoc_err(mdoc, "document has no incomplete prologue"));

if (0 == mdoc->meta.date)

return(mdoc_err(mdoc, "document has no incomplete prologue"));

return(1);

}

/* Warn if conventional sections are out of order. */

static int

post_sh(struct mdoc *mdoc)

{

char buf[64];

enum mdoc_sec sec;

int i;

struct mdoc_node *n;

char *args[MDOC_LINEARG_MAX];

if (MDOC_HEAD != mdoc->last->type)

return(1);

assert(MDOC_Sh == mdoc->last->tok);

n = mdoc->last->child;

if ( ! xstrlcats(buf, mdoc->last->child, 64))

assert(n);

return(mdoc_err(mdoc, "macro parameters too long"));

for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) {

if (SEC_CUSTOM == (sec = mdoc_atosec(buf)))

assert(MDOC_TEXT == n->type);

assert(NULL == n->child);

assert(n->data.text.string);

args[i] = n->data.text.string;

}

sec = mdoc_atosec((size_t)i, (const char **)args);

if (SEC_CUSTOM == sec)

return(1);

if (sec > mdoc->sec_lastn)

return(1);

if (sec == mdoc->sec_lastn)

return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated"));

return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order"));

Line 795 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *no

Line 1033 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *no

{

v_pre *p;

/* TODO: character-escape checks. */

if (MDOC_TEXT == node->type)

return(1);

assert(MDOC_ROOT != node->type);

Line 817 mdoc_valid_post(struct mdoc *mdoc)

Line 1053 mdoc_valid_post(struct mdoc *mdoc)

if (MDOC_TEXT == mdoc->last->type)

return(1);

if (MDOC_ROOT == mdoc->last->type) {

if (MDOC_ROOT == mdoc->last->type)

/* TODO: make sure prologue is complete. */

return(post_root(mdoc));

return(1);

}

if (NULL == mdoc_valids[mdoc->last->tok].post)

return(1);

CVSweb