mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.16 and 1.19

version 1.16, 2008/11/28 18:15:29

version 1.19, 2008/11/29 16:23:22

Line 38

/* FIXME: NAME section needs specific elements. */

/* FIXME: don't print Os, just do roffbegin. */

#define ROFF_MAXARG 32

enum roffd {

Line 54 enum rofftype {

Line 56 enum rofftype {

#define ROFFCALL_ARGS \

int tok, struct rofftree *tree, \

const char *argv[], enum roffd type

char *argv[], enum roffd type

struct rofftree;

Line 70 struct rofftok {

Line 72 struct rofftok {

#define ROFF_CALLABLE (1 << 1) /* "Callable". */

#define ROFF_QUOTES (1 << 2) /* Quoted args. */

#define ROFF_SHALLOW (1 << 3) /* Nesting block. */

#define ROFF_PUNCT (1 << 4)

};

struct roffarg {

Line 129 static int roffargs(const struct rofftree *,

Line 132 static int roffargs(const struct rofftree *,

int, char *, char **);

static int roffargok(int, int);

static int roffnextopt(const struct rofftree *,

int, const char ***, char **);

int, char ***, char **);

static int roffparse(struct rofftree *, char *, size_t);

static int roffparse(struct rofftree *, char *);

static int textparse(const struct rofftree *,

static int textparse(const struct rofftree *, char *);

const char *, size_t);

static const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit,

Line 189 static const struct rofftok tokens[ROFF_MAX] = {

Line 191 static const struct rofftok tokens[ROFF_MAX] = {

{ roff_layout, roffarg_Bl, NULL, roffchild_Bl, 0, ROFF_LAYOUT, 0 }, /* Bl */

{ roff_close, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */

{ roff_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, ROFF_SHALLOW }, /* It */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ad */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Ad */

{ roff_text, roffarg_An, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* An */

{ roff_text, roffarg_An, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* An */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ar */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Ar */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Cd */ /* XXX man.4 only */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Cm */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dv */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Dv */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Er */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Er */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ev */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Ev */ /* XXX needs arg */

{ roff_text, roffarg_Ex, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ex */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fa */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Fa */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fd */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fl */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Fl */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fn */ /* XXX needs arg */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Fn */ /* XXX needs arg */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ft */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Ft */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ic */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Ic */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* In */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Li */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Li */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Nd */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Nm */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Nm */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Op */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Op */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ot */ /* XXX deprecated */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pa */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Pa */

{ roff_text, roffarg_Rv, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Rv */

{ roff_text, roffarg_St, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* St */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Va */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Va */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Vt */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Vt */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xr */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Xr */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %A */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %B */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %D */

Line 234 static const struct rofftok tokens[ROFF_MAX] = {

Line 236 static const struct rofftok tokens[ROFF_MAX] = {

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bf */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bq */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bq */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bsx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Bsx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Bx */

{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Db */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dc */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dq */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ef */ /* FIXME */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Em */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Em */ /* XXX needs arg */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Fx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Fx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ms */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Ms */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* No */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Nx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Nx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ox */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Ox */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */

{ roff_text, NULL, NULL, NULL, 0, ROFF_LAYOUT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */

Line 266 static const struct rofftok tokens[ROFF_MAX] = {

Line 268 static const struct rofftok tokens[ROFF_MAX] = {

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sq */

{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sx */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Sy */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_PUNCT }, /* Tn */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ux */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_PUNCT }, /* Ux */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */

{ roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */

Line 285 static const int tokenargs[ROFF_ARGMAX] = {

Line 287 static const int tokenargs[ROFF_ARGMAX] = {

0, ROFF_VALUE, ROFF_VALUE, 0,

0, 0, 0, 0,

0, 0, ROFF_VALUE, 0,

0, 0, 0, 0,

Line 295 static const int tokenargs[ROFF_ARGMAX] = {

Line 298 static const int tokenargs[ROFF_ARGMAX] = {

0, 0, 0, 0,

};

const char *const toknamesp[ROFF_MAX] = {

Line 360 roff_free(struct rofftree *tree, int flush)

Line 362 roff_free(struct rofftree *tree, int flush)

int error, t;

struct roffnode *n;

error = 0;

if ( ! flush)

goto end;

Line 372 roff_free(struct rofftree *tree, int flush)

Line 376 roff_free(struct rofftree *tree, int flush)

for (n = tree->last; n->parent; n = n->parent) {

if (0 != tokens[n->tok].ctx)

break;

continue;

roff_warn(tree, NULL, "closing explicit scope `%s'",

toknames[n->tok]);

goto end;

Line 384 roff_free(struct rofftree *tree, int flush)

Line 388 roff_free(struct rofftree *tree, int flush)

goto end;

}

if ( ! (*tree->cb.roffhead)(tree->arg))

goto end;

error = 0;

end:

Line 395 end:

Line 396 end:

roffnode_free(tree);

free(tree);

return(error ? 0 : 1);

}

Line 404 roff_alloc(const struct roffcb *cb, void *args)

Line 406 roff_alloc(const struct roffcb *cb, void *args)

{

struct rofftree *tree;

assert(args);

assert(cb);

if (NULL == (tree = calloc(1, sizeof(struct rofftree))))

err(1, "calloc");

Line 412 roff_alloc(const struct roffcb *cb, void *args)

Line 417 roff_alloc(const struct roffcb *cb, void *args)

(void)memcpy(&tree->cb, cb, sizeof(struct roffcb));

if ( ! (*tree->cb.roffhead)(args)) {

free(tree);

return(NULL);

}

return(tree);

}

int

roff_engine(struct rofftree *tree, char *buf, size_t sz)

roff_engine(struct rofftree *tree, char *buf)

{

tree->cur = NULL;

tree->cur = buf;

assert(buf);

if (0 == sz) {

if (0 == *buf) {

roff_warn(tree, buf, "blank line");

return(0);

} else if ('.' != *buf)

return(textparse(tree, buf, sz));

return(textparse(tree, buf));

return(roffparse(tree, buf, sz));

return(roffparse(tree, buf));

}

static int

textparse(const struct rofftree *tree, const char *buf, size_t sz)

textparse(const struct rofftree *tree, char *buf)

{

/* Print text. */

return((*tree->cb.roffdata)(tree->arg, buf));

return(1);

}

Line 512 roffscan(int tok, const int *tokv)

static int

roffparse(struct rofftree *tree, char *buf, size_t sz)

roffparse(struct rofftree *tree, char *buf)

{

int tok, t;

struct roffnode *n;

char *argv[ROFF_MAXARG];

const char **argvp;

char **argvp;

assert(sz > 0);

if (ROFF_MAX == (tok = rofffindtok(buf + 1))) {

roff_err(tree, buf + 1, "bogus line macro");

return(0);

Line 534 roffparse(struct rofftree *tree, char *buf, size_t sz)

Line 532 roffparse(struct rofftree *tree, char *buf, size_t sz)

if ( ! roffargs(tree, tok, buf, argv))

return(0);

argvp = (const char **)argv;

argvp = (char **)argv;

* Prelude macros break some assumptions, so branch now.

Line 561 roffparse(struct rofftree *tree, char *buf, size_t sz)

Line 559 roffparse(struct rofftree *tree, char *buf, size_t sz)

}

if ( ! roffscan(tok, tokens[tree->last->tok].children)) {

roff_err(tree, *argvp, "`%s' is invalid child `%s'",

roff_err(tree, *argvp, "`%s' is invalid child of `%s'",

toknames[tree->last->tok],

toknames[tok],

toknames[tok]);

toknames[tree->last->tok]);

return(0);

}

Line 758 roffnode_free(struct rofftree *tree)

Line 756 roffnode_free(struct rofftree *tree)

static int

roffnextopt(const struct rofftree *tree, int tok,

const char ***in, char **val)

char ***in, char **val)

{

const char *arg, **argv;

char *arg, **argv;

int v;

*val = NULL;

Line 867 roff_Os(ROFFCALL_ARGS)

Line 865 roff_Os(ROFFCALL_ARGS)

{

if (ROFF_EXIT == type) {

assert(ROFF_PRELUDE_Os & tree->state);

roffnode_free(tree);

return(roff_layout(tok, tree, argv, type));

return((*tree->cb.rofftail)(tree->arg));

} else if (ROFF_BODY & tree->state) {

assert( ! (ROFF_PRELUDE & tree->state));

assert(ROFF_PRELUDE_Os & tree->state);

Line 890 roff_Os(ROFFCALL_ARGS)

Line 888 roff_Os(ROFFCALL_ARGS)

assert(NULL == tree->last);

return(roff_layout(tok, tree, argv, type));

if (NULL == roffnode_new(tok, tree))

return(0);

return((*tree->cb.roffhead)(tree->arg));

}

Line 931 roff_layout(ROFFCALL_ARGS)

Line 932 roff_layout(ROFFCALL_ARGS)

if (NULL == roffnode_new(tok, tree))

return(0);

if ( ! (*tree->cb.roffblkin)(tree->arg, tok, argcp, argvp))

return(0);

if (NULL == *argv)

return(1);

if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp))

return(0);

if ( ! (ROFF_PARSED & tokens[tok].flags)) {

while (*argv) {

if ( ! (*tree->cb.roffdata)

if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))

(tree->arg, *argv++))

return(0);

}

return((*tree->cb.roffout)(tree->arg, tok));

if ( ! ((*tree->cb.roffout)(tree->arg, tok)))

return(0);

return((*tree->cb.roffblkin)(tree->arg, tok));

}

while (*argv) {

Line 959 roff_layout(ROFFCALL_ARGS)

Line 962 roff_layout(ROFFCALL_ARGS)

break;

}

assert(tree->arg);

if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))

return(0);

}

if ( ! ((*tree->cb.roffout)(tree->arg, tok)))

return((*tree->cb.roffout)(tree->arg, tok));

return(0);

return((*tree->cb.roffblkin)(tree->arg, tok));

}

CVSweb