=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.1 retrieving revision 1.78 diff -u -p -r1.1 -r1.78 --- mandoc/roff.c 2008/11/24 14:24:55 1.1 +++ mandoc/roff.c 2010/05/16 22:28:33 1.78 @@ -1,701 +1,554 @@ -/* $Id: roff.c,v 1.1 2008/11/24 14:24:55 kristaps Exp $ */ +/* $Id: roff.c,v 1.78 2010/05/16 22:28:33 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 -#include "libmdocml.h" -#include "private.h" +#include "mandoc.h" +#include "roff.h" -#define ROFF_MAXARG 10 +#define ROFF_CTL(c) \ + ('.' == (c) || '\'' == (c)) +#if 0 +#define ROFF_MDEBUG(p, str) \ + fprintf(stderr, "%s: %s (%d:%d)\n", (str), \ + roffs[(p)->last->tok].name, \ + (p)->last->line, (p)->last->col) +#else +#define ROFF_MDEBUG(p, str) while (/* CONSTCOND */ 0) +#endif -enum roffd { - ROFF_ENTER = 0, - ROFF_EXIT +enum rofft { + ROFF_if, + ROFF_ig, + ROFF_cblock, + ROFF_ccond, +#if 0 + ROFF_am, + ROFF_ami, + ROFF_de, + ROFF_dei, + ROFF_close, +#endif + ROFF_MAX }; -enum rofftype { - ROFF_TITLE, - 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 \ - struct rofftree *tree, const char *argv[], enum roffd type - -struct rofftree; - -struct rofftok { - char *name; - 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 { - char *name; - 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 */ + char *end; /* end-token: custom */ + int line; /* parse line */ + int col; /* parse col */ + int endspan; }; -struct rofftree { - struct roffnode *last; - time_t date; - char title[256]; - char section[256]; - char volume[256]; - 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) - struct md_mbuf *mbuf; /* NULL if ROFF_EXIT and error. */ +#define ROFF_ARGS struct roff *r, /* parse ctx */ \ + enum rofft tok, /* tok of macro */ \ + char **bufp, /* input buffer */ \ + size_t *szp, /* size of input buffer */ \ + int ln, /* parse line */ \ + int ppos, /* original pos in buffer */ \ + int pos, /* current pos in buffer */ \ + int *offs /* reset offset of buffer data */ - const struct md_args *args; - const struct md_rbuf *rbuf; -}; +typedef enum rofferr (*roffproc)(ROFF_ARGS); -#define ROFF___ 0 -#define ROFF_Dd 1 -#define ROFF_Dt 2 -#define ROFF_Os 3 -#define ROFF_Sh 4 -#define ROFF_An 5 -#define ROFF_Li 6 -#define ROFF_MAX 7 - -static int roff_Dd(ROFFCALL_ARGS); -static int roff_Dt(ROFFCALL_ARGS); -static int roff_Os(ROFFCALL_ARGS); -static int roff_Sh(ROFFCALL_ARGS); -static int roff_An(ROFFCALL_ARGS); -static int roff_Li(ROFFCALL_ARGS); - -static struct roffnode *roffnode_new(int, size_t, - struct rofftree *); -static void roffnode_free(int, struct rofftree *); - -static int rofffindtok(const char *); -static int rofffindarg(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 void dbg_enter(const struct md_args *, int); -static void dbg_leave(const struct md_args *, int); - - -static const struct rofftok tokens[ROFF_MAX] = { - { "\\\"", NULL, ROFF_COMMENT, 0 }, - { "Dd", roff_Dd, ROFF_TITLE, 0 }, - { "Dt", roff_Dt, ROFF_TITLE, 0 }, - { "Os", roff_Os, ROFF_TITLE, 0 }, - { "Sh", roff_Sh, ROFF_LAYOUT, 0 }, - { "An", roff_An, ROFF_TEXT, ROFF_PARSED }, - { "Li", roff_Li, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, +struct roffmac { + const char *name; /* macro name */ + roffproc proc; + roffproc text; }; -#define ROFF_Split 0 -#define ROFF_Nosplit 1 -#define ROFF_ARGMAX 2 +static enum rofferr roff_if(ROFF_ARGS); +static enum rofferr roff_if_text(ROFF_ARGS); +static enum rofferr roff_ig(ROFF_ARGS); +static enum rofferr roff_ig_text(ROFF_ARGS); +static enum rofferr roff_cblock(ROFF_ARGS); +static enum rofferr roff_ccond(ROFF_ARGS); -static const struct roffarg tokenargs[ROFF_ARGMAX] = { - { "split", 0 }, - { "nosplit", 0 }, +const struct roffmac roffs[ROFF_MAX] = { + { "if", roff_if, roff_if_text }, + { "ig", roff_ig, roff_ig_text }, + { ".", roff_cblock, NULL }, + { "\\}", roff_ccond, NULL }, }; +static void roff_free1(struct roff *); +static enum rofft roff_hash_find(const char *); +static void roffnode_cleanscope(struct roff *); +static int roffnode_push(struct roff *, + enum rofft, int, int); +static void roffnode_pop(struct roff *); +static enum rofft roff_parse(const char *, int *); -int -roff_free(struct rofftree *tree, int flush) -{ - int error; - assert(tree->mbuf); - if ( ! flush) - tree->mbuf = NULL; - - /* LINTED */ - while (tree->last) - if ( ! (*tokens[tree->last->tok].cb) - (tree, NULL, ROFF_EXIT)) - /* Disallow flushing. */ - tree->mbuf = NULL; - - 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); -} - - -struct rofftree * -roff_alloc(const struct md_args *args, struct md_mbuf *out, - const struct md_rbuf *in) +/* + * 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) { - struct rofftree *tree; + int i; - if (NULL == (tree = calloc(1, sizeof(struct rofftree)))) { - warn("malloc"); - return(NULL); - } + /* FIXME: make this be fast and efficient. */ - tree->state = ROFF_PRELUDE; - tree->args = args; - tree->mbuf = out; - tree->rbuf = in; + for (i = 0; i < (int)ROFF_MAX; i++) + if (0 == strcmp(roffs[i].name, p)) + return((enum rofft)i); - return(tree); + return(ROFF_MAX); } -int -roff_engine(struct rofftree *tree, char *buf, size_t sz) +/* + * Pop the current node off of the stack of roff instructions currently + * pending. + */ +static void +roffnode_pop(struct roff *r) { + struct roffnode *p; - if (0 == sz) { - warnx("%s: blank line (line %zu)", - tree->rbuf->name, - tree->rbuf->line); - return(0); - } else if ('.' != *buf) - return(textparse(tree, buf, sz)); - - return(roffparse(tree, buf, sz)); + assert(r->last); + p = r->last; + r->last = r->last->parent; + if (p->end) + free(p->end); + free(p); } +/* + * Push a roff node onto the instruction stack. This must later be + * removed with roffnode_pop(). + */ static int -textparse(const struct rofftree *tree, const char *buf, size_t sz) +roffnode_push(struct roff *r, enum rofft tok, int line, int col) { - - if (NULL == tree->last) { - warnx("%s: unexpected text (line %zu)", - tree->rbuf->name, - tree->rbuf->line); + struct roffnode *p; + + if (NULL == (p = calloc(1, sizeof(struct roffnode)))) { + (*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL); 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? */ + while (r->last) + roffnode_pop(r); +} - 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; +void +roff_reset(struct roff *r) +{ - return(ROFF_MAXARG > i); + roff_free1(r); } -static int -roffparse(struct rofftree *tree, char *buf, size_t sz) +void +roff_free(struct roff *r) { - int tok, t; - struct roffnode *node; - char *argv[ROFF_MAXARG]; - const char **argvp; - assert(sz > 0); + roff_free1(r); + free(r); +} - /* - * 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); +struct roff * +roff_alloc(const mandocmsg msg, void *data) +{ + struct roff *r; + + if (NULL == (r = calloc(1, sizeof(struct roff)))) { + (*msg)(MANDOCERR_MEM, data, 0, 0, NULL); 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, tokens[tok].name, - tree->rbuf->line); - return(0); } - /* Domain cross-contamination (and sanity) checks. */ + r->msg = msg; + r->data = data; + return(r); +} - switch (tokens[tok].type) { - case (ROFF_TITLE): - if (ROFF_PRELUDE & tree->state) { - assert( ! (ROFF_BODY & tree->state)); - break; - } - assert(ROFF_BODY & tree->state); - warnx("%s: prelude token `%s' in body (line %zu)", - tree->rbuf->name, tokens[tok].name, - tree->rbuf->line); - return(0); - case (ROFF_LAYOUT): - /* FALLTHROUGH */ - case (ROFF_TEXT): - if (ROFF_BODY & tree->state) { - assert( ! (ROFF_PRELUDE & tree->state)); - break; - } - assert(ROFF_PRELUDE & tree->state); - warnx("%s: body token `%s' in prelude (line %zu)", - tree->rbuf->name, tokens[tok].name, - tree->rbuf->line); - return(0); - case (ROFF_COMMENT): - return(1); - default: - abort(); - } - /* - * 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. - */ +enum rofferr +roff_parseln(struct roff *r, int ln, + char **bufp, size_t *szp, int pos, int *offs) +{ + enum rofft t; + int ppos, i, j, wtf; - node = NULL; + if (r->last && ! ROFF_CTL((*bufp)[pos])) { + /* + * If a scope is open and we're not a macro, pass it + * through our text detector and continue as quickly as + * possible. + */ + t = r->last->tok; + assert(roffs[t].text); + return((*roffs[t].text) + (r, t, bufp, szp, ln, pos, pos, offs)); + } else if ( ! ROFF_CTL((*bufp)[pos])) + /* + * Don't do anything if we're free-form text. + */ + return(ROFF_CONT); - if (ROFF_LAYOUT == tokens[tok].type && - ! (ROFF_NESTED & tokens[tok].flags)) { - for (node = tree->last; node; node = node->parent) { - if (node->tok == tok) - break; + /* A macro-ish line with a possibly-open macro context. */ - /* Don't break nested scope. */ + wtf = 0; - if ( ! (ROFF_NESTED & tokens[node->tok].flags)) - continue; - warnx("%s: scope of %s (line %zu) broken by " - "%s (line %zu)", - tree->rbuf->name, - tokens[tok].name, - node->line, - tokens[node->tok].name, - tree->rbuf->line); - return(0); + if (r->last && r->last->end) { + /* + * We have a scope open that has a custom end-macro + * handler. Try to match it against the input. + */ + i = pos + 1; + while (' ' == (*bufp)[i] || '\t' == (*bufp)[i]) + i++; + + for (j = 0; r->last->end[j]; j++, i++) + if ((*bufp)[i] != r->last->end[j]) + break; + + if ('\0' == r->last->end[j] && + ('\0' == (*bufp)[i] || + ' ' == (*bufp)[i] || + '\t' == (*bufp)[i])) { + roffnode_pop(r); + roffnode_cleanscope(r); + wtf = 1; } } - if (node) { - assert(ROFF_LAYOUT == tokens[tok].type); - assert( ! (ROFF_NESTED & tokens[tok].flags)); - assert(node->tok == tok); + ppos = pos; + if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) { + /* + * This is some of groff's stranger behaviours. If we + * encountered a custom end-scope tag and that tag also + * happens to be a "real" macro, then we need to try + * interpreting it again as a real macro. If it's not, + * then return ignore. Else continue. + */ + if (wtf) + return(ROFF_IGN); + else if (NULL == r->last) + return(ROFF_CONT); - /* Clear up to last scoped token. */ - - /* LINTED */ - do { - t = tree->last->tok; - if ( ! (*tokens[tree->last->tok].cb) - (tree, NULL, ROFF_EXIT)) - return(0); - } while (t != tok); + /* FIXME: this assumes that we ignore!? */ + return(ROFF_IGN); } - /* Proceed with actual token processing. */ - - argvp = (const char **)&argv[1]; - return((*tokens[tok].cb)(tree, argvp, ROFF_ENTER)); + assert(roffs[t].proc); + return((*roffs[t].proc) + (r, t, bufp, szp, ln, ppos, pos, offs)); } -static int -rofffindarg(const char *name) +int +roff_endparse(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, tokenargs[i].name)) - return((int)i); - - return(ROFF_ARGMAX); + if (NULL == r->last) + return(1); + return((*r->msg)(MANDOCERR_SCOPEEXIT, r->data, r->last->line, + r->last->col, NULL)); } -static int -rofffindtok(const char *name) +/* + * 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) { - size_t i; + int j; + char mac[5]; + enum rofft t; - /* FIXME: use a table, this is slow but ok for now. */ + assert(ROFF_CTL(buf[*pos])); + (*pos)++; - /* LINTED */ - for (i = 0; i < ROFF_MAX; i++) - /* LINTED */ - if (0 == strncmp(name, tokens[i].name, 2)) - return((int)i); - - return(ROFF_MAX); -} + while (buf[*pos] && (' ' == buf[*pos] || '\t' == buf[*pos])) + (*pos)++; + if ('\0' == buf[*pos]) + return(ROFF_MAX); -/* FIXME: accept only struct rofftree *. */ -static struct roffnode * -roffnode_new(int tokid, size_t line, struct rofftree *tree) -{ - struct roffnode *p; - - if (NULL == (p = malloc(sizeof(struct roffnode)))) { - warn("malloc"); - return(NULL); - } + for (j = 0; j < 4; j++, (*pos)++) + if ('\0' == (mac[j] = buf[*pos])) + break; + else if (' ' == buf[*pos]) + break; - p->line = line; - p->tok = tokid; - p->parent = tree->last; - tree->last = p; - return(p); -} + if (j == 4 || j < 1) + return(ROFF_MAX); + mac[j] = '\0'; -static void -roffnode_free(int tokid, struct rofftree *tree) -{ - struct roffnode *p; + if (ROFF_MAX == (t = roff_hash_find(mac))) + return(t); - assert(tree->last); - assert(tree->last->tok == tokid); + while (buf[*pos] && ' ' == buf[*pos]) + (*pos)++; - p = tree->last; - tree->last = tree->last->parent; - free(p); + return(t); } -static int dbg_lvl = 0; - - -static void -dbg_enter(const struct md_args *args, int tokid) +/* ARGSUSED */ +static enum rofferr +roff_cblock(ROFF_ARGS) { - int i; - static char buf[72]; - assert(args); - if ( ! (args->dbg & MD_DBG_TREE)) - return; - assert(tokid >= 0 && tokid <= ROFF_MAX); + if (NULL == r->last) { + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); + } - buf[0] = buf[71] = 0; - - switch (tokens[tokid].type) { - case (ROFF_LAYOUT): - (void)strncat(buf, "[body-layout] ", sizeof(buf) - 1); - break; - case (ROFF_TEXT): - (void)strncat(buf, "[ body-text] ", sizeof(buf) - 1); - break; - case (ROFF_TITLE): - (void)strncat(buf, "[ prelude] ", sizeof(buf) - 1); - break; - default: - abort(); + if (ROFF_ig != r->last->tok) { + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); } - /* LINTED */ - for (i = 0; i < dbg_lvl; i++) - (void)strncat(buf, " ", sizeof(buf) - 1); + if ((*bufp)[pos]) + if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL)) + return(ROFF_ERR); - (void)strncat(buf, tokens[tokid].name, sizeof(buf) - 1); + ROFF_MDEBUG(r, "closing ignore block"); + roffnode_pop(r); + roffnode_cleanscope(r); + return(ROFF_IGN); - (void)printf("%s\n", buf); - - dbg_lvl++; } -/* FIXME: accept only struct rofftree *. */ static void -dbg_leave(const struct md_args *args, int tokid) +roffnode_cleanscope(struct roff *r) { - assert(args); - if ( ! (args->dbg & MD_DBG_TREE)) - return; - assert(tokid >= 0 && tokid <= ROFF_MAX); - assert(dbg_lvl > 0); - dbg_lvl--; + while (r->last) { + if (--r->last->endspan < 0) + break; + ROFF_MDEBUG(r, "closing implicit scope"); + roffnode_pop(r); + } } -/* FIXME: accept only struct rofftree *. */ /* ARGSUSED */ -static int -roff_Dd(ROFFCALL_ARGS) +static enum rofferr +roff_ccond(ROFF_ARGS) { - dbg_enter(tree->args, ROFF_Dd); + if (NULL == r->last) { + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); + } - assert(ROFF_PRELUDE & tree->state); - if (ROFF_PRELUDE_Dt & tree->state || - ROFF_PRELUDE_Dd & tree->state) { - warnx("%s: prelude `Dd' out-of-order (line %zu)", - tree->rbuf->name, tree->rbuf->line); - return(0); + if (ROFF_if != r->last->tok) { + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); } - assert(NULL == tree->last); - tree->state |= ROFF_PRELUDE_Dd; + if (r->last->endspan > -1) { + if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); + } - dbg_leave(tree->args, ROFF_Dd); + if ((*bufp)[pos]) + if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL)) + return(ROFF_ERR); - return(1); + ROFF_MDEBUG(r, "closing explicit scope"); + roffnode_pop(r); + roffnode_cleanscope(r); + return(ROFF_IGN); } /* ARGSUSED */ -static int -roff_Dt(ROFFCALL_ARGS) +static enum rofferr +roff_ig(ROFF_ARGS) { + int sv; + size_t sz; - dbg_enter(tree->args, ROFF_Dt); + if ( ! roffnode_push(r, tok, ln, ppos)) + return(ROFF_ERR); - assert(ROFF_PRELUDE & 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); + if ('\0' == (*bufp)[pos]) { + ROFF_MDEBUG(r, "opening ignore block"); + return(ROFF_IGN); } - assert(NULL == tree->last); - tree->state |= ROFF_PRELUDE_Dt; + sv = pos; + while ((*bufp)[pos] && ' ' != (*bufp)[pos] && + '\t' != (*bufp)[pos]) + pos++; - dbg_leave(tree->args, ROFF_Dt); + /* + * Note: groff does NOT like escape characters in the input. + * Instead of detecting this, we're just going to let it fly and + * to hell with it. + */ - return(1); -} + assert(pos > sv); + sz = (size_t)(pos - sv); + r->last->end = malloc(sz + 1); -/* ARGSUSED */ -static int -roff_Os(ROFFCALL_ARGS) -{ - - if (ROFF_EXIT == type) { - roffnode_free(ROFF_Os, tree); - dbg_leave(tree->args, ROFF_Os); - return(1); - } - - dbg_enter(tree->args, ROFF_Os); - - 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 (NULL == r->last->end) { + (*r->msg)(MANDOCERR_MEM, r->data, ln, pos, NULL); + return(ROFF_ERR); } - assert(NULL == tree->last); - if (NULL == roffnode_new(ROFF_Os, tree->rbuf->line, tree)) - return(0); + memcpy(r->last->end, *bufp + sv, sz); + r->last->end[(int)sz] = '\0'; - tree->state |= ROFF_PRELUDE_Os; - tree->state &= ~ROFF_PRELUDE; - tree->state |= ROFF_BODY; + ROFF_MDEBUG(r, "opening explicit ignore block"); - return(1); + if ((*bufp)[pos]) + if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL)) + return(ROFF_ERR); + + return(ROFF_IGN); } /* ARGSUSED */ -static int -roff_Sh(ROFFCALL_ARGS) +static enum rofferr +roff_ig_text(ROFF_ARGS) { - if (ROFF_EXIT == type) { - roffnode_free(ROFF_Sh, tree); - dbg_leave(tree->args, ROFF_Sh); - return(1); - } - - dbg_enter(tree->args, ROFF_Sh); - - if (NULL == roffnode_new(ROFF_Sh, tree->rbuf->line, tree)) - return(0); - - return(1); + return(ROFF_IGN); } /* ARGSUSED */ -static int -roff_Li(ROFFCALL_ARGS) +static enum rofferr +roff_if_text(ROFF_ARGS) { + char *ep, *st; - dbg_enter(tree->args, ROFF_Li); - dbg_leave(tree->args, ROFF_Li); + st = &(*bufp)[pos]; + if (NULL == (ep = strstr(st, "\\}"))) { + roffnode_cleanscope(r); + return(ROFF_IGN); + } - return(1); + if (ep > st && '\\' != *(ep - 1)) { + ROFF_MDEBUG(r, "closing explicit scope (in-line)"); + roffnode_pop(r); + } + + roffnode_cleanscope(r); + return(ROFF_IGN); } -static int -roffnextopt(const char ***in, char **val) +/* ARGSUSED */ +static enum rofferr +roff_if(ROFF_ARGS) { - const char *arg, **argv; - int v; + int sv; - *val = NULL; - argv = *in; - assert(argv); + /* + * Read ahead past the conditional. + * FIXME: this does not work, as conditionals don't end on + * whitespace, but are parsed according to a formal grammar. + * It's good enough for now, however. + */ - 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); + while ((*bufp)[pos] && ' ' != (*bufp)[pos]) + pos++; - *in = ++argv; + sv = pos; + while (' ' == (*bufp)[pos]) + pos++; - /* FIXME: what if this looks like a roff token or argument? */ + /* + * Roff is weird. If we have just white-space after the + * conditional, it's considered the BODY and we exit without + * really doing anything. Warn about this. It's probably + * wrong. + */ - return(*argv ? v : ROFF_ARGMAX); -} + if ('\0' == (*bufp)[pos] && sv != pos) { + if ( ! (*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL)) + return(ROFF_ERR); + return(ROFF_IGN); + } + if ( ! roffnode_push(r, tok, ln, ppos)) + return(ROFF_ERR); -/* ARGSUSED */ -static int -roff_An(ROFFCALL_ARGS) -{ - int c; - char *val; + /* Don't evaluate: just assume NO. */ - dbg_enter(tree->args, ROFF_An); + r->last->endspan = 1; - while (-1 != (c = roffnextopt(&argv, &val))) { - switch (c) { - case (ROFF_Split): - /* Process argument. */ - break; - case (ROFF_Nosplit): - /* Process argument. */ - break; - default: - warnx("%s: error parsing `An' args (line %zu)", - tree->rbuf->name, - tree->rbuf->line); - return(0); - } - argv++; - } + if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) { + ROFF_MDEBUG(r, "opening explicit scope"); + r->last->endspan = -1; + pos += 2; + } else + ROFF_MDEBUG(r, "opening implicit scope"); - /* Print header. */ - - while (*argv) { - if (/* is_parsable && */ 2 >= strlen(*argv)) { - if (ROFF_MAX != (c = rofffindtok(*argv))) { - if (ROFF_CALLABLE & tokens[c].flags) { - /* Call to token. */ - if ( ! (*tokens[c].cb)(tree, (const char **)argv + 1, ROFF_ENTER)) - return(0); - } - /* Print token. */ - } else { - /* Print token. */ - } - } else { - /* Print token. */ - } - argv++; - } + /* + * If there are no arguments on the line, the next-line scope is + * assumed. + */ - /* Print footer. */ + if ('\0' == (*bufp)[pos]) + return(ROFF_IGN); - dbg_leave(tree->args, ROFF_An); + /* Otherwise re-run the roff parser after recalculating. */ - return(1); + *offs = pos; + return(ROFF_RERUN); } -