=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.4 retrieving revision 1.70 diff -u -p -r1.4 -r1.70 --- mandoc/roff.c 2008/11/25 12:14:02 1.4 +++ mandoc/roff.c 2010/05/15 20:51:40 1.70 @@ -1,691 +1,320 @@ -/* $Id: roff.c,v 1.4 2008/11/25 12:14:02 kristaps Exp $ */ +/* $Id: roff.c,v 1.70 2010/05/15 20:51:40 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include -#include -#include #include -#include #include -#include -#include "libmdocml.h" -#include "private.h" +#include "mandoc.h" +#include "roff.h" -#define ROFF_MAXARG 10 - -enum roffd { - ROFF_ENTER = 0, - ROFF_EXIT +enum rofft { + ROFF_de, + ROFF_dei, + ROFF_am, + ROFF_ami, + ROFF_ig, + ROFF_close, + ROFF_MAX }; -/* FIXME: prolog roffs can be text roffs, too. */ - -enum rofftype { - ROFF_COMMENT, - ROFF_TEXT, - ROFF_LAYOUT +struct roff { + struct roffnode *last; /* leaf of stack */ + mandocmsg msg; /* err/warn/fatal messages */ + void *data; /* privdata for messages */ }; -#define ROFFCALL_ARGS \ - int tok, struct rofftree *tree, \ - const char *argv[], enum roffd type - -struct rofftree; - -struct rofftok { - int (*cb)(ROFFCALL_ARGS); - enum rofftype type; - int flags; -#define ROFF_NESTED (1 << 0) -#define ROFF_PARSED (1 << 1) -#define ROFF_CALLABLE (1 << 2) -#define ROFF_QUOTES (1 << 3) -}; - -struct roffarg { - int tok; - int flags; -#define ROFF_VALUE (1 << 0) -}; - struct roffnode { - int tok; - struct roffnode *parent; - size_t line; + enum rofft tok; /* type of node */ + struct roffnode *parent; /* up one in stack */ + int line; /* parse line */ + int col; /* parse col */ }; -struct rofftree { - struct roffnode *last; - time_t date; - char os[64]; - char title[64]; - char section[64]; - char volume[64]; - int state; -#define ROFF_PRELUDE (1 << 1) -#define ROFF_PRELUDE_Os (1 << 2) -#define ROFF_PRELUDE_Dt (1 << 3) -#define ROFF_PRELUDE_Dd (1 << 4) -#define ROFF_BODY (1 << 5) +#define ROFF_ARGS struct roff *r, /* parse ctx */ \ + char **bufp, /* input buffer */ \ + size_t *szp, /* size of input buffer */ \ + int ln, /* parse line */ \ + int ppos /* current pos in buffer */ - roffin roffin; - roffblkin roffblkin; - roffout roffout; - roffblkout roffblkout; +typedef enum rofferr (*roffproc)(ROFF_ARGS); - struct md_mbuf *mbuf; /* NULL if !flush. */ - const struct md_args *args; - const struct md_rbuf *rbuf; +struct roffmac { + const char *name; /* macro name */ + roffproc sub; /* child of control black */ + roffproc new; /* root of stack (type = ROFF_MAX) */ }; -static int roff_Dd(ROFFCALL_ARGS); -static int roff_Dt(ROFFCALL_ARGS); -static int roff_Os(ROFFCALL_ARGS); +static enum rofferr roff_ignore(ROFF_ARGS); +static enum rofferr roff_new_close(ROFF_ARGS); +static enum rofferr roff_new_ig(ROFF_ARGS); +static enum rofferr roff_sub_ig(ROFF_ARGS); -static int roff_layout(ROFFCALL_ARGS); -static int roff_text(ROFFCALL_ARGS); - -static struct roffnode *roffnode_new(int, struct rofftree *); -static void roffnode_free(int, struct rofftree *); - -static int rofffindtok(const char *); -static int rofffindarg(const char *); -static int rofffindcallable(const char *); -static int roffargs(int, char *, char **); -static int roffparse(struct rofftree *, char *, size_t); -static int textparse(const struct rofftree *, - const char *, size_t); - - -static const struct rofftok tokens[ROFF_MAX] = { - { NULL, ROFF_COMMENT, 0 }, - { roff_Dd, ROFF_TEXT, 0 }, /* Dd */ - { roff_Dt, ROFF_TEXT, 0 }, /* Dt */ - { roff_Os, ROFF_TEXT, 0 }, /* Os */ - { roff_layout, ROFF_LAYOUT, ROFF_PARSED }, /* Sh */ - { roff_layout, ROFF_LAYOUT, ROFF_PARSED }, /* Ss XXX */ - { roff_layout, ROFF_LAYOUT, 0 }, /* Pp */ - { roff_layout, ROFF_LAYOUT, 0 }, /* D1 */ - { roff_layout, ROFF_LAYOUT, 0 }, /* Dl */ - { roff_layout, ROFF_LAYOUT, 0 }, /* Bd */ - { roff_layout, ROFF_LAYOUT, 0 }, /* Ed */ - { roff_layout, ROFF_LAYOUT, 0 }, /* Bl */ - { roff_layout, ROFF_LAYOUT, 0 }, /* El */ - { roff_layout, ROFF_LAYOUT, 0 }, /* It */ - { roff_text, ROFF_TEXT, ROFF_PARSED }, /* An */ - { roff_text, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Li */ +const struct roffmac roffs[ROFF_MAX] = { + { "de", NULL, roff_ignore }, + { "dei", NULL, roff_ignore }, + { "am", NULL, roff_ignore }, + { "ami", NULL, roff_ignore }, + { "ig", roff_sub_ig, roff_new_ig }, + { ".", NULL, roff_new_close }, }; -/* FIXME: multiple owners? */ +static void roff_free1(struct roff *); +static enum rofft roff_hash_find(const char *); +static int roffnode_push(struct roff *, + enum rofft, int, int); +static void roffnode_pop(struct roff *); +static enum rofft roff_parse(const char *, int *); -static const struct roffarg tokenargs[ROFF_ARGMAX] = { - { ROFF_An, 0 }, /* split */ - { ROFF_An, 0 }, /* nosplit */ - { ROFF_Bd, 0 }, /* ragged */ - { ROFF_Bd, 0 }, /* unfilled */ - { ROFF_Bd, 0 }, /* literal */ - { ROFF_Bd, ROFF_VALUE }, /* file */ - { ROFF_Bd, ROFF_VALUE }, /* offset */ - { ROFF_Bl, 0 }, /* bullet */ - { ROFF_Bl, 0 }, /* dash */ - { ROFF_Bl, 0 }, /* hyphen */ - { ROFF_Bl, 0 }, /* item */ - { ROFF_Bl, 0 }, /* enum */ - { ROFF_Bl, 0 }, /* tag */ - { ROFF_Bl, 0 }, /* diag */ - { ROFF_Bl, 0 }, /* hang */ - { ROFF_Bl, 0 }, /* ohang */ - { ROFF_Bl, 0 }, /* inset */ - { ROFF_Bl, 0 }, /* column */ -}; -static const char *const toknames[ROFF_MAX] = ROFF_NAMES; -static const char *const tokargnames[ROFF_ARGMAX] = ROFF_ARGNAMES; - - -int -roff_free(struct rofftree *tree, int flush) +/* + * Look up a roff token by its name. Returns ROFF_MAX if no macro by + * the nil-terminated string name could be found. + */ +static enum rofft +roff_hash_find(const char *p) { - int error; + int i; - assert(tree->mbuf); - if ( ! flush) - tree->mbuf = NULL; + /* FIXME: make this be fast and efficient. */ - /* LINTED */ - while (tree->last) - if ( ! (*tokens[tree->last->tok].cb) - (tree->last->tok, tree, NULL, ROFF_EXIT)) - /* Disallow flushing. */ - tree->mbuf = NULL; + for (i = 0; i < (int)ROFF_MAX; i++) + if (0 == strcmp(roffs[i].name, p)) + return((enum rofft)i); - error = tree->mbuf ? 0 : 1; - - if (tree->mbuf && (ROFF_PRELUDE & tree->state)) { - warnx("%s: prelude never finished", - tree->rbuf->name); - error = 1; - } - - free(tree); - return(error ? 0 : 1); + return(ROFF_MAX); } -struct rofftree * -roff_alloc(const struct md_args *args, struct md_mbuf *out, - const struct md_rbuf *in, roffin textin, - roffout textout, roffblkin blkin, roffblkout blkout) +/* + * Pop the current node off of the stack of roff instructions currently + * pending. + */ +static void +roffnode_pop(struct roff *r) { - struct rofftree *tree; + struct roffnode *p; - if (NULL == (tree = calloc(1, sizeof(struct rofftree)))) { - warn("malloc"); - return(NULL); - } - - tree->state = ROFF_PRELUDE; - tree->args = args; - tree->mbuf = out; - tree->rbuf = in; - tree->roffin = textin; - tree->roffout = textout; - tree->roffblkin = blkin; - tree->roffblkout = blkout; - - return(tree); + if (NULL == (p = r->last)) + return; + r->last = p->parent; + free(p); } -int -roff_engine(struct rofftree *tree, char *buf, size_t sz) +/* + * Push a roff node onto the instruction stack. This must later be + * removed with roffnode_pop(). + */ +static int +roffnode_push(struct roff *r, enum rofft tok, int line, int col) { + struct roffnode *p; - if (0 == sz) { - warnx("%s: blank line (line %zu)", - tree->rbuf->name, - tree->rbuf->line); + if (NULL == (p = calloc(1, sizeof(struct roffnode)))) { + (*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL); return(0); - } else if ('.' != *buf) - return(textparse(tree, buf, sz)); - - return(roffparse(tree, buf, sz)); -} - - -static int -textparse(const struct rofftree *tree, const char *buf, size_t sz) -{ - - if (NULL == tree->last) { - warnx("%s: unexpected text (line %zu)", - tree->rbuf->name, - tree->rbuf->line); - return(0); - } else if (NULL == tree->last->parent) { - warnx("%s: disallowed text (line %zu)", - tree->rbuf->name, - tree->rbuf->line); - return(0); } - /* Print text. */ + p->tok = tok; + p->parent = r->last; + p->line = line; + p->col = col; + r->last = p; return(1); } -static int -roffargs(int tok, char *buf, char **argv) +static void +roff_free1(struct roff *r) { - int i; - (void)tok;/* FIXME: quotable strings? */ - - assert(tok >= 0 && tok < ROFF_MAX); - assert('.' == *buf); - - /* LINTED */ - for (i = 0; *buf && i < ROFF_MAXARG; i++) { - argv[i] = buf++; - while (*buf && ! isspace(*buf)) - buf++; - if (0 == *buf) { - continue; - } - *buf++ = 0; - while (*buf && isspace(*buf)) - buf++; - } - - assert(i > 0); - if (i < ROFF_MAXARG) - argv[i] = NULL; - - return(ROFF_MAXARG > i); + while (r->last) + roffnode_pop(r); } -static int -roffparse(struct rofftree *tree, char *buf, size_t sz) +void +roff_reset(struct roff *r) { - int tok, t; - struct roffnode *node; - char *argv[ROFF_MAXARG]; - const char **argvp; - assert(sz > 0); - - /* - * Extract the token identifier from the buffer. If there's no - * callback for the token (comment, etc.) then exit immediately. - * We don't do any error handling (yet), so if the token doesn't - * exist, die. - */ - - if (3 > sz) { - warnx("%s: malformed line (line %zu)", - tree->rbuf->name, - tree->rbuf->line); - return(0); - } else if (ROFF_MAX == (tok = rofffindtok(buf + 1))) { - warnx("%s: unknown line token `%c%c' (line %zu)", - tree->rbuf->name, - *(buf + 1), *(buf + 2), - tree->rbuf->line); - return(0); - } else if (ROFF_COMMENT == tokens[tok].type) - /* Ignore comment tokens. */ - return(1); - - if ( ! roffargs(tok, buf, argv)) { - warnx("%s: too many arguments to `%s' (line %zu)", - tree->rbuf->name, toknames[tok], - tree->rbuf->line); - return(0); - } - - /* - * If this is a non-nestable layout token and we're below a - * token of the same type, then recurse upward to the token, - * closing out the interim scopes. - * - * If there's a nested token on the chain, then raise an error - * as nested tokens have corresponding "ending" tokens and we're - * breaking their scope. - */ - - node = NULL; - - if (ROFF_LAYOUT == tokens[tok].type && - ! (ROFF_NESTED & tokens[tok].flags)) { - for (node = tree->last; node; node = node->parent) { - if (node->tok == tok) - break; - - /* Don't break nested scope. */ - - if ( ! (ROFF_NESTED & tokens[node->tok].flags)) - continue; - warnx("%s: scope of %s (line %zu) broken by " - "%s (line %zu)", - tree->rbuf->name, - toknames[tok], node->line, - toknames[node->tok], - tree->rbuf->line); - return(0); - } - } - - if (node) { - assert(ROFF_LAYOUT == tokens[tok].type); - assert( ! (ROFF_NESTED & tokens[tok].flags)); - assert(node->tok == tok); - - /* Clear up to last scoped token. */ - - /* LINTED */ - do { - t = tree->last->tok; - if ( ! (*tokens[tree->last->tok].cb) - (tree->last->tok, tree, NULL, ROFF_EXIT)) - return(0); - } while (t != tok); - } - - /* Proceed with actual token processing. */ - - argvp = (const char **)&argv[1]; - return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER)); + roff_free1(r); } -static int -rofffindarg(const char *name) +void +roff_free(struct roff *r) { - size_t i; - /* FIXME: use a table, this is slow but ok for now. */ - - /* LINTED */ - for (i = 0; i < ROFF_ARGMAX; i++) - /* LINTED */ - if (0 == strcmp(name, tokargnames[i])) - return((int)i); - - return(ROFF_ARGMAX); + roff_free1(r); + free(r); } -static int -rofffindtok(const char *name) +struct roff * +roff_alloc(const mandocmsg msg, void *data) { - size_t i; + struct roff *r; - /* FIXME: use a table, this is slow but ok for now. */ + if (NULL == (r = calloc(1, sizeof(struct roff)))) { + (*msg)(MANDOCERR_MEM, data, 0, 0, NULL); + return(0); + } - /* LINTED */ - for (i = 0; i < ROFF_MAX; i++) - /* LINTED */ - if (0 == strncmp(name, toknames[i], 2)) - return((int)i); - - return(ROFF_MAX); + r->msg = msg; + r->data = data; + return(r); } -static int -rofffindcallable(const char *name) +enum rofferr +roff_parseln(struct roff *r, int ln, char **bufp, size_t *szp) { - int c; + enum rofft t; + int ppos; - if (ROFF_MAX == (c = rofffindtok(name))) - return(ROFF_MAX); - return(ROFF_CALLABLE & tokens[c].flags ? c : ROFF_MAX); -} + if (NULL != r->last) { + /* + * If there's a node on the stack, then jump directly + * into its processing function. + */ + t = r->last->tok; + assert(roffs[t].sub); + return((*roffs[t].sub)(r, bufp, szp, ln, 0)); + } else if ('.' != (*bufp)[0] && NULL == r->last) + /* Return when in free text without a context. */ + return(ROFF_CONT); + /* There's nothing on the stack: make us anew. */ -static struct roffnode * -roffnode_new(int tokid, struct rofftree *tree) -{ - struct roffnode *p; - - if (NULL == (p = malloc(sizeof(struct roffnode)))) { - warn("malloc"); - return(NULL); - } + if (ROFF_MAX == (t = roff_parse(*bufp, &ppos))) + return(ROFF_CONT); - p->line = tree->rbuf->line; - p->tok = tokid; - p->parent = tree->last; - tree->last = p; - return(p); + assert(roffs[t].new); + return((*roffs[t].new)(r, bufp, szp, ln, ppos)); } -static void -roffnode_free(int tokid, struct rofftree *tree) +/* + * Parse a roff node's type from the input buffer. This must be in the + * form of ".foo xxx" in the usual way. + */ +static enum rofft +roff_parse(const char *buf, int *pos) { - struct roffnode *p; + int j; + char mac[5]; + enum rofft t; - assert(tree->last); - assert(tree->last->tok == tokid); + assert('.' == buf[0]); + *pos = 1; - p = tree->last; - tree->last = tree->last->parent; - free(p); -} + while (buf[*pos] && (' ' == buf[*pos] || '\t' == buf[*pos])) + (*pos)++; + if ('\0' == buf[*pos]) + return(ROFF_MAX); -/* ARGSUSED */ -static int -roff_Dd(ROFFCALL_ARGS) -{ + for (j = 0; j < 4; j++, (*pos)++) + if ('\0' == (mac[j] = buf[*pos])) + break; + else if (' ' == buf[*pos]) + break; - if (ROFF_BODY & tree->state) { - assert( ! (ROFF_PRELUDE & tree->state)); - assert(ROFF_PRELUDE_Dd & tree->state); - return(roff_text(tok, tree, argv, type)); - } + if (j == 4 || j < 1) + return(ROFF_MAX); - assert(ROFF_PRELUDE & tree->state); - assert( ! (ROFF_BODY & tree->state)); + mac[j] = '\0'; - if (ROFF_PRELUDE_Dd & tree->state || - ROFF_PRELUDE_Dt & tree->state) { - warnx("%s: prelude `Dd' out-of-order (line %zu)", - tree->rbuf->name, tree->rbuf->line); - return(0); - } + if (ROFF_MAX == (t = roff_hash_find(mac))) + return(t); - /* TODO: parse date. */ + while (buf[*pos] && ' ' == buf[*pos]) + (*pos)++; - assert(NULL == tree->last); - tree->state |= ROFF_PRELUDE_Dd; - - return(1); + return(t); } /* ARGSUSED */ -static int -roff_Dt(ROFFCALL_ARGS) +static enum rofferr +roff_ignore(ROFF_ARGS) { - if (ROFF_BODY & tree->state) { - assert( ! (ROFF_PRELUDE & tree->state)); - assert(ROFF_PRELUDE_Dt & tree->state); - return(roff_text(tok, tree, argv, type)); - } - - assert(ROFF_PRELUDE & tree->state); - assert( ! (ROFF_BODY & tree->state)); - - if ( ! (ROFF_PRELUDE_Dd & tree->state) || - (ROFF_PRELUDE_Dt & tree->state)) { - warnx("%s: prelude `Dt' out-of-order (line %zu)", - tree->rbuf->name, tree->rbuf->line); - return(0); - } - - /* TODO: parse date. */ - - assert(NULL == tree->last); - tree->state |= ROFF_PRELUDE_Dt; - - return(1); + return(ROFF_IGN); } /* ARGSUSED */ -static int -roff_Os(ROFFCALL_ARGS) +static enum rofferr +roff_sub_ig(ROFF_ARGS) { + enum rofft t; + int pos; - if (ROFF_EXIT == type) { - assert(ROFF_PRELUDE_Os & tree->state); - return(roff_layout(tok, tree, argv, type)); - } else if (ROFF_BODY & tree->state) { - assert( ! (ROFF_PRELUDE & tree->state)); - assert(ROFF_PRELUDE_Os & tree->state); - return(roff_text(tok, tree, argv, type)); - } + /* Ignore free-text lines. */ - assert(ROFF_PRELUDE & tree->state); - if ( ! (ROFF_PRELUDE_Dt & tree->state) || - ! (ROFF_PRELUDE_Dd & tree->state)) { - warnx("%s: prelude `Os' out-of-order (line %zu)", - tree->rbuf->name, tree->rbuf->line); - return(0); - } + if ('.' != (*bufp)[ppos]) + return(ROFF_IGN); - /* TODO: extract OS. */ + /* Ignore macros unless it's a closing macro. */ - tree->state |= ROFF_PRELUDE_Os; - tree->state &= ~ROFF_PRELUDE; - tree->state |= ROFF_BODY; + t = roff_parse(*bufp, &pos); + if (ROFF_close != t) + return(ROFF_IGN); - assert(NULL == tree->last); - - return(roff_layout(tok, tree, argv, type)); + roffnode_pop(r); + return(ROFF_IGN); } -/* ARGUSED */ -static int -roffnextopt(const char ***in, char **val) +/* ARGSUSED */ +static enum rofferr +roff_new_close(ROFF_ARGS) { - const char *arg, **argv; - int v; - *val = NULL; - argv = *in; - assert(argv); - - if (NULL == (arg = *argv)) - return(-1); - if ('-' != *arg) - return(-1); - if (ROFF_ARGMAX == (v = rofffindarg(&arg[1]))) - return(-1); - if ( ! (ROFF_VALUE & tokenargs[v].flags)) - return(v); - - *in = ++argv; - - /* FIXME: what if this looks like a roff token or argument? */ - - return(*argv ? v : ROFF_ARGMAX); + /* + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + */ + return(ROFF_IGN); } /* ARGSUSED */ -static int -roff_layout(ROFFCALL_ARGS) +static enum rofferr +roff_new_ig(ROFF_ARGS) { - int i, c, argcp[ROFF_MAXARG]; - char *v, *argvp[ROFF_MAXARG]; - if (ROFF_PRELUDE & tree->state) { - warnx("%s: macro `%s' called in prelude (line %zu)", - tree->rbuf->name, toknames[tok], - tree->rbuf->line); - return(0); - } - - if (ROFF_EXIT == type) { - roffnode_free(tok, tree); - return((*tree->roffblkout)(tok)); - } - - i = 0; - while (-1 != (c = roffnextopt(&argv, &v))) { - if (ROFF_ARGMAX == c) { - warnx("%s: error parsing `%s' args (line %zu)", - tree->rbuf->name, - toknames[tok], - tree->rbuf->line); - return(0); - } - argcp[i] = c; - argvp[i] = v; - argv++; - } - - if (NULL == roffnode_new(tok, tree)) - return(0); - - if ( ! (*tree->roffin)(tok, argcp, argvp)) - return(0); - - if ( ! (ROFF_PARSED & tokens[tok].flags)) { - /* TODO: print all tokens. */ - - if ( ! ((*tree->roffout)(tok))) - return(0); - return((*tree->roffblkin)(tok)); - } - - while (*argv) { - if (2 >= strlen(*argv) && ROFF_MAX != - (c = rofffindcallable(*argv))) - if ( ! (*tokens[c].cb)(c, tree, - argv + 1, ROFF_ENTER)) - return(0); - - /* TODO: print token. */ - argv++; - } - - if ( ! ((*tree->roffout)(tok))) - return(0); - - return((*tree->roffblkin)(tok)); + return(roffnode_push(r, ROFF_ig, ln, ppos) ? + ROFF_IGN : ROFF_ERR); } -/* ARGSUSED */ -static int -roff_text(ROFFCALL_ARGS) +int +roff_endparse(struct roff *r) { - int i, c, argcp[ROFF_MAXARG]; - char *v, *argvp[ROFF_MAXARG]; - if (ROFF_PRELUDE & tree->state) { - warnx("%s: macro `%s' called in prelude (line %zu)", - tree->rbuf->name, toknames[tok], - tree->rbuf->line); - return(0); - } - - i = 0; - while (-1 != (c = roffnextopt(&argv, &v))) { - if (ROFF_ARGMAX == c) { - warnx("%s: error parsing `%s' args (line %zu)", - tree->rbuf->name, - toknames[tok], - tree->rbuf->line); - return(0); - } - argcp[i] = c; - argvp[i] = v; - argv++; - } - - if ( ! (*tree->roffin)(tok, argcp, argvp)) - return(0); - - if ( ! (ROFF_PARSED & tokens[tok].flags)) { - /* TODO: print all tokens. */ - return((*tree->roffout)(tok)); - } - - while (*argv) { - if (2 >= strlen(*argv) && ROFF_MAX != - (c = rofffindcallable(*argv))) - if ( ! (*tokens[c].cb)(c, tree, - argv + 1, ROFF_ENTER)) - return(0); - - /* TODO: print token. */ - argv++; - } - - return((*tree->roffout)(tok)); + if (NULL == r->last) + return(1); + return((*r->msg)(MANDOCERR_SCOPEEXIT, r->data, + r->last->line, r->last->col, NULL)); }