=================================================================== RCS file: /cvs/mandoc/mdoc_argv.c,v retrieving revision 1.20 retrieving revision 1.77 diff -u -p -r1.20 -r1.77 --- mandoc/mdoc_argv.c 2009/07/20 14:09:38 1.20 +++ mandoc/mdoc_argv.c 2011/05/12 23:44:01 1.77 @@ -1,6 +1,6 @@ -/* $Id: mdoc_argv.c,v 1.20 2009/07/20 14:09:38 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.77 2011/05/12 23:44:01 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 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 @@ -14,6 +14,10 @@ * 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 @@ -22,31 +26,31 @@ #include #include +#include "mdoc.h" +#include "mandoc.h" #include "libmdoc.h" +#include "libmandoc.h" -/* - * Routines to parse arguments of macros. Arguments follow the syntax - * of `-arg [val [valN...]]'. Arguments come in all types: quoted - * arguments, multiple arguments per value, no-value arguments, etc. - * - * There's no limit to the number or arguments that may be allocated. - */ +#define MULTI_STEP 5 /* pre-allocate argument values */ +#define DELIMSZ 6 /* max possible size of a delimiter */ -/* FIXME .Bf Li raises "macro-like parameter". */ +enum argsflag { + ARGSFL_NONE = 0, + ARGSFL_DELIM, /* handle delimiters of [[::delim::][ ]+]+ */ + ARGSFL_TABSEP /* handle tab/`Ta' separated phrases */ +}; -#define ARGS_DELIM (1 << 1) -#define ARGS_TABSEP (1 << 2) +enum argvflag { + ARGV_NONE, /* no args to flag (e.g., -split) */ + ARGV_SINGLE, /* one arg to flag (e.g., -file xxx) */ + ARGV_MULTI, /* multiple args (e.g., -column xxx yyy) */ + ARGV_OPT_SINGLE /* optional arg (e.g., -offset [xxx]) */ +}; -#define ARGV_NONE (1 << 0) -#define ARGV_SINGLE (1 << 1) -#define ARGV_MULTI (1 << 2) -#define ARGV_OPT_SINGLE (1 << 3) - -#define MULTI_STEP 5 - -static int argv_a2arg(int, const char *); -static int args(struct mdoc *, int, int *, - char *, int, char **); +static enum mdocargt argv_a2arg(enum mdoct, const char *); +static enum margserr args(struct mdoc *, int, int *, + char *, enum argsflag, char **); +static int args_checkpunct(const char *, int); static int argv(struct mdoc *, int, struct mdoc_argv *, int *, char *); static int argv_single(struct mdoc *, int, @@ -55,17 +59,16 @@ static int argv_opt_single(struct mdoc *, int, struct mdoc_argv *, int *, char *); static int argv_multi(struct mdoc *, int, struct mdoc_argv *, int *, char *); +static void argn_free(struct mdoc_arg *, int); -/* Per-argument flags. */ - -static int mdoc_argvflags[MDOC_ARG_MAX] = { +static const enum argvflag argvflags[MDOC_ARG_MAX] = { ARGV_NONE, /* MDOC_Split */ ARGV_NONE, /* MDOC_Nosplit */ ARGV_NONE, /* MDOC_Ragged */ ARGV_NONE, /* MDOC_Unfilled */ ARGV_NONE, /* MDOC_Literal */ - ARGV_NONE, /* MDOC_File */ - ARGV_SINGLE, /* MDOC_Offset */ + ARGV_SINGLE, /* MDOC_File */ + ARGV_OPT_SINGLE, /* MDOC_Offset */ ARGV_NONE, /* MDOC_Bullet */ ARGV_NONE, /* MDOC_Dash */ ARGV_NONE, /* MDOC_Hyphen */ @@ -79,7 +82,7 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { ARGV_MULTI, /* MDOC_Column */ ARGV_SINGLE, /* MDOC_Width */ ARGV_NONE, /* MDOC_Compact */ - ARGV_OPT_SINGLE, /* MDOC_Std */ + ARGV_NONE, /* MDOC_Std */ ARGV_NONE, /* MDOC_Filled */ ARGV_NONE, /* MDOC_Words */ ARGV_NONE, /* MDOC_Emphasis */ @@ -87,144 +90,199 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { ARGV_NONE /* MDOC_Symbolic */ }; -static int mdoc_argflags[MDOC_MAX] = { - 0, /* Ap */ - 0, /* Dd */ - 0, /* Dt */ - 0, /* Os */ - 0, /* Sh */ - 0, /* Ss */ - ARGS_DELIM, /* Pp */ - ARGS_DELIM, /* D1 */ - ARGS_DELIM, /* Dl */ - 0, /* Bd */ - 0, /* Ed */ - 0, /* Bl */ - 0, /* El */ - 0, /* It */ - ARGS_DELIM, /* Ad */ - ARGS_DELIM, /* An */ - ARGS_DELIM, /* Ar */ - 0, /* Cd */ - ARGS_DELIM, /* Cm */ - ARGS_DELIM, /* Dv */ - ARGS_DELIM, /* Er */ - ARGS_DELIM, /* Ev */ - 0, /* Ex */ - ARGS_DELIM, /* Fa */ - 0, /* Fd */ - ARGS_DELIM, /* Fl */ - ARGS_DELIM, /* Fn */ - ARGS_DELIM, /* Ft */ - ARGS_DELIM, /* Ic */ - 0, /* In */ - ARGS_DELIM, /* Li */ - 0, /* Nd */ - ARGS_DELIM, /* Nm */ - ARGS_DELIM, /* Op */ - 0, /* Ot */ - ARGS_DELIM, /* Pa */ - 0, /* Rv */ - ARGS_DELIM, /* St */ - ARGS_DELIM, /* Va */ - ARGS_DELIM, /* Vt */ - ARGS_DELIM, /* Xr */ - 0, /* %A */ - 0, /* %B */ - 0, /* %D */ - 0, /* %I */ - 0, /* %J */ - 0, /* %N */ - 0, /* %O */ - 0, /* %P */ - 0, /* %R */ - 0, /* %T */ - 0, /* %V */ - ARGS_DELIM, /* Ac */ - 0, /* Ao */ - ARGS_DELIM, /* Aq */ - ARGS_DELIM, /* At */ - ARGS_DELIM, /* Bc */ - 0, /* Bf */ - 0, /* Bo */ - ARGS_DELIM, /* Bq */ - ARGS_DELIM, /* Bsx */ - ARGS_DELIM, /* Bx */ - 0, /* Db */ - ARGS_DELIM, /* Dc */ - 0, /* Do */ - ARGS_DELIM, /* Dq */ - ARGS_DELIM, /* Ec */ - 0, /* Ef */ - ARGS_DELIM, /* Em */ - 0, /* Eo */ - ARGS_DELIM, /* Fx */ - ARGS_DELIM, /* Ms */ - ARGS_DELIM, /* No */ - ARGS_DELIM, /* Ns */ - ARGS_DELIM, /* Nx */ - ARGS_DELIM, /* Ox */ - ARGS_DELIM, /* Pc */ - ARGS_DELIM, /* Pf */ - 0, /* Po */ - ARGS_DELIM, /* Pq */ - ARGS_DELIM, /* Qc */ - ARGS_DELIM, /* Ql */ - 0, /* Qo */ - ARGS_DELIM, /* Qq */ - 0, /* Re */ - 0, /* Rs */ - ARGS_DELIM, /* Sc */ - 0, /* So */ - ARGS_DELIM, /* Sq */ - 0, /* Sm */ - ARGS_DELIM, /* Sx */ - ARGS_DELIM, /* Sy */ - ARGS_DELIM, /* Tn */ - ARGS_DELIM, /* Ux */ - ARGS_DELIM, /* Xc */ - 0, /* Xo */ - 0, /* Fo */ - 0, /* Fc */ - 0, /* Oo */ - ARGS_DELIM, /* Oc */ - 0, /* Bk */ - 0, /* Ek */ - 0, /* Bt */ - 0, /* Hf */ - 0, /* Fr */ - 0, /* Ud */ - 0, /* Lb */ - ARGS_DELIM, /* Lp */ - ARGS_DELIM, /* Lk */ - ARGS_DELIM, /* Mt */ - ARGS_DELIM, /* Brq */ - 0, /* Bro */ - ARGS_DELIM, /* Brc */ - 0, /* %C */ - 0, /* Es */ - 0, /* En */ - 0, /* Dx */ - 0, /* %Q */ - 0, /* br */ - 0, /* sp */ +static const enum argsflag argflags[MDOC_MAX] = { + ARGSFL_NONE, /* Ap */ + ARGSFL_NONE, /* Dd */ + ARGSFL_NONE, /* Dt */ + ARGSFL_NONE, /* Os */ + ARGSFL_NONE, /* Sh */ + ARGSFL_NONE, /* Ss */ + ARGSFL_NONE, /* Pp */ + ARGSFL_DELIM, /* D1 */ + ARGSFL_DELIM, /* Dl */ + ARGSFL_NONE, /* Bd */ + ARGSFL_NONE, /* Ed */ + ARGSFL_NONE, /* Bl */ + ARGSFL_NONE, /* El */ + ARGSFL_NONE, /* It */ + ARGSFL_DELIM, /* Ad */ + ARGSFL_DELIM, /* An */ + ARGSFL_DELIM, /* Ar */ + ARGSFL_NONE, /* Cd */ + ARGSFL_DELIM, /* Cm */ + ARGSFL_DELIM, /* Dv */ + ARGSFL_DELIM, /* Er */ + ARGSFL_DELIM, /* Ev */ + ARGSFL_NONE, /* Ex */ + ARGSFL_DELIM, /* Fa */ + ARGSFL_NONE, /* Fd */ + ARGSFL_DELIM, /* Fl */ + ARGSFL_DELIM, /* Fn */ + ARGSFL_DELIM, /* Ft */ + ARGSFL_DELIM, /* Ic */ + ARGSFL_NONE, /* In */ + ARGSFL_DELIM, /* Li */ + ARGSFL_NONE, /* Nd */ + ARGSFL_DELIM, /* Nm */ + ARGSFL_DELIM, /* Op */ + ARGSFL_NONE, /* Ot */ + ARGSFL_DELIM, /* Pa */ + ARGSFL_NONE, /* Rv */ + ARGSFL_DELIM, /* St */ + ARGSFL_DELIM, /* Va */ + ARGSFL_DELIM, /* Vt */ + ARGSFL_DELIM, /* Xr */ + ARGSFL_NONE, /* %A */ + ARGSFL_NONE, /* %B */ + ARGSFL_NONE, /* %D */ + ARGSFL_NONE, /* %I */ + ARGSFL_NONE, /* %J */ + ARGSFL_NONE, /* %N */ + ARGSFL_NONE, /* %O */ + ARGSFL_NONE, /* %P */ + ARGSFL_NONE, /* %R */ + ARGSFL_NONE, /* %T */ + ARGSFL_NONE, /* %V */ + ARGSFL_DELIM, /* Ac */ + ARGSFL_NONE, /* Ao */ + ARGSFL_DELIM, /* Aq */ + ARGSFL_DELIM, /* At */ + ARGSFL_DELIM, /* Bc */ + ARGSFL_NONE, /* Bf */ + ARGSFL_NONE, /* Bo */ + ARGSFL_DELIM, /* Bq */ + ARGSFL_DELIM, /* Bsx */ + ARGSFL_DELIM, /* Bx */ + ARGSFL_NONE, /* Db */ + ARGSFL_DELIM, /* Dc */ + ARGSFL_NONE, /* Do */ + ARGSFL_DELIM, /* Dq */ + ARGSFL_DELIM, /* Ec */ + ARGSFL_NONE, /* Ef */ + ARGSFL_DELIM, /* Em */ + ARGSFL_NONE, /* Eo */ + ARGSFL_DELIM, /* Fx */ + ARGSFL_DELIM, /* Ms */ + ARGSFL_DELIM, /* No */ + ARGSFL_DELIM, /* Ns */ + ARGSFL_DELIM, /* Nx */ + ARGSFL_DELIM, /* Ox */ + ARGSFL_DELIM, /* Pc */ + ARGSFL_DELIM, /* Pf */ + ARGSFL_NONE, /* Po */ + ARGSFL_DELIM, /* Pq */ + ARGSFL_DELIM, /* Qc */ + ARGSFL_DELIM, /* Ql */ + ARGSFL_NONE, /* Qo */ + ARGSFL_DELIM, /* Qq */ + ARGSFL_NONE, /* Re */ + ARGSFL_NONE, /* Rs */ + ARGSFL_DELIM, /* Sc */ + ARGSFL_NONE, /* So */ + ARGSFL_DELIM, /* Sq */ + ARGSFL_NONE, /* Sm */ + ARGSFL_DELIM, /* Sx */ + ARGSFL_DELIM, /* Sy */ + ARGSFL_DELIM, /* Tn */ + ARGSFL_DELIM, /* Ux */ + ARGSFL_DELIM, /* Xc */ + ARGSFL_NONE, /* Xo */ + ARGSFL_NONE, /* Fo */ + ARGSFL_NONE, /* Fc */ + ARGSFL_NONE, /* Oo */ + ARGSFL_DELIM, /* Oc */ + ARGSFL_NONE, /* Bk */ + ARGSFL_NONE, /* Ek */ + ARGSFL_NONE, /* Bt */ + ARGSFL_NONE, /* Hf */ + ARGSFL_NONE, /* Fr */ + ARGSFL_NONE, /* Ud */ + ARGSFL_NONE, /* Lb */ + ARGSFL_NONE, /* Lp */ + ARGSFL_DELIM, /* Lk */ + ARGSFL_DELIM, /* Mt */ + ARGSFL_DELIM, /* Brq */ + ARGSFL_NONE, /* Bro */ + ARGSFL_DELIM, /* Brc */ + ARGSFL_NONE, /* %C */ + ARGSFL_NONE, /* Es */ + ARGSFL_NONE, /* En */ + ARGSFL_NONE, /* Dx */ + ARGSFL_NONE, /* %Q */ + ARGSFL_NONE, /* br */ + ARGSFL_NONE, /* sp */ + ARGSFL_NONE, /* %U */ + ARGSFL_NONE, /* Ta */ }; +static const enum mdocargt args_Ex[] = { + MDOC_Std, + MDOC_ARG_MAX +}; +static const enum mdocargt args_An[] = { + MDOC_Split, + MDOC_Nosplit, + MDOC_ARG_MAX +}; + +static const enum mdocargt args_Bd[] = { + MDOC_Ragged, + MDOC_Unfilled, + MDOC_Filled, + MDOC_Literal, + MDOC_File, + MDOC_Offset, + MDOC_Compact, + MDOC_Centred, + MDOC_ARG_MAX +}; + +static const enum mdocargt args_Bf[] = { + MDOC_Emphasis, + MDOC_Literal, + MDOC_Symbolic, + MDOC_ARG_MAX +}; + +static const enum mdocargt args_Bk[] = { + MDOC_Words, + MDOC_ARG_MAX +}; + +static const enum mdocargt args_Bl[] = { + MDOC_Bullet, + MDOC_Dash, + MDOC_Hyphen, + MDOC_Item, + MDOC_Enum, + MDOC_Tag, + MDOC_Diag, + MDOC_Hang, + MDOC_Ohang, + MDOC_Inset, + MDOC_Column, + MDOC_Width, + MDOC_Offset, + MDOC_Compact, + MDOC_Nested, + MDOC_ARG_MAX +}; + /* * Parse an argument from line text. This comes in the form of -key * [value0...], which may either have a single mandatory value, at least * one mandatory value, an optional single value, or no value. */ -int -mdoc_argv(struct mdoc *m, int line, int tok, +enum margverr +mdoc_argv(struct mdoc *m, int line, enum mdoct tok, struct mdoc_arg **v, int *pos, char *buf) { char *p, sv; struct mdoc_argv tmp; struct mdoc_arg *arg; - if (0 == buf[*pos]) + if ('\0' == buf[*pos]) return(ARGV_EOLN); assert(' ' != buf[*pos]); @@ -245,13 +303,13 @@ mdoc_argv(struct mdoc *m, int line, int tok, /* XXX - save zeroed byte, if not an argument. */ - sv = 0; + sv = '\0'; if (buf[*pos]) { sv = buf[*pos]; - buf[(*pos)++] = 0; + buf[(*pos)++] = '\0'; } - (void)memset(&tmp, 0, sizeof(struct mdoc_argv)); + memset(&tmp, 0, sizeof(struct mdoc_argv)); tmp.line = line; tmp.pos = *pos; @@ -270,35 +328,23 @@ mdoc_argv(struct mdoc *m, int line, int tok, if ( ! argv(m, line, &tmp, pos, buf)) return(ARGV_ERROR); - if (NULL == (arg = *v)) { - *v = calloc(1, sizeof(struct mdoc_arg)); - if (NULL == *v) { - (void)mdoc_nerr(m, m->last, EMALLOC); - return(ARGV_ERROR); - } - arg = *v; - } + if (NULL == (arg = *v)) + arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg)); arg->argc++; - arg->argv = realloc(arg->argv, arg->argc * - sizeof(struct mdoc_argv)); + arg->argv = mandoc_realloc + (arg->argv, arg->argc * sizeof(struct mdoc_argv)); - if (NULL == arg->argv) { - (void)mdoc_nerr(m, m->last, EMALLOC); - return(ARGV_ERROR); - } - - (void)memcpy(&arg->argv[(int)arg->argc - 1], + memcpy(&arg->argv[(int)arg->argc - 1], &tmp, sizeof(struct mdoc_argv)); return(ARGV_ARG); } - void mdoc_argv_free(struct mdoc_arg *p) { - int i, j; + int i; if (NULL == p) return; @@ -310,109 +356,97 @@ mdoc_argv_free(struct mdoc_arg *p) } assert(p->argc); - /* LINTED */ - for (i = 0; i < (int)p->argc; i++) { - if (0 == p->argv[i].sz) - continue; - /* LINTED */ - for (j = 0; j < (int)p->argv[i].sz; j++) - free(p->argv[i].value[j]); + for (i = (int)p->argc - 1; i >= 0; i--) + argn_free(p, i); - free(p->argv[i].value); - } - free(p->argv); free(p); } +static void +argn_free(struct mdoc_arg *p, int iarg) +{ + struct mdoc_argv *arg; + int j; -int + arg = &p->argv[iarg]; + + if (arg->sz && arg->value) { + for (j = (int)arg->sz - 1; j >= 0; j--) + free(arg->value[j]); + free(arg->value); + } + + for (--p->argc; iarg < (int)p->argc; iarg++) + p->argv[iarg] = p->argv[iarg+1]; +} + +enum margserr mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) { - return(args(m, line, pos, buf, 0, v)); + return(args(m, line, pos, buf, ARGSFL_NONE, v)); } - -int -mdoc_args(struct mdoc *m, int line, - int *pos, char *buf, int tok, char **v) +enum margserr +mdoc_args(struct mdoc *m, int line, int *pos, + char *buf, enum mdoct tok, char **v) { - int fl, c, i; + enum argsflag fl; struct mdoc_node *n; - fl = (0 == tok) ? 0 : mdoc_argflags[tok]; + fl = argflags[tok]; if (MDOC_It != tok) return(args(m, line, pos, buf, fl, v)); - /* - * The `It' macro is a special case, as it acquires parameters from its - * parent `Bl' context, specifically, we're concerned with -column. + /* + * We know that we're in an `It', so it's reasonable to expect + * us to be sitting in a `Bl'. Someday this may not be the case + * (if we allow random `It's sitting out there), so provide a + * safe fall-back into the default behaviour. */ for (n = m->last; n; n = n->parent) - if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) - break; + if (MDOC_Bl == n->tok) + if (LIST_column == n->norm->Bl.type) { + fl = ARGSFL_TABSEP; + break; + } - assert(n); - c = (int)(n->args ? n->args->argc : 0); - assert(c > 0); - - /* LINTED */ - for (i = 0; i < c; i++) { - if (MDOC_Column != n->args->argv[i].arg) - continue; - fl |= ARGS_TABSEP; - fl &= ~ARGS_DELIM; - break; - } - return(args(m, line, pos, buf, fl, v)); } - -static int +static enum margserr args(struct mdoc *m, int line, int *pos, - char *buf, int fl, char **v) + char *buf, enum argsflag fl, char **v) { - int i, psv; - char *p, *pp; + char *p, *pp; + enum margserr rc; - assert(*pos); assert(' ' != buf[*pos]); - if (0 == buf[*pos]) - return(ARGS_EOLN); + if ('\0' == buf[*pos]) { + if (MDOC_PPHRASE & m->flags) + return(ARGS_EOLN); + /* + * If we're not in a partial phrase and the flag for + * being a phrase literal is still set, the punctuation + * is unterminated. + */ + if (MDOC_PHRASELIT & m->flags) + mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); - /* - * If the first character is a delimiter and we're to look for - * delimited strings, then pass down the buffer seeing if it - * follows the pattern of [[::delim::][ ]+]+. - */ - - if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { - for (i = *pos; buf[i]; ) { - if ( ! mdoc_iscdelim(buf[i])) - break; - i++; - if (0 == buf[i] || ' ' != buf[i]) - break; - i++; - while (buf[i] && ' ' == buf[i]) - i++; - } - - /* FIXME: warn about trailing whitespace. */ - - if (0 == buf[i]) { - *v = &buf[*pos]; - return(ARGS_PUNCT); - } + m->flags &= ~MDOC_PHRASELIT; + return(ARGS_EOLN); } *v = &buf[*pos]; + if (ARGSFL_DELIM == fl) + if (args_checkpunct(buf, *pos)) + return(ARGS_PUNCT); + /* * First handle TABSEP items, restricted to `Bl -column'. This * ignores conventional token parsing and instead uses tabs or @@ -420,42 +454,51 @@ args(struct mdoc *m, int line, int *pos, * for arguments at a later phase. */ - if (ARGS_TABSEP & fl) { - psv = *pos; - + if (ARGSFL_TABSEP == fl) { /* Scan ahead to tab (can't be escaped). */ p = strchr(*v, '\t'); + pp = NULL; /* Scan ahead to unescaped `Ta'. */ - for (pp = *v; ; pp++) { - if (NULL == (pp = strstr(pp, "Ta"))) - break; - if (pp > *v && ' ' != *(pp - 1)) - continue; - if (' ' == *(pp + 2) || 0 == *(pp + 2)) - break; - } + if ( ! (MDOC_PHRASELIT & m->flags)) + for (pp = *v; ; pp++) { + if (NULL == (pp = strstr(pp, "Ta"))) + break; + if (pp > *v && ' ' != *(pp - 1)) + continue; + if (' ' == *(pp + 2) || '\0' == *(pp + 2)) + break; + } + /* By default, assume a phrase. */ + rc = ARGS_PHRASE; + + /* + * Adjust new-buffer position to be beyond delimiter + * mark (e.g., Ta -> end + 2). + */ if (p && pp) { *pos += pp < p ? 2 : 1; + rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE; p = pp < p ? pp : p; } else if (p && ! pp) { + rc = ARGS_PPHRASE; *pos += 1; } else if (pp && ! p) { p = pp; *pos += 2; - } else + } else { + rc = ARGS_PEND; p = strchr(*v, 0); + } - if (0 == *p && ' ' == *(p - 1)) - if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) - return(ARGS_ERROR); + /* Whitespace check for eoln case... */ + if ('\0' == *p && ' ' == *(p - 1)) + mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); - *p = 0; *pos += (int)(p - *v); /* Strip delimiter's preceding whitespace. */ - pp = p - 1; while (pp > *v && ' ' == *pp) { if (pp > *v && '\\' == *(pp - 1)) @@ -465,11 +508,10 @@ args(struct mdoc *m, int line, int *pos, *(pp + 1) = 0; /* Strip delimiter's proceeding whitespace. */ - for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) /* Skip ahead. */ ; - return(ARGS_PHRASE); + return(rc); } /* @@ -478,9 +520,13 @@ args(struct mdoc *m, int line, int *pos, * Whitespace is NOT involved in literal termination. */ - if ('\"' == buf[*pos]) { - *v = &buf[++(*pos)]; + if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) { + if ( ! (MDOC_PHRASELIT & m->flags)) + *v = &buf[++(*pos)]; + if (MDOC_PPHRASE & m->flags) + m->flags |= MDOC_PHRASELIT; + for ( ; buf[*pos]; (*pos)++) { if ('\"' != buf[*pos]) continue; @@ -489,208 +535,179 @@ args(struct mdoc *m, int line, int *pos, (*pos)++; } - if (0 == buf[*pos]) { - if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) - return(ARGS_ERROR); + if ('\0' == buf[*pos]) { + if (MDOC_PPHRASE & m->flags) + return(ARGS_QWORD); + mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); return(ARGS_QWORD); } - buf[(*pos)++] = 0; + m->flags &= ~MDOC_PHRASELIT; + buf[(*pos)++] = '\0'; - if (0 == buf[*pos]) + if ('\0' == buf[*pos]) return(ARGS_QWORD); while (' ' == buf[*pos]) (*pos)++; - if (0 == buf[*pos]) - if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) - return(ARGS_ERROR); + if ('\0' == buf[*pos]) + mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); return(ARGS_QWORD); } - /* - * A non-quoted term progresses until either the end of line or - * a non-escaped whitespace. - */ + p = &buf[*pos]; + *v = mandoc_getarg(m->parse, &p, line, pos); - for ( ; buf[*pos]; (*pos)++) - if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) - break; + return(ARGS_WORD); +} - if (0 == buf[*pos]) - return(ARGS_WORD); +/* + * Check if the string consists only of space-separated closing + * delimiters. This is a bit of a dance: the first must be a close + * delimiter, but it may be followed by middle delimiters. Arbitrary + * whitespace may separate these tokens. + */ +static int +args_checkpunct(const char *buf, int i) +{ + int j; + char dbuf[DELIMSZ]; + enum mdelim d; - buf[(*pos)++] = 0; + /* First token must be a close-delimiter. */ - while (' ' == buf[*pos]) - (*pos)++; + for (j = 0; buf[i] && ' ' != buf[i] && j < DELIMSZ; j++, i++) + dbuf[j] = buf[i]; - if (0 == buf[*pos]) - if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) - return(ARGS_ERROR); + if (DELIMSZ == j) + return(0); - return(ARGS_WORD); -} + dbuf[j] = '\0'; + if (DELIM_CLOSE != mdoc_isdelim(dbuf)) + return(0); + while (' ' == buf[i]) + i++; -static int -argv_a2arg(int tok, const char *argv) + /* Remaining must NOT be open/none. */ + + while (buf[i]) { + j = 0; + while (buf[i] && ' ' != buf[i] && j < DELIMSZ) + dbuf[j++] = buf[i++]; + + if (DELIMSZ == j) + return(0); + + dbuf[j] = '\0'; + d = mdoc_isdelim(dbuf); + if (DELIM_NONE == d || DELIM_OPEN == d) + return(0); + + while (' ' == buf[i]) + i++; + } + + return('\0' == buf[i]); +} + +/* + * Match up an argument string (e.g., `-foo bar' having "foo") with the + * correrct identifier. It must apply to the given macro. If none was + * found (including bad matches), return MDOC_ARG_MAX. + */ +static enum mdocargt +argv_a2arg(enum mdoct tok, const char *p) { + const enum mdocargt *argsp; - /* - * Parse an argument identifier from its text. XXX - this - * should really be table-driven to clarify the code. - * - * If you add an argument to the list, make sure that you - * register it here with its one or more macros! - */ + argsp = NULL; switch (tok) { case (MDOC_An): - if (0 == strcmp(argv, "split")) - return(MDOC_Split); - else if (0 == strcmp(argv, "nosplit")) - return(MDOC_Nosplit); + argsp = args_An; break; - case (MDOC_Bd): - if (0 == strcmp(argv, "ragged")) - return(MDOC_Ragged); - else if (0 == strcmp(argv, "unfilled")) - return(MDOC_Unfilled); - else if (0 == strcmp(argv, "filled")) - return(MDOC_Filled); - else if (0 == strcmp(argv, "literal")) - return(MDOC_Literal); - else if (0 == strcmp(argv, "file")) - return(MDOC_File); - else if (0 == strcmp(argv, "offset")) - return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) - return(MDOC_Compact); + argsp = args_Bd; break; - case (MDOC_Bf): - if (0 == strcmp(argv, "emphasis")) - return(MDOC_Emphasis); - else if (0 == strcmp(argv, "literal")) - return(MDOC_Literal); - else if (0 == strcmp(argv, "symbolic")) - return(MDOC_Symbolic); + argsp = args_Bf; break; - case (MDOC_Bk): - if (0 == strcmp(argv, "words")) - return(MDOC_Words); + argsp = args_Bk; break; - case (MDOC_Bl): - if (0 == strcmp(argv, "bullet")) - return(MDOC_Bullet); - else if (0 == strcmp(argv, "dash")) - return(MDOC_Dash); - else if (0 == strcmp(argv, "hyphen")) - return(MDOC_Hyphen); - else if (0 == strcmp(argv, "item")) - return(MDOC_Item); - else if (0 == strcmp(argv, "enum")) - return(MDOC_Enum); - else if (0 == strcmp(argv, "tag")) - return(MDOC_Tag); - else if (0 == strcmp(argv, "diag")) - return(MDOC_Diag); - else if (0 == strcmp(argv, "hang")) - return(MDOC_Hang); - else if (0 == strcmp(argv, "ohang")) - return(MDOC_Ohang); - else if (0 == strcmp(argv, "inset")) - return(MDOC_Inset); - else if (0 == strcmp(argv, "column")) - return(MDOC_Column); - else if (0 == strcmp(argv, "width")) - return(MDOC_Width); - else if (0 == strcmp(argv, "offset")) - return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) - return(MDOC_Compact); - else if (0 == strcmp(argv, "nested")) - return(MDOC_Nested); + argsp = args_Bl; break; - case (MDOC_Rv): /* FALLTHROUGH */ case (MDOC_Ex): - if (0 == strcmp(argv, "std")) - return(MDOC_Std); + argsp = args_Ex; break; default: - break; + return(MDOC_ARG_MAX); } + assert(argsp); + + for ( ; MDOC_ARG_MAX != *argsp ; argsp++) + if (0 == strcmp(p, mdoc_argnames[*argsp])) + return(*argsp); + return(MDOC_ARG_MAX); } - static int argv_multi(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { - int c; + enum margserr ac; char *p; for (v->sz = 0; ; v->sz++) { if ('-' == buf[*pos]) break; - c = args(m, line, pos, buf, 0, &p); - if (ARGS_ERROR == c) + ac = args(m, line, pos, buf, ARGSFL_NONE, &p); + if (ARGS_ERROR == ac) return(0); - else if (ARGS_EOLN == c) + else if (ARGS_EOLN == ac) break; - if (0 == v->sz % MULTI_STEP) { - v->value = realloc(v->value, + if (0 == v->sz % MULTI_STEP) + v->value = mandoc_realloc(v->value, (v->sz + MULTI_STEP) * sizeof(char *)); - if (NULL == v->value) { - (void)mdoc_nerr(m, m->last, EMALLOC); - return(ARGV_ERROR); - } - } - if (NULL == (v->value[(int)v->sz] = strdup(p))) - return(mdoc_nerr(m, m->last, EMALLOC)); + + v->value[(int)v->sz] = mandoc_strdup(p); } return(1); } - static int argv_opt_single(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { - int c; + enum margserr ac; char *p; if ('-' == buf[*pos]) return(1); - c = args(m, line, pos, buf, 0, &p); - if (ARGS_ERROR == c) + ac = args(m, line, pos, buf, ARGSFL_NONE, &p); + if (ARGS_ERROR == ac) return(0); - if (ARGS_EOLN == c) + if (ARGS_EOLN == ac) return(1); v->sz = 1; - if (NULL == (v->value = calloc(1, sizeof(char *)))) - return(mdoc_nerr(m, m->last, EMALLOC)); - if (NULL == (v->value[0] = strdup(p))) - return(mdoc_nerr(m, m->last, EMALLOC)); + v->value = mandoc_malloc(sizeof(char *)); + v->value[0] = mandoc_strdup(p); return(1); } - /* * Parse a single, mandatory value from the stream. */ @@ -698,27 +715,26 @@ static int argv_single(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { - int c, ppos; + int ppos; + enum margserr ac; char *p; ppos = *pos; - c = args(m, line, pos, buf, 0, &p); - if (ARGS_ERROR == c) + ac = args(m, line, pos, buf, ARGSFL_NONE, &p); + if (ARGS_EOLN == ac) { + mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT); return(0); - if (ARGS_EOLN == c) - return(mdoc_perr(m, line, ppos, EARGVAL)); + } else if (ARGS_ERROR == ac) + return(0); v->sz = 1; - if (NULL == (v->value = calloc(1, sizeof(char *)))) - return(mdoc_nerr(m, m->last, EMALLOC)); - if (NULL == (v->value[0] = strdup(p))) - return(mdoc_nerr(m, m->last, EMALLOC)); + v->value = mandoc_malloc(sizeof(char *)); + v->value[0] = mandoc_strdup(p); return(1); } - /* * Determine rules for parsing arguments. Arguments can either accept * no parameters, an optional single parameter, one parameter, or @@ -732,16 +748,18 @@ argv(struct mdoc *mdoc, int line, v->sz = 0; v->value = NULL; - switch (mdoc_argvflags[v->arg]) { + switch (argvflags[v->arg]) { case (ARGV_SINGLE): return(argv_single(mdoc, line, v, pos, buf)); case (ARGV_MULTI): return(argv_multi(mdoc, line, v, pos, buf)); case (ARGV_OPT_SINGLE): return(argv_opt_single(mdoc, line, v, pos, buf)); - default: - /* ARGV_NONE */ + case (ARGV_NONE): break; + default: + abort(); + /* NOTREACHED */ } return(1);