mandoc/mdoc_validate.c - diff

Return to mdoc_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_validate.c between version 1.109 and 1.126

version 1.109, 2010/07/04 21:59:30

version 1.126, 2010/11/29 14:50:33

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 32

#include "libmandoc.h"

/* FIXME: .Bl -diag can't have non-text children in HEAD. */

/* TODO: ignoring Pp (it's superfluous in some invocations). */

#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n

#define POST_ARGS struct mdoc *mdoc

enum check_ineq {

CHECK_LT,

CHECK_GT,

CHECK_EQ

};

enum check_lvl {

CHECK_WARN,

CHECK_ERROR,

CHECK_FATAL

};

typedef int (*v_pre)(PRE_ARGS);

typedef int (*v_post)(POST_ARGS);

Line 45 struct valids {

Line 56 struct valids {

v_post *post;

};

static int check_count(struct mdoc *, enum mdoc_type,

enum check_lvl, enum check_ineq, int);

static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);

static int check_stdarg(PRE_ARGS);

static int check_text(struct mdoc *, int, int, char *);

static int check_argv(struct mdoc *,

struct mdoc_node *, struct mdoc_argv *);

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

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 warn_child_gt(struct mdoc *, const char *, int);

static int err_child_eq(struct mdoc *, const char *, int);

static int warn_child_eq(struct mdoc *, const char *, int);

static int warn_count(struct mdoc *, const char *,

int, const char *, int);

static int err_count(struct mdoc *, const char *,

int, const char *, int);

static int ebool(POST_ARGS);

static int berr_ge1(POST_ARGS);

static int bwarn_ge1(POST_ARGS);

static int ebool(POST_ARGS);

static int eerr_eq0(POST_ARGS);

static int eerr_eq1(POST_ARGS);

static int eerr_ge1(POST_ARGS);

static int eerr_le1(POST_ARGS);

static int ewarn_eq0(POST_ARGS);

static int ewarn_ge1(POST_ARGS);

static int herr_eq0(POST_ARGS);

static int herr_ge1(POST_ARGS);

static int hwarn_eq1(POST_ARGS);

static int hwarn_eq0(POST_ARGS);

static int hwarn_eq1(POST_ARGS);

static int hwarn_le1(POST_ARGS);

static int post_an(POST_ARGS);

Line 81 static int post_at(POST_ARGS);

Line 85 static int post_at(POST_ARGS);

static int post_bf(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_defaults(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_dt(POST_ARGS);

static int post_it(POST_ARGS);

static int post_lb(POST_ARGS);

Line 91 static int post_sh(POST_ARGS);

Line 97 static int post_sh(POST_ARGS);

static int post_sh_body(POST_ARGS);

static int post_sh_head(POST_ARGS);

static int post_st(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 101 static int pre_display(PRE_ARGS);

Line 106 static int pre_display(PRE_ARGS);

static int pre_dt(PRE_ARGS);

static int pre_it(PRE_ARGS);

static int pre_os(PRE_ARGS);

static int pre_par(PRE_ARGS);

static int pre_rv(PRE_ARGS);

static int pre_sh(PRE_ARGS);

static int pre_ss(PRE_ARGS);

static v_post posts_an[] = { post_an, NULL };

static v_post posts_at[] = { post_at, NULL };

static v_post posts_at[] = { post_at, post_defaults, NULL };

static v_post posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bf[] = { hwarn_le1, post_bf, NULL };

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

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

static v_post posts_eoln[] = { post_eoln, NULL };

static v_post posts_defaults[] = { post_defaults, NULL };

static v_post posts_dt[] = { post_dt, NULL };

static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };

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

static v_post posts_lb[] = { eerr_eq1, post_lb, NULL };

static v_post posts_nd[] = { berr_ge1, NULL };

static v_post posts_nm[] = { post_nm, NULL };

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

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

static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL };

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

static v_post posts_sp[] = { eerr_le1, NULL };

Line 130 static v_post posts_vt[] = { post_vt, NULL };

Line 137 static v_post posts_vt[] = { post_vt, NULL };

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

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

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

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

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

static v_pre pres_bl[] = { pre_bl, NULL };

static v_pre pres_bl[] = { pre_bl, pre_par, NULL };

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

static v_pre pres_dd[] = { pre_dd, NULL };

static v_pre pres_dt[] = { pre_dt, NULL };

Line 140 static v_pre pres_ex[] = { NULL, NULL };

Line 147 static v_pre pres_ex[] = { NULL, NULL };

static v_pre pres_fd[] = { NULL, NULL };

static v_pre pres_it[] = { pre_it, NULL };

static v_pre pres_os[] = { pre_os, NULL };

static v_pre pres_pp[] = { pre_par, NULL };

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

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

static v_pre pres_ss[] = { pre_ss, NULL };

const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ap */

{ pres_dd, posts_text }, /* Dd */

{ pres_dd, posts_wtext }, /* Dd */

{ pres_dt, posts_dt }, /* Dt */

{ pres_os, NULL }, /* Os */

{ pres_sh, posts_sh }, /* Sh */

{ pres_ss, posts_ss }, /* Ss */

{ NULL, posts_notext }, /* Pp */

{ pres_pp, posts_notext }, /* Pp */

{ pres_d1, posts_wline }, /* D1 */

{ pres_d1, posts_wline }, /* Dl */

{ pres_bd, posts_bd_bk }, /* Bd */

Line 161 const struct valids mdoc_valids[MDOC_MAX] = {

Line 169 const struct valids mdoc_valids[MDOC_MAX] = {

{ pres_it, posts_it }, /* It */

{ NULL, posts_text }, /* Ad */

{ pres_an, posts_an }, /* An */

{ NULL, NULL }, /* Ar */

{ NULL, posts_defaults }, /* Ar */

{ NULL, posts_text }, /* Cd */

{ NULL, NULL }, /* Cm */

{ NULL, NULL }, /* Dv */

Line 175 const struct valids mdoc_valids[MDOC_MAX] = {

Line 183 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_wtext }, /* Ft */

{ NULL, posts_text }, /* Ic */

{ NULL, posts_text1 }, /* In */

{ NULL, NULL }, /* Li */

{ NULL, posts_defaults }, /* Li */

{ NULL, posts_nd }, /* Nd */

{ NULL, posts_nm }, /* Nm */

{ NULL, posts_wline }, /* Op */

Line 254 const struct valids mdoc_valids[MDOC_MAX] = {

Line 262 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_lb }, /* Lb */

{ NULL, posts_notext }, /* Lp */

{ NULL, posts_text }, /* Lk */

{ NULL, posts_text }, /* Mt */

{ NULL, posts_defaults }, /* Mt */

{ NULL, posts_wline }, /* Brq */

{ NULL, NULL }, /* Bro */

{ NULL, NULL }, /* Brc */

Line 264 const struct valids mdoc_valids[MDOC_MAX] = {

Line 272 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Dx */

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

{ NULL, posts_notext }, /* br */

{ NULL, posts_sp }, /* sp */

{ pres_pp, posts_sp }, /* sp */

{ NULL, posts_text1 }, /* %U */

{ NULL, NULL }, /* Ta */

};

#define RSORD_MAX 14 /* Number of `Rs' blocks. */

static const enum mdoct rsord[RSORD_MAX] = {

MDOC__A,

MDOC__T,

MDOC__B,

MDOC__I,

MDOC__J,

MDOC__R,

MDOC__N,

MDOC__V,

MDOC__P,

MDOC__Q,

MDOC__D,

MDOC__O,

MDOC__C,

MDOC__U

};

int

mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)

{

Line 318 mdoc_valid_post(struct mdoc *mdoc)

Line 345 mdoc_valid_post(struct mdoc *mdoc)

return(1);

}

static int

check_count(struct mdoc *m, enum mdoc_type type,

enum check_lvl lvl, enum check_ineq ineq, int val)

{

const char *p;

static inline int

if (m->last->type != type)

warn_count(struct mdoc *m, const char *k,

return(1);

int want, const char *v, int has)

switch (ineq) {

case (CHECK_LT):

p = "less than ";

if (m->last->nchild < val)

return(1);

break;

case (CHECK_GT):

p = "greater than ";

if (m->last->nchild > val)

return(1);

break;

case (CHECK_EQ):

p = "";

if (val == m->last->nchild)

return(1);

break;

}

if (CHECK_WARN == lvl) {

return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,

m->last->line, m->last->pos,

"want %s%d children (have %d)",

p, val, m->last->nchild));

}

return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,

m->last->line, m->last->pos,

"require %s%d children (have %d)",

p, val, m->last->nchild));

}

static int

berr_ge1(POST_ARGS)

{

return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,

return(check_count(mdoc, MDOC_BODY, CHECK_FATAL, CHECK_GT, 0));

m->last->line, m->last->pos,

"%s %s %d (have %d)", v, k, want, has));

}

static int

bwarn_ge1(POST_ARGS)

{

return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0));

}

static inline int

static int

err_count(struct mdoc *m, const char *k,

eerr_eq0(POST_ARGS)

int want, const char *v, int has)

{

return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 0));

}

mdoc_vmsg(m, MANDOCERR_SYNTARGCOUNT,

static int

m->last->line, m->last->pos,

eerr_eq1(POST_ARGS)

"%s %s %d (have %d)",

{

v, k, want, has);

return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 1));

return(0);

}

static int

eerr_ge1(POST_ARGS)

{

return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_GT, 0));

}

static int

* Build these up with macros because they're basically the same check

eerr_le1(POST_ARGS)

* for different inequalities. Yes, this could be done with functions,

{

* but this is reasonable for now.

return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_LT, 2));

}

#define CHECK_CHILD_DEFN(lvl, name, ineq) \

static int

static int \

ewarn_eq0(POST_ARGS)

lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) \

{

{ \

return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0));

if (mdoc->last->nchild ineq sz) \

return(1); \

return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \

}

#define CHECK_BODY_DEFN(name, lvl, func, num) \

static int

static int \

ewarn_ge1(POST_ARGS)

b##lvl##_##name(POST_ARGS) \

{

{ \

return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0));

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

return(1); \

return(func(mdoc, "multi-line arguments", (num))); \

}

#define CHECK_ELEM_DEFN(name, lvl, func, num) \

static int

static int \

herr_eq0(POST_ARGS)

e##lvl##_##name(POST_ARGS) \

{

{ \

return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_EQ, 0));

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

return(func(mdoc, "line arguments", (num))); \

}

#define CHECK_HEAD_DEFN(name, lvl, func, num) \

static int

static int \

herr_ge1(POST_ARGS)

h##lvl##_##name(POST_ARGS) \

{

{ \

return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_GT, 0));

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

return(1); \

return(func(mdoc, "line arguments", (num))); \

}

static int

hwarn_eq0(POST_ARGS)

{

return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0));

}

CHECK_CHILD_DEFN(warn, gt, >) /* warn_child_gt() */

static int

CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */

hwarn_eq1(POST_ARGS)

CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */

{

CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */

return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 1));

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, err, err_child_gt, 0) /* berr_ge1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_ge1() */

CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */

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, warn, warn_child_lt, 2) /* hwarn_le1() */

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(eq0, warn, warn_child_eq, 0) /* hwarn_eq0() */

static int

hwarn_le1(POST_ARGS)

{

return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2));

}

static int

check_stdarg(PRE_ARGS)

{

Line 454 check_argv(struct mdoc *m, struct mdoc_node *n, struct

Line 514 check_argv(struct mdoc *m, struct mdoc_node *n, struct

static int

check_text(struct mdoc *mdoc, int line, int pos, char *p)

check_text(struct mdoc *m, int ln, int pos, char *p)

{

int c;

size_t sz;

* FIXME: we absolutely cannot let \b get through or it will

* destroy some assumptions in terms of format.

for ( ; *p; p++, pos++) {

sz = strcspn(p, "\t\\");

p += (int)sz;

if ('\0' == *p)

break;

pos += (int)sz;

if ('\t' == *p) {

if ( ! (MDOC_LITERAL & mdoc->flags))

if (MDOC_LITERAL & m->flags)

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

continue;

return(0);

if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB))

} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)

continue;

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

return(0);

}

if ('\\' != *p)

/* Check the special character. */

continue;

c = mandoc_special(p);

if (c) {

p += c - 1;

pos += c - 1;

continue;

} else

}

mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);

c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE);

if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c)

return(c);

}

return(1);

}

static int

check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)

{

Line 510 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type

Line 567 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type

}

static int

pre_display(PRE_ARGS)

{

Line 625 pre_bl(PRE_ARGS)

Line 681 pre_bl(PRE_ARGS)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))

return(0);

break;

default:

continue;

}

/* Check: duplicate auxiliary arguments. */

Line 856 pre_it(PRE_ARGS)

Line 914 pre_it(PRE_ARGS)

static int

pre_an(PRE_ARGS)

{

int i;

if (NULL == n->args)

return(1);

if (n->args->argc > 1)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT))

for (i = 1; i < (int)n->args->argc; i++)

if ( ! mdoc_pmsg(mdoc, n->args->argv[i].line,

n->args->argv[i].pos, MANDOCERR_IGNARGV))

return(0);

if (MDOC_Split == n->args->argv[0].arg)

Line 947 static int

Line 1008 static int

post_bf(POST_ARGS)

{

struct mdoc_node *np;

int arg;

enum mdocargt arg;

* Unlike other data pointers, these are "housed" by the HEAD

Line 1074 post_nm(POST_ARGS)

Line 1135 post_nm(POST_ARGS)

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME));

}

static int

post_defaults(POST_ARGS)

{

struct mdoc_node *nn;

* The `Ar' defaults to "file ..." if no value is provided as an

* argument; the `Mt' macro uses "~"; the `Li' just gets an

* empty string.

if (mdoc->last->child)

return(1);

nn = mdoc->last;

mdoc->next = MDOC_NEXT_CHILD;

switch (nn->tok) {

case (MDOC_Ar):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"))

return(0);

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))

return(0);

break;

case (MDOC_At):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T"))

return(0);

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX"))

return(0);

break;

case (MDOC_Li):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))

return(0);

break;

case (MDOC_Mt):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))

return(0);

break;

default:

abort();

/* NOTREACHED */

}

mdoc->last = nn;

return(1);

}

static int

post_at(POST_ARGS)

{

const char *p, *q;

char *buf;

size_t sz;

* If we have a child, look it up in the standard keys. If a

* key exist, use that instead of the child; if it doesn't,

* prefix "AT&T UNIX " to the existing data.

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

return(1);

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

if (mdoc_a2att(mdoc->last->child->string))

p = mdoc_a2att(mdoc->last->child->string);

return(1);

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT));

}

if (p) {

free(mdoc->last->child->string);

mdoc->last->child->string = mandoc_strdup(p);

} else {

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);

p = "AT&T UNIX ";

q = mdoc->last->child->string;

sz = strlen(p) + strlen(q) + 1;

buf = mandoc_malloc(sz);

strlcpy(buf, p, sz);

strlcat(buf, q, sz);

free(mdoc->last->child->string);

mdoc->last->child->string = buf;

}

return(1);

}

static int

post_an(POST_ARGS)

{

Line 1095 post_an(POST_ARGS)

Line 1226 post_an(POST_ARGS)

np = mdoc->last;

if (AUTH__NONE != np->data.An.auth && np->child)

return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT));

return(eerr_eq0(mdoc));

* FIXME: make this ewarn and make sure that the front-ends

* don't print the arguments.

if (AUTH__NONE != np->data.An.auth || np->child)

return(1);

return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS));

Line 1192 post_it(POST_ARGS)

Line 1327 post_it(POST_ARGS)

static int

post_bl_head(POST_ARGS)

{

int i;

struct mdoc_node *n;

assert(mdoc->last->parent);

Line 1206 post_bl_head(POST_ARGS)

Line 1340 post_bl_head(POST_ARGS)

return(1);

}

if (0 == (i = mdoc->last->nchild))

/* FIXME: should be ERROR class. */

return(1);

return(hwarn_eq0(mdoc));

return(warn_count(mdoc, "==", 0, "line arguments", i));

}

Line 1298 post_st(POST_ARGS)

Line 1431 post_st(POST_ARGS)

static int

post_rs(POST_ARGS)

{

struct mdoc_node *nn;

struct mdoc_node *nn, *next, *prev;

int i, j;

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

return(1);

for (nn = mdoc->last->child; nn; nn = nn->next)

switch (nn->tok) {

* Make sure only certain types of nodes are allowed within the

case(MDOC__U):

* the `Rs' body. Delete offending nodes and raise a warning.

/* FALLTHROUGH */

* Do this before re-ordering for the sake of clarity.

case(MDOC__Q):

/* FALLTHROUGH */

case(MDOC__C):

next = NULL;

/* FALLTHROUGH */

for (nn = mdoc->last->child; nn; nn = next) {

case(MDOC__A):

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

/* FALLTHROUGH */

if (nn->tok == rsord[i])

case(MDOC__B):

break;

/* FALLTHROUGH */

case(MDOC__D):

if (i < RSORD_MAX) {

/* FALLTHROUGH */

next = nn->next;

case(MDOC__I):

continue;

/* FALLTHROUGH */

case(MDOC__J):

/* FALLTHROUGH */

case(MDOC__N):

/* FALLTHROUGH */

case(MDOC__O):

/* FALLTHROUGH */

case(MDOC__P):

/* FALLTHROUGH */

case(MDOC__R):

/* FALLTHROUGH */

case(MDOC__T):

/* FALLTHROUGH */

case(MDOC__V):

break;

default:

mdoc_nmsg(mdoc, nn, MANDOCERR_SYNTCHILD);

return(0);

}

next = nn->next;

mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD);

mdoc_node_delete(mdoc, nn);

}

* The full `Rs' block needs special handling to order the

* sub-elements according to `rsord'. Pick through each element

* and correctly order it. This is a insertion sort.

next = NULL;

for (nn = mdoc->last->child->next; nn; nn = next) {

/* Determine order of `nn'. */

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

if (rsord[i] == nn->tok)

break;

* Remove `nn' from the chain. This somewhat

* repeats mdoc_node_unlink(), but since we're

* just re-ordering, there's no need for the

* full unlink process.

if (NULL != (next = nn->next))

next->prev = nn->prev;

if (NULL != (prev = nn->prev))

prev->next = nn->next;

nn->prev = nn->next = NULL;

* Scan back until we reach a node that's

* ordered before `nn'.

for ( ; prev ; prev = prev->prev) {

/* Determine order of `prev'. */

for (j = 0; j < RSORD_MAX; j++)

if (rsord[j] == prev->tok)

break;

if (j <= i)

break;

}

* Set `nn' back into its correct place in front

* of the `prev' node.

nn->prev = prev;

if (prev) {

if (prev->next)

prev->next->prev = nn;

nn->next = prev->next;

prev->next = nn;

} else {

mdoc->last->child->prev = nn;

nn->next = mdoc->last->child;

mdoc->last->child = nn;

}

return(1);

}

Line 1391 post_sh_body(POST_ARGS)

Line 1574 post_sh_body(POST_ARGS)

static int

post_sh_head(POST_ARGS)

{

char buf[BUFSIZ];

enum mdoc_sec sec;

const struct mdoc_node *n;

struct mdoc_node *n;

* Process a new section. Sections are either "named" or

* "custom"; custom sections are user-defined, while named ones

* "custom". Custom sections are user-defined, while named ones

* usually follow a conventional order and may only appear in

* follow a conventional order and may only appear in certain

* certain manual sections.

* manual sections.

buf[0] = '\0';

/* FIXME: use dynamic buffer... */

* FIXME: yes, these can use a dynamic buffer, but I don't do so

* in the interests of simplicity.

for (n = mdoc->last->child; n; n = n->next) {

/* XXX - copied from compact(). */

/* XXX - copied from concat(). */

assert(MDOC_TEXT == n->type);

if (strlcat(buf, n->string, BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

if (NULL == n->next)

continue;

if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

Line 1427 post_sh_head(POST_ARGS)

Line 1609 post_sh_head(POST_ARGS)

sec = mdoc_str2sec(buf);

/* The NAME should be first. */

* Check: NAME should always be first, CUSTOM has no roles,

* non-CUSTOM has a conventional order to be followed.

if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST))

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST);

return(0);

/* The SYNOPSIS gets special attention in other areas. */

if (SEC_SYNOPSIS == sec)

mdoc->flags |= MDOC_SYNOPSIS;

else

mdoc->flags &= ~MDOC_SYNOPSIS;

/* Mark our last section. */

mdoc->lastsec = sec;

/* We don't care about custom sections after this. */

if (SEC_CUSTOM == sec)

return(1);

* Check whether our non-custom section is being repeated or is

* out of order.

if (sec == mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP))

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP);

return(0);

if (sec < mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO))

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO);

return(0);

/* Mark the last named section. */

* Check particular section/manual conventions. LIBRARY can

* only occur in manual section 2, 3, and 9.

mdoc->lastnamed = sec;

/* Check particular section/manual conventions. */

assert(mdoc->meta.msec);

switch (sec) {

case (SEC_RETURN_VALUES):

/* FALLTHROUGH */

case (SEC_ERRORS):

/* FALLTHROUGH */

case (SEC_LIBRARY):

assert(mdoc->meta.msec);

if (*mdoc->meta.msec == '2')

break;

if (*mdoc->meta.msec == '3')

break;

if (*mdoc->meta.msec == '9')

break;

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC));

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC);

break;

default:

break;

}

return(1);

}

static int

pre_par(PRE_ARGS)

{

if (NULL == mdoc->last)

return(1);

* Don't allow prior `Lp' or `Pp' prior to a paragraph-type

* block: `Lp', `Pp', or non-compact `Bd' or `Bl'.

if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)

return(1);

if (MDOC_Bl == n->tok && n->data.Bl->comp)

return(1);

if (MDOC_Bd == n->tok && n->data.Bd->comp)

return(1);

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);

mdoc_node_delete(mdoc, mdoc->last);

return(1);

}

CVSweb