mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.36 and 1.40

version 1.36, 2008/12/04 11:25:29

version 1.40, 2008/12/04 23:10:51

Line 42

/* TODO: macros with a set number of arguments? */

/* TODO: validate Dt macro arguments. */

#define ROFF_MAXARG 32

enum roffd {

ROFF_ENTER = 0,

ROFF_EXIT

Line 69 struct rofftok {

Line 67 struct rofftok {

const int *children; /* Limit to kids. */

int ctx; /* Blk-close node. */

enum rofftype type; /* Type of macro. */

int flags;

#define ROFF_PARSED (1 << 0) /* "Parsed". */

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

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

#define ROFF_LSCOPE (1 << 3) /* Line scope. */

};

struct roffarg {

int flags;

#define ROFF_VALUE (1 << 0) /* Has a value. */

};

struct roffnode {

int tok; /* Token id. */

struct roffnode *parent; /* Parent (or NULL). */

Line 113 static int roff_layout(ROFFCALL_ARGS);

Line 106 static int roff_layout(ROFFCALL_ARGS);

static int roff_text(ROFFCALL_ARGS);

static int roff_noop(ROFFCALL_ARGS);

static int roff_depr(ROFFCALL_ARGS);

static int roff_ordered(ROFFCALL_ARGS);

static struct roffnode *roffnode_new(int, struct rofftree *);

static void roffnode_free(struct rofftree *);

static void roff_warn(const struct rofftree *,

Line 133 static int roffparseopts(struct rofftree *, int,

Line 127 static int roffparseopts(struct rofftree *, int,

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

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

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

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

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

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

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

#ifdef __linux__

extern size_t strlcat(char *, const char *, size_t);

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

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

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* 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 }, /* Fn */ /* XXX needs arg */ /* FIXME */

{roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, /*XXX*/ -1 }, /* Fn */

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* 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, 0 }, /* In */

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

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

{ 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 }, /* Vt */ /* XXX needs arg */

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

{roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, /*XXX*/ -1 }, /* Xr */

{ 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 250 static const struct rofftok tokens[ROFF_MAX] = {

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

{ 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 }, /* Ms */

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

{ roff_Ns, 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 }, /* Ox */

Line 272 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 }, /* Sy */

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

{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* 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 */

{ roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */

{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */

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

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

{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */

};

#define ROFF_VALUE (1 << 0)

static const int tokenargs[ROFF_ARGMAX] = {

0, 0, 0, 0,

0, ROFF_VALUE, ROFF_VALUE, 0,

Line 450 roff_engine(struct rofftree *tree, char *buf)

Line 448 roff_engine(struct rofftree *tree, char *buf)

static int

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

textparse(struct rofftree *tree, char *buf)

{

char *bufp;

/* TODO: literal parsing. */

if ( ! (ROFF_BODY & tree->state)) {

roff_err(tree, buf, "data not in body");

return(0);

}

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

/* LINTED */

while (*buf) {

while (*buf && isspace(*buf))

buf++;

if (0 == *buf)

break;

bufp = buf++;

while (*buf && ! isspace(*buf))

buf++;

if (0 != *buf) {

*buf++ = 0;

if ( ! roffdata(tree, 1, bufp))

return(0);

continue;

}

if ( ! roffdata(tree, 1, bufp))

return(0);

break;

}

return(1);

}

Line 473 roffargs(const struct rofftree *tree,

Line 500 roffargs(const struct rofftree *tree,

p = buf;

* This is an ugly little loop. It parses a line into

* space-delimited tokens. If a quote mark is encountered, a

* token is alloted the entire quoted text. If whitespace is

* escaped, it's included in the prior alloted token.

/* LINTED */

for (i = 0; *buf && i < ROFF_MAXARG; i++) {

for (i = 0; *buf && i < ROFF_MAXLINEARG; i++) {

if ('\"' == *buf) {

argv[i] = ++buf;

while (*buf && '\"' != *buf)

Line 488 roffargs(const struct rofftree *tree,

Line 522 roffargs(const struct rofftree *tree,

}

} else {

argv[i] = buf++;

while (*buf && ! isspace(*buf))

while (*buf) {

buf++;

if ( ! isspace(*buf)) {

buf++;

continue;

}

if (*(buf - 1) == '\\') {

buf++;

continue;

}

break;

}

if (0 == *buf)

continue;

}

Line 497 roffargs(const struct rofftree *tree,

Line 540 roffargs(const struct rofftree *tree,

while (*buf && isspace(*buf))

buf++;

}

assert(i > 0);

if (ROFF_MAXARG == i && *buf) {

if (ROFF_MAXLINEARG == i && *buf) {

roff_err(tree, p, "too many arguments for `%s'", toknames

[tok]);

return(0);

Line 530 roffparse(struct rofftree *tree, char *buf)

Line 573 roffparse(struct rofftree *tree, char *buf)

{

int tok, t;

struct roffnode *n;

char *argv[ROFF_MAXARG];

char *argv[ROFF_MAXLINEARG];

char **argvp;

if (0 != *buf && 0 != *(buf + 1) && 0 != *(buf + 2))

Line 833 roffnode_free(struct rofftree *tree)

Line 876 roffnode_free(struct rofftree *tree)

static int

roffspecial(struct rofftree *tree, int tok, char **ordp)

{

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

tree->cur, ordp));

}

static int

roffcall(struct rofftree *tree, int tok, char **argv)

{

Line 907 roffpurgepunct(struct rofftree *tree, char **argv)

Line 959 roffpurgepunct(struct rofftree *tree, char **argv)

/* LINTED */

while (argv[i])

if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))

if ( ! roffdata(tree, 0, argv[i++]))

return(0);

return(1);

}

Line 938 roffparseopts(struct rofftree *tree, int tok,

Line 990 roffparseopts(struct rofftree *tree, int tok,

}

static int

roffdata(struct rofftree *tree, int space, char *buf)

{

if (0 == *buf)

return(1);

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

space != 0, tree->cur, buf));

}

/* ARGSUSED */

static int

roff_Dd(ROFFCALL_ARGS)

Line 1085 roff_Dt(ROFFCALL_ARGS)

Line 1148 roff_Dt(ROFFCALL_ARGS)

static int

roff_Sm(ROFFCALL_ARGS)

{

int argcp[1];

char *morep[1], *p;

char *argvp[1], *morep[1], *p;

p = *argv++;

argcp[0] = ROFF_ARGMAX;

argvp[0] = NULL;

if (NULL == (morep[0] = *argv++)) {

roff_err(tree, p, "`Sm' expects an argument");

return(0);

Line 1104 roff_Sm(ROFFCALL_ARGS)

Line 1164 roff_Sm(ROFFCALL_ARGS)

if (*argv)

roff_warn(tree, *argv, "`Sm' shouldn't have arguments");

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

if ( ! roffspecial(tree, tok, morep))

tok, argcp, argvp, morep))

return(0);

while (*argv) {

while (*argv)

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

if ( ! roffdata(tree, 1, *argv++))

continue;

return(0);

}

return(1);

}

Line 1123 static int

Line 1180 static int

roff_Ns(ROFFCALL_ARGS)

{

int j, c, first;

int argcp[1];

char *morep[1];

char *argvp[1], *morep[1];

first = (*argv++ == tree->cur);

morep[0] = NULL;

argcp[0] = ROFF_ARGMAX;

if ( ! roffspecial(tree, tok, morep))

argvp[0] = morep[0] = NULL;

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

tok, argcp, argvp, morep))

return(0);

while (*argv) {

Line 1143 roff_Ns(ROFFCALL_ARGS)

Line 1196 roff_Ns(ROFFCALL_ARGS)

}

if ( ! roffispunct(*argv)) {

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

if ( ! roffdata(tree, 1, *argv++))

continue;

return(0);

continue;

}

for (j = 0; argv[j]; j++)

if ( ! roffispunct(argv[j]))

break;

if (argv[j]) {

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

if ( ! roffdata(tree, 0, *argv++))

continue;

return(0);

continue;

}

break;

Line 1221 roff_Os(ROFFCALL_ARGS)

Line 1275 roff_Os(ROFFCALL_ARGS)

static int

roff_layout(ROFFCALL_ARGS)

{

int i, c, argcp[ROFF_MAXARG];

int i, c, argcp[ROFF_MAXLINEARG];

char *argvp[ROFF_MAXARG];

char *argvp[ROFF_MAXLINEARG];

if (ROFF_PRELUDE & tree->state) {

roff_err(tree, *argv, "bad `%s' in prelude",

Line 1266 roff_layout(ROFFCALL_ARGS)

Line 1320 roff_layout(ROFFCALL_ARGS)

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

i = 0;

while (*argv) {

while (*argv)

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

if ( ! roffdata(tree, i++, *argv++))

return(0);

i = 1;

}

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

return(0);

return((*tree->cb.roffblkbodyin)

Line 1286 roff_layout(ROFFCALL_ARGS)

Line 1339 roff_layout(ROFFCALL_ARGS)

while (*argv) {

if (ROFF_MAX == (c = rofffindcallable(*argv))) {

assert(tree->arg);

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

if ( ! roffdata(tree, i++, *argv++))

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

return(0);

i = 1;

continue;

}

if ( ! roffcall(tree, c, argv))

Line 1327 roff_layout(ROFFCALL_ARGS)

Line 1378 roff_layout(ROFFCALL_ARGS)

/* ARGSUSED */

static int

roff_ordered(ROFFCALL_ARGS)

{

int i, first, c;

char *ordp[ROFF_MAXLINEARG];

if (ROFF_PRELUDE & tree->state) {

roff_err(tree, *argv, "`%s' disallowed in prelude",

toknames[tok]);

return(0);

}

first = (*argv == tree->cur);

argv++;

if (NULL == *argv) {

/* FIXME: satisfies number of args? */

ordp[0] = NULL;

return(roffspecial(tree, tok, ordp));

}

i = 0;

while (*argv && i < ROFF_MAXLINEARG) {

if (ROFF_MAX != (c = rofffindcallable(*argv)))

return(roffcall(tree, c, argv));

if (roffispunct(*argv))

break;

ordp[i++] = *argv++;

}

ordp[i] = NULL;

/* FIXME: too many or too few args? */

if (i == ROFF_MAXLINEARG && *argv) {

roff_err(tree, *argv, "too many args", toknames[tok]);

return(0);

}

/* FIXME: error if there's stuff after the punctuation. */

if ( ! roffspecial(tree, tok, ordp))

return(0);

if ( ! first || NULL == *argv)

return(1);

return(roffpurgepunct(tree, argv));

}

/* ARGSUSED */

static int

roff_text(ROFFCALL_ARGS)

{

int i, j, first, c, argcp[ROFF_MAXARG];

int i, j, first, c, argcp[ROFF_MAXLINEARG];

char *argvp[ROFF_MAXARG];

char *argvp[ROFF_MAXLINEARG];

if (ROFF_PRELUDE & tree->state) {

roff_err(tree, *argv, "`%s' disallowed in prelude",

Line 1350 roff_text(ROFFCALL_ARGS)

Line 1456 roff_text(ROFFCALL_ARGS)

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

i = 0;

while (*argv) {

while (*argv)

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

if ( ! roffdata(tree, i++, *argv++))

return(0);

i = 1;

}

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

}

Line 1383 roff_text(ROFFCALL_ARGS)

Line 1488 roff_text(ROFFCALL_ARGS)

}

if ( ! roffispunct(*argv)) {

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

if ( ! roffdata(tree, i++, *argv++))

return(0);

i = 1;

continue;

}

Line 1395 roff_text(ROFFCALL_ARGS)

Line 1499 roff_text(ROFFCALL_ARGS)

break;

if (argv[j]) {

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

if ( ! roffdata(tree, 0, *argv++))

return(0);

continue;

}

CVSweb