mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.32 and 1.38

version 1.32, 2008/12/02 00:15:41

version 1.38, 2008/12/04 16:34:59

Line 17

* PERFORMANCE OF THIS SOFTWARE.

#include <sys/param.h>

#include <sys/types.h>

#include <assert.h>

#include <ctype.h>

Line 30

Line 31

#include "libmdocml.h"

#include "private.h"

/* FIXME: First letters of quoted-text interpreted in rofffindtok. */

/* FIXME: `No' not implemented. */

/* TODO: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */

/* TODO: warn about "X section only" macros. */

/* TODO: warn about empty lists. */

Line 37

Line 40

/* TODO: (warn) NAME section has particular order. */

/* TODO: unify empty-content tags a la <br />. */

/* 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 104 static int roff_Dd(ROFFCALL_ARGS);

Line 106 static int roff_Dd(ROFFCALL_ARGS);

static int roff_Dt(ROFFCALL_ARGS);

static int roff_Os(ROFFCALL_ARGS);

static int roff_Ns(ROFFCALL_ARGS);

static int roff_Sm(ROFFCALL_ARGS);

static int roff_layout(ROFFCALL_ARGS);

static int roff_text(ROFFCALL_ARGS);

static int roff_noop(ROFFCALL_ARGS);

Line 126 static int roffnextopt(const struct rofftree *,

Line 129 static int roffnextopt(const struct rofftree *,

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

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 *);

#ifdef __linux__

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

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

extern int vsnprintf(char *, size_t,

const char *, va_list);

extern char *strptime(const char *, const char *,

struct tm *);

#endif

static const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit, ROFF_ARGMAX };

static const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled, ROFF_Literal,

ROFF_File, ROFF_Offset, ROFF_Filled, ROFF_Compact, ROFF_ARGMAX };

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

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

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

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

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

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

{ roff_Sm, NULL, NULL, NULL, 0, ROFF_TEXT, 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 }, /* 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 435 roff_engine(struct rofftree *tree, char *buf)

Line 449 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 459 roffargs(const struct rofftree *tree,

Line 502 roffargs(const struct rofftree *tree,

p = buf;

/* 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 484 roffargs(const struct rofftree *tree,

Line 527 roffargs(const struct rofftree *tree,

}

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 515 roffparse(struct rofftree *tree, char *buf)

Line 558 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 818 roffnode_free(struct rofftree *tree)

Line 861 roffnode_free(struct rofftree *tree)

static int

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

{

if (NULL == tokens[tok].cb) {

roff_err(tree, *argv, "unsupported macro `%s'",

toknames[tok]);

return(0);

}

if ( ! (*tokens[tok].cb)(tok, tree, argv, ROFF_ENTER))

return(0);

return(1);

}

static int

roffnextopt(const struct rofftree *tree, int tok,

char ***in, char **val)

{

Line 835 roffnextopt(const struct rofftree *tree, int tok,

Line 893 roffnextopt(const struct rofftree *tree, int tok,

if (ROFF_ARGMAX == (v = rofffindarg(arg + 1))) {

roff_warn(tree, arg, "argument-like parameter `%s' to "

"`%s'", &arg[1], toknames[tok]);

"`%s'", arg, toknames[tok]);

return(-1);

}

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

Line 935 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 908 roffparseopts(struct rofftree *tree, int tok,

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

}

static int

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

{

int tok;

if (0 == *buf)

return(1);

if (-1 == (tok = rofftok_scan(buf))) {

roff_err(tree, buf, "invalid character sequence");

return(0);

} else if (ROFFTok_MAX != tok) {

if (ROFFTok_Null == tok) { /* FIXME */

buf += 2;

return(roffdata(tree, space, buf));

}

return((*tree->cb.rofftoken)

(tree->arg, space != 0, tok));

}

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

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

}

/* ARGSUSED */

static int

roff_Dd(ROFFCALL_ARGS)

Line 1053 roff_Dt(ROFFCALL_ARGS)

Line 1136 roff_Dt(ROFFCALL_ARGS)

/* ARGSUSED */

static int

roff_Ns(ROFFCALL_ARGS)

roff_Sm(ROFFCALL_ARGS)

{

int j, c, first;

int argcp[1];

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

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

p = *argv++;

argv++;

argcp[0] = ROFF_ARGMAX;

argvp[0] = NULL;

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

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

return(0);

} else if (0 != strcmp(morep[0], "on") &&

0 != strcmp(morep[0], "off")) {

roff_err(tree, p, "`Sm' has invalid argument");

return(0);

}

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

if (*argv)

if (NULL == tokens[c].cb) {

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

roff_err(tree, *argv, "unsupported macro `%s'",

toknames[c]);

return(0);

}

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

return(0);

if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))

return(0);

if ( ! first)

return(1);

return(roffpurgepunct(tree, argv));

}

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

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

tok, argcp, argvp, morep))

return(0);

while (*argv) {

while (*argv)

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

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

if ( ! roffispunct(*argv)) {

return(0);

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

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

return(0);

continue;

}

/* FIXME: this is identical to that of

* roff_text. */

/* See if only punctuation remains. */

return(1);

}

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

if ( ! roffispunct(argv[j]))

break;

if (argv[j]) {

/* ARGSUSED */

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

static int

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

roff_Ns(ROFFCALL_ARGS)

return(0);

{

continue;

int j, c, first;

}

int argcp[1];

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

/* Only punctuation remains. */

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

argcp[0] = ROFF_ARGMAX;

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

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

tok, argcp, argvp, morep))

return(0);

while (*argv) {

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

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

return(0);

break;

}

if (NULL == tokens[c].cb) {

roff_err(tree, *argv, "unsupported macro `%s'",

if ( ! roffispunct(*argv)) {

toknames[c]);

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

return(0);

continue;

}

if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))

return(0);

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

if ( ! roffispunct(argv[j]))

break;

if (argv[j]) {

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

return(0);

continue;

}

break;

}

if ( ! first)

return(1);

return(roffpurgepunct(tree, argv));

}

Line 1168 roff_Os(ROFFCALL_ARGS)

Line 1263 roff_Os(ROFFCALL_ARGS)

assert(NULL == tree->last);

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

return((*tree->cb.roffhead)(tree->arg, &tree->tm,

tree->os, tree->title, tree->section,

tree->volume));

}

Line 1176 roff_Os(ROFFCALL_ARGS)

Line 1273 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 1185 roff_layout(ROFFCALL_ARGS)

Line 1282 roff_layout(ROFFCALL_ARGS)

return(0);

} else if (ROFF_EXIT == type) {

roffnode_free(tree);

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

return(0);

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

}

Line 1206 roff_layout(ROFFCALL_ARGS)

Line 1305 roff_layout(ROFFCALL_ARGS)

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

return(0);

if (NULL == *argv)

return(1);

return((*tree->cb.roffblkbodyin)

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

(tree->arg, tok, argcp, argvp));

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

return(0);

Line 1217 roff_layout(ROFFCALL_ARGS)

Line 1318 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((*tree->cb.roffout)(tree->arg, tok));

return(0);

return((*tree->cb.roffblkbodyin)

(tree->arg, tok, argcp, argvp));

}

Line 1234 roff_layout(ROFFCALL_ARGS)

Line 1337 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))

if (NULL == tokens[c].cb) {

roff_err(tree, *argv, "unsupported macro `%s'",

toknames[c]);

return(0);

}

if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))

return(0);

break;

}

Line 1259 roff_layout(ROFFCALL_ARGS)

Line 1352 roff_layout(ROFFCALL_ARGS)

* macro.

if (NULL == *argv)

if (NULL == *argv) {

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

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

return(0);

return((*tree->cb.roffblkbodyin)

(tree->arg, tok, argcp, argvp));

}

* Expensive. Scan to the end of line then work backwards until

Line 1270 roff_layout(ROFFCALL_ARGS)

Line 1367 roff_layout(ROFFCALL_ARGS)

if ( ! roffpurgepunct(tree, argv))

return(0);

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

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

return(0);

return((*tree->cb.roffblkbodyin)

(tree->arg, tok, argcp, argvp));

}

Line 1278 roff_layout(ROFFCALL_ARGS)

Line 1378 roff_layout(ROFFCALL_ARGS)

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 1299 roff_text(ROFFCALL_ARGS)

Line 1399 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 1316 roff_text(ROFFCALL_ARGS)

Line 1415 roff_text(ROFFCALL_ARGS)

i = 0;

while (*argv) {

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

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

if ( ! roffispunct(*argv)) {

if ( ! (ROFF_LSCOPE & tokens[tok].flags))

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

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

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

return(0);

i = 1;

continue;

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

}

return(0);

/* See if only punctuation remains. */

if (ROFF_LSCOPE & tokens[tok].flags)

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

i = 1;

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

if ( ! roffispunct(argv[j]))

break;

if (argv[j]) {

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

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

return(0);

continue;

}

break;

}

/* Only punctuation remains. */

if ( ! roffispunct(*argv)) {

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

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

return(0);

break;

continue;

}

i = 1;

* A sub-command has been found. Execute it and

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

* discontinue parsing for arguments. If we're

if ( ! roffispunct(argv[j]))

* line-scoped, then close out after it returns; if we

break;

* aren't, then close out before.

if (NULL == tokens[c].cb) {

if (argv[j]) {

roff_err(tree, *argv, "unsupported macro `%s'",

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

toknames[c]);

return(0);

}

if ( ! (ROFF_LSCOPE & tokens[tok].flags))

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

return(0);

continue;

if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))

}

return(0);

if (ROFF_LSCOPE & tokens[tok].flags)

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

return(0);

break;

}

Line 1429 roff_err(const struct rofftree *tree, const char *pos,

Line 1508 roff_err(const struct rofftree *tree, const char *pos,

(*tree->cb.roffmsg)(tree->arg,

ROFF_ERROR, tree->cur, pos, buf);

}

CVSweb