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.232 and 1.245

version 1.232, 2014/07/30 00:19:16

version 1.245, 2014/08/19 17:31:55

Line 16

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <sys/types.h>

#ifndef OSNAME

#include <sys/utsname.h>

#endif

#include <sys/types.h>

#include <assert.h>

#include <ctype.h>

#include <limits.h>

Line 60 typedef int (*v_pre)(PRE_ARGS);

Line 57 typedef int (*v_pre)(PRE_ARGS);

typedef int (*v_post)(POST_ARGS);

struct valids {

v_pre *pre;

v_pre pre;

v_post *post;

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

static void check_argv(struct mdoc *,

struct mdoc_node *, struct mdoc_argv *);

Line 88 static int hwarn_ge1(POST_ARGS);

Line 84 static int hwarn_ge1(POST_ARGS);

static int post_an(POST_ARGS);

static int post_at(POST_ARGS);

static int post_bf(POST_ARGS);

static int post_bk(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_block(POST_ARGS);

static int post_bl_block_width(POST_ARGS);

static int post_bl_block_tag(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_bx(POST_ARGS);

static int post_d1(POST_ARGS);

static int post_defaults(POST_ARGS);

static int post_dd(POST_ARGS);

static int post_dt(POST_ARGS);

Line 101 static int post_en(POST_ARGS);

Line 99 static int post_en(POST_ARGS);

static int post_es(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_ex(POST_ARGS);

static int post_fo(POST_ARGS);

static int post_hyph(POST_ARGS);

static int post_hyphtext(POST_ARGS);

static int post_ignpar(POST_ARGS);

static int post_it(POST_ARGS);

static int post_lb(POST_ARGS);

static int post_literal(POST_ARGS);

static int post_nd(POST_ARGS);

static int post_nm(POST_ARGS);

static int post_ns(POST_ARGS);

static int post_os(POST_ARGS);

static int post_par(POST_ARGS);

static int post_prol(POST_ARGS);

static int post_root(POST_ARGS);

static int post_rs(POST_ARGS);

static int post_sh(POST_ARGS);

Line 124 static int pre_bl(PRE_ARGS);

static int pre_dd(PRE_ARGS);

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

static int pre_ss(PRE_ARGS);

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[] = { 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 };

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

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

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

static v_post posts_d1[] = { bwarn_ge1, post_hyph, NULL };

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_ex[] = { post_ex, 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 };

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

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

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

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

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

static v_post posts_ns[] = { post_ns, NULL };

static v_post posts_os[] = { post_os, post_prol, NULL };

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

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

static v_post posts_sh[] = { post_ignpar,hwarn_ge1,post_sh,post_hyph,NULL };

static v_post posts_sp[] = { post_par, ewarn_le1, NULL };

static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL };

static v_post posts_st[] = { post_st, NULL };

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

static v_post posts_text1[] = { ewarn_eq1, NULL };

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

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

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

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

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

static v_pre pres_dl[] = { pre_literal, pre_display, NULL };

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 };

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

static v_pre pres_std[] = { pre_std, NULL };

static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ap */

{ pres_dd, posts_dd }, /* Dd */

{ pre_dd, post_dd }, /* Dd */

{ pres_dt, posts_dt }, /* Dt */

{ pre_dt, post_dt }, /* Dt */

{ pres_os, posts_os }, /* Os */

{ pre_os, post_os }, /* Os */

{ pres_sh, posts_sh }, /* Sh */

{ NULL, post_sh }, /* Sh */

{ pres_ss, posts_ss }, /* Ss */

{ NULL, post_ignpar }, /* Ss */

{ pres_pp, posts_pp }, /* Pp */

{ pre_par, post_par }, /* Pp */

{ pres_d1, posts_d1 }, /* D1 */

{ pre_display, post_d1 }, /* D1 */

{ pres_dl, posts_dl }, /* Dl */

{ pre_literal, post_literal }, /* Dl */

{ pres_bd, posts_bd }, /* Bd */

{ pre_bd, post_literal }, /* Bd */

{ NULL, NULL }, /* Ed */

{ pres_bl, posts_bl }, /* Bl */

{ pre_bl, post_bl }, /* Bl */

{ NULL, NULL }, /* El */

{ pres_it, posts_it }, /* It */

{ pre_par, post_it }, /* It */

{ NULL, NULL }, /* Ad */

{ pres_an, posts_an }, /* An */

{ pre_an, post_an }, /* An */

{ NULL, posts_defaults }, /* Ar */

{ NULL, post_defaults }, /* Ar */

{ NULL, NULL }, /* Cd */

{ NULL, NULL }, /* Cm */

{ NULL, NULL }, /* Dv */

{ NULL, NULL }, /* Er */

{ NULL, NULL }, /* Ev */

{ pres_std, posts_ex }, /* Ex */

{ pre_std, post_ex }, /* Ex */

{ NULL, NULL }, /* Fa */

{ NULL, posts_text }, /* Fd */

{ NULL, ewarn_ge1 }, /* Fd */

{ NULL, NULL }, /* Fl */

{ NULL, NULL }, /* Fn */

{ NULL, NULL }, /* Ft */

{ NULL, NULL }, /* Ic */

{ NULL, posts_text1 }, /* In */

{ NULL, ewarn_eq1 }, /* In */

{ NULL, posts_defaults }, /* Li */

{ NULL, post_defaults }, /* Li */

{ NULL, posts_nd }, /* Nd */

{ NULL, post_nd }, /* Nd */

{ NULL, posts_nm }, /* Nm */

{ NULL, post_nm }, /* Nm */

{ NULL, NULL }, /* Op */

{ pres_obsolete, NULL }, /* Ot */

{ pre_obsolete, NULL }, /* Ot */

{ NULL, posts_defaults }, /* Pa */

{ NULL, post_defaults }, /* Pa */

{ pres_std, NULL }, /* Rv */

{ pre_std, NULL }, /* Rv */

{ NULL, posts_st }, /* St */

{ NULL, post_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

{ NULL, post_vt }, /* Vt */

{ NULL, posts_text }, /* Xr */

{ NULL, ewarn_ge1 }, /* Xr */

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

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

{ NULL, posts_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */

{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */

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

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

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

{ NULL, ewarn_ge1 }, /* %I */

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

{ NULL, ewarn_ge1 }, /* %J */

{ NULL, posts_hyphtext }, /* %N */

{ NULL, post_hyphtext }, /* %N */

{ NULL, posts_hyphtext }, /* %O */

{ NULL, post_hyphtext }, /* %O */

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

{ NULL, ewarn_ge1 }, /* %P */

{ NULL, posts_hyphtext }, /* %R */

{ NULL, post_hyphtext }, /* %R */

{ NULL, posts_hyphtext }, /* %T */ /* FIXME: can be used outside Rs/Re. */

{ NULL, post_hyphtext }, /* %T */ /* FIXME: can be used outside Rs/Re. */

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

{ NULL, ewarn_ge1 }, /* %V */

{ NULL, NULL }, /* Ac */

{ NULL, NULL }, /* Ao */

{ NULL, NULL }, /* Aq */

{ NULL, posts_at }, /* At */

{ NULL, post_at }, /* At */

{ NULL, NULL }, /* Bc */

{ NULL, posts_bf }, /* Bf */

{ NULL, post_bf }, /* Bf */

{ NULL, NULL }, /* Bo */

{ NULL, NULL }, /* Bq */

{ NULL, NULL }, /* Bsx */

{ NULL, posts_bx }, /* Bx */

{ NULL, post_bx }, /* Bx */

{ NULL, posts_bool }, /* Db */

{ NULL, ebool }, /* Db */

{ NULL, NULL }, /* Dc */

{ NULL, NULL }, /* Do */

{ NULL, NULL }, /* Dq */

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

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

{ NULL, NULL }, /* Eo */

{ NULL, NULL }, /* Fx */

{ NULL, NULL }, /* Ms */

{ NULL, posts_notext }, /* No */

{ NULL, ewarn_eq0 }, /* No */

{ NULL, posts_ns }, /* Ns */

{ NULL, post_ns }, /* Ns */

{ NULL, NULL }, /* Nx */

{ NULL, NULL }, /* Ox */

{ NULL, NULL }, /* Pc */

{ NULL, posts_text1 }, /* Pf */

{ NULL, ewarn_eq1 }, /* Pf */

{ NULL, NULL }, /* Po */

{ NULL, NULL }, /* Pq */

{ NULL, NULL }, /* Qc */

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

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

{ NULL, NULL }, /* Qo */

{ NULL, NULL }, /* Qq */

{ NULL, NULL }, /* Re */

{ NULL, posts_rs }, /* Rs */

{ NULL, post_rs }, /* Rs */

{ NULL, NULL }, /* Sc */

{ NULL, NULL }, /* So */

{ NULL, NULL }, /* Sq */

{ NULL, posts_bool }, /* Sm */

{ NULL, ebool }, /* Sm */

{ NULL, posts_hyph }, /* Sx */

{ NULL, post_hyph }, /* Sx */

{ NULL, NULL }, /* Sy */

{ NULL, NULL }, /* Tn */

{ NULL, NULL }, /* Ux */

{ NULL, NULL }, /* Xc */

{ NULL, NULL }, /* Xo */

{ NULL, posts_fo }, /* Fo */

{ NULL, post_fo }, /* Fo */

{ NULL, NULL }, /* Fc */

{ NULL, NULL }, /* Oo */

{ NULL, NULL }, /* Oc */

{ NULL, posts_bk }, /* Bk */

{ NULL, post_bk }, /* Bk */

{ NULL, NULL }, /* Ek */

{ NULL, posts_eoln }, /* Bt */

{ NULL, post_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

{ pres_obsolete, NULL }, /* Fr */

{ pre_obsolete, NULL }, /* Fr */

{ NULL, posts_eoln }, /* Ud */

{ NULL, post_eoln }, /* Ud */

{ NULL, posts_lb }, /* Lb */

{ NULL, post_lb }, /* Lb */

{ pres_pp, posts_pp }, /* Lp */

{ pre_par, post_par }, /* Lp */

{ NULL, NULL }, /* Lk */

{ NULL, posts_defaults }, /* Mt */

{ NULL, post_defaults }, /* Mt */

{ NULL, NULL }, /* Brq */

{ NULL, NULL }, /* Bro */

{ NULL, NULL }, /* Brc */

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

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

{ pres_obsolete, posts_es }, /* Es */

{ pre_obsolete, post_es }, /* Es */

{ pres_obsolete, posts_en }, /* En */

{ pre_obsolete, post_en }, /* En */

{ NULL, NULL }, /* Dx */

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

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

{ NULL, posts_pp }, /* br */

{ NULL, post_par }, /* br */

{ NULL, posts_sp }, /* sp */

{ NULL, post_par }, /* sp */

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

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

{ NULL, NULL }, /* Ta */

{ NULL, NULL }, /* ll */

};

Line 359 static const char * const secnames[SEC__MAX] = {

Line 305 static const char * const secnames[SEC__MAX] = {

int

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

{

v_pre *p;

v_pre p;

int line, pos;

char *tp;

switch (n->type) {

case MDOC_TEXT:

tp = n->string;

check_text(mdoc, n->line, n->pos, n->string);

line = n->line;

pos = n->pos;

check_text(mdoc, line, pos, tp);

/* FALLTHROUGH */

case MDOC_TBL:

/* FALLTHROUGH */

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

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

}

check_args(mdoc, n);

p = mdoc_valids[n->tok].pre;

if (NULL == mdoc_valids[n->tok].pre)

return(*p ? (*p)(mdoc, n) : 1);

return(1);

for (p = mdoc_valids[n->tok].pre; *p; p++)

if ( ! (*p)(mdoc, n))

return(0);

return(1);

}

int

mdoc_valid_post(struct mdoc *mdoc)

{

v_post *p;

struct mdoc_node *n;

v_post p;

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

n = mdoc->last;

if (n->flags & MDOC_VALID)

return(1);

mdoc->last->flags |= MDOC_VALID;

n->flags |= MDOC_VALID;

switch (mdoc->last->type) {

switch (n->type) {

case MDOC_TEXT:

/* FALLTHROUGH */

case MDOC_EQN:

Line 409 mdoc_valid_post(struct mdoc *mdoc)

Line 347 mdoc_valid_post(struct mdoc *mdoc)

case MDOC_ROOT:

return(post_root(mdoc));

default:

break;

p = mdoc_valids[n->tok].post;

return(*p ? (*p)(mdoc) : 1);

}

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

return(1);

for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)

if ( ! (*p)(mdoc))

return(0);

return(1);

}

static int

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

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

}

static int

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

{

assert(n->parent);

if ((MDOC_ROOT == t || tok == n->parent->tok) &&

(t == n->parent->type))

return(1);

mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse,

n->line, n->pos, "want parent %s",

MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]);

return(0);

}

static int

pre_display(PRE_ARGS)

{

struct mdoc_node *node;

Line 590 static int

Line 505 static int

pre_bl(PRE_ARGS)

{

struct mdoc_node *np;

struct mdoc_argv *argv;

struct mdoc_argv *argv, *wa;

int i;

enum mdocargt mdoclt;

enum mdoc_list lt;

if (MDOC_BLOCK != n->type) {

Line 613 pre_bl(PRE_ARGS)

Line 529 pre_bl(PRE_ARGS)

* ones. If we find no list type, we default to LIST_item.

wa = (n->args == NULL) ? NULL : n->args->argv;

mdoclt = MDOC_ARG_MAX;

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

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

lt = LIST__NONE;

Line 660 pre_bl(PRE_ARGS)

Line 578 pre_bl(PRE_ARGS)

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

break;

case MDOC_Width:

wa = argv;

if (0 == argv->sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

mdoc->parse, argv->line,

Line 693 pre_bl(PRE_ARGS)

Line 612 pre_bl(PRE_ARGS)

}

if (LIST__NONE == lt)

continue;

mdoclt = argv->arg;

/* Check: multiple list types. */

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

mandoc_msg(MANDOCERR_BL_REP,

mandoc_vmsg(MANDOCERR_BL_REP,

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

mdoc_argnames[argv->arg]);

"Bl -%s", mdoc_argnames[argv->arg]);

continue;

}

Line 708 pre_bl(PRE_ARGS)

Line 628 pre_bl(PRE_ARGS)

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

n->norm->Bl.offs ||

n->norm->Bl.comp)

mandoc_msg(MANDOCERR_BL_LATETYPE,

mandoc_vmsg(MANDOCERR_BL_LATETYPE,

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

mdoc->parse, n->line, n->pos, "Bl -%s",

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

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

Line 722 pre_bl(PRE_ARGS)

Line 642 pre_bl(PRE_ARGS)

/* Allow lists to default to LIST_item. */

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

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE);

mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,

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

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

}

Line 736 pre_bl(PRE_ARGS)

Line 657 pre_bl(PRE_ARGS)

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

case LIST_tag:

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

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOWIDTH);

mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,

n->line, n->pos, "Bl -tag");

break;

case LIST_column:

/* FALLTHROUGH */

Line 748 pre_bl(PRE_ARGS)

Line 670 pre_bl(PRE_ARGS)

/* FALLTHROUGH */

case LIST_item:

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

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,

wa->line, wa->pos, "Bl -%s",

mdoc_argnames[mdoclt]);

break;

case LIST_bullet:

/* FALLTHROUGH */

Line 766 pre_bl(PRE_ARGS)

Line 690 pre_bl(PRE_ARGS)

break;

}

return(1);

return(pre_par(mdoc, n));

}

static int

Line 777 pre_bd(PRE_ARGS)

Line 701 pre_bd(PRE_ARGS)

int i;

enum mdoc_disp dt;

pre_literal(mdoc, n);

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

assert(n->pending);

Line 811 pre_bd(PRE_ARGS)

Line 737 pre_bd(PRE_ARGS)

dt = DISP_literal;

break;

case MDOC_File:

mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);

mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,

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

return(0);

case MDOC_Offset:

if (0 == argv->sz) {

Line 844 pre_bd(PRE_ARGS)

Line 771 pre_bd(PRE_ARGS)

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

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

else

mandoc_msg(MANDOCERR_BD_REP,

mandoc_vmsg(MANDOCERR_BD_REP,

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

mdoc_argnames[argv->arg]);

"Bd -%s", mdoc_argnames[argv->arg]);

}

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

mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE);

mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse,

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

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

}

return(1);

return(pre_par(mdoc, n));

}

static int

pre_ss(PRE_ARGS)

{

if (MDOC_BLOCK != n->type)

return(1);

return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));

}

static int

pre_sh(PRE_ARGS)

{

if (MDOC_BLOCK != n->type)

return(1);

return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));

}

static int

pre_it(PRE_ARGS)

{

if (MDOC_BLOCK != n->type)

return(1);

return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));

}

static int

pre_an(PRE_ARGS)

{

int i;

struct mdoc_argv *argv;

size_t i;

if (NULL == n->args)

if (n->args == NULL)

return(1);

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

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

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

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

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

mandoc_vmsg(MANDOCERR_AN_REP,

mdoc->parse, argv->line, argv->pos,

"An -%s", mdoc_argnames[argv->arg]);

}

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

argv = n->args->argv;

if (argv->arg == MDOC_Split)

n->norm->An.auth = AUTH_split;

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

else if (argv->arg == MDOC_Nosplit)

n->norm->An.auth = AUTH_nosplit;

else

abort();

Line 934 static int

Line 839 static int

pre_dt(PRE_ARGS)

{

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

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

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

if (mdoc->meta.title)

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

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

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

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

return(1);

}

Line 949 static int

Line 852 static int

pre_os(PRE_ARGS)

{

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

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

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

if (mdoc->meta.os)

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

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

else if (mdoc->flags & MDOC_PBODY)

mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,

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

return(1);

}

Line 964 static int

Line 865 static int

pre_dd(PRE_ARGS)

{

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

if (mdoc->meta.date != NULL)

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

if (mdoc->meta.date)

mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,

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

else if (mdoc->flags & MDOC_PBODY)

mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,

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

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

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

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

mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,

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

return(1);

}

Line 1010 post_bf(POST_ARGS)

Line 915 post_bf(POST_ARGS)

nch = np->child;

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

if (NULL == nch) {

mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT);

mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,

np->line, np->pos, "Bf");

return(1);

}

nch = nch->next;

Line 1090 post_eoln(POST_ARGS)

Line 996 post_eoln(POST_ARGS)

}

static int

post_fo(POST_ARGS)

{

hwarn_eq1(mdoc);

bwarn_ge1(mdoc);

return(1);

}

static int

post_vt(POST_ARGS)

{

const struct mdoc_node *n;

Line 1123 post_nm(POST_ARGS)

Line 1038 post_nm(POST_ARGS)

mdoc_deroff(&mdoc->meta.name, mdoc->last);

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

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

mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,

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

return(1);

}

static int

post_nd(POST_ARGS)

{

berr_ge1(mdoc);

return(post_hyph(mdoc));

}

static int

post_d1(POST_ARGS)

{

bwarn_ge1(mdoc);

return(post_hyph(mdoc));

}

static int

post_literal(POST_ARGS)

{

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

hwarn_eq0(mdoc);

bwarn_ge1(mdoc);

* The `Dl' (note "el" not "one") and `Bd' macros unset the

* MDOC_LITERAL flag as they leave. Note that `Bd' only sets

Line 1168 post_defaults(POST_ARGS)

Line 1104 post_defaults(POST_ARGS)

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

Line 1200 post_at(POST_ARGS)

Line 1130 post_at(POST_ARGS)

const char *std_att;

char *att;

n = mdoc->last;

if (n->child == NULL) {

mdoc->next = MDOC_NEXT_CHILD;

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

return(0);

mdoc->last = n;

return(1);

}

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

n = n->child;

return(1);

assert(MDOC_TEXT == n->type);

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

mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse,

mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,

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

n->line, n->pos, "At %s", n->string);

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

} else

att = mandoc_strdup(std_att);

Line 1260 post_it(POST_ARGS)

Line 1197 post_it(POST_ARGS)

int i, cols;

enum mdoc_list lt;

struct mdoc_node *nbl, *nit, *nch;

enum mandocerr er;

nit = mdoc->last;

if (MDOC_BLOCK != nit->type)

Line 1280 post_it(POST_ARGS)

Line 1216 post_it(POST_ARGS)

/* FALLTHROUGH */

case LIST_diag:

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

mandoc_msg(MANDOCERR_IT_NOHEAD,

mandoc_vmsg(MANDOCERR_IT_NOHEAD,

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

"Bl -%s It",

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

break;

case LIST_bullet:

Line 1292 post_it(POST_ARGS)

Line 1229 post_it(POST_ARGS)

/* FALLTHROUGH */

case LIST_hyphen:

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

mandoc_msg(MANDOCERR_IT_NOBODY,

mandoc_vmsg(MANDOCERR_IT_NOBODY,

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

"Bl -%s It",

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

/* FALLTHROUGH */

case LIST_item:

Line 1311 post_it(POST_ARGS)

Line 1249 post_it(POST_ARGS)

if (MDOC_BODY == nch->type)

i++;

if (i < cols)

if (i < cols || i > cols + 1)

er = MANDOCERR_ARGCOUNT;

mandoc_vmsg(MANDOCERR_ARGCOUNT,

else if (i == cols || i == cols + 1)

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

break;

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

else

break;

er = MANDOCERR_SYNTARGCOUNT;

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

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

return(MANDOCERR_ARGCOUNT == er);

default:

abort();

}

Line 1507 static int

Line 1440 static int

post_bl_head(POST_ARGS)

{

struct mdoc_node *np, *nn, *nnp;

struct mdoc_argv *argv;

int i, j;

if (LIST_column != mdoc->last->norm->Bl.type)

Line 1514 post_bl_head(POST_ARGS)

Line 1448 post_bl_head(POST_ARGS)

return(hwarn_eq0(mdoc));

* Convert old-style lists, where the column width specifiers

* Append old-style lists, where the column width specifiers

* trail as macro parameters, to the new-style ("normal-form")

* lists where they're argument values following -column.

/* First, disallow both types and allow normal-form. */

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

* TODO: technically, we can accept both and just merge the two

* lists, but I'll leave that for another day.

if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) {

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

return(0);

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

return(1);

np = mdoc->last->parent;

Line 1540 post_bl_head(POST_ARGS)

Line 1464 post_bl_head(POST_ARGS)

break;

assert(j < (int)np->args->argc);

assert(0 == np->args->argv[j].sz);

* Accommodate for new-style groff column syntax. Shuffle the

Line 1548 post_bl_head(POST_ARGS)

Line 1471 post_bl_head(POST_ARGS)

* column field. Then, delete the head children.

np->args->argv[j].sz = (size_t)mdoc->last->nchild;

argv = np->args->argv + j;

np->args->argv[j].value = mandoc_reallocarray(NULL,

i = argv->sz;

(size_t)mdoc->last->nchild, sizeof(char *));

argv->sz += mdoc->last->nchild;

argv->value = mandoc_reallocarray(argv->value,

argv->sz, sizeof(char *));

mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;

mdoc->last->norm->Bl.ncols = argv->sz;

mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value;

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

for (i = 0, nn = mdoc->last->child; nn; i++) {

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

np->args->argv[j].value[i] = nn->string;

argv->value[i] = nn->string;

nn->string = NULL;

nnp = nn;

nn = nn->next;

Line 1588 post_bl(POST_ARGS)

Line 1513 post_bl(POST_ARGS)

return(1);

}

bwarn_ge1(mdoc);

nchild = nbody->child;

while (NULL != nchild) {

if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {

Line 1645 post_bl(POST_ARGS)

Line 1572 post_bl(POST_ARGS)

}

static int

post_bk(POST_ARGS)

{

hwarn_eq0(mdoc);

bwarn_ge1(mdoc);

return(1);

}

static int

ebool(struct mdoc *mdoc)

{

struct mdoc_node *nch;

Line 1683 ebool(struct mdoc *mdoc)

Line 1619 ebool(struct mdoc *mdoc)

static int

post_root(POST_ARGS)

{

int ret;

struct mdoc_node *n;

ret = 1;

/* Add missing prologue data. */

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

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

mdoc->meta.date = mdoc->quick ?

mandoc_strdup("") :

mandoc_normdate(mdoc->parse, NULL, 0, 0);

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

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

ret = 0;

mandoc_msg(MANDOCERR_DT_NOTITLE,

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

mdoc->parse, 0, 0, "EOF");

mdoc->meta.title = mandoc_strdup("UNTITLED");

}

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

mdoc->meta.vol = mandoc_strdup("LOCAL");

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

mandoc_msg(MANDOCERR_OS_MISSING,

mdoc->parse, 0, 0, NULL);

mdoc->meta.os = mandoc_strdup("");

}

n = mdoc->first;

assert(n);

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

if (NULL == n->child)

mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY);

mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse,

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

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

mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,

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

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

return(ret);

return(1);

}

static int

Line 1729 post_st(POST_ARGS)

Line 1678 post_st(POST_ARGS)

assert(MDOC_TEXT == nch->type);

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

mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse,

mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,

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

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

mdoc_node_delete(mdoc, n);

} else {

free(nch->string);

Line 1876 post_hyph(POST_ARGS)

Line 1825 post_hyph(POST_ARGS)

}

static int

post_hyphtext(POST_ARGS)

{

ewarn_ge1(mdoc);

return(post_hyph(mdoc));

}

static int

post_ns(POST_ARGS)

{

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

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

mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,

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

return(1);

}

Line 1888 static int

Line 1846 static int

post_sh(POST_ARGS)

{

post_ignpar(mdoc);

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

return(post_sh_head(mdoc));

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

Line 1957 post_sh_head(POST_ARGS)

Line 1917 post_sh_head(POST_ARGS)

/* The NAME should be first. */

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

mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,

mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,

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

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

"Sh %s", secname);

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

Line 2001 post_sh_head(POST_ARGS)

Line 1962 post_sh_head(POST_ARGS)

if (sec == mdoc->lastnamed)

mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse,

mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,

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

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

"Sh %s", secname);

if (sec < mdoc->lastnamed)

mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse,

mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,

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

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

"Sh %s", secname);

/* Mark the last named section. */

Line 2014 post_sh_head(POST_ARGS)

Line 1977 post_sh_head(POST_ARGS)

/* Check particular section/manual conventions. */

assert(mdoc->meta.msec);

if (mdoc->meta.msec == NULL) {

free(secname);

return(1);

}

goodsec = NULL;

switch (sec) {

Line 2040 post_sh_head(POST_ARGS)

Line 2006 post_sh_head(POST_ARGS)

goodsec = "9";

mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,

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

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

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

break;

default:

break;

Line 2055 post_ignpar(POST_ARGS)

Line 2021 post_ignpar(POST_ARGS)

{

struct mdoc_node *np;

hwarn_ge1(mdoc);

post_hyph(mdoc);

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

return(1);

Line 2117 post_par(POST_ARGS)

Line 2086 post_par(POST_ARGS)

{

struct mdoc_node *np;

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

ewarn_le1(mdoc);

else

ewarn_eq0(mdoc);

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

MDOC_BLOCK != mdoc->last->type)

return(1);

Line 2144 static int

Line 2118 static int

pre_literal(PRE_ARGS)

{

pre_display(mdoc, n);

if (MDOC_BODY != n->type)

return(1);

Line 2183 post_dd(POST_ARGS)

Line 2159 post_dd(POST_ARGS)

if (NULL == n->child || '\0' == n->child->string[0]) {

mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :

mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);

return(1);

goto out;

}

datestr = NULL;

Line 2195 post_dd(POST_ARGS)

Line 2171 post_dd(POST_ARGS)

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

free(datestr);

}

out:

mdoc_node_delete(mdoc, n);

return(1);

}

Line 2207 post_dt(POST_ARGS)

Line 2185 post_dt(POST_ARGS)

n = mdoc->last;

if (mdoc->meta.title)

free(mdoc->meta.title);

free(mdoc->meta.msec);

if (mdoc->meta.vol)

free(mdoc->meta.vol);

free(mdoc->meta.arch);

if (mdoc->meta.arch)

free(mdoc->meta.arch);

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

mdoc->meta.title = NULL;

mdoc->meta.msec = NULL;

mdoc->meta.vol = NULL;

mdoc->meta.arch = NULL;

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

Line 2222 post_dt(POST_ARGS)

Line 2201 post_dt(POST_ARGS)

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

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

continue;

mandoc_msg(MANDOCERR_TITLE_CASE,

mandoc_vmsg(MANDOCERR_TITLE_CASE,

mdoc->parse, nn->line,

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

nn->string);

"Dt %s", nn->string);

break;

}

/* Handles: `.Dt'

/* No argument: msec and arch remain NULL. */

* title = unknown, volume = local, msec = 0, arch = NULL

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

/* XXX: make these macro values. */

mandoc_msg(MANDOCERR_DT_NOTITLE,

/* FIXME: warn about missing values. */

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

mdoc->meta.title = mandoc_strdup("UNKNOWN");

mdoc->meta.title = mandoc_strdup("UNTITLED");

mdoc->meta.vol = mandoc_strdup("LOCAL");

mdoc->meta.msec = mandoc_strdup("1");

goto out;

return(1);

}

/* Handles: `.Dt TITLE'

/* One argument: msec and arch remain NULL. */

* title = TITLE, volume = local, msec = 0, arch = NULL

mdoc->meta.title = mandoc_strdup(

'\0' == nn->string[0] ? "UNKNOWN" : nn->string);

'\0' == nn->string[0] ? "UNTITLED" : nn->string);

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

/* FIXME: warn about missing msec. */

mandoc_vmsg(MANDOCERR_MSEC_MISSING,

/* XXX: make this a macro value. */

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

"Dt %s", mdoc->meta.title);

mdoc->meta.vol = mandoc_strdup("LOCAL");

mdoc->meta.msec = mandoc_strdup("1");

goto out;

return(1);

}

/* Handles: `.Dt TITLE SEC'

Line 2269 post_dt(POST_ARGS)

Line 2243 post_dt(POST_ARGS)

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

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

} else {

mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse,

mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse,

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

nn->line, nn->pos, "Dt ... %s", nn->string);

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

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

}

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

return(1);

goto out;

/* Handles: `.Dt TITLE SEC VOL'

* title = TITLE,

Line 2292 post_dt(POST_ARGS)

Line 2266 post_dt(POST_ARGS)

} else {

cp = mdoc_a2arch(nn->string);

if (NULL == cp) {

mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse,

mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse,

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

nn->line, nn->pos, "Dt ... %s", nn->string);

free(mdoc->meta.vol);

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

} else

Line 2302 post_dt(POST_ARGS)

Line 2276 post_dt(POST_ARGS)

/* Ignore any subsequent parameters... */

/* FIXME: warn about subsequent parameters. */

out:

mdoc_node_delete(mdoc, n);

return(1);

}

static int

post_prol(POST_ARGS)

{

* Remove prologue macros from the document after they're

* processed. The final document uses mdoc_meta for these

* values and discards the originals.

mdoc_node_delete(mdoc, mdoc->last);

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

mdoc->flags |= MDOC_PBODY;

return(1);

}

static int

post_bx(POST_ARGS)

{

struct mdoc_node *n;

Line 2364 post_os(POST_ARGS)

Line 2323 post_os(POST_ARGS)

mdoc->meta.os = NULL;

mdoc_deroff(&mdoc->meta.os, n);

if (mdoc->meta.os)

return(1);

goto out;

if (mdoc->defos) {

mdoc->meta.os = mandoc_strdup(mdoc->defos);

return(1);

goto out;

}

#ifdef OSNAME

Line 2376 post_os(POST_ARGS)

Line 2335 post_os(POST_ARGS)

#else /*!OSNAME */

if (NULL == defbuf) {

if (-1 == uname(&utsname)) {

mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);

mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,

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

defbuf = mandoc_strdup("UNKNOWN");

} else

mandoc_asprintf(&defbuf, "%s %s",

Line 2384 post_os(POST_ARGS)

Line 2344 post_os(POST_ARGS)

}

mdoc->meta.os = mandoc_strdup(defbuf);

#endif /*!OSNAME*/

out:

mdoc_node_delete(mdoc, n);

return(1);

}

Line 2402 post_ex(POST_ARGS)

Line 2365 post_ex(POST_ARGS)

return(1);

if (mdoc->meta.name == NULL) {

mdoc_nmsg(mdoc, n, MANDOCERR_EX_NONAME);

mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,

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

return(1);

}

CVSweb