=================================================================== RCS file: /cvs/mandoc/mdoc_argv.c,v retrieving revision 1.18 retrieving revision 1.42 diff -u -p -r1.18 -r1.42 --- mandoc/mdoc_argv.c 2009/07/18 18:59:33 1.18 +++ mandoc/mdoc_argv.c 2010/05/07 15:49:36 1.42 @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.18 2009/07/18 18:59:33 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.42 2010/05/07 15:49:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -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 @@ -23,6 +27,7 @@ #include #include "libmdoc.h" +#include "libmandoc.h" /* * Routines to parse arguments of macros. Arguments follow the syntax @@ -32,11 +37,6 @@ * There's no limit to the number or arguments that may be allocated. */ -/* FIXME .Bf Li raises "macro-like parameter". */ - -#define ARGS_DELIM (1 << 1) -#define ARGS_TABSEP (1 << 2) - #define ARGV_NONE (1 << 0) #define ARGV_SINGLE (1 << 1) #define ARGV_MULTI (1 << 2) @@ -44,8 +44,8 @@ #define MULTI_STEP 5 -static int argv_a2arg(int, const char *); -static int args(struct mdoc *, int, int *, +static int argv_a2arg(enum mdoct, const char *); +static enum margserr args(struct mdoc *, int, int *, char *, int, char **); static int argv(struct mdoc *, int, struct mdoc_argv *, int *, char *); @@ -64,8 +64,8 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { 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 +79,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 */ @@ -208,6 +208,7 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* %Q */ 0, /* br */ 0, /* sp */ + 0, /* %U */ }; @@ -216,8 +217,8 @@ static int mdoc_argflags[MDOC_MAX] = { * [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; @@ -270,24 +271,13 @@ 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], &tmp, sizeof(struct mdoc_argv)); @@ -298,7 +288,7 @@ mdoc_argv(struct mdoc *m, int line, int tok, void mdoc_argv_free(struct mdoc_arg *p) { - int i, j; + int i; if (NULL == p) return; @@ -310,30 +300,48 @@ 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--) + mdoc_argn_free(p, i); - free(p->argv[i].value); - } - free(p->argv); free(p); } -int -mdoc_args(struct mdoc *m, int line, - int *pos, char *buf, int tok, char **v) +void +mdoc_argn_free(struct mdoc_arg *p, int iarg) { + struct mdoc_argv *arg = &p->argv[iarg]; + int j; + + 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, int flags, char **v) +{ + + return(args(m, line, pos, buf, flags, v)); +} + + +enum margserr +mdoc_args(struct mdoc *m, int line, int *pos, + char *buf, enum mdoct tok, char **v) +{ int fl, c, i; struct mdoc_node *n; - fl = (0 == tok) ? 0 : mdoc_argflags[tok]; + fl = mdoc_argflags[tok]; if (MDOC_It != tok) return(args(m, line, pos, buf, fl, v)); @@ -364,17 +372,33 @@ mdoc_args(struct mdoc *m, int line, } -static int +static enum margserr args(struct mdoc *m, int line, int *pos, char *buf, int fl, char **v) { int i; char *p, *pp; + enum margserr rc; + /* + * Parse out the terms (like `val' in `.Xx -arg val' or simply + * `.Xx val'), which can have all sorts of properties: + * + * ARGS_DELIM: use special handling if encountering trailing + * delimiters in the form of [[::delim::][ ]+]+. + * + * ARGS_NOWARN: don't post warnings. This is only used when + * re-parsing delimiters, as the warnings have already been + * posted. + * + * ARGS_TABSEP: use special handling for tab/`Ta' separated + * phrases like in `Bl -column'. + */ + assert(*pos); assert(' ' != buf[*pos]); - if (0 == buf[*pos]) + if ('\0' == buf[*pos]) return(ARGS_EOLN); /* @@ -383,9 +407,9 @@ args(struct mdoc *m, int line, int *pos, * follows the pattern of [[::delim::][ ]+]+. */ - if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { + if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) { for (i = *pos; buf[i]; ) { - if ( ! mdoc_iscdelim(buf[i])) + if ( mdoc_iscdelim(buf[i]) < 2) break; i++; if (0 == buf[i] || ' ' != buf[i]) @@ -395,10 +419,14 @@ args(struct mdoc *m, int line, int *pos, i++; } - /* FIXME: warn about trailing whitespace. */ - if (0 == buf[i]) { *v = &buf[*pos]; + if (' ' != buf[i - 1]) + return(ARGS_PUNCT); + if (ARGS_NOWARN & fl) + return(ARGS_PUNCT); + if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) + return(ARGS_ERROR); return(ARGS_PUNCT); } } @@ -413,7 +441,7 @@ args(struct mdoc *m, int line, int *pos, */ if (ARGS_TABSEP & fl) { - /* Scan ahead to unescaped tab. */ + /* Scan ahead to tab (can't be escaped). */ p = strchr(*v, '\t'); /* Scan ahead to unescaped `Ta'. */ @@ -426,61 +454,47 @@ args(struct mdoc *m, int line, int *pos, break; } - /* Choose delimiter tab/Ta. */ - if (p && pp) - p = (p < pp ? p : pp); - else if ( ! p && pp) + /* 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 + p = strchr(*v, 0); - /* Strip delimiter's preceding whitespace. */ - /* FIXME: escaped whitespace? */ - if (p && p > *v) { - pp = p - 1; - while (pp > *v && ' ' == *pp) - pp--; - if (pp == *v && ' ' == *pp) - *pp = 0; - else if (' ' == *pp) - *(pp + 1) = 0; - } - - /* ...in- and proceding whitespace. */ - if (p && ('\t' != *p)) { - *p++ = 0; - *p++ = 0; - } else if (p) - *p++ = 0; - - if (p) { - while (' ' == *p) - p++; - if (0 != *p) - *(p - 1) = 0; - *pos += (int)(p - *v); - } - - /* Some warnings, if applicable. */ - if (p && 0 == *p) - if ( ! mdoc_pwarn(m, line, *pos, ECOLEMPTY)) - return(ARGS_ERROR); - if (p && 0 == *p && p > *v && ' ' == *(p - 1)) + /* Whitespace check for eoln case... */ + if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) return(ARGS_ERROR); - /* Non-eoln case returns now. */ - if (p) - return(ARGS_PHRASE); + *pos += (int)(p - *v); - /* Configure the eoln case, too. */ - p = strchr(*v, 0); - assert(p); + /* Strip delimiter's preceding whitespace. */ + pp = p - 1; + while (pp > *v && ' ' == *pp) { + if (pp > *v && '\\' == *(pp - 1)) + break; + pp--; + } + *(pp + 1) = 0; - if (p > *v && ' ' == *(p - 1)) - if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) - return(ARGS_ERROR); - *pos += (int)(p - *v); + /* Strip delimiter's proceeding whitespace. */ + for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) + /* Skip ahead. */ ; - return(ARGS_PHRASE); + return(rc); } /* @@ -501,6 +515,8 @@ args(struct mdoc *m, int line, int *pos, } if (0 == buf[*pos]) { + if (ARGS_NOWARN & fl) + return(ARGS_QWORD); if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) return(ARGS_ERROR); return(ARGS_QWORD); @@ -514,7 +530,7 @@ args(struct mdoc *m, int line, int *pos, while (' ' == buf[*pos]) (*pos)++; - if (0 == buf[*pos]) + if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) return(ARGS_ERROR); @@ -538,7 +554,7 @@ args(struct mdoc *m, int line, int *pos, while (' ' == buf[*pos]) (*pos)++; - if (0 == buf[*pos]) + if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) return(ARGS_ERROR); @@ -547,7 +563,7 @@ args(struct mdoc *m, int line, int *pos, static int -argv_a2arg(int tok, const char *argv) +argv_a2arg(enum mdoct tok, const char *p) { /* @@ -560,80 +576,82 @@ argv_a2arg(int tok, const char *argv) switch (tok) { case (MDOC_An): - if (0 == strcmp(argv, "split")) + if (0 == strcmp(p, "split")) return(MDOC_Split); - else if (0 == strcmp(argv, "nosplit")) + else if (0 == strcmp(p, "nosplit")) return(MDOC_Nosplit); break; case (MDOC_Bd): - if (0 == strcmp(argv, "ragged")) + if (0 == strcmp(p, "ragged")) return(MDOC_Ragged); - else if (0 == strcmp(argv, "unfilled")) + else if (0 == strcmp(p, "unfilled")) return(MDOC_Unfilled); - else if (0 == strcmp(argv, "filled")) + else if (0 == strcmp(p, "filled")) return(MDOC_Filled); - else if (0 == strcmp(argv, "literal")) + else if (0 == strcmp(p, "literal")) return(MDOC_Literal); - else if (0 == strcmp(argv, "file")) + else if (0 == strcmp(p, "file")) return(MDOC_File); - else if (0 == strcmp(argv, "offset")) + else if (0 == strcmp(p, "offset")) return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) + else if (0 == strcmp(p, "compact")) return(MDOC_Compact); + else if (0 == strcmp(p, "centered")) + return(MDOC_Centred); break; case (MDOC_Bf): - if (0 == strcmp(argv, "emphasis")) + if (0 == strcmp(p, "emphasis")) return(MDOC_Emphasis); - else if (0 == strcmp(argv, "literal")) + else if (0 == strcmp(p, "literal")) return(MDOC_Literal); - else if (0 == strcmp(argv, "symbolic")) + else if (0 == strcmp(p, "symbolic")) return(MDOC_Symbolic); break; case (MDOC_Bk): - if (0 == strcmp(argv, "words")) + if (0 == strcmp(p, "words")) return(MDOC_Words); break; case (MDOC_Bl): - if (0 == strcmp(argv, "bullet")) + if (0 == strcmp(p, "bullet")) return(MDOC_Bullet); - else if (0 == strcmp(argv, "dash")) + else if (0 == strcmp(p, "dash")) return(MDOC_Dash); - else if (0 == strcmp(argv, "hyphen")) + else if (0 == strcmp(p, "hyphen")) return(MDOC_Hyphen); - else if (0 == strcmp(argv, "item")) + else if (0 == strcmp(p, "item")) return(MDOC_Item); - else if (0 == strcmp(argv, "enum")) + else if (0 == strcmp(p, "enum")) return(MDOC_Enum); - else if (0 == strcmp(argv, "tag")) + else if (0 == strcmp(p, "tag")) return(MDOC_Tag); - else if (0 == strcmp(argv, "diag")) + else if (0 == strcmp(p, "diag")) return(MDOC_Diag); - else if (0 == strcmp(argv, "hang")) + else if (0 == strcmp(p, "hang")) return(MDOC_Hang); - else if (0 == strcmp(argv, "ohang")) + else if (0 == strcmp(p, "ohang")) return(MDOC_Ohang); - else if (0 == strcmp(argv, "inset")) + else if (0 == strcmp(p, "inset")) return(MDOC_Inset); - else if (0 == strcmp(argv, "column")) + else if (0 == strcmp(p, "column")) return(MDOC_Column); - else if (0 == strcmp(argv, "width")) + else if (0 == strcmp(p, "width")) return(MDOC_Width); - else if (0 == strcmp(argv, "offset")) + else if (0 == strcmp(p, "offset")) return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) + else if (0 == strcmp(p, "compact")) return(MDOC_Compact); - else if (0 == strcmp(argv, "nested")) + else if (0 == strcmp(p, "nested")) return(MDOC_Nested); break; case (MDOC_Rv): /* FALLTHROUGH */ case (MDOC_Ex): - if (0 == strcmp(argv, "std")) + if (0 == strcmp(p, "std")) return(MDOC_Std); break; default: @@ -660,16 +678,11 @@ argv_multi(struct mdoc *m, int line, else if (ARGS_EOLN == c) 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); @@ -693,10 +706,8 @@ argv_opt_single(struct mdoc *m, int line, 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); } @@ -721,10 +732,8 @@ argv_single(struct mdoc *m, int line, return(mdoc_perr(m, line, ppos, EARGVAL)); 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); }