version 1.364, 2018/12/04 02:53:51 |
version 1.367, 2018/12/31 04:55:47 |
Line 288 static const char * const secnames[SEC__MAX] = { |
|
Line 288 static const char * const secnames[SEC__MAX] = { |
|
|
|
/* Validate the subtree rooted at mdoc->last. */ |
/* Validate the subtree rooted at mdoc->last. */ |
void |
void |
mdoc_node_validate(struct roff_man *mdoc) |
mdoc_validate(struct roff_man *mdoc) |
{ |
{ |
struct roff_node *n, *np; |
struct roff_node *n, *np; |
const v_post *p; |
const v_post *p; |
Line 319 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 319 mdoc_node_validate(struct roff_man *mdoc) |
|
|
|
mdoc->last = mdoc->last->child; |
mdoc->last = mdoc->last->child; |
while (mdoc->last != NULL) { |
while (mdoc->last != NULL) { |
mdoc_node_validate(mdoc); |
mdoc_validate(mdoc); |
if (mdoc->last == n) |
if (mdoc->last == n) |
mdoc->last = mdoc->last->child; |
mdoc->last = mdoc->last->child; |
else |
else |
Line 415 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
Line 415 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
return; |
return; |
|
|
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse, |
mandoc_msg(MANDOCERR_FI_TAB, ln, pos + (int)(p - cp), NULL); |
ln, pos + (int)(p - cp), NULL); |
|
} |
} |
|
|
static void |
static void |
Line 463 check_text_em(struct roff_man *mdoc, int ln, int pos, |
|
Line 462 check_text_em(struct roff_man *mdoc, int ln, int pos, |
|
nn != NULL && |
nn != NULL && |
nn->type == ROFFT_TEXT && |
nn->type == ROFFT_TEXT && |
isalpha((unsigned char)*nn->string))) { |
isalpha((unsigned char)*nn->string))) { |
mandoc_msg(MANDOCERR_DASHDASH, mdoc->parse, |
mandoc_msg(MANDOCERR_DASHDASH, |
ln, pos + (int)(cp - p) - 1, NULL); |
ln, pos + (int)(cp - p) - 1, NULL); |
break; |
break; |
} |
} |
Line 479 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
Line 478 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
return; |
return; |
|
|
if ((cp = strstr(p, "OpenBSD")) != NULL) |
if ((cp = strstr(p, "OpenBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Ox"); |
ln, pos + (cp - p), "Ox"); |
|
if ((cp = strstr(p, "NetBSD")) != NULL) |
if ((cp = strstr(p, "NetBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Nx"); |
ln, pos + (cp - p), "Nx"); |
|
if ((cp = strstr(p, "FreeBSD")) != NULL) |
if ((cp = strstr(p, "FreeBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Fx"); |
ln, pos + (cp - p), "Fx"); |
|
if ((cp = strstr(p, "DragonFly")) != NULL) |
if ((cp = strstr(p, "DragonFly")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Dx"); |
ln, pos + (cp - p), "Dx"); |
|
|
|
cp = p; |
cp = p; |
while ((cp = strstr(cp + 1, "()")) != NULL) { |
while ((cp = strstr(cp + 1, "()")) != NULL) { |
Line 498 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
Line 493 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
break; |
break; |
if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) { |
if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) { |
cpr++; |
cpr++; |
mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse, |
mandoc_msg(MANDOCERR_FUNC, ln, pos + (int)(cpr - p), |
ln, pos + (cpr - p), |
|
"%.*s()", (int)(cp - cpr), cpr); |
"%.*s()", (int)(cp - cpr), cpr); |
} |
} |
} |
} |
Line 533 post_delim(POST_ARGS) |
|
Line 527 post_delim(POST_ARGS) |
|
tok == MDOC_Ss || tok == MDOC_Fo)) |
tok == MDOC_Ss || tok == MDOC_Fo)) |
return; |
return; |
|
|
mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse, |
mandoc_msg(MANDOCERR_DELIM, nch->line, |
nch->line, nch->pos + (lc - nch->string), |
nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok], |
"%s%s %s", roff_name[tok], |
|
nch == mdoc->last->child ? "" : " ...", nch->string); |
nch == mdoc->last->child ? "" : " ...", nch->string); |
} |
} |
|
|
Line 627 post_delim_nb(POST_ARGS) |
|
Line 620 post_delim_nb(POST_ARGS) |
|
} |
} |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_DELIM_NB, mdoc->parse, |
mandoc_msg(MANDOCERR_DELIM_NB, nch->line, |
nch->line, nch->pos + (lc - nch->string), |
nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok], |
"%s%s %s", roff_name[tok], |
|
nch == mdoc->last->child ? "" : " ...", nch->string); |
nch == mdoc->last->child ? "" : " ...", nch->string); |
} |
} |
|
|
Line 695 post_bl_norm(POST_ARGS) |
|
Line 687 post_bl_norm(POST_ARGS) |
|
case MDOC_Compact: |
case MDOC_Compact: |
if (n->norm->Bl.comp) |
if (n->norm->Bl.comp) |
mandoc_msg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -compact"); |
argv->pos, "Bl -compact"); |
|
n->norm->Bl.comp = 1; |
n->norm->Bl.comp = 1; |
break; |
break; |
case MDOC_Width: |
case MDOC_Width: |
wa = argv; |
wa = argv; |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -width"); |
argv->pos, "Bl -width"); |
|
n->norm->Bl.width = "0n"; |
n->norm->Bl.width = "0n"; |
break; |
break; |
} |
} |
if (NULL != n->norm->Bl.width) |
if (NULL != n->norm->Bl.width) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bl -width %s", |
"Bl -width %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.width = argv->value[0]; |
n->norm->Bl.width = argv->value[0]; |
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -offset"); |
argv->pos, "Bl -offset"); |
|
break; |
break; |
} |
} |
if (NULL != n->norm->Bl.offs) |
if (NULL != n->norm->Bl.offs) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bl -offset %s", |
"Bl -offset %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.offs = argv->value[0]; |
n->norm->Bl.offs = argv->value[0]; |
break; |
break; |
Line 741 post_bl_norm(POST_ARGS) |
|
Line 728 post_bl_norm(POST_ARGS) |
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != n->norm->Bl.type) { |
if (LIST__NONE != n->norm->Bl.type) { |
mandoc_vmsg(MANDOCERR_BL_REP, |
mandoc_msg(MANDOCERR_BL_REP, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Bl -%s", mdoc_argnames[argv->arg]); |
"Bl -%s", mdoc_argnames[argv->arg]); |
continue; |
continue; |
} |
} |
Line 752 post_bl_norm(POST_ARGS) |
|
Line 738 post_bl_norm(POST_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) |
mandoc_vmsg(MANDOCERR_BL_LATETYPE, |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
mdoc->parse, n->line, n->pos, "Bl -%s", |
n->line, n->pos, "Bl -%s", |
mdoc_argnames[n->args->argv[0].arg]); |
mdoc_argnames[n->args->argv[0].arg]); |
|
|
n->norm->Bl.type = lt; |
n->norm->Bl.type = lt; |
Line 766 post_bl_norm(POST_ARGS) |
|
Line 752 post_bl_norm(POST_ARGS) |
|
/* 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) { |
mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_NOTYPE, n->line, n->pos, "Bl"); |
n->line, n->pos, "Bl"); |
|
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
mdoclt = MDOC_Item; |
mdoclt = MDOC_Item; |
} |
} |
Line 782 post_bl_norm(POST_ARGS) |
|
Line 767 post_bl_norm(POST_ARGS) |
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (n->norm->Bl.width == NULL) |
if (n->norm->Bl.width == NULL) |
mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_NOWIDTH, |
n->line, n->pos, "Bl -tag"); |
n->line, n->pos, "Bl -tag"); |
break; |
break; |
case LIST_column: |
case LIST_column: |
Line 791 post_bl_norm(POST_ARGS) |
|
Line 776 post_bl_norm(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
case LIST_item: |
case LIST_item: |
if (n->norm->Bl.width != NULL) |
if (n->norm->Bl.width != NULL) |
mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_SKIPW, wa->line, wa->pos, |
wa->line, wa->pos, "Bl -%s", |
"Bl -%s", mdoc_argnames[mdoclt]); |
mdoc_argnames[mdoclt]); |
|
n->norm->Bl.width = NULL; |
n->norm->Bl.width = NULL; |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
Line 841 post_bd(POST_ARGS) |
|
Line 825 post_bd(POST_ARGS) |
|
dt = DISP_literal; |
dt = DISP_literal; |
break; |
break; |
case MDOC_File: |
case MDOC_File: |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
mandoc_msg(MANDOCERR_BD_FILE, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
|
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bd -offset"); |
argv->pos, "Bd -offset"); |
|
break; |
break; |
} |
} |
if (NULL != n->norm->Bd.offs) |
if (NULL != n->norm->Bd.offs) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bd -offset %s", |
"Bd -offset %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bd.offs = argv->value[0]; |
n->norm->Bd.offs = argv->value[0]; |
break; |
break; |
case MDOC_Compact: |
case MDOC_Compact: |
if (n->norm->Bd.comp) |
if (n->norm->Bd.comp) |
mandoc_msg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bd -compact"); |
argv->pos, "Bd -compact"); |
|
n->norm->Bd.comp = 1; |
n->norm->Bd.comp = 1; |
break; |
break; |
default: |
default: |
Line 875 post_bd(POST_ARGS) |
|
Line 855 post_bd(POST_ARGS) |
|
if (DISP__NONE == n->norm->Bd.type) |
if (DISP__NONE == n->norm->Bd.type) |
n->norm->Bd.type = dt; |
n->norm->Bd.type = dt; |
else |
else |
mandoc_vmsg(MANDOCERR_BD_REP, |
mandoc_msg(MANDOCERR_BD_REP, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Bd -%s", mdoc_argnames[argv->arg]); |
"Bd -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse, |
mandoc_msg(MANDOCERR_BD_NOTYPE, n->line, n->pos, "Bd"); |
n->line, n->pos, "Bd"); |
|
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
} |
} |
Line 904 post_an_norm(POST_ARGS) |
|
Line 882 post_an_norm(POST_ARGS) |
|
|
|
for (i = 1; i < n->args->argc; i++) { |
for (i = 1; i < n->args->argc; i++) { |
argv = n->args->argv + i; |
argv = n->args->argv + i; |
mandoc_vmsg(MANDOCERR_AN_REP, |
mandoc_msg(MANDOCERR_AN_REP, argv->line, argv->pos, |
mdoc->parse, argv->line, argv->pos, |
|
"An -%s", mdoc_argnames[argv->arg]); |
"An -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
Line 926 post_eoln(POST_ARGS) |
|
Line 903 post_eoln(POST_ARGS) |
|
post_useless(mdoc); |
post_useless(mdoc); |
n = mdoc->last; |
n = mdoc->last; |
if (n->child != NULL) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line, |
mandoc_msg(MANDOCERR_ARG_SKIP, n->line, |
n->pos, "%s %s", roff_name[n->tok], n->child->string); |
n->pos, "%s %s", roff_name[n->tok], n->child->string); |
|
|
while (n->child != NULL) |
while (n->child != NULL) |
Line 989 post_ex(POST_ARGS) |
|
Line 966 post_ex(POST_ARGS) |
|
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
ic = 1; |
ic = 1; |
} else { |
} else { |
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_EX_NONAME, n->line, n->pos, "Ex"); |
n->line, n->pos, "Ex"); |
|
ic = 0; |
ic = 0; |
} |
} |
|
|
Line 1023 post_lb(POST_ARGS) |
|
Line 999 post_lb(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_LB_BAD, mdoc->parse, n->child->line, |
mandoc_msg(MANDOCERR_LB_BAD, n->child->line, |
n->child->pos, "Lb %s", n->child->string); |
n->child->pos, "Lb %s", n->child->string); |
|
|
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
Line 1087 post_std(POST_ARGS) |
|
Line 1063 post_std(POST_ARGS) |
|
if (n->args->argv[0].arg == MDOC_Std) |
if (n->args->argv[0].arg == MDOC_Std) |
return; |
return; |
|
|
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_STD, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 1102 post_st(POST_ARGS) |
|
Line 1078 post_st(POST_ARGS) |
|
assert(nch->type == ROFFT_TEXT); |
assert(nch->type == ROFFT_TEXT); |
|
|
if ((p = mdoc_a2st(nch->string)) == NULL) { |
if ((p = mdoc_a2st(nch->string)) == NULL) { |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_ST_BAD, |
nch->line, nch->pos, "St %s", nch->string); |
nch->line, nch->pos, "St %s", nch->string); |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
return; |
return; |
Line 1122 post_obsolete(POST_ARGS) |
|
Line 1098 post_obsolete(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK) |
if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK) |
mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_OBS, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 1132 post_useless(POST_ARGS) |
|
Line 1108 post_useless(POST_ARGS) |
|
struct roff_node *n; |
struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_USELESS, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
/* |
/* |
Line 1162 post_bf(POST_ARGS) |
|
Line 1138 post_bf(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (np->parent->args == NULL) { |
if (np->parent->args == NULL) { |
if (nch == NULL) { |
if (nch == NULL) { |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_NOFONT, |
np->line, np->pos, "Bf"); |
np->line, np->pos, "Bf"); |
return; |
return; |
} |
} |
nch = nch->next; |
nch = nch->next; |
} |
} |
if (nch != NULL) |
if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "Bf ... %s", nch->string); |
nch->line, nch->pos, "Bf ... %s", nch->string); |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
Line 1200 post_bf(POST_ARGS) |
|
Line 1176 post_bf(POST_ARGS) |
|
else if ( ! strcmp(np->child->string, "Sy")) |
else if ( ! strcmp(np->child->string, "Sy")) |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_BADFONT, np->child->line, |
np->child->line, np->child->pos, |
np->child->pos, "Bf %s", np->child->string); |
"Bf %s", np->child->string); |
|
} |
} |
|
|
static void |
static void |
Line 1216 post_fname(POST_ARGS) |
|
Line 1191 post_fname(POST_ARGS) |
|
pos = strcspn(n->string, "()"); |
pos = strcspn(n->string, "()"); |
cp = n->string + pos; |
cp = n->string + pos; |
if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) |
if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) |
mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse, |
mandoc_msg(MANDOCERR_FN_PAREN, n->line, n->pos + pos, |
n->line, n->pos + pos, n->string); |
"%s", n->string); |
} |
} |
|
|
static void |
static void |
Line 1239 post_fo(POST_ARGS) |
|
Line 1214 post_fo(POST_ARGS) |
|
return; |
return; |
|
|
if (n->child == NULL) { |
if (n->child == NULL) { |
mandoc_msg(MANDOCERR_FO_NOHEAD, mdoc->parse, |
mandoc_msg(MANDOCERR_FO_NOHEAD, n->line, n->pos, "Fo"); |
n->line, n->pos, "Fo"); |
|
return; |
return; |
} |
} |
if (n->child != n->last) { |
if (n->child != n->last) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
n->child->next->line, n->child->next->pos, |
n->child->next->line, n->child->next->pos, |
"Fo ... %s", n->child->next->string); |
"Fo ... %s", n->child->next->string); |
while (n->child != n->last) |
while (n->child != n->last) |
Line 1268 post_fa(POST_ARGS) |
|
Line 1242 post_fa(POST_ARGS) |
|
break; |
break; |
if (*cp != ',') |
if (*cp != ',') |
continue; |
continue; |
mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse, |
mandoc_msg(MANDOCERR_FA_COMMA, n->line, |
n->line, n->pos + (cp - n->string), |
n->pos + (int)(cp - n->string), "%s", n->string); |
n->string); |
|
break; |
break; |
} |
} |
} |
} |
Line 1296 post_nm(POST_ARGS) |
|
Line 1269 post_nm(POST_ARGS) |
|
|
|
if (mdoc->meta.name == NULL || |
if (mdoc->meta.name == NULL || |
(mdoc->lastsec == SEC_NAME && n->child == NULL)) |
(mdoc->lastsec == SEC_NAME && n->child == NULL)) |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_NM_NONAME, n->line, n->pos, "Nm"); |
n->line, n->pos, "Nm"); |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_ELEM: |
case ROFFT_ELEM: |
Line 1331 post_nd(POST_ARGS) |
|
Line 1303 post_nd(POST_ARGS) |
|
return; |
return; |
|
|
if (n->sec != SEC_NAME) |
if (n->sec != SEC_NAME) |
mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_ND_LATE, n->line, n->pos, "Nd"); |
n->line, n->pos, "Nd"); |
|
|
|
if (n->child == NULL) |
if (n->child == NULL) |
mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_ND_EMPTY, n->line, n->pos, "Nd"); |
n->line, n->pos, "Nd"); |
|
else |
else |
post_delim(mdoc); |
post_delim(mdoc); |
|
|
Line 1356 post_display(POST_ARGS) |
|
Line 1326 post_display(POST_ARGS) |
|
n->body->parent->args == NULL) |
n->body->parent->args == NULL) |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
} else if (n->child == NULL) |
} else if (n->child == NULL) |
mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
else if (n->tok == MDOC_D1) |
else if (n->tok == MDOC_D1) |
post_hyph(mdoc); |
post_hyph(mdoc); |
break; |
break; |
Line 1365 post_display(POST_ARGS) |
|
Line 1335 post_display(POST_ARGS) |
|
if (n->tok == MDOC_Bd) { |
if (n->tok == MDOC_Bd) { |
if (n->args == NULL) { |
if (n->args == NULL) { |
mandoc_msg(MANDOCERR_BD_NOARG, |
mandoc_msg(MANDOCERR_BD_NOARG, |
mdoc->parse, n->line, n->pos, "Bd"); |
n->line, n->pos, "Bd"); |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
while (n->body->child != NULL) |
while (n->body->child != NULL) |
roff_node_relink(mdoc, |
roff_node_relink(mdoc, |
Line 1378 post_display(POST_ARGS) |
|
Line 1348 post_display(POST_ARGS) |
|
} |
} |
for (np = n->parent; np != NULL; np = np->parent) { |
for (np = n->parent; np != NULL; np = np->parent) { |
if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) { |
if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) { |
mandoc_vmsg(MANDOCERR_BD_NEST, |
mandoc_msg(MANDOCERR_BD_NEST, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s in Bd", roff_name[n->tok]); |
"%s in Bd", roff_name[n->tok]); |
|
break; |
break; |
} |
} |
} |
} |
Line 1444 post_at(POST_ARGS) |
|
Line 1413 post_at(POST_ARGS) |
|
|
|
att = NULL; |
att = NULL; |
if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL)) |
if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL)) |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_AT_BAD, |
nch->line, nch->pos, "At %s", nch->string); |
nch->line, nch->pos, "At %s", nch->string); |
|
|
mdoc->next = ROFF_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
Line 1468 post_an(POST_ARGS) |
|
Line 1437 post_an(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (np->norm->An.auth == AUTH__NONE) { |
if (np->norm->An.auth == AUTH__NONE) { |
if (nch == NULL) |
if (nch == NULL) |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
np->line, np->pos, "An"); |
np->line, np->pos, "An"); |
else |
else |
post_delim_nb(mdoc); |
post_delim_nb(mdoc); |
} else if (nch != NULL) |
} else if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "An ... %s", nch->string); |
nch->line, nch->pos, "An ... %s", nch->string); |
} |
} |
|
|
Line 1569 post_it(POST_ARGS) |
|
Line 1538 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
case LIST_diag: |
case LIST_diag: |
if (nit->head->child == NULL) |
if (nit->head->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
mdoc->parse, nit->line, nit->pos, |
nit->line, nit->pos, "Bl -%s It", |
"Bl -%s It", |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
Line 1579 post_it(POST_ARGS) |
|
Line 1547 post_it(POST_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
case LIST_hyphen: |
case LIST_hyphen: |
if (nit->body == NULL || nit->body->child == NULL) |
if (nit->body == NULL || nit->body->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mandoc_msg(MANDOCERR_IT_NOBODY, |
mdoc->parse, nit->line, nit->pos, |
nit->line, nit->pos, "Bl -%s It", |
"Bl -%s It", |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if ((nch = nit->head->child) != NULL) |
if ((nch = nit->head->child) != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_SKIP, |
nit->line, nit->pos, "It %s", |
nit->line, nit->pos, "It %s", |
nch->string == NULL ? roff_name[nch->tok] : |
nch->string == NULL ? roff_name[nch->tok] : |
nch->string); |
nch->string); |
Line 1598 post_it(POST_ARGS) |
|
Line 1565 post_it(POST_ARGS) |
|
|
|
if (nit->head->next->child == NULL && |
if (nit->head->next->child == NULL && |
nit->head->next->next == NULL) { |
nit->head->next->next == NULL) { |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
nit->line, nit->pos, "It"); |
nit->line, nit->pos, "It"); |
roff_node_delete(mdoc, nit); |
roff_node_delete(mdoc, nit); |
break; |
break; |
Line 1609 post_it(POST_ARGS) |
|
Line 1576 post_it(POST_ARGS) |
|
if (nch->type != ROFFT_BODY) |
if (nch->type != ROFFT_BODY) |
continue; |
continue; |
if (i++ && nch->flags & NODE_LINE) |
if (i++ && nch->flags & NODE_LINE) |
mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse, |
mandoc_msg(MANDOCERR_TA_LINE, |
nch->line, nch->pos, "Ta"); |
nch->line, nch->pos, "Ta"); |
} |
} |
if (i < cols || i > cols + 1) |
if (i < cols || i > cols + 1) |
mandoc_vmsg(MANDOCERR_BL_COL, |
mandoc_msg(MANDOCERR_BL_COL, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"%d columns, %d cells", cols, i); |
"%d columns, %d cells", cols, i); |
else if (nit->head->next->child != NULL && |
else if (nit->head->next->child != NULL && |
nit->head->next->child->line > nit->line) |
nit->head->next->child->line > nit->line) |
mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse, |
mandoc_msg(MANDOCERR_IT_NOARG, |
nit->line, nit->pos, "Bl -column It"); |
nit->line, nit->pos, "Bl -column It"); |
break; |
break; |
default: |
default: |
Line 1648 post_bl_block(POST_ARGS) |
|
Line 1614 post_bl_block(POST_ARGS) |
|
continue; |
continue; |
} |
} |
if (ni->next == NULL) { |
if (ni->next == NULL) { |
mandoc_msg(MANDOCERR_PAR_MOVE, |
mandoc_msg(MANDOCERR_PAR_MOVE, nc->line, |
mdoc->parse, nc->line, nc->pos, |
nc->pos, "%s", roff_name[nc->tok]); |
roff_name[nc->tok]); |
|
roff_node_relink(mdoc, nc); |
roff_node_relink(mdoc, nc); |
} else if (n->norm->Bl.comp == 0 && |
} else if (n->norm->Bl.comp == 0 && |
n->norm->Bl.type != LIST_column) { |
n->norm->Bl.type != LIST_column) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_msg(MANDOCERR_PAR_SKIP, |
mdoc->parse, nc->line, nc->pos, |
nc->line, nc->pos, |
"%s before It", roff_name[nc->tok]); |
"%s before It", roff_name[nc->tok]); |
roff_node_delete(mdoc, nc); |
roff_node_delete(mdoc, nc); |
} else |
} else |
Line 1701 post_bl_head(POST_ARGS) |
|
Line 1666 post_bl_head(POST_ARGS) |
|
if (nh->norm->Bl.type != LIST_column) { |
if (nh->norm->Bl.type != LIST_column) { |
if ((nch = nh->child) == NULL) |
if ((nch = nh->child) == NULL) |
return; |
return; |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "Bl ... %s", nch->string); |
nch->line, nch->pos, "Bl ... %s", nch->string); |
while (nch != NULL) { |
while (nch != NULL) { |
roff_node_delete(mdoc, nch); |
roff_node_delete(mdoc, nch); |
Line 1778 post_bl(POST_ARGS) |
|
Line 1743 post_bl(POST_ARGS) |
|
|
|
nchild = nbody->child; |
nchild = nbody->child; |
if (nchild == NULL) { |
if (nchild == NULL) { |
mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_EMPTY, |
nbody->line, nbody->pos, "Bl"); |
nbody->line, nbody->pos, "Bl"); |
return; |
return; |
} |
} |
Line 1821 post_bl(POST_ARGS) |
|
Line 1786 post_bl(POST_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_MOVE, nchild->line, nchild->pos, |
nchild->line, nchild->pos, roff_name[nchild->tok]); |
"%s", roff_name[nchild->tok]); |
|
|
/* |
/* |
* Move the node out of the Bl block. |
* Move the node out of the Bl block. |
Line 1877 post_bl(POST_ARGS) |
|
Line 1842 post_bl(POST_ARGS) |
|
if (prev_Er != NULL) { |
if (prev_Er != NULL) { |
order = strcmp(prev_Er, nnext->string); |
order = strcmp(prev_Er, nnext->string); |
if (order > 0) |
if (order > 0) |
mandoc_vmsg(MANDOCERR_ER_ORDER, |
mandoc_msg(MANDOCERR_ER_ORDER, |
mdoc->parse, nnext->line, nnext->pos, |
nnext->line, nnext->pos, |
"Er %s %s (NetBSD)", |
"Er %s %s (NetBSD)", |
prev_Er, nnext->string); |
prev_Er, nnext->string); |
else if (order == 0) |
else if (order == 0) |
mandoc_vmsg(MANDOCERR_ER_REP, |
mandoc_msg(MANDOCERR_ER_REP, |
mdoc->parse, nnext->line, nnext->pos, |
nnext->line, nnext->pos, |
"Er %s (NetBSD)", prev_Er); |
"Er %s (NetBSD)", prev_Er); |
} |
} |
prev_Er = nnext->string; |
prev_Er = nnext->string; |
Line 1898 post_bk(POST_ARGS) |
|
Line 1863 post_bk(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (n->type == ROFFT_BLOCK && n->body->child == NULL) { |
if (n->type == ROFFT_BLOCK && n->body->child == NULL) { |
mandoc_msg(MANDOCERR_BLK_EMPTY, |
mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, "Bk"); |
mdoc->parse, n->line, n->pos, "Bk"); |
|
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
} |
} |
} |
} |
Line 1927 post_sm(POST_ARGS) |
|
Line 1891 post_sm(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_SM_BAD, |
mandoc_msg(MANDOCERR_SM_BAD, nch->line, nch->pos, |
mdoc->parse, nch->line, nch->pos, |
|
"%s %s", roff_name[mdoc->last->tok], nch->string); |
"%s %s", roff_name[mdoc->last->tok], nch->string); |
roff_node_relink(mdoc, nch); |
roff_node_relink(mdoc, nch); |
return; |
return; |
Line 1968 post_root(POST_ARGS) |
|
Line 1931 post_root(POST_ARGS) |
|
mandoc_normdate(mdoc, NULL, 0, 0); |
mandoc_normdate(mdoc, NULL, 0, 0); |
|
|
if (mdoc->meta.title == NULL) { |
if (mdoc->meta.title == NULL) { |
mandoc_msg(MANDOCERR_DT_NOTITLE, |
mandoc_msg(MANDOCERR_DT_NOTITLE, 0, 0, "EOF"); |
mdoc->parse, 0, 0, "EOF"); |
|
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
} |
} |
|
|
Line 1977 post_root(POST_ARGS) |
|
Line 1939 post_root(POST_ARGS) |
|
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
|
|
if (mdoc->meta.os == NULL) { |
if (mdoc->meta.os == NULL) { |
mandoc_msg(MANDOCERR_OS_MISSING, |
mandoc_msg(MANDOCERR_OS_MISSING, 0, 0, NULL); |
mdoc->parse, 0, 0, NULL); |
|
mdoc->meta.os = mandoc_strdup(""); |
mdoc->meta.os = mandoc_strdup(""); |
} else if (mdoc->meta.os_e && |
} else if (mdoc->meta.os_e && |
(mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0) |
(mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0) |
mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0, |
mandoc_msg(MANDOCERR_RCS_MISSING, 0, 0, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"(OpenBSD)" : "(NetBSD)"); |
"(OpenBSD)" : "(NetBSD)"); |
|
|
Line 1991 post_root(POST_ARGS) |
|
Line 1952 post_root(POST_ARGS) |
|
while (*arch != NULL && strcmp(*arch, mdoc->meta.arch)) |
while (*arch != NULL && strcmp(*arch, mdoc->meta.arch)) |
arch++; |
arch++; |
if (*arch == NULL) { |
if (*arch == NULL) { |
n = mdoc->first->child; |
n = mdoc->meta.first->child; |
while (n->tok != MDOC_Dt || |
while (n->tok != MDOC_Dt || |
n->child == NULL || |
n->child == NULL || |
n->child->next == NULL || |
n->child->next == NULL || |
n->child->next->next == NULL) |
n->child->next->next == NULL) |
n = n->next; |
n = n->next; |
n = n->child->next->next; |
n = n->child->next->next; |
mandoc_vmsg(MANDOCERR_ARCH_BAD, |
mandoc_msg(MANDOCERR_ARCH_BAD, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Dt ... %s %s", mdoc->meta.arch, |
"Dt ... %s %s", mdoc->meta.arch, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"(OpenBSD)" : "(NetBSD)"); |
"(OpenBSD)" : "(NetBSD)"); |
Line 2008 post_root(POST_ARGS) |
|
Line 1968 post_root(POST_ARGS) |
|
|
|
/* Check that we begin with a proper `Sh'. */ |
/* Check that we begin with a proper `Sh'. */ |
|
|
n = mdoc->first->child; |
n = mdoc->meta.first->child; |
while (n != NULL && |
while (n != NULL && |
(n->type == ROFFT_COMMENT || |
(n->type == ROFFT_COMMENT || |
(n->tok >= MDOC_Dd && |
(n->tok >= MDOC_Dd && |
Line 2016 post_root(POST_ARGS) |
|
Line 1976 post_root(POST_ARGS) |
|
n = n->next; |
n = n->next; |
|
|
if (n == NULL) |
if (n == NULL) |
mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL); |
mandoc_msg(MANDOCERR_DOC_EMPTY, 0, 0, NULL); |
else if (n->tok != MDOC_Sh) |
else if (n->tok != MDOC_Sh) |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_BEFORE, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 2034 post_rs(POST_ARGS) |
|
Line 1994 post_rs(POST_ARGS) |
|
return; |
return; |
|
|
if (np->child == NULL) { |
if (np->child == NULL) { |
mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_RS_EMPTY, np->line, np->pos, "Rs"); |
np->line, np->pos, "Rs"); |
|
return; |
return; |
} |
} |
|
|
Line 2053 post_rs(POST_ARGS) |
|
Line 2012 post_rs(POST_ARGS) |
|
break; |
break; |
|
|
if (i == RSORD_MAX) { |
if (i == RSORD_MAX) { |
mandoc_msg(MANDOCERR_RS_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_RS_BAD, nch->line, nch->pos, |
nch->line, nch->pos, roff_name[nch->tok]); |
"%s", roff_name[nch->tok]); |
i = -1; |
i = -1; |
} else if (nch->tok == MDOC__J || nch->tok == MDOC__B) |
} else if (nch->tok == MDOC__J || nch->tok == MDOC__B) |
np->norm->Rs.quote_T++; |
np->norm->Rs.quote_T++; |
Line 2143 post_ns(POST_ARGS) |
|
Line 2102 post_ns(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
if (n->flags & NODE_LINE || |
if (n->flags & NODE_LINE || |
(n->next != NULL && n->next->flags & NODE_DELIMC)) |
(n->next != NULL && n->next->flags & NODE_DELIMC)) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
|
} |
} |
|
|
static void |
static void |
Line 2196 post_sh_name(POST_ARGS) |
|
Line 2154 post_sh_name(POST_ARGS) |
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Nm: |
case MDOC_Nm: |
if (hasnm && n->child != NULL) |
if (hasnm && n->child != NULL) |
mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT, |
mandoc_msg(MANDOCERR_NAMESEC_PUNCT, |
mdoc->parse, n->line, n->pos, |
n->line, n->pos, |
"Nm %s", n->child->string); |
"Nm %s", n->child->string); |
hasnm = 1; |
hasnm = 1; |
continue; |
continue; |
Line 2205 post_sh_name(POST_ARGS) |
|
Line 2163 post_sh_name(POST_ARGS) |
|
hasnd = 1; |
hasnd = 1; |
if (n->next != NULL) |
if (n->next != NULL) |
mandoc_msg(MANDOCERR_NAMESEC_ND, |
mandoc_msg(MANDOCERR_NAMESEC_ND, |
mdoc->parse, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
break; |
break; |
case TOKEN_NONE: |
case TOKEN_NONE: |
if (n->type == ROFFT_TEXT && |
if (n->type == ROFFT_TEXT && |
Line 2216 post_sh_name(POST_ARGS) |
|
Line 2174 post_sh_name(POST_ARGS) |
|
} |
} |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_BAD, |
n->line, n->pos, roff_name[n->tok]); |
n->line, n->pos, "%s", roff_name[n->tok]); |
continue; |
continue; |
} |
} |
break; |
break; |
} |
} |
|
|
if ( ! hasnm) |
if ( ! hasnm) |
mandoc_msg(MANDOCERR_NAMESEC_NONM, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_NONM, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
if ( ! hasnd) |
if ( ! hasnd) |
mandoc_msg(MANDOCERR_NAMESEC_NOND, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_NOND, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
|
|
Line 2253 post_sh_see_also(POST_ARGS) |
|
Line 2211 post_sh_see_also(POST_ARGS) |
|
sec = n->child->next->string; |
sec = n->child->next->string; |
if (lastsec != NULL) { |
if (lastsec != NULL) { |
if (lastpunct[0] != ',' || lastpunct[1] != '\0') |
if (lastpunct[0] != ',' || lastpunct[1] != '\0') |
mandoc_vmsg(MANDOCERR_XR_PUNCT, |
mandoc_msg(MANDOCERR_XR_PUNCT, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s before %s(%s)", |
"%s before %s(%s)", lastpunct, |
lastpunct, name, sec); |
name, sec); |
|
cmp = strcmp(lastsec, sec); |
cmp = strcmp(lastsec, sec); |
if (cmp > 0) |
if (cmp > 0) |
mandoc_vmsg(MANDOCERR_XR_ORDER, |
mandoc_msg(MANDOCERR_XR_ORDER, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s(%s) after %s(%s)", |
"%s(%s) after %s(%s)", name, |
name, sec, lastname, lastsec); |
sec, lastname, lastsec); |
|
else if (cmp == 0 && |
else if (cmp == 0 && |
strcasecmp(lastname, name) > 0) |
strcasecmp(lastname, name) > 0) |
mandoc_vmsg(MANDOCERR_XR_ORDER, |
mandoc_msg(MANDOCERR_XR_ORDER, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s after %s", name, lastname); |
"%s after %s", name, lastname); |
|
} |
} |
lastname = name; |
lastname = name; |
lastsec = sec; |
lastsec = sec; |
Line 2288 post_sh_see_also(POST_ARGS) |
|
Line 2243 post_sh_see_also(POST_ARGS) |
|
return; |
return; |
lastpunct = n->string; |
lastpunct = n->string; |
if (n->next == NULL || n->next->tok == MDOC_Rs) |
if (n->next == NULL || n->next->tok == MDOC_Rs) |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
mandoc_msg(MANDOCERR_XR_PUNCT, n->line, |
n->line, n->pos, "%s after %s(%s)", |
n->pos, "%s after %s(%s)", |
lastpunct, lastname, lastsec); |
lastpunct, lastname, lastsec); |
n = n->next; |
n = n->next; |
} |
} |
Line 2310 post_sh_authors(POST_ARGS) |
|
Line 2265 post_sh_authors(POST_ARGS) |
|
{ |
{ |
|
|
if ( ! child_an(mdoc->last)) |
if ( ! child_an(mdoc->last)) |
mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse, |
mandoc_msg(MANDOCERR_AN_MISSING, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
|
|
Line 2376 post_sh_head(POST_ARGS) |
|
Line 2331 post_sh_head(POST_ARGS) |
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE) |
if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE) |
mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_FIRST, |
mdoc->last->line, mdoc->last->pos, "Sh %s", |
mdoc->last->line, mdoc->last->pos, "Sh %s", |
sec != SEC_CUSTOM ? secnames[sec] : |
sec != SEC_CUSTOM ? secnames[sec] : |
(nch = mdoc->last->child) == NULL ? "" : |
(nch = mdoc->last->child) == NULL ? "" : |
Line 2413 post_sh_head(POST_ARGS) |
|
Line 2368 post_sh_head(POST_ARGS) |
|
} |
} |
} |
} |
if (goodsec != NULL) |
if (goodsec != NULL) |
mandoc_vmsg(MANDOCERR_SEC_TYPO, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_TYPO, nch->line, nch->pos, |
nch->line, nch->pos, "Sh %s instead of %s", |
"Sh %s instead of %s", nch->string, goodsec); |
nch->string, goodsec); |
|
return; |
return; |
} |
} |
|
|
Line 2425 post_sh_head(POST_ARGS) |
|
Line 2379 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |
mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_REP, mdoc->last->line, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->pos, "Sh %s", secnames[sec]); |
"Sh %s", secnames[sec]); |
|
|
|
if (sec < mdoc->lastnamed) |
if (sec < mdoc->lastnamed) |
mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->last->line, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->pos, "Sh %s", secnames[sec]); |
"Sh %s", secnames[sec]); |
|
|
|
/* Mark the last named section. */ |
/* Mark the last named section. */ |
|
|
Line 2464 post_sh_head(POST_ARGS) |
|
Line 2416 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (NULL == goodsec) |
if (NULL == goodsec) |
goodsec = "9"; |
goodsec = "9"; |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_MSEC, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"Sh %s for %s only", secnames[sec], goodsec); |
"Sh %s for %s only", secnames[sec], goodsec); |
break; |
break; |
Line 2481 post_xr(POST_ARGS) |
|
Line 2433 post_xr(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
if (nch->next == NULL) { |
if (nch->next == NULL) { |
mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse, |
mandoc_msg(MANDOCERR_XR_NOSEC, |
n->line, n->pos, "Xr %s", nch->string); |
n->line, n->pos, "Xr %s", nch->string); |
} else { |
} else { |
assert(nch->next == n->last); |
assert(nch->next == n->last); |
if(mandoc_xr_add(nch->next->string, nch->string, |
if(mandoc_xr_add(nch->next->string, nch->string, |
nch->line, nch->pos)) |
nch->line, nch->pos)) |
mandoc_vmsg(MANDOCERR_XR_SELF, mdoc->parse, |
mandoc_msg(MANDOCERR_XR_SELF, |
nch->line, nch->pos, "Xr %s %s", |
nch->line, nch->pos, "Xr %s %s", |
nch->string, nch->next->string); |
nch->string, nch->next->string); |
} |
} |
Line 2516 post_ignpar(POST_ARGS) |
|
Line 2468 post_ignpar(POST_ARGS) |
|
if ((np = mdoc->last->child) != NULL) |
if ((np = mdoc->last->child) != NULL) |
if (np->tok == MDOC_Pp || |
if (np->tok == MDOC_Pp || |
np->tok == ROFF_br || np->tok == ROFF_sp) { |
np->tok == ROFF_br || np->tok == ROFF_sp) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, |
mdoc->parse, np->line, np->pos, |
|
"%s after %s", roff_name[np->tok], |
"%s after %s", roff_name[np->tok], |
roff_name[mdoc->last->tok]); |
roff_name[mdoc->last->tok]); |
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, np); |
Line 2525 post_ignpar(POST_ARGS) |
|
Line 2476 post_ignpar(POST_ARGS) |
|
|
|
if ((np = mdoc->last->last) != NULL) |
if ((np = mdoc->last->last) != NULL) |
if (np->tok == MDOC_Pp || np->tok == ROFF_br) { |
if (np->tok == MDOC_Pp || np->tok == ROFF_br) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, |
np->line, np->pos, "%s at the end of %s", |
"%s at the end of %s", roff_name[np->tok], |
roff_name[np->tok], |
|
roff_name[mdoc->last->tok]); |
roff_name[mdoc->last->tok]); |
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, np); |
} |
} |
Line 2558 post_prevpar(POST_ARGS) |
|
Line 2508 post_prevpar(POST_ARGS) |
|
if (n->tok == MDOC_It && n->parent->norm->Bl.comp) |
if (n->tok == MDOC_It && n->parent->norm->Bl.comp) |
return; |
return; |
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_PAR_SKIP, n->prev->line, n->prev->pos, |
n->prev->line, n->prev->pos, "%s before %s", |
"%s before %s", roff_name[n->prev->tok], roff_name[n->tok]); |
roff_name[n->prev->tok], roff_name[n->tok]); |
|
roff_node_delete(mdoc, n->prev); |
roff_node_delete(mdoc, n->prev); |
} |
} |
|
|
Line 2573 post_par(POST_ARGS) |
|
Line 2522 post_par(POST_ARGS) |
|
|
|
np = mdoc->last; |
np = mdoc->last; |
if (np->child != NULL) |
if (np->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_msg(MANDOCERR_ARG_SKIP, np->line, np->pos, |
mdoc->parse, np->line, np->pos, "%s %s", |
"%s %s", roff_name[np->tok], np->child->string); |
roff_name[np->tok], np->child->string); |
|
} |
} |
|
|
static void |
static void |
Line 2588 post_dd(POST_ARGS) |
|
Line 2536 post_dd(POST_ARGS) |
|
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.date != NULL) { |
if (mdoc->meta.date != NULL) { |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dd"); |
n->line, n->pos, "Dd"); |
|
free(mdoc->meta.date); |
free(mdoc->meta.date); |
} else if (mdoc->flags & MDOC_PBODY) |
} else if (mdoc->flags & MDOC_PBODY) |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Dd"); |
n->line, n->pos, "Dd"); |
|
else if (mdoc->meta.title != NULL) |
else if (mdoc->meta.title != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dd after Dt"); |
n->line, n->pos, "Dd after Dt"); |
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dd after Os"); |
n->line, n->pos, "Dd after Os"); |
|
|
if (n->child == NULL || n->child->string[0] == '\0') { |
if (n->child == NULL || n->child->string[0] == '\0') { |
Line 2629 post_dt(POST_ARGS) |
|
Line 2575 post_dt(POST_ARGS) |
|
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->flags & MDOC_PBODY) { |
if (mdoc->flags & MDOC_PBODY) { |
mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_DT_LATE, n->line, n->pos, "Dt"); |
n->line, n->pos, "Dt"); |
|
return; |
return; |
} |
} |
|
|
if (mdoc->meta.title != NULL) |
if (mdoc->meta.title != NULL) |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dt"); |
n->line, n->pos, "Dt"); |
|
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dt after Os"); |
n->line, n->pos, "Dt after Os"); |
|
|
free(mdoc->meta.title); |
free(mdoc->meta.title); |
Line 2655 post_dt(POST_ARGS) |
|
Line 2599 post_dt(POST_ARGS) |
|
|
|
nn = n->child; |
nn = n->child; |
if (nn == NULL || *nn->string == '\0') { |
if (nn == NULL || *nn->string == '\0') { |
mandoc_msg(MANDOCERR_DT_NOTITLE, |
mandoc_msg(MANDOCERR_DT_NOTITLE, n->line, n->pos, "Dt"); |
mdoc->parse, n->line, n->pos, "Dt"); |
|
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
} else { |
} else { |
mdoc->meta.title = mandoc_strdup(nn->string); |
mdoc->meta.title = mandoc_strdup(nn->string); |
Line 2665 post_dt(POST_ARGS) |
|
Line 2608 post_dt(POST_ARGS) |
|
|
|
for (p = nn->string; *p != '\0'; p++) |
for (p = nn->string; *p != '\0'; p++) |
if (islower((unsigned char)*p)) { |
if (islower((unsigned char)*p)) { |
mandoc_vmsg(MANDOCERR_TITLE_CASE, |
mandoc_msg(MANDOCERR_TITLE_CASE, nn->line, |
mdoc->parse, nn->line, |
nn->pos + (int)(p - nn->string), |
nn->pos + (p - nn->string), |
|
"Dt %s", nn->string); |
"Dt %s", nn->string); |
break; |
break; |
} |
} |
Line 2679 post_dt(POST_ARGS) |
|
Line 2621 post_dt(POST_ARGS) |
|
nn = nn->next; |
nn = nn->next; |
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_vmsg(MANDOCERR_MSEC_MISSING, |
mandoc_msg(MANDOCERR_MSEC_MISSING, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Dt %s", mdoc->meta.title); |
"Dt %s", mdoc->meta.title); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
return; /* msec and arch remain NULL. */ |
return; /* msec and arch remain NULL. */ |
Line 2692 post_dt(POST_ARGS) |
|
Line 2633 post_dt(POST_ARGS) |
|
|
|
cp = mandoc_a2msec(nn->string); |
cp = mandoc_a2msec(nn->string); |
if (cp == NULL) { |
if (cp == NULL) { |
mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_MSEC_BAD, |
nn->line, nn->pos, "Dt ... %s", nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |
Line 2710 post_dt(POST_ARGS) |
|
Line 2651 post_dt(POST_ARGS) |
|
/* Ignore fourth and later arguments. */ |
/* Ignore fourth and later arguments. */ |
|
|
if ((nn = nn->next) != NULL) |
if ((nn = nn->next) != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nn->line, nn->pos, "Dt ... %s", nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
} |
} |
|
|
Line 2731 post_bx(POST_ARGS) |
|
Line 2672 post_bx(POST_ARGS) |
|
!strcmp(nch->string, "Free") ? "Fx" : |
!strcmp(nch->string, "Free") ? "Fx" : |
!strcmp(nch->string, "DragonFly") ? "Dx" : NULL; |
!strcmp(nch->string, "DragonFly") ? "Dx" : NULL; |
if (macro != NULL) |
if (macro != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, |
n->line, n->pos, macro); |
n->line, n->pos, "%s", macro); |
mdoc->last = nch; |
mdoc->last = nch; |
nch = nch->next; |
nch = nch->next; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
Line 2780 post_os(POST_ARGS) |
|
Line 2721 post_os(POST_ARGS) |
|
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.os != NULL) |
if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
else if (mdoc->flags & MDOC_PBODY) |
else if (mdoc->flags & MDOC_PBODY) |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
|
|
post_delim(mdoc); |
post_delim(mdoc); |
|
|
Line 2813 post_os(POST_ARGS) |
|
Line 2752 post_os(POST_ARGS) |
|
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (defbuf == NULL) { |
if (defbuf == NULL) { |
if (uname(&utsname) == -1) { |
if (uname(&utsname) == -1) { |
mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse, |
mandoc_msg(MANDOCERR_OS_UNAME, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
defbuf = mandoc_strdup("UNKNOWN"); |
defbuf = mandoc_strdup("UNKNOWN"); |
} else |
} else |
mandoc_asprintf(&defbuf, "%s %s", |
mandoc_asprintf(&defbuf, "%s %s", |
|
|
*/ |
*/ |
|
|
if (n->child != NULL) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse, |
mandoc_msg(MANDOCERR_OS_ARG, n->child->line, n->child->pos, |
n->child->line, n->child->pos, |
|
"Os %s (%s)", n->child->string, |
"Os %s (%s)", n->child->string, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"OpenBSD" : "NetBSD"); |
"OpenBSD" : "NetBSD"); |
|
|
return; |
return; |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (mdoc->meta.os_e == MANDOC_OS_OPENBSD) |
if (mdoc->meta.os_e == MANDOC_OS_OPENBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING, |
mandoc_msg(MANDOCERR_MDOCDATE_MISSING, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "Dd %s (OpenBSD)", n->string); |
"Dd %s (OpenBSD)", n->string); |
|
} else { |
} else { |
if (mdoc->meta.os_e == MANDOC_OS_NETBSD) |
if (mdoc->meta.os_e == MANDOC_OS_NETBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE, |
mandoc_msg(MANDOCERR_MDOCDATE, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "Dd %s (NetBSD)", n->string); |
"Dd %s (NetBSD)", n->string); |
|
} |
} |
} |
} |
|
|