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.214 and 1.229

version 1.214, 2014/04/23 21:06:41

version 1.229, 2014/07/06 19:09:00

Line 84 static int ewarn_le1(POST_ARGS);

static int hwarn_eq0(POST_ARGS);

static int hwarn_eq1(POST_ARGS);

static int hwarn_ge1(POST_ARGS);

static int hwarn_le1(POST_ARGS);

static int post_an(POST_ARGS);

static int post_at(POST_ARGS);

Line 98 static int post_bx(POST_ARGS);

Line 97 static int post_bx(POST_ARGS);

static int post_defaults(POST_ARGS);

static int post_dd(POST_ARGS);

static int post_dt(POST_ARGS);

static int post_en(POST_ARGS);

static int post_es(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_hyph(POST_ARGS);

static int post_ignpar(POST_ARGS);

Line 125 static int pre_display(PRE_ARGS);

Line 126 static int pre_display(PRE_ARGS);

static int pre_dt(PRE_ARGS);

static int pre_it(PRE_ARGS);

static int pre_literal(PRE_ARGS);

static int pre_obsolete(PRE_ARGS);

static int pre_os(PRE_ARGS);

static int pre_par(PRE_ARGS);

static int pre_sh(PRE_ARGS);

Line 134 static int pre_std(PRE_ARGS);

Line 136 static int pre_std(PRE_ARGS);

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

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

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

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

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

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

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

static v_post posts_bx[] = { post_bx, NULL };

Line 145 static v_post posts_d1[] = { bwarn_ge1, post_hyph, NU

Line 147 static v_post posts_d1[] = { bwarn_ge1, post_hyph, NU

static v_post posts_dd[] = { post_dd, post_prol, NULL };

static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL };

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

static v_post posts_en[] = { post_en, NULL };

static v_post posts_es[] = { post_es, NULL };

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

static v_post posts_hyph[] = { post_hyph, NULL };

static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL };

Line 173 static v_pre pres_dl[] = { pre_literal, pre_display,

Line 177 static v_pre pres_dl[] = { pre_literal, pre_display,

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

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

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

static v_pre pres_obsolete[] = { pre_obsolete, NULL };

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

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

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

Line 214 static const struct valids mdoc_valids[MDOC_MAX] = {

Line 219 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_nd }, /* Nd */

{ NULL, posts_nm }, /* Nm */

{ NULL, NULL }, /* Op */

{ NULL, NULL }, /* Ot */

{ pres_obsolete, NULL }, /* Ot */

{ NULL, posts_defaults }, /* Pa */

{ pres_std, posts_std }, /* Rv */

{ NULL, posts_st }, /* St */

Line 284 static const struct valids mdoc_valids[MDOC_MAX] = {

Line 289 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ek */

{ NULL, posts_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

{ NULL, NULL }, /* Fr */

{ pres_obsolete, NULL }, /* Fr */

{ NULL, posts_eoln }, /* Ud */

{ NULL, posts_lb }, /* Lb */

{ pres_pp, posts_pp }, /* Lp */

Line 294 static const struct valids mdoc_valids[MDOC_MAX] = {

Line 299 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Bro */

{ NULL, NULL }, /* Brc */

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

{ NULL, NULL }, /* Es */

{ pres_obsolete, posts_es }, /* Es */

{ NULL, NULL }, /* En */

{ pres_obsolete, posts_en }, /* En */

{ NULL, NULL }, /* Dx */

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

{ NULL, posts_pp }, /* br */

Line 509 hwarn_ge1(POST_ARGS)

Line 514 hwarn_ge1(POST_ARGS)

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

}

static int

hwarn_le1(POST_ARGS)

{

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

}

static void

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

{

Line 552 check_text(struct mdoc *mdoc, int ln, int pos, char *p

Line 551 check_text(struct mdoc *mdoc, int ln, int pos, char *p

return;

for (cp = p; NULL != (p = strchr(p, '\t')); p++)

mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);

mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,

ln, pos + (int)(p - cp), NULL);

}

static int

Line 585 pre_display(PRE_ARGS)

break;

if (node)

mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);

mandoc_vmsg(MANDOCERR_BD_NEST,

mdoc->parse, n->line, n->pos,

"%s in Bd", mdoc_macronames[n->tok]);

return(1);

}

Line 593 pre_display(PRE_ARGS)

Line 595 pre_display(PRE_ARGS)

static int

pre_bl(PRE_ARGS)

{

int i, comp, dup;

const char *offs, *width;

enum mdoc_list lt;

struct mdoc_node *np;

struct mdoc_argv *argv;

int i;

enum mdoc_list lt;

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

Line 618 pre_bl(PRE_ARGS)

Line 620 pre_bl(PRE_ARGS)

for (i = 0; n->args && i < (int)n->args->argc; i++) {

argv = n->args->argv + i;

lt = LIST__NONE;

dup = comp = 0;

switch (argv->arg) {

width = offs = NULL;

switch (n->args->argv[i].arg) {

/* Set list types. */

case MDOC_Bullet:

lt = LIST_bullet;

Line 658 pre_bl(PRE_ARGS)

Line 659 pre_bl(PRE_ARGS)

break;

/* Set list arguments. */

case MDOC_Compact:

dup = n->norm->Bl.comp;

if (n->norm->Bl.comp)

comp = 1;

mandoc_msg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -compact");

n->norm->Bl.comp = 1;

break;

case MDOC_Width:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

width = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bl.width);

argv->pos, "Bl -width");

n->norm->Bl.width = "0n";

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bl.width)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -width %s",

argv->value[0]);

n->norm->Bl.width = argv->value[0];

break;

case MDOC_Offset:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

offs = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bl.offs);

argv->pos, "Bl -offset");

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bl.offs)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -offset %s",

argv->value[0]);

n->norm->Bl.offs = argv->value[0];

break;

default:

continue;

}

if (LIST__NONE == lt)

continue;

/* Check: duplicate auxiliary arguments. */

if (dup)

mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

if (comp && ! dup)

n->norm->Bl.comp = comp;

if (offs && ! dup)

n->norm->Bl.offs = offs;

if (width && ! dup)

n->norm->Bl.width = width;

/* Check: multiple list types. */

if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)

if (LIST__NONE != n->norm->Bl.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);

mandoc_msg(MANDOCERR_BL_REP,

mdoc->parse, n->line, n->pos,

/* Assign list type. */

mdoc_argnames[argv->arg]);

continue;

if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {

n->norm->Bl.type = lt;

/* Set column information, too. */

if (LIST_column == lt) {

n->norm->Bl.ncols =

n->args->argv[i].sz;

n->norm->Bl.cols = (void *)

n->args->argv[i].value;

}

/* The list type should come first. */

if (n->norm->Bl.type == LIST__NONE)

if (n->norm->Bl.width ||

n->norm->Bl.offs ||

n->norm->Bl.comp)

mandoc_msg(MANDOCERR_BL_LATETYPE,

mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);

mdoc->parse, n->line, n->pos,

mdoc_argnames[n->args->argv[0].arg]);

continue;

n->norm->Bl.type = lt;

if (LIST_column == lt) {

n->norm->Bl.ncols = argv->sz;

n->norm->Bl.cols = (void *)argv->value;

}

/* Allow lists to default to LIST_item. */

if (LIST__NONE == n->norm->Bl.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE);

n->norm->Bl.type = LIST_item;

}

Line 741 pre_bl(PRE_ARGS)

Line 742 pre_bl(PRE_ARGS)

switch (n->norm->Bl.type) {

case LIST_tag:

if (NULL == n->norm->Bl.width)

mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOWIDTH);

break;

case LIST_column:

/* FALLTHROUGH */

Line 777 pre_bl(PRE_ARGS)

Line 778 pre_bl(PRE_ARGS)

static int

pre_bd(PRE_ARGS)

{

int i, dup, comp;

enum mdoc_disp dt;

const char *offs;

struct mdoc_node *np;

struct mdoc_argv *argv;

int i;

enum mdoc_disp dt;

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

Line 796 pre_bd(PRE_ARGS)

Line 797 pre_bd(PRE_ARGS)

}

for (i = 0; n->args && i < (int)n->args->argc; i++) {

argv = n->args->argv + i;

dt = DISP__NONE;

dup = comp = 0;

offs = NULL;

switch (n->args->argv[i].arg) {

switch (argv->arg) {

case MDOC_Centred:

dt = DISP_centred;

break;

Line 820 pre_bd(PRE_ARGS)

mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);

return(0);

case MDOC_Offset:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

offs = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bd.offs);

argv->pos, "Bd -offset");

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bd.offs)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bd -offset %s",

argv->value[0]);

n->norm->Bd.offs = argv->value[0];

break;

case MDOC_Compact:

comp = 1;

if (n->norm->Bd.comp)

dup = n->norm->Bd.comp;

mandoc_msg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bd -compact");

n->norm->Bd.comp = 1;

break;

default:

abort();

/* NOTREACHED */

}

if (DISP__NONE == dt)

continue;

/* Check whether we have duplicates. */

if (DISP__NONE == n->norm->Bd.type)

if (dup)

mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

/* Make our auxiliary assignments. */

if (offs && ! dup)

n->norm->Bd.offs = offs;

if (comp && ! dup)

n->norm->Bd.comp = comp;

/* Check whether a type has already been assigned. */

if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE)

mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);

/* Make our type assignment. */

if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)

n->norm->Bd.type = dt;

else

mandoc_msg(MANDOCERR_BD_REP,

mdoc->parse, n->line, n->pos,

mdoc_argnames[argv->arg]);

}

if (DISP__NONE == n->norm->Bd.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE);

n->norm->Bd.type = DISP_ragged;

}

Line 926 pre_std(PRE_ARGS)

Line 921 pre_std(PRE_ARGS)

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

return(1);

mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV);

mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

return(1);

}

static int

pre_obsolete(PRE_ARGS)

{

if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type)

mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

return(1);

}

static int

pre_dt(PRE_ARGS)

{

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

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

n->line, n->pos, "Dt");

if (mdoc->meta.title)

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

n->line, n->pos, "Dt");

return(1);

}

Line 948 pre_os(PRE_ARGS)

Line 956 pre_os(PRE_ARGS)

{

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

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

n->line, n->pos, "Os");

if (mdoc->meta.os)

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

n->line, n->pos, "Os");

return(1);

}

Line 961 pre_dd(PRE_ARGS)

Line 971 pre_dd(PRE_ARGS)

{

if (mdoc->meta.title || mdoc->meta.os)

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

n->line, n->pos, "Dd");

if (mdoc->meta.date)

mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

n->line, n->pos, "Dd");

return(1);

}

Line 972 pre_dd(PRE_ARGS)

Line 984 pre_dd(PRE_ARGS)

static int

post_bf(POST_ARGS)

{

struct mdoc_node *np;

struct mdoc_node *np, *nch;

enum mdocargt arg;

Line 999 post_bf(POST_ARGS)

Line 1011 post_bf(POST_ARGS)

assert(MDOC_BLOCK == np->parent->type);

assert(MDOC_Bf == np->parent->tok);

/* Check the number of arguments. */

* Cannot have both argument and parameter.

* If neither is specified, let it through with a warning.

if (np->parent->args && np->child) {

nch = np->child;

mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);

if (NULL == np->parent->args) {

return(0);

if (NULL == nch) {

} else if (NULL == np->parent->args && NULL == np->child) {

mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT);

mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);

return(1);

}

nch = nch->next;

}

if (NULL != nch)

mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,

nch->line, nch->pos, "Bf ... %s", nch->string);

/* Extract argument into data. */

Line 1036 post_bf(POST_ARGS)

Line 1049 post_bf(POST_ARGS)

else if (0 == strcmp(np->child->string, "Sy"))

np->norm->Bf.font = FONT_Sy;

else

mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);

mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,

np->child->line, np->child->pos,

"Bf %s", np->child->string);

return(1);

}

Line 1069 post_lb(POST_ARGS)

Line 1084 post_lb(POST_ARGS)

static int

post_eoln(POST_ARGS)

{

const struct mdoc_node *n;

if (mdoc->last->child)

n = mdoc->last;

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

if (n->child)

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, n->line, n->pos,

"%s %s", mdoc_macronames[n->tok],

n->child->string);

return(1);

}

Line 1093 post_vt(POST_ARGS)

Line 1113 post_vt(POST_ARGS)

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

if (MDOC_TEXT != n->type)

mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);

mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

return(1);

}

Line 1198 post_at(POST_ARGS)

Line 1219 post_at(POST_ARGS)

assert(MDOC_TEXT == n->type);

if (NULL == (std_att = mdoc_a2att(n->string))) {

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

mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse,

n->line, n->pos, n->string);

mandoc_asprintf(&att, "AT&T UNIX %s", n->string);

} else

att = mandoc_strdup(std_att);

Line 1224 post_an(POST_ARGS)

Line 1246 post_an(POST_ARGS)

}

static int

post_en(POST_ARGS)

{

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

mdoc->last->norm->Es = mdoc->last_es;

return(1);

}

static int

post_es(POST_ARGS)

{

mdoc->last_es = mdoc->last;

return(1);

}

static int

post_it(POST_ARGS)

{

int i, cols;

enum mdoc_list lt;

struct mdoc_node *n, *c;

struct mdoc_node *nbl, *nit, *nch;

enum mandocerr er;

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

nit = mdoc->last;

if (MDOC_BLOCK != nit->type)

return(1);

n = mdoc->last->parent->parent;

nbl = nit->parent->parent;

lt = n->norm->Bl.type;

lt = nbl->norm->Bl.type;

if (LIST__NONE == lt) {

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

return(1);

}

switch (lt) {

case LIST_tag:

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

/* FALLTHROUGH */

break;

/* FIXME: give this a dummy value. */

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

break;

case LIST_hang:

/* FALLTHROUGH */

case LIST_ohang:

Line 1256 post_it(POST_ARGS)

Line 1287 post_it(POST_ARGS)

case LIST_inset:

/* FALLTHROUGH */

case LIST_diag:

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

if (NULL == nit->head->child)

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

mandoc_msg(MANDOCERR_IT_NOHEAD,

mdoc->parse, nit->line, nit->pos,

mdoc_argnames[nbl->args->argv[0].arg]);

break;

case LIST_bullet:

/* FALLTHROUGH */

Line 1266 post_it(POST_ARGS)

Line 1299 post_it(POST_ARGS)

case LIST_enum:

/* FALLTHROUGH */

case LIST_hyphen:

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

if (NULL == nit->body->child)

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

mandoc_msg(MANDOCERR_IT_NOBODY,

mdoc->parse, nit->line, nit->pos,

mdoc_argnames[nbl->args->argv[0].arg]);

/* FALLTHROUGH */

case LIST_item:

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

if (NULL != nit->head->child)

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

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, nit->line, nit->pos,

"It %s", nit->head->child->string);

break;

case LIST_column:

cols = (int)n->norm->Bl.ncols;

cols = (int)nbl->norm->Bl.ncols;

assert(NULL == mdoc->last->head->child);

assert(NULL == nit->head->child);

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

for (i = 0, nch = nit->child; nch; nch = nch->next)

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

if (MDOC_BODY == nch->type)

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

if (MDOC_BODY == c->type)

i++;

if (i < cols)

Line 1292 post_it(POST_ARGS)

Line 1326 post_it(POST_ARGS)

else

er = MANDOCERR_SYNTARGCOUNT;

mandoc_vmsg(er, mdoc->parse,

mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos,

mdoc->last->line, mdoc->last->pos,

"columns == %d (have %d)", cols, i);

return(MANDOCERR_ARGCOUNT == er);

default:

break;

abort();

}

return(1);

Line 1346 post_bl_block(POST_ARGS)

Line 1379 post_bl_block(POST_ARGS)

continue;

}

if (NULL == ni->next) {

mdoc_nmsg(mdoc, nc, MANDOCERR_MOVEPAR);

mandoc_msg(MANDOCERR_PAR_MOVE,

mdoc->parse, nc->line, nc->pos,

mdoc_macronames[nc->tok]);

if ( ! mdoc_node_relink(mdoc, nc))

return(0);

} else if (0 == n->norm->Bl.comp &&

LIST_column != n->norm->Bl.type) {

mdoc_nmsg(mdoc, nc, MANDOCERR_IGNPAR);

mandoc_vmsg(MANDOCERR_PAR_SKIP,

mdoc->parse, nc->line, nc->pos,

"%s before It",

mdoc_macronames[nc->tok]);

mdoc_node_delete(mdoc, nc);

} else

break;

Line 1385 post_bl_block_width(POST_ARGS)

Line 1423 post_bl_block_width(POST_ARGS)

width = 6;

else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))

return(1);

else if (0 == (width = macro2len(tok))) {

else

mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);

width = macro2len(tok);

return(1);

}

/* The value already exists: free and reallocate it. */

Line 1567 post_bl(POST_ARGS)

Line 1603 post_bl(POST_ARGS)

continue;

}

mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD);

mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,

nchild->line, nchild->pos,

mdoc_macronames[nchild->tok]);

* Move the node out of the Bl block.

Line 1617 post_bl(POST_ARGS)

Line 1655 post_bl(POST_ARGS)

static int

ebool(struct mdoc *mdoc)

{

struct mdoc_node *nch;

enum mdoct tok;

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

tok = mdoc->last->tok;

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

nch = mdoc->last->child;

mdoc_node_delete(mdoc, mdoc->last);

if (NULL == nch) {

if (MDOC_Sm == tok)

mdoc->flags ^= MDOC_SMOFF;

return(1);

}

check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);

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

check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2);

if (0 == strcmp(mdoc->last->child->string, "on")) {

assert(MDOC_TEXT == nch->type);

if (MDOC_Sm == mdoc->last->tok)

if (0 == strcmp(nch->string, "on")) {

if (MDOC_Sm == tok)

mdoc->flags &= ~MDOC_SMOFF;

return(1);

}

if (0 == strcmp(mdoc->last->child->string, "off")) {

if (0 == strcmp(nch->string, "off")) {

if (MDOC_Sm == mdoc->last->tok)

if (MDOC_Sm == tok)

mdoc->flags |= MDOC_SMOFF;

return(1);

}

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

mandoc_vmsg(MANDOCERR_SM_BAD,

return(1);

mdoc->parse, nch->line, nch->pos,

"%s %s", mdoc_macronames[tok], nch->string);

return(mdoc_node_relink(mdoc, nch));

}

static int

post_root(POST_ARGS)

{

int erc;

int ret;

struct mdoc_node *n;

erc = 0;

ret = 1;

/* Check that we have a finished prologue. */

if ( ! (MDOC_PBODY & mdoc->flags)) {

erc++;

ret = 0;

mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);

}

Line 1662 post_root(POST_ARGS)

Line 1708 post_root(POST_ARGS)

/* Check that we begin with a proper `Sh'. */

if (NULL == n->child) {

if (NULL == n->child)

erc++;

mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY);

mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);

else if (MDOC_Sh != n->child->tok)

} else if (MDOC_BLOCK != n->child->type ||

mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,

MDOC_Sh != n->child->tok) {

n->child->line, n->child->pos,

erc++;

mdoc_macronames[n->child->tok]);

/* Can this be lifted? See rxdebug.1 for example. */

mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);

}

return(erc ? 0 : 1);

return(ret);

}

static int

post_st(POST_ARGS)

{

struct mdoc_node *ch;

struct mdoc_node *n, *nch;

const char *p;

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

n = mdoc->last;

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

nch = n->child;

mdoc_node_delete(mdoc, mdoc->last);

if (NULL == nch) {

mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

mdoc_node_delete(mdoc, n);

return(1);

}

assert(MDOC_TEXT == ch->type);

assert(MDOC_TEXT == nch->type);

if (NULL == (p = mdoc_a2st(ch->string))) {

if (NULL == (p = mdoc_a2st(nch->string))) {

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

mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse,

mdoc_node_delete(mdoc, mdoc->last);

nch->line, nch->pos, nch->string);

mdoc_node_delete(mdoc, n);

} else {

free(ch->string);

free(nch->string);

ch->string = mandoc_strdup(p);

nch->string = mandoc_strdup(p);

}

return(1);

Line 1739 post_rs(POST_ARGS)

Line 1787 post_rs(POST_ARGS)

}

next = nn->next;

mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD);

mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse,

nn->line, nn->pos, mdoc_macronames[nn->tok]);

mdoc_node_delete(mdoc, nn);

}

Line 1862 post_ns(POST_ARGS)

Line 1911 post_ns(POST_ARGS)

{

if (MDOC_LINE & mdoc->last->flags)

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

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

return(1);

}

Line 1893 post_sh_body(POST_ARGS)

Line 1942 post_sh_body(POST_ARGS)

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

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

mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,

mdoc->last->line, mdoc->last->pos, "empty");

return(1);

}

Line 1902 post_sh_body(POST_ARGS)

Line 1952 post_sh_body(POST_ARGS)

continue;

if (MDOC_TEXT == n->type)

continue;

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

mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

}

assert(n);

if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)

return(1);

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

mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

return(1);

}

Line 1917 static int

Line 1969 static int

post_sh_head(POST_ARGS)

{

struct mdoc_node *n;

const char *goodsec;

char *secname;

enum mdoc_sec sec;

Line 1935 post_sh_head(POST_ARGS)

Line 1988 post_sh_head(POST_ARGS)

/* The NAME should be first. */

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

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

mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,

mdoc->last->line, mdoc->last->pos, secname);

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

Line 1978 post_sh_head(POST_ARGS)

Line 2032 post_sh_head(POST_ARGS)

if (sec == mdoc->lastnamed)

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

mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse,

mdoc->last->line, mdoc->last->pos, secname);

if (sec < mdoc->lastnamed)

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

mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse,

mdoc->last->line, mdoc->last->pos, secname);

/* Mark the last named section. */

Line 1991 post_sh_head(POST_ARGS)

Line 2047 post_sh_head(POST_ARGS)

assert(mdoc->meta.msec);

goodsec = NULL;

switch (sec) {

case SEC_ERRORS:

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

break;

goodsec = "2, 3, 4, 9";

/* FALLTHROUGH */

case SEC_RETURN_VALUES:

/* FALLTHROUGH */

Line 2003 post_sh_head(POST_ARGS)

Line 2061 post_sh_head(POST_ARGS)

break;

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

break;

if (NULL == goodsec)

goodsec = "2, 3, 9";

/* FALLTHROUGH */

case SEC_CONTEXT:

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

break;

mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse,

if (NULL == goodsec)

mdoc->last->line, mdoc->last->pos, secname);

goodsec = "9";

mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,

mdoc->last->line, mdoc->last->pos,

"%s for %s only", secname, goodsec);

break;

default:

break;

Line 2028 post_ignpar(POST_ARGS)

Line 2091 post_ignpar(POST_ARGS)

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

if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {

mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR);

mandoc_vmsg(MANDOCERR_PAR_SKIP,

mdoc->parse, np->line, np->pos,

"%s after %s", mdoc_macronames[np->tok],

mdoc_macronames[mdoc->last->tok]);

mdoc_node_delete(mdoc, np);

}

if (NULL != (np = mdoc->last->last))

if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {

mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR);

mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,

np->line, np->pos, "%s at the end of %s",

mdoc_macronames[np->tok],

mdoc_macronames[mdoc->last->tok]);

mdoc_node_delete(mdoc, np);

}

Line 2066 pre_par(PRE_ARGS)

Line 2135 pre_par(PRE_ARGS)

if (MDOC_It == n->tok && n->parent->norm->Bl.comp)

return(1);

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

mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,

mdoc->last->line, mdoc->last->pos,

"%s before %s", mdoc_macronames[mdoc->last->tok],

mdoc_macronames[n->tok]);

mdoc_node_delete(mdoc, mdoc->last);

return(1);

}

Line 2074 pre_par(PRE_ARGS)

Line 2146 pre_par(PRE_ARGS)

static int

post_par(POST_ARGS)

{

struct mdoc_node *np;

if (MDOC_ELEM != mdoc->last->type &&

MDOC_BLOCK != mdoc->last->type)

return(1);

if (NULL == mdoc->last->prev) {

if (NULL == (np = mdoc->last->prev)) {

if (MDOC_Sh != mdoc->last->parent->tok &&

np = mdoc->last->parent;

MDOC_Ss != mdoc->last->parent->tok)

if (MDOC_Sh != np->tok && MDOC_Ss != np->tok)

return(1);

} else {

if (MDOC_Pp != mdoc->last->prev->tok &&

if (MDOC_Pp != np->tok && MDOC_Lp != np->tok &&

MDOC_Lp != mdoc->last->prev->tok &&

(MDOC_br != mdoc->last->tok ||

(MDOC_sp != mdoc->last->prev->tok &&

(MDOC_sp != np->tok && MDOC_br != np->tok)))

MDOC_br != mdoc->last->prev->tok)))

return(1);

}

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

mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,

mdoc->last->line, mdoc->last->pos,

"%s after %s", mdoc_macronames[mdoc->last->tok],

mdoc_macronames[np->tok]);

mdoc_node_delete(mdoc, mdoc->last);

return(1);

}

Line 2173 post_dt(POST_ARGS)

Line 2247 post_dt(POST_ARGS)

mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;

/* First make all characters uppercase. */

/* First check that all characters are uppercase. */

if (NULL != (nn = n->child))

for (p = nn->string; *p; p++) {

if (toupper((unsigned char)*p) == *p)

continue;

mandoc_msg(MANDOCERR_TITLE_CASE,

mdoc->parse, nn->line,

* FIXME: don't be lazy: have this make all

nn->pos + (p - nn->string),

* characters be uppercase and just warn once.

nn->string);

mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE);

break;

}

Line 2228 post_dt(POST_ARGS)

Line 2300 post_dt(POST_ARGS)

mdoc->meta.vol = mandoc_strdup(cp);

mdoc->meta.msec = mandoc_strdup(nn->string);

} else {

mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC);

mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse,

nn->line, nn->pos, nn->string);

mdoc->meta.vol = mandoc_strdup(nn->string);

mdoc->meta.msec = mandoc_strdup(nn->string);

}

Line 2250 post_dt(POST_ARGS)

Line 2323 post_dt(POST_ARGS)

} else {

cp = mdoc_a2arch(nn->string);

if (NULL == cp) {

mdoc_nmsg(mdoc, nn, MANDOCERR_BADVOLARCH);

mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse,

nn->line, nn->pos, nn->string);

free(mdoc->meta.vol);

mdoc->meta.vol = mandoc_strdup(nn->string);

} else

CVSweb