=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.13 retrieving revision 1.15 diff -u -p -r1.13 -r1.15 --- mandoc/roff.c 2008/11/27 17:27:50 1.13 +++ mandoc/roff.c 2008/11/28 15:25:49 1.15 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.13 2008/11/27 17:27:50 kristaps Exp $ */ +/* $Id: roff.c,v 1.15 2008/11/28 15:25:49 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -80,28 +80,27 @@ struct roffarg { struct roffnode { int tok; /* Token id. */ struct roffnode *parent; /* Parent (or NULL). */ - size_t line; /* Parsed at line. */ }; struct rofftree { struct roffnode *last; /* Last parsed node. */ - time_t date; /* `Dd' results. */ char *cur; + + time_t date; /* `Dd' results. */ char os[64]; /* `Os' results. */ char title[64]; /* `Dt' results. */ char section[64]; /* `Dt' results. */ char volume[64]; /* `Dt' results. */ + int state; #define ROFF_PRELUDE (1 << 1) /* In roff prelude. */ - /* FIXME: if we had prev ptrs, this wouldn't be necessary. */ #define ROFF_PRELUDE_Os (1 << 2) /* `Os' is parsed. */ #define ROFF_PRELUDE_Dt (1 << 3) /* `Dt' is parsed. */ #define ROFF_PRELUDE_Dd (1 << 4) /* `Dd' is parsed. */ #define ROFF_BODY (1 << 5) /* In roff body. */ - struct md_mbuf *mbuf; /* Output (or NULL). */ - const struct md_args *args; /* Global args. */ - const struct md_rbuf *rbuf; /* Input. */ - const struct roffcb *cb; + + struct roffcb cb; + void *arg; }; static int roff_Dd(ROFFCALL_ARGS); @@ -115,7 +114,7 @@ static int roff_close(ROFFCALL_ARGS); static int roff_special(ROFFCALL_ARGS); static struct roffnode *roffnode_new(int, struct rofftree *); -static void roffnode_free(int, struct rofftree *); +static void roffnode_free(struct rofftree *); static void roff_warn(const struct rofftree *, const char *, char *, ...); @@ -175,8 +174,7 @@ static const int roffparent_It[] = { ROFF_Bl, ROFF_It, static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX }; /* Table of all known tokens. */ -static const struct rofftok tokens[ROFF_MAX] = - { +static const struct rofftok tokens[ROFF_MAX] = { {roff_comment, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */ { roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dd */ { roff_Dt, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dt */ @@ -273,17 +271,16 @@ static const struct rofftok tokens[ROFF_MAX] = { 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, NULL, 0, ROFF_LAYOUT, 0 }, /* Fo */ + { roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */ { roff_close, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */ - { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */ + { roff_layout, NULL, NULL, roffchild_Oo, 0, ROFF_LAYOUT, 0 }, /* Oo */ { roff_close, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */ { roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */ { roff_close, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */ }; /* Table of all known token arguments. */ -static const int tokenargs[ROFF_ARGMAX] = - { +static const int tokenargs[ROFF_ARGMAX] = { 0, 0, 0, 0, 0, ROFF_VALUE, ROFF_VALUE, 0, 0, 0, 0, 0, @@ -301,8 +298,7 @@ static const int tokenargs[ROFF_ARGMAX] = 0, 0, 0, 0, }; -const char *const toknamesp[ROFF_MAX] = - { +const char *const toknamesp[ROFF_MAX] = { "\\\"", "Dd", "Dt", "Os", "Sh", "Ss", "Pp", "D1", "Dl", "Bd", "Ed", "Bl", @@ -331,8 +327,7 @@ const char *const toknamesp[ROFF_MAX] = "Bk", "Ek", }; -const char *const tokargnamesp[ROFF_ARGMAX] = - { +const char *const tokargnamesp[ROFF_ARGMAX] = { "split", "nosplit", "ragged", "unfilled", "literal", "file", "offset", "bullet", "dash", @@ -355,7 +350,6 @@ const char *const tokargnamesp[ROFF_ARGMAX] = "svid4", "filled", "words", }; - const char *const *toknames = toknamesp; const char *const *tokargnames = tokargnamesp; @@ -364,33 +358,32 @@ int roff_free(struct rofftree *tree, int flush) { int error; + struct roffnode *n; - assert(tree->mbuf); - if ( ! flush) - tree->mbuf = NULL; + error = 0; - /* LINTED */ - while (tree->last) - if ( ! (*tokens[tree->last->tok].cb) - (tree->last->tok, tree, NULL, ROFF_EXIT)) - /* Disallow flushing. */ - tree->mbuf = NULL; + for (n = tree->last; n->parent; n = n->parent) + if (tokens[n->tok].ctx == 0) { + roff_warn(tree, NULL, "closing explicit scope " + "of `%s'", toknames[n->tok]); + error = 1; + } - error = tree->mbuf ? 0 : 1; - - if (tree->mbuf && (ROFF_PRELUDE & tree->state)) { - /*roff_warn(tree, "prelude never finished");*/ + if (0 == error && (ROFF_PRELUDE & tree->state)) { + roff_warn(tree, NULL, "prelude never finished"); error = 1; } + while (tree->last) + roffnode_free(tree); + free(tree); return(error ? 0 : 1); } struct rofftree * -roff_alloc(const struct md_args *args, struct md_mbuf *out, - const struct md_rbuf *in, const struct roffcb *cb) +roff_alloc(const struct roffcb *cb, void *args) { struct rofftree *tree; @@ -398,11 +391,10 @@ roff_alloc(const struct md_args *args, struct md_mbuf err(1, "calloc"); tree->state = ROFF_PRELUDE; - tree->args = args; - tree->mbuf = out; - tree->rbuf = in; - tree->cb = cb; + tree->arg = args; + (void)memcpy(&tree->cb, cb, sizeof(struct roffcb)); + return(tree); } @@ -411,7 +403,7 @@ int roff_engine(struct rofftree *tree, char *buf, size_t sz) { - tree->cur = buf; + tree->cur = NULL; if (0 == sz) { roff_warn(tree, buf, "blank line"); @@ -540,18 +532,16 @@ roffparse(struct rofftree *tree, char *buf, size_t sz) */ if ( ! roffscan(tree->last->tok, tokens[tok].parents)) { - warnx("%s: invalid parent `%s' for `%s' (line %zu)", - tree->rbuf->name, - toknames[tree->last->tok], - toknames[tok], tree->rbuf->line); + roff_err(tree, *argvp, "`%s' has invalid parent `%s'", + toknames[tok], + toknames[tree->last->tok]); return(0); } if ( ! roffscan(tok, tokens[tree->last->tok].children)) { - warnx("%s: invalid child `%s' for `%s' (line %zu)", - tree->rbuf->name, toknames[tok], + roff_err(tree, *argvp, "`%s' is invalid child `%s'", toknames[tree->last->tok], - tree->rbuf->line); + toknames[tok]); return(0); } @@ -632,6 +622,7 @@ roffparse(struct rofftree *tree, char *buf, size_t sz) assert(tree->last); assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx); + /* LINTED */ do { t = tree->last->tok; if ( ! (*tokens[t].cb)(t, tree, NULL, ROFF_EXIT)) @@ -706,7 +697,6 @@ roffnode_new(int tokid, struct rofftree *tree) if (NULL == (p = malloc(sizeof(struct roffnode)))) err(1, "malloc"); - p->line = tree->rbuf->line; p->tok = tokid; p->parent = tree->last; tree->last = p; @@ -732,12 +722,11 @@ roffargok(int tokid, int argid) static void -roffnode_free(int tokid, struct rofftree *tree) +roffnode_free(struct rofftree *tree) { struct roffnode *p; assert(tree->last); - assert(tree->last->tok == tokid); p = tree->last; tree->last = tree->last->parent; @@ -897,8 +886,8 @@ roff_layout(ROFFCALL_ARGS) } if (ROFF_EXIT == type) { - roffnode_free(tok, tree); - return((*tree->cb->roffblkout)(tree->args, tok)); + roffnode_free(tree); + return((*tree->cb.roffblkout)(tree->arg, tok)); } i = 0; @@ -920,16 +909,19 @@ roff_layout(ROFFCALL_ARGS) if (NULL == roffnode_new(tok, tree)) return(0); - if ( ! (*tree->cb->roffin)(tree->args, tok, argcp, argvp)) + if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp)) return(0); if ( ! (ROFF_PARSED & tokens[tok].flags)) { + while (*argv) { + if ( ! (*tree->cb.roffdata) + (tree->arg, *argv++)) + return(0); + } - /* TODO: print all tokens. */ - - if ( ! ((*tree->cb->roffout)(tree->args, tok))) + if ( ! ((*tree->cb.roffout)(tree->arg, tok))) return(0); - return((*tree->cb->roffblkin)(tree->args, tok)); + return((*tree->cb.roffblkin)(tree->arg, tok)); } while (*argv) { @@ -940,20 +932,18 @@ roff_layout(ROFFCALL_ARGS) toknames[c]); return(0); } - if ( ! (*tokens[c].cb)(c, tree, - argv, ROFF_ENTER)) + if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER)) return(0); + break; } - /* TODO: print token. */ - - argv++; + if ( ! (*tree->cb.roffdata)(tree->arg, *argv++)) + return(0); } - if ( ! ((*tree->cb->roffout)(tree->args, tok))) + if ( ! ((*tree->cb.roffout)(tree->arg, tok))) return(0); - - return((*tree->cb->roffblkin)(tree->args, tok)); + return((*tree->cb.roffblkin)(tree->arg, tok)); } @@ -986,14 +976,15 @@ roff_text(ROFFCALL_ARGS) argcp[i] = ROFF_ARGMAX; argvp[i] = NULL; - if ( ! (*tree->cb->roffin)(tree->args, tok, argcp, argvp)) + if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp)) return(0); if ( ! (ROFF_PARSED & tokens[tok].flags)) { - - /* TODO: print all tokens. */ - - return((*tree->cb->roffout)(tree->args, tok)); + while (*argv) { + if ( ! (*tree->cb.roffdata)(tree->arg, *argv++)) + return(0); + } + return((*tree->cb.roffout)(tree->arg, tok)); } while (*argv) { @@ -1007,14 +998,13 @@ roff_text(ROFFCALL_ARGS) if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER)) return(0); + break; } - - /* TODO: print token. */ - - argv++; + if ( ! (*tree->cb.roffdata)(tree->arg, *argv++)) + return(0); } - return((*tree->cb->roffout)(tree->args, tok)); + return((*tree->cb.roffout)(tree->arg, tok)); } @@ -1041,7 +1031,7 @@ static int roff_special(ROFFCALL_ARGS) { - return((*tree->cb->roffspecial)(tok)); + return((*tree->cb.roffspecial)(tree->arg, tok)); } @@ -1055,8 +1045,8 @@ roff_warn(const struct rofftree *tree, const char *pos (void)vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - (*tree->cb->roffmsg)(tree->args, ROFF_WARN, tree->cur, pos, - tree->rbuf->name, tree->rbuf->line, buf); + (*tree->cb.roffmsg)(tree->arg, + ROFF_WARN, tree->cur, pos, buf); } @@ -1070,6 +1060,6 @@ roff_err(const struct rofftree *tree, const char *pos, (void)vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - (*tree->cb->roffmsg)(tree->args, ROFF_ERROR, tree->cur, pos, - tree->rbuf->name, tree->rbuf->line, buf); + (*tree->cb.roffmsg)(tree->arg, + ROFF_ERROR, tree->cur, pos, buf); }