=================================================================== RCS file: /cvs/mandoc/Attic/argv.c,v retrieving revision 1.28 retrieving revision 1.36 diff -u -p -r1.28 -r1.36 --- mandoc/Attic/argv.c 2009/02/23 15:19:47 1.28 +++ mandoc/Attic/argv.c 2009/03/05 12:08:53 1.36 @@ -1,4 +1,4 @@ -/* $Id: argv.c,v 1.28 2009/02/23 15:19:47 kristaps Exp $ */ +/* $Id: argv.c,v 1.36 2009/03/05 12:08:53 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -35,13 +35,20 @@ #define ARGS_DELIM (1 << 1) #define ARGS_TABSEP (1 << 2) -static int lookup(int, const char *); +#define ARGV_NONE (1 << 0) +#define ARGV_SINGLE (1 << 1) +#define ARGV_MULTI (1 << 2) +#define ARGV_OPT_SINGLE (1 << 3) + +static int argv_a2arg(int, const char *); static int args(struct mdoc *, int, int *, char *, int, char **); static int argv(struct mdoc *, int, struct mdoc_arg *, int *, char *); static int argv_single(struct mdoc *, int, struct mdoc_arg *, int *, char *); +static int argv_opt_single(struct mdoc *, int, + struct mdoc_arg *, int *, char *); static int argv_multi(struct mdoc *, int, struct mdoc_arg *, int *, char *); static int pwarn(struct mdoc *, int, int, int); @@ -60,6 +67,73 @@ static int perr(struct mdoc *, int, int, int); #define EARGVAL (1) #define EARGMANY (2) +/* Per-argument flags. */ + +static int mdoc_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_NONE, /* MDOC_Bullet */ + ARGV_NONE, /* MDOC_Dash */ + ARGV_NONE, /* MDOC_Hyphen */ + ARGV_NONE, /* MDOC_Item */ + ARGV_NONE, /* MDOC_Enum */ + ARGV_NONE, /* MDOC_Tag */ + ARGV_NONE, /* MDOC_Diag */ + ARGV_NONE, /* MDOC_Hang */ + ARGV_NONE, /* MDOC_Ohang */ + ARGV_NONE, /* MDOC_Inset */ + ARGV_MULTI, /* MDOC_Column */ + ARGV_SINGLE, /* MDOC_Width */ + ARGV_NONE, /* MDOC_Compact */ + ARGV_OPT_SINGLE, /* MDOC_Std */ + ARGV_NONE, /* MDOC_p1003_1_88 */ + ARGV_NONE, /* MDOC_p1003_1_90 */ + ARGV_NONE, /* MDOC_p1003_1_96 */ + ARGV_NONE, /* MDOC_p1003_1_2001 */ + ARGV_NONE, /* MDOC_p1003_1_2004 */ + ARGV_NONE, /* MDOC_p1003_1 */ + ARGV_NONE, /* MDOC_p1003_1b */ + ARGV_NONE, /* MDOC_p1003_1b_93 */ + ARGV_NONE, /* MDOC_p1003_1c_95 */ + ARGV_NONE, /* MDOC_p1003_1g_2000 */ + ARGV_NONE, /* MDOC_p1003_2_92 */ + ARGV_NONE, /* MDOC_p1387_2_95 */ + ARGV_NONE, /* MDOC_p1003_2 */ + ARGV_NONE, /* MDOC_p1387_2 */ + ARGV_NONE, /* MDOC_isoC_90 */ + ARGV_NONE, /* MDOC_isoC_amd1 */ + ARGV_NONE, /* MDOC_isoC_tcor1 */ + ARGV_NONE, /* MDOC_isoC_tcor2 */ + ARGV_NONE, /* MDOC_isoC_99 */ + ARGV_NONE, /* MDOC_ansiC */ + ARGV_NONE, /* MDOC_ansiC_89 */ + ARGV_NONE, /* MDOC_ansiC_99 */ + ARGV_NONE, /* MDOC_ieee754 */ + ARGV_NONE, /* MDOC_iso8802_3 */ + ARGV_NONE, /* MDOC_xpg3 */ + ARGV_NONE, /* MDOC_xpg4 */ + ARGV_NONE, /* MDOC_xpg4_2 */ + ARGV_NONE, /* MDOC_xpg4_3 */ + ARGV_NONE, /* MDOC_xbd5 */ + ARGV_NONE, /* MDOC_xcu5 */ + ARGV_NONE, /* MDOC_xsh5 */ + ARGV_NONE, /* MDOC_xns5 */ + ARGV_NONE, /* MDOC_xns5_2d2_0 */ + ARGV_NONE, /* MDOC_xcurses4_2 */ + ARGV_NONE, /* MDOC_susv2 */ + ARGV_NONE, /* MDOC_susv3 */ + ARGV_NONE, /* MDOC_svid4 */ + ARGV_NONE, /* MDOC_Filled */ + ARGV_NONE, /* MDOC_Words */ + ARGV_NONE, /* MDOC_Emphasis */ + ARGV_NONE /* MDOC_Symbolic */ +}; + static int mdoc_argflags[MDOC_MAX] = { 0, /* \" */ 0, /* Dd */ @@ -74,7 +148,7 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* Ed */ 0, /* Bl */ 0, /* El */ - ARGS_DELIM, /* It */ + 0, /* It */ ARGS_DELIM, /* Ad */ ARGS_DELIM, /* An */ ARGS_DELIM, /* Ar */ @@ -236,29 +310,49 @@ mdoc_args(struct mdoc *mdoc, int line, fl = (0 == tok) ? 0 : mdoc_argflags[tok]; /* - * First see if we should use TABSEP (Bl -column). This - * invalidates the use of ARGS_DELIM. + * Override per-macro argument flags with context-specific ones. + * As of now, this is only valid for `It' depending on its list + * context. */ - if (MDOC_It == tok) { + switch (tok) { + case (MDOC_It): for (n = mdoc->last; n; n = n->parent) - if (MDOC_BLOCK == n->type) - if (MDOC_Bl == n->tok) - break; + if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) + break; + assert(n); c = (int)n->data.block.argc; assert(c > 0); + /* + * Using `Bl -column' adds ARGS_TABSEP to the arguments + * and invalidates ARGS_DELIM. Using `Bl -diag' allows + * for quoted arguments. + */ + /* LINTED */ for (i = 0; i < c; i++) { - if (MDOC_Column != n->data.block.argv[i].arg) - continue; - fl |= ARGS_TABSEP; - fl &= ~ARGS_DELIM; - break; + switch (n->data.block.argv[i].arg) { + case (MDOC_Column): + fl |= ARGS_TABSEP; + fl &= ~ARGS_DELIM; + i = c; + break; + case (MDOC_Diag): + fl |= ARGS_QUOTED; + i = c; + break; + default: + break; + } } + default: + break; } + /* Continue parsing the arguments themselves... */ + return(args(mdoc, line, pos, buf, fl, v)); } @@ -267,7 +361,7 @@ static int args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v) { - int i, c; + int i; char *p, *pp; assert(*pos > 0); @@ -290,14 +384,15 @@ args(struct mdoc *mdoc, int line, */ if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { - for (i = *pos; (c = buf[i]); ) { - if ( ! mdoc_iscdelim(c)) + for (i = *pos; buf[i]; ) { + if ( ! mdoc_iscdelim(buf[i])) break; i++; - if (0 == buf[i] || ! isspace(c)) + /* There must be at least one space... */ + if (0 == buf[i] || ! isspace((int)buf[i])) break; i++; - while (buf[i] && isspace(c)) + while (buf[i] && isspace((int)buf[i])) i++; } if (0 == buf[i]) { @@ -375,7 +470,7 @@ args(struct mdoc *mdoc, int line, p++; if (0 != *p) *(p - 1) = 0; - *pos += p - *v; + *pos += (int)(p - *v); } if (p && 0 == *p) @@ -396,7 +491,7 @@ args(struct mdoc *mdoc, int line, if (p > *v && ' ' == *(p - 1)) if ( ! pwarn(mdoc, line, *pos, WTAILWS)) return(0); - *pos += p - *v; + *pos += (int)(p - *v); return(ARGS_WORD); } @@ -404,8 +499,8 @@ args(struct mdoc *mdoc, int line, /* Do non-tabsep look-ahead here. */ if ( ! (ARGS_TABSEP & fl)) - while ((c = buf[*pos])) { - if (isspace(c)) + while (buf[*pos]) { + if (isspace((int)buf[*pos])) if ('\\' != buf[*pos - 1]) break; (*pos)++; @@ -466,9 +561,17 @@ args(struct mdoc *mdoc, int line, static int -lookup(int tok, const char *argv) +argv_a2arg(int tok, const char *argv) { + /* + * 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! + */ + switch (tok) { case (MDOC_An): if (xstrcmp(argv, "split")) @@ -650,7 +753,7 @@ argv_multi(struct mdoc *mdoc, int line, return(0); } else if (ARGS_EOLN == c) break; - v->value[v->sz] = p; + v->value[(int)v->sz] = p; } if (0 < v->sz && v->sz < MDOC_LINEARG_MAX) @@ -665,6 +768,34 @@ argv_multi(struct mdoc *mdoc, int line, static int +argv_opt_single(struct mdoc *mdoc, int line, + struct mdoc_arg *v, int *pos, char *buf) +{ + int c, ppos; + char *p; + + ppos = *pos; + + if ('-' == buf[*pos]) + return(1); + + c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + if (ARGS_ERROR == c) + return(0); + if (ARGS_EOLN == c) + return(1); + + v->sz = 1; + v->value = xcalloc(1, sizeof(char *)); + v->value[0] = p; + return(1); +} + + +/* + * Parse a single, mandatory value from the stream. + */ +static int argv_single(struct mdoc *mdoc, int line, struct mdoc_arg *v, int *pos, char *buf) { @@ -677,7 +808,7 @@ argv_single(struct mdoc *mdoc, int line, if (ARGS_ERROR == c) return(0); if (ARGS_EOLN == c) - return(perr(mdoc, line, ppos, EARGVAL)); + return(perr(mdoc, line, ppos, EARGVAL)); v->sz = 1; v->value = xcalloc(1, sizeof(char *)); @@ -686,6 +817,11 @@ argv_single(struct mdoc *mdoc, int line, } +/* + * Determine rules for parsing arguments. Arguments can either accept + * no parameters, an optional single parameter, one parameter, or + * multiple parameters. + */ static int argv(struct mdoc *mdoc, int line, struct mdoc_arg *v, int *pos, char *buf) @@ -694,16 +830,15 @@ argv(struct mdoc *mdoc, int line, v->sz = 0; v->value = NULL; - switch (v->arg) { - case(MDOC_Std): - /* FALLTHROUGH */ - case(MDOC_Width): - /* FALLTHROUGH */ - case(MDOC_Offset): + switch (mdoc_argvflags[v->arg]) { + case (ARGV_SINGLE): return(argv_single(mdoc, line, v, pos, buf)); - case(MDOC_Column): + 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 */ break; } @@ -711,11 +846,16 @@ argv(struct mdoc *mdoc, int line, } +/* + * 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 *mdoc, int line, int tok, struct mdoc_arg *v, int *pos, char *buf) { - int i, ppos; + int i; char *p; (void)memset(v, 0, sizeof(struct mdoc_arg)); @@ -747,7 +887,13 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, if (buf[*pos]) buf[(*pos)++] = 0; - if (MDOC_ARG_MAX == (v->arg = lookup(tok, p))) { + /* + * We now parse out the per-macro arguments. XXX - this can be + * made much cleaner using per-argument tables. See argv_a2arg + * for details. + */ + + if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) { if ( ! pwarn(mdoc, line, i, WARGVPARM)) return(ARGV_ERROR); return(ARGV_WORD); @@ -758,7 +904,6 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, /* FIXME: whitespace if no value. */ - ppos = *pos; if ( ! argv(mdoc, line, v, pos, buf)) return(ARGV_ERROR);