version 1.36, 2009/07/17 12:40:48 |
version 1.46, 2009/10/18 13:26:16 |
Line 74 static int eerr_eq0(POST_ARGS); |
|
Line 74 static int eerr_eq0(POST_ARGS); |
|
static int eerr_eq1(POST_ARGS); |
static int eerr_eq1(POST_ARGS); |
static int eerr_ge1(POST_ARGS); |
static int eerr_ge1(POST_ARGS); |
static int eerr_le2(POST_ARGS); |
static int eerr_le2(POST_ARGS); |
|
static int eerr_le1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int herr_eq0(POST_ARGS); |
static int herr_eq0(POST_ARGS); |
static int herr_ge1(POST_ARGS); |
static int herr_ge1(POST_ARGS); |
Line 81 static int hwarn_eq1(POST_ARGS); |
|
Line 82 static int hwarn_eq1(POST_ARGS); |
|
static int hwarn_le1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
|
|
static int post_an(POST_ARGS); |
static int post_an(POST_ARGS); |
static int post_args(POST_ARGS); |
|
static int post_at(POST_ARGS); |
static int post_at(POST_ARGS); |
static int post_bf(POST_ARGS); |
static int post_bf(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
Line 90 static int post_it(POST_ARGS); |
|
Line 90 static int post_it(POST_ARGS); |
|
static int post_lb(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_root(POST_ARGS); |
|
static int post_rs(POST_ARGS); |
static int post_sh(POST_ARGS); |
static int post_sh(POST_ARGS); |
static int post_sh_body(POST_ARGS); |
static int post_sh_body(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static int post_sp(POST_ARGS); |
|
static int post_st(POST_ARGS); |
static int post_st(POST_ARGS); |
static int pre_an(PRE_ARGS); |
static int pre_an(PRE_ARGS); |
static int pre_bd(PRE_ARGS); |
static int pre_bd(PRE_ARGS); |
Line 118 static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NUL |
|
Line 118 static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NUL |
|
static v_post posts_bf[] = { hwarn_le1, post_bf, 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_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_ex[] = { eerr_eq0, post_args, NULL }; |
|
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_in[] = { eerr_eq1, NULL }; |
static v_post posts_in[] = { eerr_eq1, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
Line 127 static v_post posts_nd[] = { berr_ge1, NULL }; |
|
Line 126 static v_post posts_nd[] = { berr_ge1, NULL }; |
|
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_notext[] = { eerr_eq0, NULL }; |
static v_post posts_notext[] = { eerr_eq0, NULL }; |
static v_post posts_pf[] = { eerr_eq1, NULL }; |
static v_post posts_pf[] = { eerr_eq1, NULL }; |
static v_post posts_rv[] = { eerr_eq0, post_args, 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[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sp[] = { post_sp, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
Line 176 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 175 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_ex }, /* Ex */ |
{ pres_ex, NULL }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
Line 190 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 189 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_wline }, /* Op */ |
{ NULL, posts_wline }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Pa */ |
{ NULL, NULL }, /* Pa */ |
{ pres_rv, posts_rv }, /* Rv */ |
{ pres_rv, NULL }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_text }, /* Vt */ |
{ NULL, posts_text }, /* Vt */ |
Line 239 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 238 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Qo */ |
{ NULL, NULL }, /* Qo */ |
{ NULL, posts_wline }, /* Qq */ |
{ NULL, posts_wline }, /* Qq */ |
{ NULL, NULL }, /* Re */ |
{ NULL, NULL }, /* Re */ |
{ NULL, posts_wline }, /* Rs */ |
{ NULL, posts_rs }, /* Rs */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, posts_wline }, /* Sq */ |
{ NULL, posts_wline }, /* Sq */ |
Line 409 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1 |
|
Line 408 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1 |
|
CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */ |
CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */ |
CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */ |
CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */ |
CHECK_ELEM_DEFN(le2, err, err_child_lt, 3) /* eerr_le2() */ |
CHECK_ELEM_DEFN(le2, err, err_child_lt, 3) /* eerr_le2() */ |
|
CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1() */ |
CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */ |
CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */ |
CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ |
CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ |
Line 622 pre_bl(PRE_ARGS) |
|
Line 622 pre_bl(PRE_ARGS) |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Column): |
case (MDOC_Column): |
if (-1 != type) |
if (type >= 0) |
return(mdoc_nerr(mdoc, n, EMULTILIST)); |
return(mdoc_nerr(mdoc, n, EMULTILIST)); |
type = n->args->argv[pos].arg; |
type = n->args->argv[pos].arg; |
break; |
break; |
|
case (MDOC_Compact): |
|
if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE)) |
|
return(0); |
|
break; |
case (MDOC_Width): |
case (MDOC_Width): |
if (-1 != width) |
if (width >= 0) |
return(mdoc_nerr(mdoc, n, EARGREP)); |
return(mdoc_nerr(mdoc, n, EARGREP)); |
|
if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE)) |
|
return(0); |
width = n->args->argv[pos].arg; |
width = n->args->argv[pos].arg; |
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
if (-1 != offset) |
if (offset >= 0) |
return(mdoc_nerr(mdoc, n, EARGREP)); |
return(mdoc_nerr(mdoc, n, EARGREP)); |
|
if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE)) |
|
return(0); |
offset = n->args->argv[pos].arg; |
offset = n->args->argv[pos].arg; |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
if (-1 == type) |
if (type < 0) |
return(mdoc_nerr(mdoc, n, ELISTTYPE)); |
return(mdoc_nerr(mdoc, n, ELISTTYPE)); |
|
|
/* |
/* |
Line 651 pre_bl(PRE_ARGS) |
|
Line 659 pre_bl(PRE_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH)) |
if (width < 0 && ! mdoc_nwarn(mdoc, n, EMISSWIDTH)) |
return(0); |
return(0); |
break; |
break; |
case (MDOC_Column): |
case (MDOC_Column): |
Line 661 pre_bl(PRE_ARGS) |
|
Line 669 pre_bl(PRE_ARGS) |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (MDOC_Item): |
if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH)) |
if (width >= 0 && ! mdoc_nwarn(mdoc, n, ENOWIDTH)) |
return(0); |
return(0); |
break; |
break; |
default: |
default: |
Line 862 post_bf(POST_ARGS) |
|
Line 870 post_bf(POST_ARGS) |
|
return(1); |
return(1); |
else if (0 == strcmp(p, "Li")) |
else if (0 == strcmp(p, "Li")) |
return(1); |
return(1); |
else if (0 == strcmp(p, "Sm")) |
else if (0 == strcmp(p, "Sy")) |
return(1); |
return(1); |
|
|
return(mdoc_nerr(mdoc, head, EFONT)); |
return(mdoc_nerr(mdoc, head, EFONT)); |
Line 912 post_an(POST_ARGS) |
|
Line 920 post_an(POST_ARGS) |
|
if (mdoc->last->args) { |
if (mdoc->last->args) { |
if (NULL == mdoc->last->child) |
if (NULL == mdoc->last->child) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, mdoc->last, ELINE)); |
return(mdoc_nerr(mdoc, mdoc->last, ENOLINE)); |
} |
} |
|
|
if (mdoc->last->child) |
if (mdoc->last->child) |
Line 922 post_an(POST_ARGS) |
|
Line 930 post_an(POST_ARGS) |
|
|
|
|
|
static int |
static int |
post_args(POST_ARGS) |
|
{ |
|
|
|
if (mdoc->last->args) |
|
return(1); |
|
return(mdoc_nerr(mdoc, mdoc->last, ELINE)); |
|
} |
|
|
|
|
|
static int |
|
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
int type, i, cols; |
int type, i, cols; |
Line 1028 post_it(POST_ARGS) |
|
Line 1026 post_it(POST_ARGS) |
|
c = mdoc->last->child; |
c = mdoc->last->child; |
for (i = 0; c && MDOC_HEAD == c->type; c = c->next) |
for (i = 0; c && MDOC_HEAD == c->type; c = c->next) |
i++; |
i++; |
if (i == cols) |
|
|
if (i < cols || i == (cols + 1)) { |
|
if ( ! mdoc_vwarn(mdoc, mdoc->last->line, |
|
mdoc->last->pos, "column " |
|
"mismatch: have %d, want %d", |
|
i, cols)) |
|
return(0); |
break; |
break; |
return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos, |
} else if (i == cols) |
"column mismatch (have %d, want %d)", |
break; |
i, cols)); |
|
|
return(mdoc_verr(mdoc, mdoc->last->line, |
|
mdoc->last->pos, "column mismatch: " |
|
"have %d, want %d", i, cols)); |
default: |
default: |
break; |
break; |
} |
} |
Line 1081 post_bl(POST_ARGS) |
|
Line 1088 post_bl(POST_ARGS) |
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
if (MDOC_It == n->tok) |
if (MDOC_It == n->tok) |
continue; |
continue; |
return(mdoc_verr(mdoc, n->line, n->pos, |
return(mdoc_nerr(mdoc, n, EBADCHILD)); |
"bad child of parent %s", |
|
mdoc_macronames[mdoc->last->tok])); |
|
} |
} |
|
|
return(1); |
return(1); |
Line 1131 post_root(POST_ARGS) |
|
Line 1136 post_root(POST_ARGS) |
|
|
|
|
|
static int |
static int |
post_sp(POST_ARGS) |
post_st(POST_ARGS) |
{ |
{ |
long lval; |
|
char *ep, *buf; |
|
|
|
if (NULL == mdoc->last->child) |
if (mdoc_a2st(mdoc->last->child->string)) |
return(1); |
return(1); |
else if ( ! eerr_eq1(mdoc)) |
return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND)); |
return(0); |
|
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
|
buf = mdoc->last->child->string; |
|
assert(buf); |
|
|
|
/* From OpenBSD's strtol(3). */ |
|
errno = 0; |
|
lval = strtol(buf, &ep, 10); |
|
if (buf[0] == '\0' || *ep != '\0') |
|
return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT)); |
|
|
|
if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || |
|
(lval > INT_MAX || lval < 0)) |
|
return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT)); |
|
|
|
return(1); |
|
} |
} |
|
|
|
|
|
|
|
|
static int |
static int |
post_st(POST_ARGS) |
post_rs(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *nn; |
|
|
if (mdoc_a2st(mdoc->last->child->string)) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND)); |
|
|
for (nn = mdoc->last->child; nn; nn = nn->next) |
|
switch (nn->tok) { |
|
case(MDOC__Q): |
|
/* FALLTHROUGH */ |
|
case(MDOC__C): |
|
/* FALLTHROUGH */ |
|
case(MDOC__A): |
|
/* FALLTHROUGH */ |
|
case(MDOC__B): |
|
/* FALLTHROUGH */ |
|
case(MDOC__D): |
|
/* FALLTHROUGH */ |
|
case(MDOC__I): |
|
/* FALLTHROUGH */ |
|
case(MDOC__J): |
|
/* FALLTHROUGH */ |
|
case(MDOC__N): |
|
/* FALLTHROUGH */ |
|
case(MDOC__O): |
|
/* FALLTHROUGH */ |
|
case(MDOC__P): |
|
/* FALLTHROUGH */ |
|
case(MDOC__R): |
|
/* FALLTHROUGH */ |
|
case(MDOC__T): |
|
/* FALLTHROUGH */ |
|
case(MDOC__V): |
|
break; |
|
default: |
|
return(mdoc_nerr(mdoc, nn, EBADCHILD)); |
|
} |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 1210 post_sh_body(POST_ARGS) |
|
Line 1228 post_sh_body(POST_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
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_nwarn(mdoc, mdoc->last, ENAMESECINC)); |
return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC)); |