version 1.132, 2010/11/30 12:59:20 |
version 1.133, 2010/11/30 14:27:37 |
|
|
static int check_count(struct mdoc *, enum mdoc_type, |
static int check_count(struct mdoc *, enum mdoc_type, |
enum check_lvl, enum check_ineq, int); |
enum check_lvl, enum check_ineq, int); |
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); |
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); |
static int check_stdarg(PRE_ARGS); |
static void check_text(struct mdoc *, int, int, char *); |
static int check_text(struct mdoc *, int, int, char *); |
static void check_argv(struct mdoc *, |
static int check_argv(struct mdoc *, |
|
struct mdoc_node *, struct mdoc_argv *); |
struct mdoc_node *, struct mdoc_argv *); |
static int check_args(struct mdoc *, struct mdoc_node *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
|
|
static int concat(struct mdoc *, char *, |
static int concat(struct mdoc *, char *, |
const struct mdoc_node *, size_t); |
const struct mdoc_node *, size_t); |
Line 127 static int pre_it(PRE_ARGS); |
|
Line 126 static int pre_it(PRE_ARGS); |
|
static int pre_literal(PRE_ARGS); |
static int pre_literal(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
static int pre_par(PRE_ARGS); |
static int pre_par(PRE_ARGS); |
static int pre_rv(PRE_ARGS); |
|
static int pre_sh(PRE_ARGS); |
static int pre_sh(PRE_ARGS); |
static int pre_ss(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_an[] = { post_an, NULL }; |
static v_post posts_at[] = { post_at, post_defaults, NULL }; |
static v_post posts_at[] = { post_at, post_defaults, NULL }; |
Line 169 static v_pre pres_dl[] = { pre_literal, pre_display, |
|
Line 168 static v_pre pres_dl[] = { pre_literal, pre_display, |
|
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_ex[] = { NULL, NULL }; |
|
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_it[] = { pre_it, NULL }; |
static v_pre pres_it[] = { pre_it, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_rv[] = { pre_rv, NULL }; |
|
static v_pre pres_sh[] = { pre_sh, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
static v_pre pres_ss[] = { pre_ss, NULL }; |
static v_pre pres_ss[] = { pre_ss, NULL }; |
|
static v_pre pres_std[] = { pre_std, NULL }; |
|
|
const struct valids mdoc_valids[MDOC_MAX] = { |
const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
Line 201 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 199 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ pres_er, posts_text }, /* Er */ |
{ pres_er, posts_text }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_ex, posts_std }, /* Ex */ |
{ pres_std, posts_std }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
Line 215 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 213 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_wline }, /* Op */ |
{ NULL, posts_wline }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_rv, posts_std }, /* Rv */ |
{ pres_std, posts_std }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
Line 334 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 332 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
tp = n->string; |
tp = n->string; |
line = n->line; |
line = n->line; |
pos = n->pos; |
pos = n->pos; |
return(check_text(mdoc, line, pos, tp)); |
check_text(mdoc, line, pos, tp); |
|
return(1); |
} |
} |
|
|
if ( ! check_args(mdoc, n)) |
check_args(mdoc, n); |
return(0); |
|
if (NULL == mdoc_valids[n->tok].pre) |
if (NULL == mdoc_valids[n->tok].pre) |
return(1); |
return(1); |
for (p = mdoc_valids[n->tok].pre; *p; p++) |
for (p = mdoc_valids[n->tok].pre; *p; p++) |
Line 396 check_count(struct mdoc *m, enum mdoc_type type, |
|
Line 395 check_count(struct mdoc *m, enum mdoc_type type, |
|
if (val == m->last->nchild) |
if (val == m->last->nchild) |
return(1); |
return(1); |
break; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
if (CHECK_WARN == lvl) { |
if (CHECK_WARN == lvl) { |
Line 405 check_count(struct mdoc *m, enum mdoc_type type, |
|
Line 407 check_count(struct mdoc *m, enum mdoc_type type, |
|
p, val, m->last->nchild)); |
p, val, m->last->nchild)); |
} |
} |
|
|
|
/* FIXME: THIS IS THE SAME AS THE ABOVE. */ |
|
|
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
m->last->line, m->last->pos, |
m->last->line, m->last->pos, |
"require %s%d children (have %d)", |
"require %s%d children (have %d)", |
Line 490 hwarn_le1(POST_ARGS) |
|
Line 494 hwarn_le1(POST_ARGS) |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
} |
} |
|
|
|
static void |
static int |
|
check_stdarg(PRE_ARGS) |
|
{ |
|
|
|
if (n->args && 1 == n->args->argc) |
|
if (MDOC_Std == n->args->argv[0].arg) |
|
return(1); |
|
return(mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV)); |
|
} |
|
|
|
|
|
static int |
|
check_args(struct mdoc *m, struct mdoc_node *n) |
check_args(struct mdoc *m, struct mdoc_node *n) |
{ |
{ |
int i; |
int i; |
|
|
if (NULL == n->args) |
if (NULL == n->args) |
return(1); |
return; |
|
|
assert(n->args->argc); |
assert(n->args->argc); |
for (i = 0; i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) |
if ( ! check_argv(m, n, &n->args->argv[i])) |
check_argv(m, n, &n->args->argv[i]); |
return(0); |
|
|
|
return(1); |
|
} |
} |
|
|
|
static void |
static int |
|
check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v) |
check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v) |
{ |
{ |
int i; |
int i; |
|
|
for (i = 0; i < (int)v->sz; i++) |
for (i = 0; i < (int)v->sz; i++) |
if ( ! check_text(m, v->line, v->pos, v->value[i])) |
check_text(m, v->line, v->pos, v->value[i]); |
return(0); |
|
|
|
if (MDOC_Std == v->arg) { |
/* FIXME: move to post_std(). */ |
if (v->sz || m->meta.name) |
|
return(1); |
|
if ( ! mdoc_nmsg(m, n, MANDOCERR_NONAME)) |
|
return(0); |
|
} |
|
|
|
return(1); |
if (MDOC_Std == v->arg) |
|
if ( ! (v->sz || m->meta.name)) |
|
mdoc_nmsg(m, n, MANDOCERR_NONAME); |
} |
} |
|
|
|
static void |
static int |
|
check_text(struct mdoc *m, int ln, int pos, char *p) |
check_text(struct mdoc *m, int ln, int pos, char *p) |
{ |
{ |
int c; |
int c; |
Line 555 check_text(struct mdoc *m, int ln, int pos, char *p) |
|
Line 538 check_text(struct mdoc *m, int ln, int pos, char *p) |
|
pos += (int)sz; |
pos += (int)sz; |
|
|
if ('\t' == *p) { |
if ('\t' == *p) { |
if (MDOC_LITERAL & m->flags) |
if ( ! (MDOC_LITERAL & m->flags)) |
continue; |
mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB); |
if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB)) |
continue; |
continue; |
|
return(0); |
|
} |
} |
|
|
/* Check the special character. */ |
if (0 == (c = mandoc_special(p))) { |
|
|
c = mandoc_special(p); |
|
if (c) { |
|
p += c - 1; |
|
pos += c - 1; |
|
} else |
|
mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
} |
continue; |
|
} |
|
|
return(1); |
p += c - 1; |
|
pos += c - 1; |
|
} |
} |
} |
|
|
|
|
static int |
static int |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
{ |
{ |
Line 705 pre_bl(PRE_ARGS) |
|
Line 682 pre_bl(PRE_ARGS) |
|
dup = (NULL != n->data.Bl->offs); |
dup = (NULL != n->data.Bl->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
return(0); |
|
break; |
break; |
default: |
default: |
continue; |
continue; |
Line 714 pre_bl(PRE_ARGS) |
|
Line 690 pre_bl(PRE_ARGS) |
|
|
|
/* Check: duplicate auxiliary arguments. */ |
/* Check: duplicate auxiliary arguments. */ |
|
|
if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
if (dup) |
return(0); |
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bl->comp = comp; |
n->data.Bl->comp = comp; |
Line 727 pre_bl(PRE_ARGS) |
|
Line 703 pre_bl(PRE_ARGS) |
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
return(0); |
|
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
Line 749 pre_bl(PRE_ARGS) |
|
Line 724 pre_bl(PRE_ARGS) |
|
if (n->data.Bl->width || |
if (n->data.Bl->width || |
n->data.Bl->offs || |
n->data.Bl->offs || |
n->data.Bl->comp) |
n->data.Bl->comp) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
return(0); |
|
|
|
continue; |
continue; |
} |
} |
Line 758 pre_bl(PRE_ARGS) |
|
Line 732 pre_bl(PRE_ARGS) |
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->data.Bl->type) { |
if (LIST__NONE == n->data.Bl->type) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE)) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
return(0); |
|
n->data.Bl->type = LIST_item; |
n->data.Bl->type = LIST_item; |
} |
} |
|
|
Line 773 pre_bl(PRE_ARGS) |
|
Line 746 pre_bl(PRE_ARGS) |
|
case (LIST_tag): |
case (LIST_tag): |
if (n->data.Bl->width) |
if (n->data.Bl->width) |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
break; |
break; |
return(0); |
|
case (LIST_column): |
case (LIST_column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_diag): |
case (LIST_diag): |
Line 787 pre_bl(PRE_ARGS) |
|
Line 759 pre_bl(PRE_ARGS) |
|
case (LIST_item): |
case (LIST_item): |
if (NULL == n->data.Bl->width) |
if (NULL == n->data.Bl->width) |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG); |
break; |
break; |
return(0); |
|
default: |
default: |
break; |
break; |
} |
} |
Line 856 pre_bd(PRE_ARGS) |
|
Line 827 pre_bd(PRE_ARGS) |
|
dup = (NULL != n->data.Bd->offs); |
dup = (NULL != n->data.Bd->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
return(0); |
|
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
comp = 1; |
comp = 1; |
Line 870 pre_bd(PRE_ARGS) |
|
Line 840 pre_bd(PRE_ARGS) |
|
|
|
/* Check whether we have duplicates. */ |
/* Check whether we have duplicates. */ |
|
|
if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
if (dup) |
return(0); |
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
/* Make our auxiliary assignments. */ |
/* Make our auxiliary assignments. */ |
|
|
Line 883 pre_bd(PRE_ARGS) |
|
Line 853 pre_bd(PRE_ARGS) |
|
/* Check whether a type has already been assigned. */ |
/* Check whether a type has already been assigned. */ |
|
|
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
return(0); |
|
|
|
/* Make our type assignment. */ |
/* Make our type assignment. */ |
|
|
Line 893 pre_bd(PRE_ARGS) |
|
Line 862 pre_bd(PRE_ARGS) |
|
} |
} |
|
|
if (DISP__NONE == n->data.Bd->type) { |
if (DISP__NONE == n->data.Bd->type) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
return(0); |
|
n->data.Bd->type = DISP_ragged; |
n->data.Bd->type = DISP_ragged; |
} |
} |
|
|
Line 930 pre_it(PRE_ARGS) |
|
Line 898 pre_it(PRE_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
/* |
/* |
* FIXME: this can probably be lifted if we make the It into |
* FIXME: this can probably be lifted if we make the It into |
* something else on-the-fly? |
* something else on-the-fly? |
Line 947 pre_an(PRE_ARGS) |
|
Line 916 pre_an(PRE_ARGS) |
|
return(1); |
return(1); |
|
|
for (i = 1; i < (int)n->args->argc; i++) |
for (i = 1; i < (int)n->args->argc; i++) |
if ( ! mdoc_pmsg(mdoc, n->args->argv[i].line, |
mdoc_pmsg(mdoc, n->args->argv[i].line, |
n->args->argv[i].pos, MANDOCERR_IGNARGV)) |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
return(0); |
|
|
|
if (MDOC_Split == n->args->argv[0].arg) |
if (MDOC_Split == n->args->argv[0].arg) |
n->data.An.auth = AUTH_split; |
n->data.An.auth = AUTH_split; |
Line 962 pre_an(PRE_ARGS) |
|
Line 930 pre_an(PRE_ARGS) |
|
} |
} |
|
|
static int |
static int |
pre_rv(PRE_ARGS) |
pre_std(PRE_ARGS) |
{ |
{ |
|
|
return(check_stdarg(mdoc, n)); |
if (n->args && 1 == n->args->argc) |
|
if (MDOC_Std == n->args->argv[0].arg) |
|
return(1); |
|
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV); |
|
return(1); |
} |
} |
|
|
static int |
static int |
Line 973 pre_dt(PRE_ARGS) |
|
Line 946 pre_dt(PRE_ARGS) |
|
{ |
{ |
|
|
if (0 == mdoc->meta.date || mdoc->meta.os) |
if (0 == mdoc->meta.date || mdoc->meta.os) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
return(0); |
|
if (mdoc->meta.title) |
if (mdoc->meta.title) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
return(0); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 986 pre_os(PRE_ARGS) |
|
Line 959 pre_os(PRE_ARGS) |
|
{ |
{ |
|
|
if (NULL == mdoc->meta.title || 0 == mdoc->meta.date) |
if (NULL == mdoc->meta.title || 0 == mdoc->meta.date) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
return(0); |
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
return(0); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 999 pre_dd(PRE_ARGS) |
|
Line 972 pre_dd(PRE_ARGS) |
|
{ |
{ |
|
|
if (mdoc->meta.title || mdoc->meta.os) |
if (mdoc->meta.title || mdoc->meta.os) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
return(0); |
|
if (mdoc->meta.date) |
if (mdoc->meta.date) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP)) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
return(0); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1049 post_bf(POST_ARGS) |
|
Line 1022 post_bf(POST_ARGS) |
|
if (np->parent->args && np->child) { |
if (np->parent->args && np->child) { |
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
} else if (NULL == np->parent->args && NULL == np->child) |
} else if (NULL == np->parent->args && NULL == np->child) { |
return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
|
return(1); |
|
} |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
|
|
Line 1075 post_bf(POST_ARGS) |
|
Line 1050 post_bf(POST_ARGS) |
|
np->data.Bf->font = FONT_Li; |
np->data.Bf->font = FONT_Li; |
else if (0 == strcmp(np->child->string, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
np->data.Bf->font = FONT_Sy; |
np->data.Bf->font = FONT_Sy; |
else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)) |
else |
return(0); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
|
|
return(1); |
return(1); |
} |
} |
|
|
post_eoln(POST_ARGS) |
post_eoln(POST_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->last->child) |
if (mdoc->last->child) |
return(1); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)); |
return(1); |
} |
} |
|
|
|
|
Line 1142 post_vt(POST_ARGS) |
|
Line 1117 post_vt(POST_ARGS) |
|
|
|
for (n = mdoc->last->child; n; n = n->next) |
for (n = mdoc->last->child; n; n = n->next) |
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_CHILD)) |
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
return(0); |
|
|
|
return(1); |
return(1); |
} |
} |
Line 1283 post_an(POST_ARGS) |
|
Line 1257 post_an(POST_ARGS) |
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE != np->data.An.auth && np->child) |
if (AUTH__NONE != np->data.An.auth && np->child) |
return(eerr_eq0(mdoc)); |
return(eerr_eq0(mdoc)); |
|
|
/* |
/* |
* FIXME: make this ewarn and make sure that the front-ends |
* FIXME: make this ewarn and make sure that the front-ends |
* don't print the arguments. |
* don't print the arguments. |
*/ |
*/ |
if (AUTH__NONE != np->data.An.auth || np->child) |
if (AUTH__NONE != np->data.An.auth || np->child) |
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS)); |
|
|
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
|
return(1); |
} |
} |
|
|
|
|
Line 1310 post_it(POST_ARGS) |
|
Line 1287 post_it(POST_ARGS) |
|
|
|
if (LIST__NONE == lt) { |
if (LIST__NONE == lt) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
return(0); |
return(1); |
} |
} |
|
|
switch (lt) { |
switch (lt) { |
Line 1318 post_it(POST_ARGS) |
|
Line 1295 post_it(POST_ARGS) |
|
if (mdoc->last->head->child) |
if (mdoc->last->head->child) |
break; |
break; |
/* FIXME: give this a dummy value. */ |
/* FIXME: give this a dummy value. */ |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
return(0); |
|
break; |
break; |
case (LIST_hang): |
case (LIST_hang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1329 post_it(POST_ARGS) |
|
Line 1305 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_diag): |
case (LIST_diag): |
if (NULL == mdoc->last->head->child) |
if (NULL == mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
return(0); |
|
break; |
break; |
case (LIST_bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1340 post_it(POST_ARGS) |
|
Line 1315 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
if (NULL == mdoc->last->body->child) |
if (NULL == mdoc->last->body->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
return(0); |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (mdoc->last->head->child) |
if (mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
return(0); |
|
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = (int)n->data.Bl->ncols; |
cols = (int)n->data.Bl->ncols; |
Line 1354 post_it(POST_ARGS) |
|
Line 1327 post_it(POST_ARGS) |
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
if (NULL == mdoc->last->body->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
return(0); |
|
|
|
for (i = 0, c = mdoc->last->child; c; c = c->next) |
for (i = 0, c = mdoc->last->child; c; c = c->next) |
if (MDOC_BODY == c->type) |
if (MDOC_BODY == c->type) |
Line 1432 post_bl_block_width(POST_ARGS) |
|
Line 1404 post_bl_block_width(POST_ARGS) |
|
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) { |
return(mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH)); |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
|
return(1); |
|
} |
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
Line 1481 post_bl_block_tag(POST_ARGS) |
|
Line 1455 post_bl_block_tag(POST_ARGS) |
|
|
|
if (nn == NULL) { |
if (nn == NULL) { |
/* No -width for .Bl and first .It is emtpy */ |
/* No -width for .Bl and first .It is emtpy */ |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
return(0); |
|
break; |
break; |
} |
} |
|
|
Line 1493 post_bl_block_tag(POST_ARGS) |
|
Line 1466 post_bl_block_tag(POST_ARGS) |
|
|
|
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
sz = ssz; |
sz = ssz; |
else if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
else |
return(0); |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
|
break; |
break; |
} |
} |
Line 1626 post_bl(POST_ARGS) |
|
Line 1599 post_bl(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
ebool(struct mdoc *mdoc) |
ebool(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
|
|
|
/* LINTED */ |
if (NULL == mdoc->last->child) |
for (n = mdoc->last->child; n; n = n->next) { |
return(1); |
if (MDOC_TEXT != n->type) |
|
break; |
|
if (0 == strcmp(n->string, "on")) |
|
continue; |
|
if (0 == strcmp(n->string, "off")) |
|
continue; |
|
break; |
|
} |
|
|
|
if (NULL == n) |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
|
if (0 == strcmp(mdoc->last->child->string, "on")) |
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, n, MANDOCERR_BADBOOL)); |
if (0 == strcmp(mdoc->last->child->string, "off")) |
|
return(1); |
|
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL); |
|
return(1); |
} |
} |
|
|
|
|
static int |
static int |
post_root(POST_ARGS) |
post_root(POST_ARGS) |
{ |
{ |
|
int erc; |
|
struct mdoc_node *n; |
|
|
if (NULL == mdoc->first->child) |
erc = 0; |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY); |
|
else if ( ! (MDOC_PBODY & mdoc->flags)) |
/* Check that we have a finished prologue. */ |
|
|
|
if ( ! (MDOC_PBODY & mdoc->flags)) { |
|
erc++; |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG); |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG); |
else if (MDOC_BLOCK != mdoc->first->child->type) |
} |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY); |
|
else if (MDOC_Sh != mdoc->first->child->tok) |
|
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY); |
|
else |
|
return(1); |
|
|
|
return(0); |
n = mdoc->first; |
|
assert(n); |
|
|
|
/* Check that we begin with a proper `Sh'. */ |
|
|
|
if (NULL == n->child) { |
|
erc++; |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY); |
|
} else if (MDOC_BLOCK != n->child->type || |
|
MDOC_Sh != n->child->tok) { |
|
erc++; |
|
/* Can this be lifted? See rxdebug.1 for example. */ |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY); |
|
} |
|
|
|
return(erc ? 0 : 1); |
} |
} |
|
|
static int |
static int |
Line 1783 post_rs(POST_ARGS) |
|
Line 1766 post_rs(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
post_sh(POST_ARGS) |
post_sh(POST_ARGS) |
{ |
{ |
Line 1796 post_sh(POST_ARGS) |
|
Line 1778 post_sh(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
post_sh_body(POST_ARGS) |
post_sh_body(POST_ARGS) |
{ |
{ |
Line 1811 post_sh_body(POST_ARGS) |
|
Line 1792 post_sh_body(POST_ARGS) |
|
* children of the BODY declaration can also be "text". |
* children of the BODY declaration can also be "text". |
*/ |
*/ |
|
|
if (NULL == (n = mdoc->last->child)) |
if (NULL == (n = mdoc->last->child)) { |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC)); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
|
return(1); |
|
} |
|
|
for ( ; n && n->next; n = n->next) { |
for ( ; n && n->next; n = n->next) { |
if (MDOC_ELEM == n->type && MDOC_Nm == n->tok) |
if (MDOC_ELEM == n->type && MDOC_Nm == n->tok) |
continue; |
continue; |
if (MDOC_TEXT == n->type) |
if (MDOC_TEXT == n->type) |
continue; |
continue; |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC)) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
return(0); |
|
} |
} |
|
|
assert(n); |
assert(n); |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC)); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
|
return(1); |
} |
} |
|
|
|
|
static int |
static int |
post_sh_head(POST_ARGS) |
post_sh_head(POST_ARGS) |
{ |
{ |
Line 1975 post_dd(POST_ARGS) |
|
Line 1958 post_dd(POST_ARGS) |
|
|
|
if (NULL == n->child) { |
if (NULL == n->child) { |
mdoc->meta.date = time(NULL); |
mdoc->meta.date = time(NULL); |
return(post_prol(mdoc)); |
return(1); |
} |
} |
|
|
if ( ! concat(mdoc, buf, n->child, DATESIZ)) |
if ( ! concat(mdoc, buf, n->child, DATESIZ)) |
Line 1985 post_dd(POST_ARGS) |
|
Line 1968 post_dd(POST_ARGS) |
|
(MTIME_MDOCDATE | MTIME_CANONICAL, buf); |
(MTIME_MDOCDATE | MTIME_CANONICAL, buf); |
|
|
if (0 == mdoc->meta.date) { |
if (0 == mdoc->meta.date) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE)) |
mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE); |
return(0); |
|
mdoc->meta.date = time(NULL); |
mdoc->meta.date = time(NULL); |
} |
} |
|
|
Line 2017 post_dt(POST_ARGS) |
|
Line 1999 post_dt(POST_ARGS) |
|
for (p = nn->string; *p; p++) { |
for (p = nn->string; *p; p++) { |
if (toupper((u_char)*p) == *p) |
if (toupper((u_char)*p) == *p) |
continue; |
continue; |
if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE)) |
|
return(0); |
/* |
|
* FIXME: don't be lazy: have this make all |
|
* characters be uppercase and just warn once. |
|
*/ |
|
mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE); |
break; |
break; |
} |
} |
|
|
Line 2061 post_dt(POST_ARGS) |
|
Line 2047 post_dt(POST_ARGS) |
|
if (cp) { |
if (cp) { |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
} else if (mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC)) { |
} else { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
} else |
} |
return(0); |
|
|
|
if (NULL == (nn = nn->next)) |
if (NULL == (nn = nn->next)) |
return(1); |
return(1); |
Line 2185 post_std(POST_ARGS) |
|
Line 2171 post_std(POST_ARGS) |
|
|
|
if (n->child) |
if (n->child) |
return(1); |
return(1); |
|
|
if (NULL == mdoc->meta.name) |
if (NULL == mdoc->meta.name) |
return(1); |
return(1); |
|
|
Line 2193 post_std(POST_ARGS) |
|
Line 2180 post_std(POST_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name)) |
if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name)) |
return(0); |
return(0); |
|
|
mdoc->last = nn; |
mdoc->last = nn; |
return(1); |
return(1); |
} |
} |
Line 2206 concat(struct mdoc *m, char *p, const struct mdoc_node |
|
Line 2194 concat(struct mdoc *m, char *p, const struct mdoc_node |
|
/* |
/* |
* Concatenate sibling nodes together. All siblings must be of |
* Concatenate sibling nodes together. All siblings must be of |
* type MDOC_TEXT or an assertion is raised. Concatenation is |
* type MDOC_TEXT or an assertion is raised. Concatenation is |
* separated by a single whitespace. |
* separated by a single whitespace. Returns 0 on fatal (string |
|
* overrun) error. |
*/ |
*/ |
|
|
for ( ; n; n = n->next) { |
for ( ; n; n = n->next) { |