=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.22 retrieving revision 1.28 diff -u -p -r1.22 -r1.28 --- mandoc/roff.c 2008/11/30 18:53:11 1.22 +++ mandoc/roff.c 2008/12/01 16:01:28 1.28 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.22 2008/11/30 18:53:11 kristaps Exp $ */ +/* $Id: roff.c,v 1.28 2008/12/01 16:01:28 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -28,16 +28,20 @@ #include "libmdocml.h" #include "private.h" -/* FIXME: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */ +/* TODO: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */ -/* FIXME: warn about "X section only" macros. */ +/* TODO: warn about "X section only" macros. */ -/* FIXME: warn about empty lists. */ +/* TODO: warn about empty lists. */ -/* FIXME: roff_layout and roff_text have identical-ish lower bodies. */ +/* TODO: (warn) some sections need specific elements. */ -/* FIXME: NAME section needs specific elements. */ +/* TODO: (warn) NAME section has particular order. */ +/* TODO: unify empty-content tags a la
. */ + +/* TODO: macros with a set number of arguments? */ + #define ROFF_MAXARG 32 enum roffd { @@ -69,6 +73,7 @@ struct rofftok { #define ROFF_PARSED (1 << 0) /* "Parsed". */ #define ROFF_CALLABLE (1 << 1) /* "Callable". */ #define ROFF_SHALLOW (1 << 2) /* Nesting block. */ +#define ROFF_LSCOPE (1 << 3) }; struct roffarg { @@ -108,9 +113,8 @@ static int roff_Os(ROFFCALL_ARGS); static int roff_layout(ROFFCALL_ARGS); static int roff_text(ROFFCALL_ARGS); -static int roff_comment(ROFFCALL_ARGS); -static int roff_close(ROFFCALL_ARGS); -static int roff_special(ROFFCALL_ARGS); +static int roff_noop(ROFFCALL_ARGS); +static int roff_depr(ROFFCALL_ARGS); static struct roffnode *roffnode_new(int, struct rofftree *); static void roffnode_free(struct rofftree *); @@ -129,6 +133,8 @@ static int roffargs(const struct rofftree *, static int roffargok(int, int); static int roffnextopt(const struct rofftree *, int, char ***, char **); +static int roffparseopts(struct rofftree *, int, + char ***, int *, char **); static int roffparse(struct rofftree *, char *); static int textparse(const struct rofftree *, char *); @@ -173,19 +179,19 @@ static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX /* Table of all known tokens. */ static const struct rofftok tokens[ROFF_MAX] = { - {roff_comment, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */ + { roff_noop, 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 */ { roff_Os, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Os */ { roff_layout, NULL, NULL, NULL, ROFF_Sh, ROFF_LAYOUT, 0 }, /* Sh */ { roff_layout, NULL, NULL, NULL, ROFF_Ss, ROFF_LAYOUT, 0 }, /* Ss */ - { roff_text, NULL, NULL, NULL, ROFF_Pp, ROFF_TEXT, 0 }, /* Pp */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* D1 */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Dl */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Pp */ /* XXX 0 args */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_LSCOPE }, /* D1 */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_LSCOPE }, /* Dl */ { roff_layout, roffarg_Bd, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bd */ - { roff_close, NULL, NULL, NULL, ROFF_Bd, ROFF_LAYOUT, 0 }, /* Ed */ + { roff_noop, NULL, NULL, NULL, ROFF_Bd, ROFF_LAYOUT, 0 }, /* Ed */ { roff_layout, roffarg_Bl, NULL, roffchild_Bl, 0, ROFF_LAYOUT, 0 }, /* Bl */ - { roff_close, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */ + { roff_noop, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */ { roff_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, ROFF_PARSED | ROFF_SHALLOW }, /* It */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ad */ /* FIXME */ { roff_text, roffarg_An, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* An */ @@ -206,8 +212,8 @@ static const struct rofftok tokens[ROFF_MAX] = { { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Li */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Nd */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Nm */ /* FIXME */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Op */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ot */ /* XXX deprecated */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Op */ + { roff_depr, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ot */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pa */ { roff_text, roffarg_Rv, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Rv */ { roff_text, roffarg_St, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* St */ @@ -227,42 +233,42 @@ static const struct rofftok tokens[ROFF_MAX] = { { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %V */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ac */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ao */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Aq */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Aq */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* At */ /* XXX at most 2 args */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bf */ /* FIXME */ + { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bf */ /* FIXME */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bq */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Bq */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bsx */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bx */ - {roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Db */ + { NULL, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Db */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dc */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dq */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Dq */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ef */ /* FIXME */ + { roff_noop, NULL, NULL, NULL, ROFF_Bf, ROFF_LAYOUT, 0 }, /* Ef */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Em */ /* XXX needs arg */ { 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 */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */ + { NULL, 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 */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */ - { roff_text, NULL, NULL, NULL, 0, ROFF_LAYOUT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pq */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Pq */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qc */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ql */ - { roff_layout, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qo */ - { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qq */ - { roff_close, NULL, roffparent_Re, NULL, ROFF_Rs, ROFF_LAYOUT, 0 }, /* Re */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qo */ + { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Qq */ + { roff_noop, NULL, roffparent_Re, NULL, ROFF_Rs, ROFF_LAYOUT, 0 }, /* Re */ { roff_layout, NULL, NULL, roffchild_Rs, 0, ROFF_LAYOUT, 0 }, /* Rs */ { 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 }, /* Sq */ - {roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */ + { 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_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 */ @@ -270,11 +276,15 @@ static const struct rofftok tokens[ROFF_MAX] = { { 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_close, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */ + { roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */ { roff_layout, NULL, NULL, roffchild_Oo, 0, ROFF_LAYOUT, 0 }, /* Oo */ - { roff_close, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */ + { roff_noop, 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 */ + { roff_noop, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bt */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Hf */ + { roff_depr, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fr */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */ }; /* Table of all known token arguments. */ @@ -307,8 +317,11 @@ const char *const toknamesp[ROFF_MAX] = { "Ic", "In", "Li", "Nd", "Nm", "Op", "Ot", "Pa", "Rv", "St", "Va", "Vt", + /* LINTED */ "Xr", "\%A", "\%B", "\%D", + /* LINTED */ "\%I", "\%J", "\%N", "\%O", + /* LINTED */ "\%P", "\%R", "\%T", "\%V", "Ac", "Ao", "Aq", "At", "Bc", "Bf", "Bo", "Bq", @@ -322,7 +335,8 @@ const char *const toknamesp[ROFF_MAX] = { "Sq", "Sm", "Sx", "Sy", "Tn", "Ux", "Xc", "Xo", "Fo", "Fc", "Oo", "Oc", - "Bk", "Ek", + "Bk", "Ek", "Bt", "Hf", + "Fr", "Ud", }; const char *const tokargnamesp[ROFF_ARGMAX] = { @@ -366,14 +380,14 @@ roff_free(struct rofftree *tree, int flush) error = 1; if (ROFF_PRELUDE & tree->state) { - roff_warn(tree, NULL, "prelude never finished"); + roff_err(tree, NULL, "prelude never finished"); goto end; } - for (n = tree->last; n->parent; n = n->parent) { + for (n = tree->last; n; n = n->parent) { if (0 != tokens[n->tok].ctx) continue; - roff_warn(tree, NULL, "closing explicit scope `%s'", + roff_err(tree, NULL, "closing explicit scope `%s'", toknames[n->tok]); goto end; } @@ -491,7 +505,6 @@ roffargs(const struct rofftree *tree, } -/* XXX */ static int roffscan(int tok, const int *tokv) { @@ -515,6 +528,10 @@ roffparse(struct rofftree *tree, char *buf) char *argv[ROFF_MAXARG]; char **argvp; + if (0 != *buf && 0 != *(buf + 1) && 0 != *(buf + 2)) + if (0 == strncmp(buf, ".\\\"", 3)) + return(1); + if (ROFF_MAX == (tok = rofffindtok(buf + 1))) { roff_err(tree, buf + 1, "bogus line macro"); return(0); @@ -522,9 +539,9 @@ roffparse(struct rofftree *tree, char *buf) roff_err(tree, buf + 1, "unsupported macro `%s'", toknames[tok]); return(0); - } else if (ROFF_COMMENT == tokens[tok].type) - return(1); - + } + + assert(ROFF___ != tok); if ( ! roffargs(tree, tok, buf, argv)) return(0); @@ -537,8 +554,7 @@ roffparse(struct rofftree *tree, char *buf) if (ROFF_PRELUDE & tree->state) { assert(NULL == tree->last); return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER)); - } else - assert(tree->last); + } assert(ROFF_BODY & tree->state); @@ -547,14 +563,16 @@ roffparse(struct rofftree *tree, char *buf) * children are satisfied. */ - if ( ! roffscan(tree->last->tok, tokens[tok].parents)) { + if (tree->last && ! roffscan + (tree->last->tok, tokens[tok].parents)) { 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)) { + if (tree->last && ! roffscan + (tok, tokens[tree->last->tok].children)) { roff_err(tree, *argvp, "`%s' is invalid child of `%s'", toknames[tok], toknames[tree->last->tok]); @@ -567,11 +585,6 @@ roffparse(struct rofftree *tree, char *buf) if (ROFF_LAYOUT != tokens[tok].type) return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER)); - - /* - * Check our scope rules. - */ - if (0 == tokens[tok].ctx) return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER)); @@ -602,6 +615,11 @@ roffparse(struct rofftree *tree, char *buf) n = NULL; break; } + if (tokens[n->tok].ctx == n->tok) + continue; + roff_err(tree, *argv, "`%s' breaks `%s' scope", + toknames[tok], toknames[n->tok]); + return(0); } /* @@ -635,9 +653,26 @@ roffparse(struct rofftree *tree, char *buf) * In this, the `El' tag closes out the scope of `Bl'. */ - assert(tree->last); assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx); + for (n = tree->last; n; n = n->parent) + if (n->tok != tokens[tok].ctx) { + if (n->tok == tokens[n->tok].ctx) + continue; + roff_err(tree, *argv, "`%s' breaks `%s' scope", + toknames[tok], toknames[n->tok]); + return(0); + } else + break; + + + if (NULL == n) { + roff_err(tree, *argv, "`%s' has no starting tag `%s'", + toknames[tok], + toknames[tokens[tok].ctx]); + return(0); + } + /* LINTED */ do { t = tree->last->tok; @@ -645,7 +680,6 @@ roffparse(struct rofftree *tree, char *buf) return(0); } while (t != tokens[tok].ctx); - assert(tree->last); return(1); } @@ -671,7 +705,7 @@ static int rofffindtok(const char *buf) { char token[4]; - size_t i; + int i; for (i = 0; *buf && ! isspace(*buf) && i < 3; i++, buf++) token[i] = *buf; @@ -835,6 +869,31 @@ roffnextopt(const struct rofftree *tree, int tok, } +static int +roffparseopts(struct rofftree *tree, int tok, + char ***args, int *argc, char **argv) +{ + int i, c; + char *v; + + i = 0; + + while (-1 != (c = roffnextopt(tree, tok, args, &v))) { + if (ROFF_ARGMAX == c) + return(0); + + argc[i] = c; + argv[i] = v; + i++; + *args = *args + 1; + } + + argc[i] = ROFF_ARGMAX; + argv[i] = NULL; + return(1); +} + + /* ARGSUSED */ static int roff_Dd(ROFFCALL_ARGS) @@ -903,7 +962,6 @@ roff_Os(ROFFCALL_ARGS) { if (ROFF_EXIT == type) { - roffnode_free(tree); return((*tree->cb.rofftail)(tree->arg)); } else if (ROFF_BODY & tree->state) { assert( ! (ROFF_PRELUDE & tree->state)); @@ -926,9 +984,6 @@ roff_Os(ROFFCALL_ARGS) assert(NULL == tree->last); - if (NULL == roffnode_new(tok, tree)) - return(0); - return((*tree->cb.roffhead)(tree->arg)); } @@ -938,47 +993,44 @@ static int roff_layout(ROFFCALL_ARGS) { int i, c, argcp[ROFF_MAXARG]; - char *v, *argvp[ROFF_MAXARG]; + char *argvp[ROFF_MAXARG]; if (ROFF_PRELUDE & tree->state) { - roff_err(tree, *argv, "`%s' disallowed in prelude", + roff_err(tree, *argv, "bad `%s' in prelude", toknames[tok]); return(0); - } - - if (ROFF_EXIT == type) { + } else if (ROFF_EXIT == type) { roffnode_free(tree); return((*tree->cb.roffblkout)(tree->arg, tok)); } - i = 0; - argv++; + assert( ! (ROFF_CALLABLE & tokens[tok].flags)); - while (-1 != (c = roffnextopt(tree, tok, &argv, &v))) { - if (ROFF_ARGMAX == c) - return(0); + ++argv; - argcp[i] = c; - argvp[i] = v; - i++; - argv++; - } - - argcp[i] = ROFF_ARGMAX; - argvp[i] = NULL; - + if ( ! roffparseopts(tree, tok, &argv, argcp, argvp)) + return(0); if (NULL == roffnode_new(tok, tree)) return(0); + /* + * Layouts have two parts: the layout body and header. The + * layout header is the trailing text of the line macro, while + * the layout body is everything following until termination. + */ + if ( ! (*tree->cb.roffblkin)(tree->arg, tok, argcp, argvp)) return(0); - if (NULL == *argv) return(1); - if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp)) return(0); + /* + * If there are no parsable parts, then write remaining tokens + * into the layout header and exit. + */ + if ( ! (ROFF_PARSED & tokens[tok].flags)) { i = 0; while (*argv) { @@ -989,52 +1041,67 @@ roff_layout(ROFFCALL_ARGS) return((*tree->cb.roffout)(tree->arg, tok)); } + /* + * Parsable elements may be in the header (or be the header, for + * that matter). Follow the regular parsing rules for these. + */ + i = 0; while (*argv) { - if (ROFF_MAX != (c = rofffindcallable(*argv))) { - if (NULL == tokens[c].cb) { - roff_err(tree, *argv, "unsupported " - "macro `%s'", - toknames[c]); + if (ROFF_MAX == (c = rofffindcallable(*argv))) { + assert(tree->arg); + if ( ! (*tree->cb.roffdata) + (tree->arg, i, *argv++)) return(0); - } - if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER)) - return(0); - break; + i = 1; + continue; } - assert(tree->arg); - if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++)) + if (NULL == tokens[c].cb) { + roff_err(tree, *argv, "unsupported macro `%s'", + toknames[c]); return(0); - i = 1; + } + + if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER)) + return(0); + + break; } /* - * If we're the first parser (*argv == tree->cur) then purge out - * any additional punctuation, should there be any remaining at - * the end of line. + * If there's trailing punctuation in the header, then write it + * out now. Here we mimic the behaviour of a line-dominant text + * macro. */ - if (ROFF_PARSED & tokens[tok].flags && *argv) { - i = 0; - while (argv[i]) - i++; + if (NULL == *argv) + return((*tree->cb.roffout)(tree->arg, tok)); - assert(i > 0); - if ( ! roffispunct(argv[--i])) - return((*tree->cb.roffout)(tree->arg, tok)); + /* + * Expensive. Scan to the end of line then work backwards until + * a token isn't punctuation. + */ - while (i >= 0 && roffispunct(argv[i])) - i--; - - assert(0 != i); + i = 0; + while (argv[i]) i++; - while (argv[i]) - if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) - return(0); - } + assert(i > 0); + if ( ! roffispunct(argv[--i])) + return((*tree->cb.roffout)(tree->arg, tok)); + while (i >= 0 && roffispunct(argv[i])) + i--; + + assert(0 != i); + i++; + + /* LINTED */ + while (argv[i]) + if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) + return(0); + return((*tree->cb.roffout)(tree->arg, tok)); } @@ -1044,7 +1111,7 @@ static int roff_text(ROFFCALL_ARGS) { int i, j, first, c, argcp[ROFF_MAXARG]; - char *v, *argvp[ROFF_MAXARG]; + char *argvp[ROFF_MAXARG]; if (ROFF_PRELUDE & tree->state) { roff_err(tree, *argv, "`%s' disallowed in prelude", @@ -1052,27 +1119,15 @@ roff_text(ROFFCALL_ARGS) return(0); } - /* FIXME: breaks if passed from roff_layout. */ - first = *argv == tree->cur; - - i = 0; + first = (*argv == tree->cur); argv++; - while (-1 != (c = roffnextopt(tree, tok, &argv, &v))) { - if (ROFF_ARGMAX == c) - return(0); - - argcp[i] = c; - argvp[i] = v; - i++; - argv++; - } - - argcp[i] = ROFF_ARGMAX; - argvp[i] = NULL; - + if ( ! roffparseopts(tree, tok, &argv, argcp, argvp)) + return(0); if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp)) return(0); + if (NULL == *argv) + return((*tree->cb.roffout)(tree->arg, tok)); if ( ! (ROFF_PARSED & tokens[tok].flags)) { i = 0; @@ -1084,32 +1139,50 @@ roff_text(ROFFCALL_ARGS) return((*tree->cb.roffout)(tree->arg, tok)); } + /* + * Deal with punctuation. Ugly. Work ahead until we encounter + * terminating punctuation. If we encounter it and all + * subsequent tokens are punctuation, then stop processing (the + * line-dominant macro will print these tokens after closure). + */ + i = 0; while (*argv) { if (ROFF_MAX == (c = rofffindcallable(*argv))) { - /* - * If all that remains is roff punctuation, then - * close out our scope and return. - */ - if (roffispunct(*argv)) { - for (j = 0; argv[j]; j++) - if ( ! roffispunct(argv[j])) - break; - if (NULL == argv[j]) - break; + if ( ! roffispunct(*argv)) { + if ( ! (*tree->cb.roffdata) + (tree->arg, i, *argv++)) + return(0); i = 1; + continue; } - - if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++)) - return(0); + /* See if only punctuation remains. */ + i = 1; - continue; + 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; + } + + /* Only punctuation remains. */ + + if ( ! (*tree->cb.roffout)(tree->arg, tok)) + return(0); + break; } /* * A sub-command has been found. Execute it and - * discontinue parsing for arguments. + * discontinue parsing for arguments. If we're + * line-scoped, then close out after it returns; if we + * aren't, then close out before. */ if (NULL == tokens[c].cb) { @@ -1118,49 +1191,48 @@ roff_text(ROFFCALL_ARGS) return(0); } + if ( ! (ROFF_LSCOPE & tokens[tok].flags)) + if ( ! (*tree->cb.roffout)(tree->arg, tok)) + return(0); + 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; } - if ( ! (*tree->cb.roffout)(tree->arg, tok)) - return(0); + if (NULL == *argv) + return((*tree->cb.roffout)(tree->arg, tok)); + if ( ! first) + return(1); - /* - * If we're the first parser (*argv == tree->cur) then purge out - * any additional punctuation, should there be any remaining at - * the end of line. + /* + * We're the line-dominant macro. Check if there's remaining + * punctuation. If there is, then flush it out before exiting. */ - if (first && *argv) { - i = 0; - while (argv[i]) - i++; - - assert(i > 0); - if ( ! roffispunct(argv[--i])) - return(1); - - while (i >= 0 && roffispunct(argv[i])) - i--; - - assert(0 != i); + i = 0; + while (argv[i]) i++; - while (argv[i]) - if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) - return(0); - } + assert(i > 0); + if ( ! roffispunct(argv[--i])) + return(1); - return(1); -} + while (i >= 0 && roffispunct(argv[i])) + i--; + assert(0 != i); + i++; -/* ARGSUSED */ -static int -roff_comment(ROFFCALL_ARGS) -{ + /* LINTED */ + while (argv[i]) + if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) + return(0); return(1); } @@ -1168,7 +1240,7 @@ roff_comment(ROFFCALL_ARGS) /* ARGSUSED */ static int -roff_close(ROFFCALL_ARGS) +roff_noop(ROFFCALL_ARGS) { return(1); @@ -1177,10 +1249,11 @@ roff_close(ROFFCALL_ARGS) /* ARGSUSED */ static int -roff_special(ROFFCALL_ARGS) +roff_depr(ROFFCALL_ARGS) { - return((*tree->cb.roffspecial)(tree->arg, tok)); + roff_err(tree, *argv, "`%s' is deprecated", toknames[tok]); + return(0); }