=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.28 retrieving revision 1.31 diff -u -p -r1.28 -r1.31 --- mandoc/roff.c 2008/12/01 16:01:28 1.28 +++ mandoc/roff.c 2008/12/02 00:10:37 1.31 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.28 2008/12/01 16:01:28 kristaps Exp $ */ +/* $Id: roff.c,v 1.31 2008/12/02 00:10:37 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,6 +16,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -90,7 +92,7 @@ struct rofftree { struct roffnode *last; /* Last parsed node. */ char *cur; - time_t date; /* `Dd' results. */ + struct tm tm; /* `Dd' results. */ char os[64]; /* `Os' results. */ char title[64]; /* `Dt' results. */ char section[64]; /* `Dt' results. */ @@ -110,6 +112,7 @@ struct rofftree { 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_layout(ROFFCALL_ARGS); static int roff_text(ROFFCALL_ARGS); @@ -124,6 +127,7 @@ static void roff_warn(const struct rofftree *, static void roff_err(const struct rofftree *, const char *, char *, ...); +static int roffpurgepunct(struct rofftree *, char **); static int roffscan(int, const int *); static int rofffindtok(const char *); static int rofffindarg(const char *); @@ -166,14 +170,13 @@ static const int roffarg_St[] = { static const int roffchild_Bl[] = { ROFF_It, ROFF_El, ROFF_MAX }; static const int roffchild_Fo[] = { ROFF_Fa, ROFF_Fc, ROFF_MAX }; -static const int roffchild_Oo[] = { ROFF_Op, ROFF_Oc, ROFF_MAX }; static const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B, ROFF__D, ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P, ROFF__R, ROFF__T, ROFF__V, ROFF_MAX }; static const int roffparent_El[] = { ROFF_Bl, ROFF_It, ROFF_MAX }; static const int roffparent_Fc[] = { ROFF_Fo, ROFF_Fa, ROFF_MAX }; -static const int roffparent_Oc[] = { ROFF_Oo, ROFF_Oc, ROFF_MAX }; +static const int roffparent_Oc[] = { ROFF_Oo, ROFF_MAX }; static const int roffparent_It[] = { ROFF_Bl, ROFF_It, ROFF_MAX }; static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX }; @@ -252,7 +255,7 @@ static const struct rofftok tokens[ROFF_MAX] = { { 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 */ + { roff_Ns, 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 */ @@ -277,7 +280,7 @@ static const struct rofftok tokens[ROFF_MAX] = { { 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, roffchild_Oo, 0, ROFF_LAYOUT, 0 }, /* Oo */ + { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */ { roff_noop, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */ { roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */ { roff_noop, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */ @@ -398,6 +401,9 @@ roff_free(struct rofftree *tree, int flush) goto end; } + if ( ! (*tree->cb.rofftail)(tree->arg)) + goto end; + error = 0; end: @@ -439,7 +445,7 @@ roff_engine(struct rofftree *tree, char *buf) assert(buf); if (0 == *buf) { - roff_warn(tree, buf, "blank line"); + roff_err(tree, buf, "blank line"); return(0); } else if ('.' != *buf) return(textparse(tree, buf)); @@ -452,6 +458,10 @@ static int textparse(const struct rofftree *tree, char *buf) { + if ( ! (ROFF_BODY & tree->state)) { + roff_err(tree, buf, "data not in body"); + return(0); + } return((*tree->cb.roffdata)(tree->arg, 1, buf)); } @@ -870,6 +880,29 @@ roffnextopt(const struct rofftree *tree, int tok, static int +roffpurgepunct(struct rofftree *tree, char **argv) +{ + int i; + + i = 0; + while (argv[i]) + i++; + assert(i > 0); + if ( ! roffispunct(argv[--i])) + return(1); + while (i >= 0 && roffispunct(argv[i])) + i--; + i++; + + /* LINTED */ + while (argv[i]) + if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) + return(0); + return(1); +} + + +static int roffparseopts(struct rofftree *tree, int tok, char ***args, int *argc, char **argv) { @@ -898,6 +931,8 @@ roffparseopts(struct rofftree *tree, int tok, static int roff_Dd(ROFFCALL_ARGS) { + time_t t; + char *p, buf[32]; if (ROFF_BODY & tree->state) { assert( ! (ROFF_PRELUDE & tree->state)); @@ -916,11 +951,63 @@ roff_Dd(ROFFCALL_ARGS) return(0); } - /* TODO: parse date. */ - assert(NULL == tree->last); - tree->state |= ROFF_PRELUDE_Dd; + argv++; + + if (0 == strcmp(*argv, "$Mdocdate: December 2 2008 $")) { + t = time(NULL); + if (NULL == localtime_r(&t, &tree->tm)) + err(1, "localtime_r"); + tree->state |= ROFF_PRELUDE_Dd; + return(1); + } + + /* Build this from Mdocdate or raw date. */ + + buf[0] = 0; + p = *argv; + + if (0 != strcmp(*argv, "$Mdocdate:")) { + while (*argv) { + if (strlcat(buf, *argv++, sizeof(buf)) + < sizeof(buf)) + continue; + roff_err(tree, p, "bad `Dd' date"); + return(0); + } + if (strptime(buf, "%b%d,%Y", &tree->tm)) { + tree->state |= ROFF_PRELUDE_Dd; + return(1); + } + roff_err(tree, *argv, "bad `Dd' date"); + return(0); + } + + argv++; + while (*argv && **argv != '$') { + if (strlcat(buf, *argv++, sizeof(buf)) + >= sizeof(buf)) { + roff_err(tree, p, "bad `Dd' Mdocdate"); + return(0); + } + if (strlcat(buf, " ", sizeof(buf)) + >= sizeof(buf)) { + roff_err(tree, p, "bad `Dd' Mdocdate"); + return(0); + } + } + if (NULL == *argv) { + roff_err(tree, p, "bad `Dd' Mdocdate"); + return(0); + } + + if (NULL == strptime(buf, "%b %d %Y", &tree->tm)) { + roff_err(tree, *argv, "bad `Dd' Mdocdate"); + return(0); + } + + tree->state |= ROFF_PRELUDE_Dd; return(1); } @@ -947,8 +1034,35 @@ roff_Dt(ROFFCALL_ARGS) return(0); } - /* TODO: parse date. */ + argv++; + if (NULL == *argv) { + roff_err(tree, *argv, "`Dt' needs document title"); + return(0); + } else if (strlcpy(tree->title, *argv, sizeof(tree->title)) + >= sizeof(tree->title)) { + roff_err(tree, *argv, "`Dt' document title too long"); + return(0); + } + argv++; + if (NULL == *argv) { + roff_err(tree, *argv, "`Dt' needs section"); + return(0); + } else if (strlcpy(tree->section, *argv, sizeof(tree->section)) + >= sizeof(tree->section)) { + roff_err(tree, *argv, "`Dt' section too long"); + return(0); + } + + argv++; + if (NULL == *argv) { + tree->volume[0] = 0; + } else if (strlcpy(tree->volume, *argv, sizeof(tree->volume)) + >= sizeof(tree->volume)) { + roff_err(tree, *argv, "`Dt' volume too long"); + return(0); + } + assert(NULL == tree->last); tree->state |= ROFF_PRELUDE_Dt; @@ -958,12 +1072,84 @@ roff_Dt(ROFFCALL_ARGS) /* ARGSUSED */ static int +roff_Ns(ROFFCALL_ARGS) +{ + int j, c, first; + + first = (*argv == tree->cur); + + argv++; + + if (ROFF_MAX != (c = rofffindcallable(*argv))) { + if (NULL == tokens[c].cb) { + 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++)) + return(0); + + while (*argv) { + if (ROFF_MAX == (c = rofffindcallable(*argv))) { + if ( ! roffispunct(*argv)) { + 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. */ + + 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. */ + + break; + } + 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; + } + + if ( ! first) + return(1); + return(roffpurgepunct(tree, argv)); +} + + +/* ARGSUSED */ +static int roff_Os(ROFFCALL_ARGS) { + char *p; - if (ROFF_EXIT == type) { - return((*tree->cb.rofftail)(tree->arg)); - } else if (ROFF_BODY & tree->state) { + if (ROFF_BODY & tree->state) { assert( ! (ROFF_PRELUDE & tree->state)); assert(ROFF_PRELUDE_Os & tree->state); return(roff_text(tok, tree, argv, type)); @@ -976,8 +1162,25 @@ roff_Os(ROFFCALL_ARGS) return(0); } - /* TODO: extract OS. */ + tree->os[0] = 0; + p = *++argv; + + while (*argv) { + if (strlcat(tree->os, *argv++, sizeof(tree->os)) + < sizeof(tree->os)) + continue; + roff_err(tree, p, "`Os' value too long"); + return(0); + } + + if (0 == tree->os[0]) + if (strlcpy(tree->os, "LOCAL", sizeof(tree->os)) + >= sizeof(tree->os)) { + roff_err(tree, p, "`Os' value too long"); + return(0); + } + tree->state |= ROFF_PRELUDE_Os; tree->state &= ~ROFF_PRELUDE; tree->state |= ROFF_BODY; @@ -1083,25 +1286,9 @@ roff_layout(ROFFCALL_ARGS) * a token isn't punctuation. */ - i = 0; - while (argv[i]) - i++; + if ( ! roffpurgepunct(tree, argv)) + 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)); } @@ -1210,31 +1397,7 @@ roff_text(ROFFCALL_ARGS) if ( ! first) return(1); - /* - * We're the line-dominant macro. Check if there's remaining - * punctuation. If there is, then flush it out before exiting. - */ - - 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++; - - /* LINTED */ - while (argv[i]) - if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) - return(0); - - return(1); + return(roffpurgepunct(tree, argv)); }