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.91 and 1.112

version 1.91, 2010/06/03 13:44:36

version 1.112, 2010/07/20 14:56:42

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

Line 47 struct valids {

Line 46 struct valids {

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, const char *);

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

static int check_argv(struct mdoc *,

const struct mdoc_node *,

struct mdoc_node *, struct mdoc_argv *);

const struct mdoc_argv *);

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

static int check_args(struct mdoc *,

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

Line 109 static int pre_ss(PRE_ARGS);

Line 106 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_bd[] = { hwarn_eq0, bwarn_ge1, 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 };

Line 156 const struct valids mdoc_valids[MDOC_MAX] = {

Line 153 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_notext }, /* Pp */

{ pres_d1, posts_wline }, /* D1 */

{ pres_d1, posts_wline }, /* Dl */

{ pres_bd, posts_bd }, /* Bd */

{ pres_bd, posts_bd_bk }, /* Bd */

{ NULL, NULL }, /* Ed */

{ pres_bl, posts_bl }, /* Bl */

{ NULL, NULL }, /* El */

Line 247 const struct valids mdoc_valids[MDOC_MAX] = {

Line 244 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Fc */

{ NULL, NULL }, /* Oo */

{ NULL, NULL }, /* Oc */

{ NULL, posts_wline }, /* Bk */

{ NULL, posts_bd_bk }, /* Bk */

{ NULL, NULL }, /* Ek */

{ NULL, posts_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

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

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

{

v_pre *p;

int line, pos;

const char *tp;

char *tp;

if (MDOC_TEXT == n->type) {

tp = n->string;

Line 419 check_stdarg(PRE_ARGS)

Line 416 check_stdarg(PRE_ARGS)

static int

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

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

{

int i;

Line 436 check_args(struct mdoc *m, const struct mdoc_node *n)

Line 433 check_args(struct mdoc *m, const struct mdoc_node *n)

static int

check_argv(struct mdoc *m, const struct mdoc_node *n,

check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)

const struct mdoc_argv *v)

{

int i;

Line 457 check_argv(struct mdoc *m, const struct mdoc_node *n,

Line 453 check_argv(struct mdoc *m, const struct mdoc_node *n,

static int

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

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

{

int c;

size_t sz;

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

Line 480 check_text(struct mdoc *mdoc, int line, int pos, const

Line 484 check_text(struct mdoc *mdoc, int line, int pos, const

continue;

}

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

c = mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);

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

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

return(c);

}

Line 489 check_text(struct mdoc *mdoc, int line, int pos, const

Line 493 check_text(struct mdoc *mdoc, int line, int pos, const

}

static int

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

{

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

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

}

static int

pre_display(PRE_ARGS)

{

Line 535 pre_display(PRE_ARGS)

Line 536 pre_display(PRE_ARGS)

static int

pre_bl(PRE_ARGS)

{

int i, width, offs, cmpt, dupl;

int i, comp, dup;

enum mdoc_list lt;

const char *offs, *width;

enum mdoc_list lt;

struct mdoc_node *np;

if (MDOC_BLOCK != n->type) {

assert(n->parent);

if (ENDBODY_NOT != n->end) {

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

assert(n->pending);

assert(MDOC_Bl == n->parent->tok);

np = n->pending->parent;

assert(LIST__NONE != n->parent->data.list);

} else

n->data.list = n->parent->data.list;

np = n->parent;

assert(np);

assert(MDOC_BLOCK == np->type);

assert(MDOC_Bl == np->tok);

assert(np->data.Bl);

n->data.Bl = np->data.Bl;

return(1);

}

Line 553 pre_bl(PRE_ARGS)

Line 562 pre_bl(PRE_ARGS)

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

assert(LIST__NONE == n->data.list);

assert(NULL == n->data.Bl);

offs = width = cmpt = -1;

n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));

/* LINTED */

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

lt = LIST__NONE;

dupl = 0;

dup = comp = 0;

width = offs = NULL;

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

/* Set list types. */

case (MDOC_Bullet):

Line 597 pre_bl(PRE_ARGS)

Line 607 pre_bl(PRE_ARGS)

break;

/* Set list arguments. */

case (MDOC_Compact):

if (cmpt >= 0)

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

dupl++;

comp = 1;

cmpt = i;

break;

case (MDOC_Width):

if (width >= 0)

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

dupl++;

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

width = i;

break;

case (MDOC_Offset):

if (offs >= 0)

/* NB: this can be empty! */

dupl++;

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

offs = i;

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

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

break;

}

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

return(0);

break;

}

/* Check: duplicate auxiliary arguments. */

if (dupl)

if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

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

return(0);

if (comp && ! dup)

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

if (offs && ! dup)

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

if (width && ! dup)

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

/* Check: multiple list types. */

if (LIST__NONE != lt && n->data.list != LIST__NONE)

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

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

return(0);

/* Assign list type. */

if (LIST__NONE != lt && n->data.list == LIST__NONE)

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

n->data.list = lt;

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

/* Set column information, too. */

if (LIST_column == lt) {

n->data.Bl->ncols =

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

n->data.Bl->cols = (const char **)

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

}

/* The list type should come first. */

if (n->data.list == LIST__NONE)

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

if (width >= 0 || offs >= 0 || cmpt >= 0)

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

n->data.Bl->offs ||

n->data.Bl->comp)

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

return(0);

Line 642 pre_bl(PRE_ARGS)

Line 671 pre_bl(PRE_ARGS)

/* Allow lists to default to LIST_item. */

if (LIST__NONE == n->data.list) {

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

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

return(0);

n->data.list = LIST_item;

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

}

Line 654 pre_bl(PRE_ARGS)

Line 683 pre_bl(PRE_ARGS)

* and must also be warned.

switch (n->data.list) {

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

case (LIST_tag):

if (width >= 0)

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

break;

if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))

break;

Line 670 pre_bl(PRE_ARGS)

Line 699 pre_bl(PRE_ARGS)

case (LIST_inset):

/* FALLTHROUGH */

case (LIST_item):

if (width < 0)

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

break;

if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))

break;

Line 686 pre_bl(PRE_ARGS)

Line 715 pre_bl(PRE_ARGS)

static int

pre_bd(PRE_ARGS)

{

int i, type, err;

int i, dup, comp;

enum mdoc_disp dt;

const char *offs;

struct mdoc_node *np;

if (MDOC_BLOCK != n->type)

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

assert(n->pending);

np = n->pending->parent;

} else

np = n->parent;

assert(np);

assert(MDOC_BLOCK == np->type);

assert(MDOC_Bd == np->tok);

assert(np->data.Bd);

n->data.Bd = np->data.Bd;

return(1);

if (NULL == n->args) {

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

return(0);

}

/* Make sure that only one type of display is specified. */

assert(NULL == n->data.Bd);

n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));

/* LINTED */

for (i = 0, err = type = 0; ! err &&

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

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

dt = DISP__NONE;

dup = comp = 0;

offs = NULL;

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

case (MDOC_Centred):

/* FALLTHROUGH */

dt = DISP_centred;

break;

case (MDOC_Ragged):

/* FALLTHROUGH */

dt = DISP_ragged;

break;

case (MDOC_Unfilled):

/* FALLTHROUGH */

dt = DISP_unfilled;

break;

case (MDOC_Filled):

/* FALLTHROUGH */

dt = DISP_filled;

break;

case (MDOC_Literal):

if (0 == type++)

dt = DISP_literal;

break;

case (MDOC_File):

mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);

return(0);

case (MDOC_Offset):

/* NB: this can be empty! */

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

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

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

break;

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

}

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

return(0);

break;

default:

case (MDOC_Compact):

comp = 1;

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

break;

default:

abort();

/* NOTREACHED */

}

if (type)

/* Check whether we have duplicates. */

return(1);

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

return(0);

/* Make our auxiliary assignments. */

if (offs && ! dup)

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

if (comp && ! dup)

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

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

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

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

return(0);

/* Make our type assignment. */

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

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

}

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

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

return(0);

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

}

return(1);

}

Line 742 pre_sh(PRE_ARGS)

Line 832 pre_sh(PRE_ARGS)

if (MDOC_BLOCK != n->type)

return(1);

mdoc->regs->regs[(int)REG_nS].set = 0;

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

}

Line 764 static int

Line 856 static int

pre_an(PRE_ARGS)

{

if (NULL == n->args || 1 == n->args->argc)

if (NULL == n->args)

return(1);

mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT,

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

n->line, n->pos,

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

"line arguments == 1 (have %d)",

return(0);

n->args->argc);

return(0);

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

n->data.An.auth = AUTH_split;

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

n->data.An.auth = AUTH_nosplit;

else

abort();

return(1);

}

Line 846 pre_dd(PRE_ARGS)

Line 945 pre_dd(PRE_ARGS)

static int

post_bf(POST_ARGS)

{

char *p;

struct mdoc_node *np;

struct mdoc_node *head;

int arg;

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

return(1);

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

* element, which contains the goods.

head = mdoc->last->head;

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

if (ENDBODY_NOT != mdoc->last->end) {

assert(mdoc->last->pending);

np = mdoc->last->pending->parent->head;

} else if (MDOC_BLOCK != mdoc->last->type) {

np = mdoc->last->parent->head;

} else

np = mdoc->last->head;

if (mdoc->last->args && head->child) {

assert(np);

/* FIXME: this should provide a default. */

assert(MDOC_HEAD == np->type);

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

assert(MDOC_Bf == np->tok);

return(0);

assert(np->data.Bf);

} else if (mdoc->last->args)

mdoc->last->data.Bf = np->data.Bf;

return(1);

}

if (NULL == head->child || MDOC_TEXT != head->child->type) {

np = mdoc->last;

/* FIXME: this should provide a default. */

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

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

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

np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));

* Cannot have both argument and parameter.

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

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

mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);

return(0);

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

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

/* Extract argument into data. */

if (np->parent->args) {

arg = np->parent->args->argv[0].arg;

if (MDOC_Emphasis == arg)

np->data.Bf->font = FONT_Em;

else if (MDOC_Literal == arg)

np->data.Bf->font = FONT_Li;

else if (MDOC_Symbolic == arg)

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

else

abort();

return(1);

}

p = head->child->string;

/* Extract parameter into data. */

if (0 == strcmp(p, "Em"))

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

return(1);

np->data.Bf->font = FONT_Em;

else if (0 == strcmp(p, "Li"))

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

return(1);

np->data.Bf->font = FONT_Li;

else if (0 == strcmp(p, "Sy"))

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

return(1);

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

else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE))

return(0);

mdoc_nmsg(mdoc, head, MANDOCERR_FONTTYPE);

return(1);

return(0);

}

Line 955 post_at(POST_ARGS)

Line 1090 post_at(POST_ARGS)

static int

post_an(POST_ARGS)

{

struct mdoc_node *np;

if (mdoc->last->args) {

np = mdoc->last;

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

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

return(1);

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

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

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

}

if (mdoc->last->child)

return(1);

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

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

}

Line 980 post_it(POST_ARGS)

Line 1113 post_it(POST_ARGS)

return(1);

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

lt = n->data.list;

assert(n->data.Bl);

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

if (LIST__NONE == lt) {

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

Line 1005 post_it(POST_ARGS)

Line 1139 post_it(POST_ARGS)

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

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

return(0);

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

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

return(0);

break;

case (LIST_bullet):

/* FALLTHROUGH */

Line 1016 post_it(POST_ARGS)

Line 1147 post_it(POST_ARGS)

case (LIST_enum):

/* FALLTHROUGH */

case (LIST_hyphen):

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

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

return(0);

/* FALLTHROUGH */

case (LIST_item):

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

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

return(0);

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

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

return(0);

break;

case (LIST_column):

cols = -1;

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

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

if (MDOC_Column == n->args->argv[i].arg) {

cols = (int)n->args->argv[i].sz;

break;

}

assert(-1 != cols);

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

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

Line 1072 post_bl_head(POST_ARGS)

Line 1197 post_bl_head(POST_ARGS)

assert(mdoc->last->parent);

n = mdoc->last->parent;

if (LIST_column == n->data.list) {

if (LIST_column == n->data.Bl->type) {

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

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

if (MDOC_Column == n->args->argv[i].arg)

break;

assert(i < (int)n->args->argc);

if (n->args->argv[i].sz && mdoc->last->nchild) {

mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);

return(0);

}

CVSweb