-/* $Id: mdoc_validate.c,v 1.137 2010/12/05 15:55:01 kristaps Exp $ */
+/* $Id: mdoc_validate.c,v 1.150 2011/01/01 12:18:37 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
static int post_lb(POST_ARGS);
static int post_nm(POST_ARGS);
static int post_os(POST_ARGS);
+static int post_ignpar(POST_ARGS);
static int post_prol(POST_ARGS);
static int post_root(POST_ARGS);
static int post_rs(POST_ARGS);
static v_post posts_notext[] = { ewarn_eq0, NULL };
static v_post posts_os[] = { post_os, post_prol, 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_sh[] = { post_ignpar, herr_ge1, bwarn_ge1, post_sh, NULL };
static v_post posts_sp[] = { eerr_le1, NULL };
-static v_post posts_ss[] = { herr_ge1, NULL };
+static v_post posts_ss[] = { post_ignpar, herr_ge1, bwarn_ge1, NULL };
static v_post posts_st[] = { eerr_eq1, post_st, NULL };
static v_post posts_std[] = { post_std, NULL };
static v_post posts_text[] = { eerr_ge1, NULL };
static v_pre pres_dt[] = { pre_dt, NULL };
static v_pre pres_er[] = { NULL, NULL };
static v_pre pres_fd[] = { NULL, NULL };
-static v_pre pres_it[] = { pre_it, NULL };
+static v_pre pres_it[] = { pre_it, pre_par, 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 };
{ NULL, posts_defaults }, /* Li */
{ NULL, posts_nd }, /* Nd */
{ NULL, posts_nm }, /* Nm */
- { NULL, posts_wline }, /* Op */
+ { NULL, NULL }, /* Op */
{ NULL, NULL }, /* Ot */
{ NULL, posts_defaults }, /* Pa */
{ pres_std, posts_std }, /* Rv */
{ NULL, posts_text }, /* %V */
{ NULL, NULL }, /* Ac */
{ NULL, NULL }, /* Ao */
- { NULL, posts_wline }, /* Aq */
+ { NULL, NULL }, /* Aq */
{ NULL, posts_at }, /* At */
{ NULL, NULL }, /* Bc */
{ NULL, posts_bf }, /* Bf */
{ NULL, NULL }, /* Bo */
- { NULL, posts_wline }, /* Bq */
+ { NULL, NULL }, /* Bq */
{ NULL, NULL }, /* Bsx */
{ NULL, NULL }, /* Bx */
{ NULL, posts_bool }, /* Db */
{ NULL, NULL }, /* Dc */
{ NULL, NULL }, /* Do */
- { NULL, posts_wline }, /* Dq */
+ { NULL, NULL }, /* Dq */
{ NULL, NULL }, /* Ec */
{ NULL, NULL }, /* Ef */
{ NULL, NULL }, /* Em */
{ NULL, NULL }, /* Pc */
{ NULL, posts_text1 }, /* Pf */
{ NULL, NULL }, /* Po */
- { NULL, posts_wline }, /* Pq */
+ { NULL, NULL }, /* Pq */
{ NULL, NULL }, /* Qc */
- { NULL, posts_wline }, /* Ql */
+ { NULL, NULL }, /* Ql */
{ NULL, NULL }, /* Qo */
- { NULL, posts_wline }, /* Qq */
+ { NULL, NULL }, /* Qq */
{ NULL, NULL }, /* Re */
{ NULL, posts_rs }, /* Rs */
{ NULL, NULL }, /* Sc */
{ NULL, NULL }, /* So */
- { NULL, posts_wline }, /* Sq */
+ { NULL, NULL }, /* Sq */
{ NULL, posts_bool }, /* Sm */
{ NULL, posts_text }, /* Sx */
{ NULL, posts_text }, /* Sy */
{ NULL, posts_notext }, /* Lp */
{ NULL, posts_text }, /* Lk */
{ NULL, posts_defaults }, /* Mt */
- { NULL, posts_wline }, /* Brq */
+ { NULL, NULL }, /* Brq */
{ NULL, NULL }, /* Bro */
{ NULL, NULL }, /* Brc */
{ NULL, posts_text }, /* %C */
int line, pos;
char *tp;
- if (MDOC_TEXT == n->type) {
+ switch (n->type) {
+ case (MDOC_TEXT):
tp = n->string;
line = n->line;
pos = n->pos;
check_text(mdoc, line, pos, tp);
+ /* FALLTHROUGH */
+ case (MDOC_TBL):
+ /* FALLTHROUGH */
+ case (MDOC_ROOT):
return(1);
+ default:
+ break;
}
check_args(mdoc, n);
return(1);
mdoc->last->flags |= MDOC_VALID;
- if (MDOC_TEXT == mdoc->last->type)
+ switch (mdoc->last->type) {
+ case (MDOC_TEXT):
+ /* FALLTHROUGH */
+ case (MDOC_TBL):
return(1);
- if (MDOC_ROOT == mdoc->last->type)
+ case (MDOC_ROOT):
return(post_root(mdoc));
+ default:
+ break;
+ }
if (NULL == mdoc_valids[mdoc->last->tok].post)
return(1);
assert(np);
assert(MDOC_BLOCK == np->type);
assert(MDOC_Bl == np->tok);
- assert(np->data.Bl);
- n->data.Bl = np->data.Bl;
return(1);
}
* ones. If we find no list type, we default to LIST_item.
*/
- assert(NULL == n->data.Bl);
- 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;
break;
/* Set list arguments. */
case (MDOC_Compact):
- dup = n->data.Bl->comp;
+ dup = n->norm->Bl.comp;
comp = 1;
break;
case (MDOC_Width):
- dup = (NULL != n->data.Bl->width);
+ dup = (NULL != n->norm->Bl.width);
width = n->args->argv[i].value[0];
break;
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.Bl->offs);
+ dup = (NULL != n->norm->Bl.offs);
break;
}
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
if (comp && ! dup)
- n->data.Bl->comp = comp;
+ n->norm->Bl.comp = comp;
if (offs && ! dup)
- n->data.Bl->offs = offs;
+ n->norm->Bl.offs = offs;
if (width && ! dup)
- n->data.Bl->width = width;
+ n->norm->Bl.width = width;
/* Check: multiple list types. */
- if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)
+ if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);
/* Assign list type. */
- if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
- n->data.Bl->type = lt;
+ if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {
+ n->norm->Bl.type = lt;
/* Set column information, too. */
if (LIST_column == lt) {
- n->data.Bl->ncols =
+ n->norm->Bl.ncols =
n->args->argv[i].sz;
- n->data.Bl->cols = (const char **)
+ n->norm->Bl.cols = (const char **)
n->args->argv[i].value;
}
}
/* The list type should come first. */
- if (n->data.Bl->type == LIST__NONE)
- if (n->data.Bl->width ||
- n->data.Bl->offs ||
- n->data.Bl->comp)
+ if (n->norm->Bl.type == LIST__NONE)
+ if (n->norm->Bl.width ||
+ n->norm->Bl.offs ||
+ n->norm->Bl.comp)
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
continue;
/* Allow lists to default to LIST_item. */
- if (LIST__NONE == n->data.Bl->type) {
+ if (LIST__NONE == n->norm->Bl.type) {
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);
- n->data.Bl->type = LIST_item;
+ n->norm->Bl.type = LIST_item;
}
/*
* and must also be warned.
*/
- switch (n->data.Bl->type) {
+ switch (n->norm->Bl.type) {
case (LIST_tag):
- if (n->data.Bl->width)
+ if (n->norm->Bl.width)
break;
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
break;
case (LIST_inset):
/* FALLTHROUGH */
case (LIST_item):
- if (n->data.Bl->width)
+ if (n->norm->Bl.width)
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
break;
default:
assert(np);
assert(MDOC_BLOCK == np->type);
assert(MDOC_Bd == np->tok);
- assert(np->data.Bd);
- n->data.Bd = np->data.Bd;
return(1);
}
- assert(NULL == n->data.Bd);
- n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
-
/* LINTED */
for (i = 0; n->args && i < (int)n->args->argc; i++) {
dt = DISP__NONE;
/* NB: this can be empty! */
if (n->args->argv[i].sz) {
offs = n->args->argv[i].value[0];
- dup = (NULL != n->data.Bd->offs);
+ dup = (NULL != n->norm->Bd.offs);
break;
}
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
break;
case (MDOC_Compact):
comp = 1;
- dup = n->data.Bd->comp;
+ dup = n->norm->Bd.comp;
break;
default:
abort();
/* Make our auxiliary assignments. */
if (offs && ! dup)
- n->data.Bd->offs = offs;
+ n->norm->Bd.offs = offs;
if (comp && ! dup)
- n->data.Bd->comp = comp;
+ n->norm->Bd.comp = comp;
/* Check whether a type has already been assigned. */
- if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)
+ 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->data.Bd->type == DISP__NONE)
- n->data.Bd->type = dt;
+ if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)
+ n->norm->Bd.type = dt;
}
- if (DISP__NONE == n->data.Bd->type) {
+ if (DISP__NONE == n->norm->Bd.type) {
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
- n->data.Bd->type = DISP_ragged;
+ n->norm->Bd.type = DISP_ragged;
}
return(1);
if (MDOC_BLOCK != n->type)
return(1);
- /*
- * FIXME: this can probably be lifted if we make the It into
- * something else on-the-fly?
- */
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
}
n->args->argv[i].pos, MANDOCERR_IGNARGV);
if (MDOC_Split == n->args->argv[0].arg)
- n->data.An.auth = AUTH_split;
+ n->norm->An.auth = AUTH_split;
else if (MDOC_Nosplit == n->args->argv[0].arg)
- n->data.An.auth = AUTH_nosplit;
+ n->norm->An.auth = AUTH_nosplit;
else
abort();
assert(np);
assert(MDOC_HEAD == np->type);
assert(MDOC_Bf == np->tok);
- assert(np->data.Bf);
- mdoc->last->data.Bf = np->data.Bf;
return(1);
}
np = mdoc->last;
assert(MDOC_BLOCK == np->parent->type);
assert(MDOC_Bf == np->parent->tok);
- np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));
/*
* Cannot have both argument and parameter.
if (np->parent->args) {
arg = np->parent->args->argv[0].arg;
if (MDOC_Emphasis == arg)
- np->data.Bf->font = FONT_Em;
+ np->norm->Bf.font = FONT_Em;
else if (MDOC_Literal == arg)
- np->data.Bf->font = FONT_Li;
+ np->norm->Bf.font = FONT_Li;
else if (MDOC_Symbolic == arg)
- np->data.Bf->font = FONT_Sy;
+ np->norm->Bf.font = FONT_Sy;
else
abort();
return(1);
/* Extract parameter into data. */
if (0 == strcmp(np->child->string, "Em"))
- np->data.Bf->font = FONT_Em;
+ np->norm->Bf.font = FONT_Em;
else if (0 == strcmp(np->child->string, "Li"))
- np->data.Bf->font = FONT_Li;
+ np->norm->Bf.font = FONT_Li;
else if (0 == strcmp(np->child->string, "Sy"))
- np->data.Bf->font = FONT_Sy;
+ np->norm->Bf.font = FONT_Sy;
else
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
struct mdoc_node *np;
np = mdoc->last;
- if (AUTH__NONE != np->data.An.auth && np->child)
+ if (AUTH__NONE != np->norm->An.auth && np->child)
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)
+ if (AUTH__NONE != np->norm->An.auth || np->child)
return(1);
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);
return(1);
n = mdoc->last->parent->parent;
- assert(n->data.Bl);
- lt = n->data.Bl->type;
+ lt = n->norm->Bl.type;
if (LIST__NONE == lt) {
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
break;
case (LIST_column):
- cols = (int)n->data.Bl->ncols;
+ cols = (int)n->norm->Bl.ncols;
assert(NULL == mdoc->last->head->child);
n = mdoc->last;
- if (LIST_tag == n->data.Bl->type &&
- NULL == n->data.Bl->width) {
+ if (LIST_tag == n->norm->Bl.type &&
+ NULL == n->norm->Bl.width) {
if ( ! post_bl_block_tag(mdoc))
return(0);
- } else if (NULL != n->data.Bl->width) {
+ } else if (NULL != n->norm->Bl.width) {
if ( ! post_bl_block_width(mdoc))
return(0);
} else
return(1);
- assert(n->data.Bl->width);
+ assert(n->norm->Bl.width);
return(1);
}
* the macro's width as set in share/tmac/mdoc/doc-common.
*/
- if (0 == strcmp(n->data.Bl->width, "Ds"))
+ if (0 == strcmp(n->norm->Bl.width, "Ds"))
width = 6;
- else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))
+ else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
return(1);
else if (0 == (width = mdoc_macro2len(tok))) {
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
n->args->argv[i].value[0] = mandoc_strdup(buf);
/* Set our width! */
- n->data.Bl->width = n->args->argv[i].value[0];
+ n->norm->Bl.width = n->args->argv[i].value[0];
return(1);
}
assert(MDOC_BLOCK == nn->type);
nn = nn->head->child;
- if (nn == NULL) {
- /* No -width for .Bl and first .It is emtpy */
- mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
+ if (nn == NULL)
break;
- }
if (MDOC_TEXT == nn->type) {
sz = strlen(nn->string) + 1;
if (0 != (ssz = mdoc_macro2len(nn->tok)))
sz = ssz;
- else
- mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
break;
}
n->args->argv[i].value[0] = mandoc_strdup(buf);
/* Set our width! */
- n->data.Bl->width = n->args->argv[i].value[0];
+ n->norm->Bl.width = n->args->argv[i].value[0];
return(1);
}
struct mdoc_node *np, *nn, *nnp;
int i, j;
- if (LIST_column != mdoc->last->data.Bl->type)
+ if (LIST_column != mdoc->last->norm->Bl.type)
/* FIXME: this should be ERROR class... */
return(hwarn_eq0(mdoc));
* lists, but I'll leave that for another day.
*/
- if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) {
+ if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) {
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
return(0);
} else if (NULL == mdoc->last->child)
np->args->argv[j].value = mandoc_malloc
((size_t)mdoc->last->nchild * sizeof(char *));
- mdoc->last->data.Bl->ncols = np->args->argv[j].sz;
- mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value;
+ mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
+ mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;
for (i = 0, nn = mdoc->last->child; nn; i++) {
np->args->argv[j].value[i] = nn->string;
return(post_bl_block(mdoc));
if (MDOC_BODY != mdoc->last->type)
return(1);
- if (NULL == mdoc->last->child)
- return(1);
-
- /*
- * We only allow certain children of `Bl'. This is usually on
- * `It', but apparently `Sm' occurs here and there, so we let
- * that one through, too.
- */
- /* LINTED */
for (n = mdoc->last->child; n; n = n->next) {
- if (MDOC_BLOCK == n->type && MDOC_It == n->tok)
- continue;
- if (MDOC_Sm == n->tok)
+ switch (n->tok) {
+ case (MDOC_Lp):
+ /* FALLTHROUGH */
+ case (MDOC_Pp):
+ mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
+ /* FALLTHROUGH */
+ case (MDOC_It):
+ /* FALLTHROUGH */
+ case (MDOC_Sm):
continue;
+ default:
+ break;
+ }
+
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
return(0);
}
break;
if (i < RSORD_MAX) {
+ if (MDOC__J == rsord[i])
+ mdoc->last->norm->Rs.child_J = nn;
next = nn->next;
continue;
}
return(1);
}
+static int
+post_ignpar(POST_ARGS)
+{
+ struct mdoc_node *np;
+
+ if (MDOC_BODY != mdoc->last->type)
+ return(1);
+
+ if (NULL != (np = mdoc->last->child))
+ if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+ mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR);
+ 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);
+ mdoc_node_delete(mdoc, np);
+ }
+
+ return(1);
+}
+
static int
pre_par(PRE_ARGS)
{
if (NULL == mdoc->last)
return(1);
+ if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
+ return(1);
/*
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
return(1);
-
- if (MDOC_Bl == n->tok && n->data.Bl->comp)
+ if (MDOC_Bl == n->tok && n->norm->Bl.comp)
+ return(1);
+ if (MDOC_Bd == n->tok && n->norm->Bd.comp)
return(1);
- if (MDOC_Bd == n->tok && n->data.Bd->comp)
+ if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
return(1);
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
mdoc->flags |= MDOC_LITERAL;
break;
case (MDOC_Bd):
- assert(n->data.Bd);
- if (DISP_literal == n->data.Bd->type)
+ if (DISP_literal == n->norm->Bd.type)
mdoc->flags |= MDOC_LITERAL;
- if (DISP_unfilled == n->data.Bd->type)
+ if (DISP_unfilled == n->norm->Bd.type)
mdoc->flags |= MDOC_LITERAL;
break;
default:
git.ckatri.com / mandoc.git / blobdiff