=================================================================== RCS file: /cvs/mandoc/Attic/argv.c,v retrieving revision 1.38 retrieving revision 1.54 diff -u -p -r1.38 -r1.54 --- mandoc/Attic/argv.c 2009/03/06 14:13:47 1.38 +++ mandoc/Attic/argv.c 2009/03/21 09:42:07 1.54 @@ -1,6 +1,6 @@ -/* $Id: argv.c,v 1.38 2009/03/06 14:13:47 kristaps Exp $ */ +/* $Id: argv.c,v 1.54 2009/03/21 09:42:07 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -16,6 +16,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -29,6 +31,8 @@ * 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 ARGS_QUOTED (1 << 0) @@ -41,33 +45,34 @@ #define ARGV_MULTI (1 << 2) #define ARGV_OPT_SINGLE (1 << 3) +#define MULTI_STEP 5 + +enum mwarn { + WQUOTPARM, + WARGVPARM, + WCOLEMPTY, + WTAILWS +}; + +enum merr { + EQUOTTERM, + EARGVAL +}; + static int argv_a2arg(int, const char *); static int args(struct mdoc *, int, int *, char *, int, char **); -static int argv(struct mdoc *, int, int, - struct mdoc_arg *, int *, char *); +static int argv(struct mdoc *, int, + struct mdoc_argv *, int *, char *); static int argv_single(struct mdoc *, int, - struct mdoc_arg *, int *, char *); + struct mdoc_argv *, int *, char *); static int argv_opt_single(struct mdoc *, int, - struct mdoc_arg *, int *, char *); + struct mdoc_argv *, int *, char *); static int argv_multi(struct mdoc *, int, - struct mdoc_arg *, int *, char *); -static int pwarn(struct mdoc *, int, int, int); -static int perr(struct mdoc *, int, int, int); + struct mdoc_argv *, int *, char *); +static int pwarn(struct mdoc *, int, int, enum mwarn); +static int perr(struct mdoc *, int, int, enum merr); -/* Warning messages. */ - -#define WQUOTPARM (0) -#define WARGVPARM (1) -#define WCOLEMPTY (2) -#define WTAILWS (3) - -/* Error messages. */ - -#define EQUOTTERM (0) -#define EARGVAL (1) -#define EARGMANY (2) - /* Per-argument flags. */ static int mdoc_argvflags[MDOC_ARG_MAX] = { @@ -91,10 +96,11 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { ARGV_MULTI, /* MDOC_Column */ ARGV_SINGLE, /* MDOC_Width */ ARGV_NONE, /* MDOC_Compact */ - ARGV_SINGLE, /* MDOC_Std */ + ARGV_OPT_SINGLE, /* MDOC_Std */ ARGV_NONE, /* MDOC_Filled */ ARGV_NONE, /* MDOC_Words */ ARGV_NONE, /* MDOC_Emphasis */ + ARGV_NONE, /* MDOC_Symbolic */ ARGV_NONE /* MDOC_Symbolic */ }; @@ -206,62 +212,185 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* Fr */ 0, /* Ud */ 0, /* Lb */ + 0, /* Ap */ + ARGS_DELIM, /* Lp */ + ARGS_DELIM | ARGS_QUOTED, /* Lk */ + ARGS_DELIM | ARGS_QUOTED, /* Mt */ + ARGS_DELIM, /* Brq */ + 0, /* Bro */ + ARGS_DELIM, /* Brc */ + ARGS_QUOTED, /* %C */ + 0, /* Es */ + 0, /* En */ + 0, /* Dx */ + ARGS_QUOTED, /* %Q */ }; +/* + * 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; + char *p, sv; + struct mdoc_argv tmp; + struct mdoc_arg *arg; + + if (0 == buf[*pos]) + return(ARGV_EOLN); + + assert(' ' != buf[*pos]); + + if ('-' != buf[*pos] || ARGS_ARGVLIKE & mdoc_argflags[tok]) + return(ARGV_WORD); + + /* Parse through to the first unescaped space. */ + + i = *pos; + p = &buf[++(*pos)]; + + assert(*pos > 0); + + /* LINTED */ + while (buf[*pos]) { + if (' ' == buf[*pos]) + if ('\\' != buf[*pos - 1]) + break; + (*pos)++; + } + + /* XXX - save zeroed byte, if not an argument. */ + + sv = 0; + if (buf[*pos]) { + sv = buf[*pos]; + buf[(*pos)++] = 0; + } + + (void)memset(&tmp, 0, sizeof(struct mdoc_argv)); + tmp.line = line; + tmp.pos = *pos; + + /* See if our token accepts the argument. */ + + if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { + /* XXX - restore saved zeroed byte. */ + if (sv) + buf[*pos - 1] = sv; + if ( ! pwarn(mdoc, line, i, WARGVPARM)) + return(ARGV_ERROR); + return(ARGV_WORD); + } + + while (buf[*pos] && ' ' == buf[*pos]) + (*pos)++; + + if ( ! argv(mdoc, line, &tmp, pos, buf)) + return(ARGV_ERROR); + + if (NULL == (arg = *v)) { + *v = xcalloc(1, sizeof(struct mdoc_arg)); + arg = *v; + } + + arg->argc++; + arg->argv = xrealloc(arg->argv, arg->argc * + sizeof(struct mdoc_argv)); + + (void)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; + + if (NULL == p) + return; + + if (p->refcnt) { + --(p->refcnt); + if (p->refcnt) + return; + } + + 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]); + + free(p->argv[i].value); + } + + free(p->argv); + free(p); +} + + + static int -perr(struct mdoc *mdoc, int line, int pos, int code) +perr(struct mdoc *mdoc, int line, int pos, enum merr code) { - int c; + char *p; + p = NULL; + switch (code) { case (EQUOTTERM): - c = mdoc_perr(mdoc, line, pos, - "unterminated quoted parameter"); + p = "unterminated quoted parameter"; break; case (EARGVAL): - c = mdoc_perr(mdoc, line, pos, - "argument requires a value"); + p = "argument requires a value"; break; - case (EARGMANY): - c = mdoc_perr(mdoc, line, pos, - "too many values for argument"); - break; - default: - abort(); - /* NOTREACHED */ } - return(c); + + assert(p); + return(mdoc_perr(mdoc, line, pos, p)); } static int -pwarn(struct mdoc *mdoc, int line, int pos, int code) +pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code) { + char *p; int c; + p = NULL; + c = WARN_SYNTAX; + switch (code) { case (WQUOTPARM): - c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, - "unexpected quoted parameter"); + p = "unexpected quoted parameter"; break; case (WARGVPARM): - c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, - "argument-like parameter"); + p = "argument-like parameter"; break; case (WCOLEMPTY): - c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, - "last list column is empty"); + p = "last list column is empty"; + c = WARN_COMPAT; break; case (WTAILWS): - c = mdoc_pwarn(mdoc, line, pos, WARN_COMPAT, - "trailing whitespace"); + p = "trailing whitespace"; + c = WARN_COMPAT; break; - default: - abort(); - /* NOTREACHED */ } - return(c); + + assert(p); + return(mdoc_pwarn(mdoc, line, pos, c, p)); } @@ -287,7 +416,7 @@ mdoc_args(struct mdoc *mdoc, int line, break; assert(n); - c = (int)n->data.block.argc; + c = (int)(n->args ? n->args->argc : 0); assert(c > 0); /* @@ -298,7 +427,7 @@ mdoc_args(struct mdoc *mdoc, int line, /* LINTED */ for (i = 0; i < c; i++) { - switch (n->data.block.argv[i].arg) { + switch (n->args->argv[i].arg) { case (MDOC_Column): fl |= ARGS_TABSEP; fl &= ~ARGS_DELIM; @@ -312,12 +441,11 @@ mdoc_args(struct mdoc *mdoc, int line, break; } } + break; default: break; } - /* Continue parsing the arguments themselves... */ - return(args(mdoc, line, pos, buf, fl, v)); } @@ -354,10 +482,10 @@ args(struct mdoc *mdoc, int line, break; i++; /* There must be at least one space... */ - if (0 == buf[i] || ! isspace((u_char)buf[i])) + if (0 == buf[i] || ' ' != buf[i]) break; i++; - while (buf[i] && isspace((u_char)buf[i])) + while (buf[i] && ' ' == buf[i]) i++; } if (0 == buf[i]) { @@ -373,24 +501,16 @@ args(struct mdoc *mdoc, int line, /* * Thar be dragons here! If we're tab-separated, search - * ahead for either a tab or the `Ta' macro. If a tab - * is detected, it mustn't be escaped; if a `Ta' is - * detected, it must be space-buffered before and after. - * If either of these hold true, then prune out the + * ahead for either a tab or the `Ta' macro. + * If a `Ta' is detected, it must be space-buffered before and + * after. If either of these hold true, then prune out the * extra spaces and call it an argument. */ if (ARGS_TABSEP & fl) { /* Scan ahead to unescaped tab. */ - for (p = *v; ; p++) { - if (NULL == (p = strchr(p, '\t'))) - break; - if (p == *v) - break; - if ('\\' != *(p - 1)) - break; - } + p = strchr(*v, '\t'); /* Scan ahead to unescaped `Ta'. */ @@ -446,7 +566,7 @@ args(struct mdoc *mdoc, int line, return(0); if (p) - return(ARGS_WORD); + return(ARGS_PHRASE); /* Configure the eoln case, too. */ @@ -458,14 +578,14 @@ args(struct mdoc *mdoc, int line, return(0); *pos += (int)(p - *v); - return(ARGS_WORD); + return(ARGS_PHRASE); } - + /* Do non-tabsep look-ahead here. */ if ( ! (ARGS_TABSEP & fl)) while (buf[*pos]) { - if (isspace((u_char)buf[*pos])) + if (' ' == buf[*pos]) if ('\\' != buf[*pos - 1]) break; (*pos)++; @@ -480,7 +600,7 @@ args(struct mdoc *mdoc, int line, return(ARGS_WORD); if ( ! (ARGS_TABSEP & fl)) - while (buf[*pos] && isspace((u_char)buf[*pos])) + while (buf[*pos] && ' ' == buf[*pos]) (*pos)++; if (buf[*pos]) @@ -512,7 +632,7 @@ args(struct mdoc *mdoc, int line, if (0 == buf[*pos]) return(ARGS_QWORD); - while (buf[*pos] && isspace((u_char)buf[*pos])) + while (buf[*pos] && ' ' == buf[*pos]) (*pos)++; if (buf[*pos]) @@ -558,6 +678,8 @@ argv_a2arg(int tok, const char *argv) return(MDOC_File); else if (xstrcmp(argv, "offset")) return(MDOC_Offset); + else if (xstrcmp(argv, "compact")) + return(MDOC_Compact); break; case (MDOC_Bf): @@ -603,6 +725,8 @@ argv_a2arg(int tok, const char *argv) return(MDOC_Offset); else if (xstrcmp(argv, "compact")) return(MDOC_Compact); + else if (xstrcmp(argv, "nested")) + return(MDOC_Nested); break; case (MDOC_Rv): @@ -621,48 +745,43 @@ argv_a2arg(int tok, const char *argv) static int argv_multi(struct mdoc *mdoc, int line, - struct mdoc_arg *v, int *pos, char *buf) + struct mdoc_argv *v, int *pos, char *buf) { int c, ppos; char *p; - v->sz = 0; - v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *)); - ppos = *pos; - for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) { + for (v->sz = 0; ; v->sz++) { if ('-' == buf[*pos]) break; c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); - if (ARGS_ERROR == c) { - free(v->value); + if (ARGS_ERROR == c) return(0); - } else if (ARGS_EOLN == c) + else if (ARGS_EOLN == c) break; - v->value[(int)v->sz] = p; + + if (0 == v->sz % MULTI_STEP) + v->value = xrealloc(v->value, + (v->sz + MULTI_STEP) * sizeof(char *)); + + v->value[(int)v->sz] = xstrdup(p); } - if (0 < v->sz && v->sz < MDOC_LINEARG_MAX) + if (v->sz) return(1); - free(v->value); - if (0 == v->sz) - return(perr(mdoc, line, ppos, EARGVAL)); - - return(perr(mdoc, line, ppos, EARGMANY)); + return(perr(mdoc, line, ppos, EARGVAL)); } static int argv_opt_single(struct mdoc *mdoc, int line, - struct mdoc_arg *v, int *pos, char *buf) + struct mdoc_argv *v, int *pos, char *buf) { - int c, ppos; + int c; char *p; - ppos = *pos; - if ('-' == buf[*pos]) return(1); @@ -674,7 +793,7 @@ argv_opt_single(struct mdoc *mdoc, int line, v->sz = 1; v->value = xcalloc(1, sizeof(char *)); - v->value[0] = p; + v->value[0] = xstrdup(p); return(1); } @@ -684,7 +803,7 @@ argv_opt_single(struct mdoc *mdoc, int line, */ static int argv_single(struct mdoc *mdoc, int line, - struct mdoc_arg *v, int *pos, char *buf) + struct mdoc_argv *v, int *pos, char *buf) { int c, ppos; char *p; @@ -699,7 +818,7 @@ argv_single(struct mdoc *mdoc, int line, v->sz = 1; v->value = xcalloc(1, sizeof(char *)); - v->value[0] = p; + v->value[0] = xstrdup(p); return(1); } @@ -710,28 +829,14 @@ argv_single(struct mdoc *mdoc, int line, * multiple parameters. */ static int -argv(struct mdoc *mdoc, int tok, int line, - struct mdoc_arg *v, int *pos, char *buf) +argv(struct mdoc *mdoc, int line, + struct mdoc_argv *v, int *pos, char *buf) { - int fl; v->sz = 0; v->value = NULL; - fl = mdoc_argvflags[v->arg]; - /* - * Override the default per-argument value. - */ - - switch (tok) { - case (MDOC_Ex): - fl = ARGV_OPT_SINGLE; - break; - default: - break; - } - - switch (fl) { + switch (mdoc_argvflags[v->arg]) { case (ARGV_SINGLE): return(argv_single(mdoc, line, v, pos, buf)); case (ARGV_MULTI): @@ -745,85 +850,3 @@ argv(struct mdoc *mdoc, int tok, int line, return(1); } - - -/* - * 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; - char *p; - - (void)memset(v, 0, sizeof(struct mdoc_arg)); - - if (0 == buf[*pos]) - return(ARGV_EOLN); - - assert( ! isspace((u_char)buf[*pos])); - - if ('-' != buf[*pos]) - return(ARGV_WORD); - - i = *pos; - p = &buf[++(*pos)]; - - v->line = line; - v->pos = *pos; - - assert(*pos > 0); - - /* LINTED */ - while (buf[*pos]) { - if (isspace((u_char)buf[*pos])) - if ('\\' != buf[*pos - 1]) - break; - (*pos)++; - } - - if (buf[*pos]) - buf[(*pos)++] = 0; - - /* - * 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); - } - - while (buf[*pos] && isspace((u_char)buf[*pos])) - (*pos)++; - - /* FIXME: whitespace if no value. */ - - if ( ! argv(mdoc, tok, line, v, pos, buf)) - return(ARGV_ERROR); - - return(ARGV_ARG); -} - - -void -mdoc_argv_free(int sz, struct mdoc_arg *arg) -{ - int i; - - for (i = 0; i < sz; i++) { - if (0 == arg[i].sz) { - assert(NULL == arg[i].value); - continue; - } - assert(arg[i].value); - free(arg[i].value); - } -} -