mandoc/mdoc_validate.c - diff

Return to mdoc_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_validate.c between version 1.285 and 1.294

version 1.285, 2015/04/02 22:48:17

version 1.294, 2015/10/06 18:32:19

Line 36

#include "roff.h"

#include "mdoc.h"

#include "libmandoc.h"

#include "roff_int.h"

#include "libmdoc.h"

/* FIXME: .Bl -diag can't have non-text children in HEAD. */

#define PRE_ARGS struct mdoc *mdoc, struct roff_node *n

#define PRE_ARGS struct roff_man *mdoc, struct roff_node *n

#define POST_ARGS struct mdoc *mdoc

#define POST_ARGS struct roff_man *mdoc

enum check_ineq {

CHECK_LT,

Line 57 struct valids {

Line 58 struct valids {

v_post post;

};

static void check_text(struct mdoc *, int, int, char *);

static void check_text(struct roff_man *, int, int, char *);

static void check_argv(struct mdoc *,

static void check_argv(struct roff_man *,

struct roff_node *, struct mdoc_argv *);

static void check_args(struct mdoc *, struct roff_node *);

static void check_args(struct roff_man *, struct roff_node *);

static int child_an(const struct roff_node *);

static enum roff_sec a2sec(const char *);

static size_t macro2len(int);

Line 106 static void post_sh_see_also(POST_ARGS);

Line 107 static void post_sh_see_also(POST_ARGS);

static void post_sh_authors(POST_ARGS);

static void post_sm(POST_ARGS);

static void post_st(POST_ARGS);

static void post_vt(POST_ARGS);

static void pre_an(PRE_ARGS);

static void pre_bd(PRE_ARGS);

Line 160 static const struct valids mdoc_valids[MDOC_MAX] = {

{ pre_std, NULL }, /* Rv */

{ NULL, post_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, post_vt }, /* Vt */

{ NULL, NULL }, /* Vt */

{ NULL, NULL }, /* Xr */

{ NULL, NULL }, /* %A */

{ NULL, post_hyph }, /* %B */ /* FIXME: can be used outside Rs/Re. */

Line 293 static const char * const secnames[SEC__MAX] = {

void

mdoc_valid_pre(struct mdoc *mdoc, struct roff_node *n)

mdoc_valid_pre(struct roff_man *mdoc, struct roff_node *n)

{

v_pre p;

Line 319 mdoc_valid_pre(struct mdoc *mdoc, struct roff_node *n)

}

void

mdoc_valid_post(struct mdoc *mdoc)

mdoc_valid_post(struct roff_man *mdoc)

{

struct roff_node *n;

v_post p;

Line 362 mdoc_valid_post(struct mdoc *mdoc)

}

static void

check_args(struct mdoc *mdoc, struct roff_node *n)

check_args(struct roff_man *mdoc, struct roff_node *n)

{

int i;

Line 375 check_args(struct mdoc *mdoc, struct roff_node *n)

}

static void

check_argv(struct mdoc *mdoc, struct roff_node *n, struct mdoc_argv *v)

check_argv(struct roff_man *mdoc, struct roff_node *n, struct mdoc_argv *v)

{

int i;

Line 384 check_argv(struct mdoc *mdoc, struct roff_node *n, str

}

static void

check_text(struct mdoc *mdoc, int ln, int pos, char *p)

check_text(struct roff_man *mdoc, int ln, int pos, char *p)

{

char *cp;

Line 657 pre_bd(PRE_ARGS)

break;

default:

abort();

/* NOTREACHED */

}

if (DISP__NONE == dt)

continue;

Line 904 post_fo(POST_ARGS)

Line 903 post_fo(POST_ARGS)

n->child->next->line, n->child->next->pos,

"Fo ... %s", n->child->next->string);

while (n->child != n->last)

mdoc_node_delete(mdoc, n->last);

roff_node_delete(mdoc, n->last);

}

post_fname(mdoc);

Line 932 post_fa(POST_ARGS)

Line 931 post_fa(POST_ARGS)

}

static void

post_vt(POST_ARGS)

{

const struct roff_node *n;

* The Vt macro comes in both ELEM and BLOCK form, both of which

* have different syntaxes (yet more context-sensitive

* behaviour). ELEM types must have a child, which is already

* guaranteed by the in_line parsing routine; BLOCK types,

* specifically the BODY, should only have TEXT children.

if (mdoc->last->type != ROFFT_BODY)

return;

for (n = mdoc->last->child; n; n = n->next)

if (n->type != ROFFT_TEXT)

mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

}

static void

post_nm(POST_ARGS)

{

struct roff_node *n;

Line 968 post_nm(POST_ARGS)

Line 945 post_nm(POST_ARGS)

if (NULL != mdoc->meta.name)

return;

mdoc_deroff(&mdoc->meta.name, n);

deroff(&mdoc->meta.name, n);

if (NULL == mdoc->meta.name)

mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,

Line 1046 post_defaults(POST_ARGS)

Line 1023 post_defaults(POST_ARGS)

return;

nn = mdoc->last;

mdoc->next = MDOC_NEXT_CHILD;

mdoc->next = ROFF_NEXT_CHILD;

switch (nn->tok) {

case MDOC_Ar:

mdoc_word_alloc(mdoc, nn->line, nn->pos, "file");

roff_word_alloc(mdoc, nn->line, nn->pos, "file");

mdoc_word_alloc(mdoc, nn->line, nn->pos, "...");

roff_word_alloc(mdoc, nn->line, nn->pos, "...");

break;

case MDOC_Pa:

/* FALLTHROUGH */

case MDOC_Mt:

mdoc_word_alloc(mdoc, nn->line, nn->pos, "~");

roff_word_alloc(mdoc, nn->line, nn->pos, "~");

break;

default:

abort();

/* NOTREACHED */

}

mdoc->last = nn;

}

Line 1074 post_at(POST_ARGS)

Line 1050 post_at(POST_ARGS)

n = mdoc->last;

if (n->child == NULL) {

mdoc->next = MDOC_NEXT_CHILD;

mdoc->next = ROFF_NEXT_CHILD;

mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");

roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");

mdoc->last = n;

return;

}

Line 1246 post_bl_block(POST_ARGS)

Line 1222 post_bl_block(POST_ARGS)

mdoc->parse, nc->line, nc->pos,

"%s before It",

mdoc_macronames[nc->tok]);

mdoc_node_delete(mdoc, nc);

roff_node_delete(mdoc, nc);

} else

break;

nc = ni->body->last;

Line 1268 rewrite_macro2len(char **arg)

Line 1244 rewrite_macro2len(char **arg)

return;

else if ( ! strcmp(*arg, "Ds"))

width = 6;

else if ((tok = mdoc_hash_find(*arg)) == MDOC_MAX)

else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE)

return;

else

width = macro2len(tok);

Line 1357 post_bl_head(POST_ARGS)

Line 1333 post_bl_head(POST_ARGS)

mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,

nch->line, nch->pos, "Bl ... %s", nch->string);

while (nch != NULL) {

mdoc_node_delete(mdoc, nch);

roff_node_delete(mdoc, nch);

nch = nh->child;

}

return;

Line 1398 post_bl_head(POST_ARGS)

Line 1374 post_bl_head(POST_ARGS)

argv->value[i++] = nch->string;

nch->string = NULL;

nnext = nch->next;

mdoc_node_delete(NULL, nch);

roff_node_delete(NULL, nch);

}

nh->nchild = 0;

nh->child = NULL;

Line 1497 post_bk(POST_ARGS)

Line 1473 post_bk(POST_ARGS)

if (n->type == ROFFT_BLOCK && n->body->child == NULL) {

mandoc_msg(MANDOCERR_BLK_EMPTY,

mdoc->parse, n->line, n->pos, "Bk");

mdoc_node_delete(mdoc, n);

roff_node_delete(mdoc, n);

}

static void

post_sm(struct mdoc *mdoc)

post_sm(struct roff_man *mdoc)

{

struct roff_node *nch;

Line 1561 post_root(POST_ARGS)

Line 1537 post_root(POST_ARGS)

/* Check that we begin with a proper `Sh'. */

n = mdoc->first->child;

while (n != NULL && mdoc_macros[n->tok].flags & MDOC_PROLOGUE)

while (n != NULL && n->tok != TOKEN_NONE &&

mdoc_macros[n->tok].flags & MDOC_PROLOGUE)

n = n->next;

if (n == NULL)

Line 1585 post_st(POST_ARGS)

Line 1562 post_st(POST_ARGS)

if (NULL == (p = mdoc_a2st(nch->string))) {

mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,

nch->line, nch->pos, "St %s", nch->string);

mdoc_node_delete(mdoc, n);

roff_node_delete(mdoc, n);

} else {

free(nch->string);

nch->string = mandoc_strdup(p);

Line 1632 post_rs(POST_ARGS)

Line 1609 post_rs(POST_ARGS)

* Remove this child from the chain. This somewhat

* repeats mdoc_node_unlink(), but since we're

* repeats roff_node_unlink(), but since we're

* just re-ordering, there's no need for the

* full unlink process.

Line 1764 post_sh_name(POST_ARGS)

Line 1741 post_sh_name(POST_ARGS)

mandoc_msg(MANDOCERR_NAMESEC_ND,

mdoc->parse, n->line, n->pos, NULL);

break;

case MDOC_MAX:

case TOKEN_NONE:

if (hasnm)

break;

/* FALLTHROUGH */

Line 1851 child_an(const struct roff_node *n)

Line 1828 child_an(const struct roff_node *n)

for (n = n->child; n != NULL; n = n->next)

if ((n->tok == MDOC_An && n->nchild) || child_an(n))

return(1);

return 1;

return(0);

return 0;

}

static void

Line 1881 post_sh_head(POST_ARGS)

Line 1858 post_sh_head(POST_ARGS)

secname = NULL;

sec = SEC_CUSTOM;

mdoc_deroff(&secname, mdoc->last);

deroff(&secname, mdoc->last);

sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);

/* The NAME should be first. */

Line 2005 post_ignpar(POST_ARGS)

Line 1982 post_ignpar(POST_ARGS)

mdoc->parse, np->line, np->pos,

"%s after %s", mdoc_macronames[np->tok],

mdoc_macronames[mdoc->last->tok]);

mdoc_node_delete(mdoc, np);

roff_node_delete(mdoc, np);

}

if (NULL != (np = mdoc->last->last))

Line 2014 post_ignpar(POST_ARGS)

Line 1991 post_ignpar(POST_ARGS)

np->line, np->pos, "%s at the end of %s",

mdoc_macronames[np->tok],

mdoc_macronames[mdoc->last->tok]);

mdoc_node_delete(mdoc, np);

roff_node_delete(mdoc, np);

}

Line 2047 pre_par(PRE_ARGS)

Line 2024 pre_par(PRE_ARGS)

mdoc->last->line, mdoc->last->pos,

"%s before %s", mdoc_macronames[mdoc->last->tok],

mdoc_macronames[n->tok]);

mdoc_node_delete(mdoc, mdoc->last);

roff_node_delete(mdoc, mdoc->last);

}

static void

Line 2080 post_par(POST_ARGS)

Line 2057 post_par(POST_ARGS)

mdoc->last->line, mdoc->last->pos,

"%s after %s", mdoc_macronames[mdoc->last->tok],

mdoc_macronames[np->tok]);

mdoc_node_delete(mdoc, mdoc->last);

roff_node_delete(mdoc, mdoc->last);

}

static void

Line 2109 pre_literal(PRE_ARGS)

Line 2086 pre_literal(PRE_ARGS)

break;

default:

abort();

/* NOTREACHED */

}

Line 2130 post_dd(POST_ARGS)

Line 2106 post_dd(POST_ARGS)

}

datestr = NULL;

mdoc_deroff(&datestr, n);

deroff(&datestr, n);

if (mdoc->quick)

mdoc->meta.date = datestr;

else {

Line 2139 post_dd(POST_ARGS)

Line 2115 post_dd(POST_ARGS)

free(datestr);

}

out:

mdoc_node_delete(mdoc, n);

roff_node_delete(mdoc, n);

}

static void

Line 2224 post_dt(POST_ARGS)

Line 2200 post_dt(POST_ARGS)

nn->line, nn->pos, "Dt ... %s", nn->string);

out:

mdoc_node_delete(mdoc, n);

roff_node_delete(mdoc, n);

}

static void

Line 2265 post_os(POST_ARGS)

Line 2241 post_os(POST_ARGS)

free(mdoc->meta.os);

mdoc->meta.os = NULL;

mdoc_deroff(&mdoc->meta.os, n);

deroff(&mdoc->meta.os, n);

if (mdoc->meta.os)

goto out;

Line 2290 post_os(POST_ARGS)

Line 2266 post_os(POST_ARGS)

#endif /*!OSNAME*/

out:

mdoc_node_delete(mdoc, n);

roff_node_delete(mdoc, n);

}

Line 2313 post_ex(POST_ARGS)

Line 2289 post_ex(POST_ARGS)

return;

}

mdoc->next = MDOC_NEXT_CHILD;

mdoc->next = ROFF_NEXT_CHILD;

mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);

roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);

mdoc->last = n;

}

Line 2325 a2sec(const char *p)

Line 2301 a2sec(const char *p)

for (i = 0; i < (int)SEC__MAX; i++)

if (secnames[i] && 0 == strcmp(p, secnames[i]))

return((enum roff_sec)i);

return (enum roff_sec)i;

return(SEC_CUSTOM);

return SEC_CUSTOM;

}

static size_t

Line 2336 macro2len(int macro)

Line 2312 macro2len(int macro)

switch (macro) {

case MDOC_Ad:

return(12);

return 12;

case MDOC_Ao:

return(12);

return 12;

case MDOC_An:

return(12);

return 12;

case MDOC_Aq:

return(12);

return 12;

case MDOC_Ar:

return(12);

return 12;

case MDOC_Bo:

return(12);

return 12;

case MDOC_Bq:

return(12);

return 12;

case MDOC_Cd:

return(12);

return 12;

case MDOC_Cm:

return(10);

return 10;

case MDOC_Do:

return(10);

return 10;

case MDOC_Dq:

return(12);

return 12;

case MDOC_Dv:

return(12);

return 12;

case MDOC_Eo:

return(12);

return 12;

case MDOC_Em:

return(10);

return 10;

case MDOC_Er:

return(17);

return 17;

case MDOC_Ev:

return(15);

return 15;

case MDOC_Fa:

return(12);

return 12;

case MDOC_Fl:

return(10);

return 10;

case MDOC_Fo:

return(16);

return 16;

case MDOC_Fn:

return(16);

return 16;

case MDOC_Ic:

return(10);

return 10;

case MDOC_Li:

return(16);

return 16;

case MDOC_Ms:

return(6);

return 6;

case MDOC_Nm:

return(10);

return 10;

case MDOC_No:

return(12);

return 12;

case MDOC_Oo:

return(10);

return 10;

case MDOC_Op:

return(14);

return 14;

case MDOC_Pa:

return(32);

return 32;

case MDOC_Pf:

return(12);

return 12;

case MDOC_Po:

return(12);

return 12;

case MDOC_Pq:

return(12);

return 12;

case MDOC_Ql:

return(16);

return 16;

case MDOC_Qo:

return(12);

return 12;

case MDOC_So:

return(12);

return 12;

case MDOC_Sq:

return(12);

return 12;

case MDOC_Sy:

return(6);

return 6;

case MDOC_Sx:

return(16);

return 16;

case MDOC_Tn:

return(10);

return 10;

case MDOC_Va:

return(12);

return 12;

case MDOC_Vt:

return(12);

return 12;

case MDOC_Xr:

return(10);

return 10;

default:

break;

};

return(0);

return 0;

}

CVSweb