version 1.222, 2014/07/02 19:55:10 |
version 1.226, 2014/07/04 16:12:08 |
Line 84 static int ewarn_le1(POST_ARGS); |
|
Line 84 static int ewarn_le1(POST_ARGS); |
|
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
static int hwarn_ge1(POST_ARGS); |
static int hwarn_ge1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
|
|
|
static int post_an(POST_ARGS); |
static int post_an(POST_ARGS); |
static int post_at(POST_ARGS); |
static int post_at(POST_ARGS); |
Line 137 static int pre_std(PRE_ARGS); |
|
Line 136 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 }; |
static v_post posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { post_bf, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, 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_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bx[] = { post_bx, NULL }; |
static v_post posts_bx[] = { post_bx, NULL }; |
Line 515 hwarn_ge1(POST_ARGS) |
|
Line 514 hwarn_ge1(POST_ARGS) |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
} |
} |
|
|
static int |
|
hwarn_le1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
|
} |
|
|
|
static void |
static void |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
Line 727 pre_bl(PRE_ARGS) |
|
Line 720 pre_bl(PRE_ARGS) |
|
if (n->norm->Bl.width || |
if (n->norm->Bl.width || |
n->norm->Bl.offs || |
n->norm->Bl.offs || |
n->norm->Bl.comp) |
n->norm->Bl.comp) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
|
mdoc->parse, n->line, n->pos, |
|
mdoc_argnames[n->args->argv[0].arg]); |
continue; |
continue; |
} |
} |
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->norm->Bl.type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE); |
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
Line 749 pre_bl(PRE_ARGS) |
|
Line 743 pre_bl(PRE_ARGS) |
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (NULL == n->norm->Bl.width) |
if (NULL == n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_WIDTH); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 869 pre_bd(PRE_ARGS) |
|
Line 863 pre_bd(PRE_ARGS) |
|
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
Line 934 pre_std(PRE_ARGS) |
|
Line 928 pre_std(PRE_ARGS) |
|
if (MDOC_Std == n->args->argv[0].arg) |
if (MDOC_Std == n->args->argv[0].arg) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV); |
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 996 pre_dd(PRE_ARGS) |
|
Line 991 pre_dd(PRE_ARGS) |
|
static int |
static int |
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np, *nch; |
enum mdocargt arg; |
enum mdocargt arg; |
|
|
/* |
/* |
Line 1023 post_bf(POST_ARGS) |
|
Line 1018 post_bf(POST_ARGS) |
|
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_Bf == np->parent->tok); |
assert(MDOC_Bf == np->parent->tok); |
|
|
/* |
/* Check the number of arguments. */ |
* Cannot have both argument and parameter. |
|
* If neither is specified, let it through with a warning. |
|
*/ |
|
|
|
if (np->parent->args && np->child) { |
nch = np->child; |
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
if (NULL == np->parent->args) { |
return(0); |
if (NULL == nch) { |
} else if (NULL == np->parent->args && NULL == np->child) { |
mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
return(1); |
return(1); |
} |
|
nch = nch->next; |
} |
} |
|
if (NULL != nch) |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
nch->line, nch->pos, "Bf ... %s", nch->string); |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
|
|
Line 1060 post_bf(POST_ARGS) |
|
Line 1056 post_bf(POST_ARGS) |
|
else if (0 == strcmp(np->child->string, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
|
np->child->line, np->child->pos, |
|
"Bf %s", np->child->string); |
|
|
return(1); |
return(1); |
} |
} |
Line 1093 post_lb(POST_ARGS) |
|
Line 1091 post_lb(POST_ARGS) |
|
static int |
static int |
post_eoln(POST_ARGS) |
post_eoln(POST_ARGS) |
{ |
{ |
|
const struct mdoc_node *n; |
|
|
if (mdoc->last->child) |
n = mdoc->last; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
if (n->child) |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, n->line, n->pos, |
|
"%s %s", mdoc_macronames[n->tok], |
|
n->child->string); |
return(1); |
return(1); |
} |
} |
|
|
Line 1270 post_it(POST_ARGS) |
|
Line 1273 post_it(POST_ARGS) |
|
{ |
{ |
int i, cols; |
int i, cols; |
enum mdoc_list lt; |
enum mdoc_list lt; |
struct mdoc_node *n, *c; |
struct mdoc_node *nbl, *nit, *nch; |
enum mandocerr er; |
enum mandocerr er; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
nit = mdoc->last; |
|
if (MDOC_BLOCK != nit->type) |
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
nbl = nit->parent->parent; |
lt = n->norm->Bl.type; |
lt = nbl->norm->Bl.type; |
|
|
if (LIST__NONE == lt) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
|
return(1); |
|
} |
|
|
|
switch (lt) { |
switch (lt) { |
case LIST_tag: |
case LIST_tag: |
if (mdoc->last->head->child) |
/* FALLTHROUGH */ |
break; |
|
/* FIXME: give this a dummy value. */ |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
|
break; |
|
case LIST_hang: |
case LIST_hang: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_ohang: |
case LIST_ohang: |
Line 1298 post_it(POST_ARGS) |
|
Line 1293 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == mdoc->last->head->child) |
if (NULL == nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1308 post_it(POST_ARGS) |
|
Line 1305 post_it(POST_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == mdoc->last->body->child) |
if (NULL == nit->body->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
mandoc_msg(MANDOCERR_IT_NOBODY, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if (mdoc->last->head->child) |
if (NULL != nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, nit->line, nit->pos, |
|
"It %s", nit->head->child->string); |
break; |
break; |
case LIST_column: |
case LIST_column: |
cols = (int)n->norm->Bl.ncols; |
cols = (int)nbl->norm->Bl.ncols; |
|
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == nit->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
for (i = 0, nch = nit->child; nch; nch = nch->next) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
if (MDOC_BODY == nch->type) |
|
|
for (i = 0, c = mdoc->last->child; c; c = c->next) |
|
if (MDOC_BODY == c->type) |
|
i++; |
i++; |
|
|
if (i < cols) |
if (i < cols) |
Line 1334 post_it(POST_ARGS) |
|
Line 1332 post_it(POST_ARGS) |
|
else |
else |
er = MANDOCERR_SYNTARGCOUNT; |
er = MANDOCERR_SYNTARGCOUNT; |
|
|
mandoc_vmsg(er, mdoc->parse, |
mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos, |
mdoc->last->line, mdoc->last->pos, |
|
"columns == %d (have %d)", cols, i); |
"columns == %d (have %d)", cols, i); |
return(MANDOCERR_ARGCOUNT == er); |
return(MANDOCERR_ARGCOUNT == er); |
default: |
default: |
break; |
abort(); |
} |
} |
|
|
return(1); |
return(1); |
Line 1729 post_st(POST_ARGS) |
|
Line 1726 post_st(POST_ARGS) |
|
const char *p; |
const char *p; |
|
|
if (NULL == (ch = mdoc->last->child)) { |
if (NULL == (ch = mdoc->last->child)) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
mdoc_macronames[mdoc->last->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
} |
} |