version 1.103, 2010/07/01 21:44:47 |
version 1.121, 2010/10/11 15:46:19 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* TODO: ignoring Pp (it's superfluous in some invocations). */ |
|
|
|
#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n |
#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n |
#define POST_ARGS struct mdoc *mdoc |
#define POST_ARGS struct mdoc *mdoc |
|
|
|
enum check_ineq { |
|
CHECK_LT, |
|
CHECK_GT, |
|
CHECK_EQ |
|
}; |
|
|
|
enum check_lvl { |
|
CHECK_WARN, |
|
CHECK_ERROR, |
|
CHECK_FATAL |
|
}; |
|
|
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_post)(POST_ARGS); |
typedef int (*v_post)(POST_ARGS); |
|
|
|
|
v_post *post; |
v_post *post; |
}; |
}; |
|
|
|
static int check_count(struct mdoc *, enum mdoc_type, |
|
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 int check_stdarg(PRE_ARGS); |
static int check_text(struct mdoc *, int, int, char *); |
static int check_text(struct mdoc *, int, int, char *); |
static int 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 int check_args(struct mdoc *, struct mdoc_node *); |
static int err_child_lt(struct mdoc *, const char *, int); |
|
static int warn_child_lt(struct mdoc *, const char *, int); |
|
static int err_child_gt(struct mdoc *, const char *, int); |
|
static int warn_child_gt(struct mdoc *, const char *, int); |
|
static int err_child_eq(struct mdoc *, const char *, int); |
|
static int warn_child_eq(struct mdoc *, const char *, int); |
|
static int warn_count(struct mdoc *, const char *, |
|
int, const char *, int); |
|
static int err_count(struct mdoc *, const char *, |
|
int, const char *, int); |
|
|
|
|
static int ebool(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int ebool(POST_ARGS); |
|
static int eerr_eq0(POST_ARGS); |
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_le1(POST_ARGS); |
static int eerr_le1(POST_ARGS); |
|
static int ewarn_eq0(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); |
static int hwarn_eq1(POST_ARGS); |
|
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq0(POST_ARGS); |
|
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); |
Line 101 static int pre_display(PRE_ARGS); |
|
Line 105 static int pre_display(PRE_ARGS); |
|
static int pre_dt(PRE_ARGS); |
static int pre_dt(PRE_ARGS); |
static int pre_it(PRE_ARGS); |
static int pre_it(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
|
static int pre_pp(PRE_ARGS); |
static int pre_rv(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); |
Line 118 static v_post posts_it[] = { post_it, NULL }; |
|
Line 123 static v_post posts_it[] = { post_it, NULL }; |
|
static v_post posts_lb[] = { eerr_eq1, post_lb, NULL }; |
static v_post posts_lb[] = { eerr_eq1, post_lb, NULL }; |
static v_post posts_nd[] = { berr_ge1, NULL }; |
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[] = { ewarn_eq0, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, 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[] = { eerr_le1, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
Line 130 static v_post posts_vt[] = { post_vt, NULL }; |
|
Line 135 static v_post posts_vt[] = { post_vt, NULL }; |
|
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_pp, NULL }; |
static v_pre pres_bl[] = { pre_bl, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_pp, NULL }; |
static v_pre pres_d1[] = { pre_display, NULL }; |
static v_pre pres_d1[] = { pre_display, NULL }; |
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 }; |
Line 140 static v_pre pres_ex[] = { NULL, NULL }; |
|
Line 145 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_pp, NULL }; |
static v_pre pres_rv[] = { pre_rv, 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 }; |
|
|
const struct valids mdoc_valids[MDOC_MAX] = { |
const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pres_dd, posts_text }, /* Dd */ |
{ pres_dd, posts_wtext }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_os, NULL }, /* Os */ |
{ pres_os, NULL }, /* Os */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ NULL, posts_notext }, /* Pp */ |
{ pres_pp, posts_notext }, /* Pp */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_bd, posts_bd_bk }, /* Bd */ |
{ pres_bd, posts_bd_bk }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
Line 264 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 270 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Dx */ |
{ NULL, NULL }, /* Dx */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_notext }, /* br */ |
{ NULL, posts_notext }, /* br */ |
{ NULL, posts_sp }, /* sp */ |
{ pres_pp, posts_sp }, /* sp */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
}; |
}; |
Line 318 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 324 mdoc_valid_post(struct mdoc *mdoc) |
|
return(1); |
return(1); |
} |
} |
|
|
|
static int |
|
check_count(struct mdoc *m, enum mdoc_type type, |
|
enum check_lvl lvl, enum check_ineq ineq, int val) |
|
{ |
|
const char *p; |
|
|
static inline int |
if (m->last->type != type) |
warn_count(struct mdoc *m, const char *k, |
return(1); |
int want, const char *v, int has) |
|
|
switch (ineq) { |
|
case (CHECK_LT): |
|
p = "less than "; |
|
if (m->last->nchild < val) |
|
return(1); |
|
break; |
|
case (CHECK_GT): |
|
p = "greater than "; |
|
if (m->last->nchild > val) |
|
return(1); |
|
break; |
|
case (CHECK_EQ): |
|
p = ""; |
|
if (val == m->last->nchild) |
|
return(1); |
|
break; |
|
} |
|
|
|
if (CHECK_WARN == lvl) { |
|
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
|
m->last->line, m->last->pos, |
|
"want %s%d children (have %d)", |
|
p, val, m->last->nchild)); |
|
} |
|
|
|
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
|
m->last->line, m->last->pos, |
|
"require %s%d children (have %d)", |
|
p, val, m->last->nchild)); |
|
} |
|
|
|
static int |
|
berr_ge1(POST_ARGS) |
{ |
{ |
|
|
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
return(check_count(mdoc, MDOC_BODY, CHECK_FATAL, CHECK_GT, 0)); |
m->last->line, m->last->pos, |
|
"%s %s %d (have %d)", v, k, want, has)); |
|
} |
} |
|
|
|
static int |
|
bwarn_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0)); |
|
} |
|
|
static inline int |
static int |
err_count(struct mdoc *m, const char *k, |
eerr_eq0(POST_ARGS) |
int want, const char *v, int has) |
|
{ |
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 0)); |
|
} |
|
|
mdoc_vmsg(m, MANDOCERR_SYNTARGCOUNT, |
static int |
m->last->line, m->last->pos, |
eerr_eq1(POST_ARGS) |
"%s %s %d (have %d)", |
{ |
v, k, want, has); |
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 1)); |
return(0); |
|
} |
} |
|
|
|
static int |
|
eerr_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_GT, 0)); |
|
} |
|
|
/* |
static int |
* Build these up with macros because they're basically the same check |
eerr_le1(POST_ARGS) |
* for different inequalities. Yes, this could be done with functions, |
{ |
* but this is reasonable for now. |
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_LT, 2)); |
*/ |
} |
|
|
#define CHECK_CHILD_DEFN(lvl, name, ineq) \ |
static int |
static int \ |
ewarn_eq0(POST_ARGS) |
lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) \ |
{ |
{ \ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
if (mdoc->last->nchild ineq sz) \ |
|
return(1); \ |
|
return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \ |
|
} |
} |
|
|
#define CHECK_BODY_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
ewarn_ge1(POST_ARGS) |
b##lvl##_##name(POST_ARGS) \ |
{ |
{ \ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0)); |
if (MDOC_BODY != mdoc->last->type) \ |
|
return(1); \ |
|
return(func(mdoc, "multi-line arguments", (num))); \ |
|
} |
} |
|
|
#define CHECK_ELEM_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
herr_eq0(POST_ARGS) |
e##lvl##_##name(POST_ARGS) \ |
{ |
{ \ |
return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_EQ, 0)); |
assert(MDOC_ELEM == mdoc->last->type); \ |
|
return(func(mdoc, "line arguments", (num))); \ |
|
} |
} |
|
|
#define CHECK_HEAD_DEFN(name, lvl, func, num) \ |
static int |
static int \ |
herr_ge1(POST_ARGS) |
h##lvl##_##name(POST_ARGS) \ |
{ |
{ \ |
return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_GT, 0)); |
if (MDOC_HEAD != mdoc->last->type) \ |
|
return(1); \ |
|
return(func(mdoc, "line arguments", (num))); \ |
|
} |
} |
|
|
|
static int |
|
hwarn_eq0(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0)); |
|
} |
|
|
CHECK_CHILD_DEFN(warn, gt, >) /* warn_child_gt() */ |
static int |
CHECK_CHILD_DEFN(err, gt, >) /* err_child_gt() */ |
hwarn_eq1(POST_ARGS) |
CHECK_CHILD_DEFN(warn, eq, ==) /* warn_child_eq() */ |
{ |
CHECK_CHILD_DEFN(err, eq, ==) /* err_child_eq() */ |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 1)); |
CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */ |
} |
CHECK_CHILD_DEFN(warn, lt, <) /* warn_child_lt() */ |
|
CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0) /* bwarn_ge1() */ |
|
CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1() */ |
|
CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_ge1() */ |
|
CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */ |
|
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(ge1, err, err_child_gt, 0) /* eerr_ge1() */ |
|
CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0) /* herr_eq0() */ |
|
CHECK_HEAD_DEFN(le1, warn, warn_child_lt, 2) /* hwarn_le1() */ |
|
CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0) /* herr_ge1() */ |
|
CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1) /* hwarn_eq1() */ |
|
CHECK_HEAD_DEFN(eq0, warn, warn_child_eq, 0) /* hwarn_eq0() */ |
|
|
|
|
static int |
|
hwarn_le1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
|
} |
|
|
|
|
static int |
static int |
check_stdarg(PRE_ARGS) |
check_stdarg(PRE_ARGS) |
{ |
{ |
Line 454 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
Line 493 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
|
|
|
|
static int |
static int |
check_text(struct mdoc *mdoc, int line, int pos, char *p) |
check_text(struct mdoc *m, int ln, int pos, char *p) |
{ |
{ |
int c; |
int c; |
|
size_t sz; |
|
|
/* |
|
* FIXME: we absolutely cannot let \b get through or it will |
|
* destroy some assumptions in terms of format. |
|
*/ |
|
|
|
for ( ; *p; p++, pos++) { |
for ( ; *p; p++, pos++) { |
|
sz = strcspn(p, "\t\\"); |
|
p += (int)sz; |
|
|
|
if ('\0' == *p) |
|
break; |
|
|
|
pos += (int)sz; |
|
|
if ('\t' == *p) { |
if ('\t' == *p) { |
if ( ! (MDOC_LITERAL & mdoc->flags)) |
if (MDOC_LITERAL & m->flags) |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
continue; |
return(0); |
if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB)) |
} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p) |
continue; |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
return(0); |
return(0); |
} |
|
|
if ('\\' != *p) |
/* Check the special character. */ |
continue; |
|
|
|
c = mandoc_special(p); |
c = mandoc_special(p); |
if (c) { |
if (c) { |
p += c - 1; |
p += c - 1; |
pos += c - 1; |
pos += c - 1; |
continue; |
} else |
} |
mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
|
|
c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE); |
|
if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c) |
|
return(c); |
|
} |
} |
|
|
return(1); |
return(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 510 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
Line 546 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
} |
} |
|
|
|
|
|
|
static int |
static int |
pre_display(PRE_ARGS) |
pre_display(PRE_ARGS) |
{ |
{ |
Line 537 pre_display(PRE_ARGS) |
|
Line 572 pre_display(PRE_ARGS) |
|
static int |
static int |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
int i, comp, dup; |
int i, comp, dup; |
const char *offs, *width; |
const char *offs, *width; |
enum mdoc_list lt; |
enum mdoc_list lt; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
assert(n->parent); |
if (ENDBODY_NOT != n->end) { |
if (ENDBODY_NOT != n->end) |
assert(n->pending); |
return(1); |
np = n->pending->parent; |
assert(MDOC_BLOCK == n->parent->type); |
} else |
assert(MDOC_Bl == n->parent->tok); |
np = n->parent; |
assert(LIST__NONE != n->parent->data.Bl.type); |
|
memcpy(&n->data.Bl, &n->parent->data.Bl, |
assert(np); |
sizeof(struct mdoc_bl)); |
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bl == np->tok); |
|
assert(np->data.Bl); |
|
n->data.Bl = np->data.Bl; |
return(1); |
return(1); |
} |
} |
|
|
Line 559 pre_bl(PRE_ARGS) |
|
Line 598 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
assert(LIST__NONE == n->data.Bl.type); |
assert(NULL == n->data.Bl); |
|
n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
Line 603 pre_bl(PRE_ARGS) |
|
Line 643 pre_bl(PRE_ARGS) |
|
break; |
break; |
/* Set list arguments. */ |
/* Set list arguments. */ |
case (MDOC_Compact): |
case (MDOC_Compact): |
dup = n->data.Bl.comp; |
dup = n->data.Bl->comp; |
comp = 1; |
comp = 1; |
break; |
break; |
case (MDOC_Width): |
case (MDOC_Width): |
dup = (NULL != n->data.Bl.width); |
dup = (NULL != n->data.Bl->width); |
width = n->args->argv[i].value[0]; |
width = n->args->argv[i].value[0]; |
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bl.offs); |
dup = (NULL != n->data.Bl->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
break; |
break; |
|
default: |
|
continue; |
} |
} |
|
|
/* Check: duplicate auxiliary arguments. */ |
/* Check: duplicate auxiliary arguments. */ |
Line 628 pre_bl(PRE_ARGS) |
|
Line 670 pre_bl(PRE_ARGS) |
|
return(0); |
return(0); |
|
|
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bl.comp = comp; |
n->data.Bl->comp = comp; |
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bl.offs = offs; |
n->data.Bl->offs = offs; |
if (width && ! dup) |
if (width && ! dup) |
n->data.Bl.width = width; |
n->data.Bl->width = width; |
|
|
/* 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)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
return(0); |
return(0); |
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
if (LIST__NONE != lt && n->data.Bl.type == LIST__NONE) |
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { |
n->data.Bl.type = lt; |
n->data.Bl->type = lt; |
|
/* Set column information, too. */ |
|
if (LIST_column == lt) { |
|
n->data.Bl->ncols = |
|
n->args->argv[i].sz; |
|
n->data.Bl->cols = (const char **) |
|
n->args->argv[i].value; |
|
} |
|
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
if (n->data.Bl.type == LIST__NONE) |
if (n->data.Bl->type == LIST__NONE) |
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)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
return(0); |
return(0); |
|
|
Line 659 pre_bl(PRE_ARGS) |
|
Line 709 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)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE)) |
return(0); |
return(0); |
n->data.Bl.type = LIST_item; |
n->data.Bl->type = LIST_item; |
} |
} |
|
|
/* |
/* |
Line 671 pre_bl(PRE_ARGS) |
|
Line 721 pre_bl(PRE_ARGS) |
|
* and must also be warned. |
* and must also be warned. |
*/ |
*/ |
|
|
switch (n->data.Bl.type) { |
switch (n->data.Bl->type) { |
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)) |
if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
break; |
break; |
Line 687 pre_bl(PRE_ARGS) |
|
Line 737 pre_bl(PRE_ARGS) |
|
case (LIST_inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
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)) |
if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
break; |
break; |
Line 703 pre_bl(PRE_ARGS) |
|
Line 753 pre_bl(PRE_ARGS) |
|
static int |
static int |
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
int i, dup, comp; |
int i, dup, comp; |
enum mdoc_disp dt; |
enum mdoc_disp dt; |
const char *offs; |
const char *offs; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
assert(n->parent); |
if (ENDBODY_NOT != n->end) { |
assert(MDOC_BLOCK == n->parent->type); |
assert(n->pending); |
assert(MDOC_Bd == n->parent->tok); |
np = n->pending->parent; |
assert(DISP__NONE != n->parent->data.Bd.type); |
} else |
memcpy(&n->data.Bd, &n->parent->data.Bd, |
np = n->parent; |
sizeof(struct mdoc_bd)); |
|
|
assert(np); |
|
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bd == np->tok); |
|
assert(np->data.Bd); |
|
n->data.Bd = np->data.Bd; |
return(1); |
return(1); |
} |
} |
|
|
assert(DISP__NONE == n->data.Bd.type); |
assert(NULL == n->data.Bd); |
|
n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
Line 748 pre_bd(PRE_ARGS) |
|
Line 805 pre_bd(PRE_ARGS) |
|
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bd.offs); |
dup = (NULL != n->data.Bd->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
Line 756 pre_bd(PRE_ARGS) |
|
Line 813 pre_bd(PRE_ARGS) |
|
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
comp = 1; |
comp = 1; |
dup = n->data.Bd.comp; |
dup = n->data.Bd->comp; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 771 pre_bd(PRE_ARGS) |
|
Line 828 pre_bd(PRE_ARGS) |
|
/* Make our auxiliary assignments. */ |
/* Make our auxiliary assignments. */ |
|
|
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bd.offs = offs; |
n->data.Bd->offs = offs; |
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bd.comp = comp; |
n->data.Bd->comp = comp; |
|
|
/* 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)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
return(0); |
return(0); |
|
|
/* Make our type assignment. */ |
/* Make our type assignment. */ |
|
|
if (DISP__NONE != dt && n->data.Bd.type == DISP__NONE) |
if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) |
n->data.Bd.type = dt; |
n->data.Bd->type = dt; |
} |
} |
|
|
if (DISP__NONE == n->data.Bd.type) { |
if (DISP__NONE == n->data.Bd->type) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
return(0); |
return(0); |
n->data.Bd.type = DISP_ragged; |
n->data.Bd->type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(1); |
Line 836 pre_it(PRE_ARGS) |
|
Line 893 pre_it(PRE_ARGS) |
|
static int |
static int |
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
|
int i; |
|
|
if (NULL == n->args || 1 == n->args->argc) |
if (NULL == n->args) |
return(1); |
return(1); |
mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT, |
|
n->line, n->pos, |
for (i = 1; i < (int)n->args->argc; i++) |
"line arguments == 1 (have %d)", |
if ( ! mdoc_pmsg(mdoc, n->args->argv[i].line, |
n->args->argc); |
n->args->argv[i].pos, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
|
|
|
if (MDOC_Split == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_split; |
|
else if (MDOC_Nosplit == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_nosplit; |
|
else |
|
abort(); |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 919 pre_dd(PRE_ARGS) |
|
Line 986 pre_dd(PRE_ARGS) |
|
static int |
static int |
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
char *p; |
struct mdoc_node *np; |
struct mdoc_node *head; |
enum mdocargt arg; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
/* |
return(1); |
* Unlike other data pointers, these are "housed" by the HEAD |
|
* element, which contains the goods. |
|
*/ |
|
|
head = mdoc->last->head; |
if (MDOC_HEAD != mdoc->last->type) { |
|
if (ENDBODY_NOT != mdoc->last->end) { |
|
assert(mdoc->last->pending); |
|
np = mdoc->last->pending->parent->head; |
|
} else if (MDOC_BLOCK != mdoc->last->type) { |
|
np = mdoc->last->parent->head; |
|
} else |
|
np = mdoc->last->head; |
|
|
if (mdoc->last->args && head->child) { |
assert(np); |
/* FIXME: this should provide a default. */ |
assert(MDOC_HEAD == np->type); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT); |
assert(MDOC_Bf == np->tok); |
return(0); |
assert(np->data.Bf); |
} else if (mdoc->last->args) |
mdoc->last->data.Bf = np->data.Bf; |
return(1); |
return(1); |
|
} |
|
|
if (NULL == head->child || MDOC_TEXT != head->child->type) { |
np = mdoc->last; |
/* FIXME: this should provide a default. */ |
assert(MDOC_BLOCK == np->parent->type); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT); |
assert(MDOC_Bf == np->parent->tok); |
|
np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf)); |
|
|
|
/* |
|
* Cannot have both argument and parameter. |
|
* If neither is specified, let it through with a warning. |
|
*/ |
|
|
|
if (np->parent->args && np->child) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
|
} else if (NULL == np->parent->args && NULL == np->child) |
|
return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)); |
|
|
|
/* Extract argument into data. */ |
|
|
|
if (np->parent->args) { |
|
arg = np->parent->args->argv[0].arg; |
|
if (MDOC_Emphasis == arg) |
|
np->data.Bf->font = FONT_Em; |
|
else if (MDOC_Literal == arg) |
|
np->data.Bf->font = FONT_Li; |
|
else if (MDOC_Symbolic == arg) |
|
np->data.Bf->font = FONT_Sy; |
|
else |
|
abort(); |
|
return(1); |
} |
} |
|
|
p = head->child->string; |
/* Extract parameter into data. */ |
|
|
if (0 == strcmp(p, "Em")) |
if (0 == strcmp(np->child->string, "Em")) |
return(1); |
np->data.Bf->font = FONT_Em; |
else if (0 == strcmp(p, "Li")) |
else if (0 == strcmp(np->child->string, "Li")) |
return(1); |
np->data.Bf->font = FONT_Li; |
else if (0 == strcmp(p, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
return(1); |
np->data.Bf->font = FONT_Sy; |
|
else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)) |
|
return(0); |
|
|
mdoc_nmsg(mdoc, head, MANDOCERR_FONTTYPE); |
return(1); |
return(0); |
|
} |
} |
|
|
|
|
Line 1028 post_at(POST_ARGS) |
|
Line 1131 post_at(POST_ARGS) |
|
static int |
static int |
post_an(POST_ARGS) |
post_an(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *np; |
|
|
if (mdoc->last->args) { |
np = mdoc->last; |
if (NULL == mdoc->last->child) |
if (AUTH__NONE != np->data.An.auth && np->child) |
return(1); |
return(eerr_eq0(mdoc)); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGCOUNT)); |
/* |
} |
* FIXME: make this ewarn and make sure that the front-ends |
|
* don't print the arguments. |
if (mdoc->last->child) |
*/ |
|
if (AUTH__NONE != np->data.An.auth || np->child) |
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS)); |
} |
} |
|
|
|
|
Line 1053 post_it(POST_ARGS) |
|
Line 1158 post_it(POST_ARGS) |
|
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
n = mdoc->last->parent->parent; |
lt = n->data.Bl.type; |
assert(n->data.Bl); |
|
lt = n->data.Bl->type; |
|
|
if (LIST__NONE == lt) { |
if (LIST__NONE == lt) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
Line 1078 post_it(POST_ARGS) |
|
Line 1184 post_it(POST_ARGS) |
|
if (NULL == mdoc->last->head->child) |
if (NULL == mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1089 post_it(POST_ARGS) |
|
Line 1192 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 ( ! 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)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = -1; |
cols = (int)n->data.Bl->ncols; |
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Column == n->args->argv[i].arg) { |
|
cols = (int)n->args->argv[i].sz; |
|
break; |
|
} |
|
|
|
assert(-1 != cols); |
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
if (NULL == mdoc->last->body->child) |
Line 1139 post_it(POST_ARGS) |
|
Line 1236 post_it(POST_ARGS) |
|
static int |
static int |
post_bl_head(POST_ARGS) |
post_bl_head(POST_ARGS) |
{ |
{ |
int i; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(mdoc->last->parent); |
assert(mdoc->last->parent); |
n = mdoc->last->parent; |
n = mdoc->last->parent; |
|
|
if (LIST_column == n->data.Bl.type) { |
if (LIST_column == n->data.Bl->type) { |
for (i = 0; i < (int)n->args->argc; i++) |
if (n->data.Bl->ncols && mdoc->last->nchild) { |
if (MDOC_Column == n->args->argv[i].arg) |
|
break; |
|
assert(i < (int)n->args->argc); |
|
|
|
if (n->args->argv[i].sz && mdoc->last->nchild) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
return(0); |
return(0); |
} |
} |
return(1); |
return(1); |
} |
} |
|
|
if (0 == (i = mdoc->last->nchild)) |
/* FIXME: should be ERROR class. */ |
return(1); |
return(hwarn_eq0(mdoc)); |
return(warn_count(mdoc, "==", 0, "line arguments", i)); |
|
} |
} |
|
|
|
|
Line 1418 post_sh_head(POST_ARGS) |
|
Line 1508 post_sh_head(POST_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
pre_pp(PRE_ARGS) |
|
{ |
|
|
|
if (NULL == mdoc->last) |
|
return(1); |
|
|
|
/* Don't allow prior `Lp' or `Pp'. */ |
|
|
|
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
|
return(1); |
|
|
|
if (MDOC_Bl == n->tok && n->data.Bl->comp) |
|
return(1); |
|
if (MDOC_Bd == n->tok && n->data.Bd->comp) |
|
return(1); |
|
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
} |
} |