=================================================================== RCS file: /cvs/mandoc/mdoc_argv.c,v retrieving revision 1.3 retrieving revision 1.10 diff -u -p -r1.3 -r1.10 --- mandoc/mdoc_argv.c 2009/04/12 19:45:26 1.3 +++ mandoc/mdoc_argv.c 2009/07/06 11:21:34 1.10 @@ -1,6 +1,6 @@ -/* $Id: mdoc_argv.c,v 1.3 2009/04/12 19:45:26 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.10 2009/07/06 11:21:34 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 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 above @@ -32,6 +32,9 @@ * There's no limit to the number or arguments that may be allocated. */ +/* FIXME .Bf Li raises "macro-like parameter". */ +/* FIXME .Bl -column should deprecate old-groff syntax. */ + #define ARGS_QUOTED (1 << 0) #define ARGS_DELIM (1 << 1) #define ARGS_TABSEP (1 << 2) @@ -44,14 +47,11 @@ #define MULTI_STEP 5 -enum mwarn { - WQUOTPARM, - WARGVPARM, - WCOLEMPTY, - WTAILWS -}; - enum merr { + ETAILWS, + ECOLEMPTY, + EARGVPARM, + EQUOTPARM, EQUOTTERM, EMALLOC, EARGVAL @@ -68,10 +68,10 @@ 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 int pwarn(struct mdoc *, int, int, enum mwarn); -static int perr(struct mdoc *, int, int, enum merr); +static int perr(struct mdoc *, int, int, enum merr, int); -#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) +#define pwarn(m, l, p, t) perr((m), (l), (p), (t), 0) +#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t), 1) /* Per-argument flags. */ @@ -105,7 +105,7 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { }; static int mdoc_argflags[MDOC_MAX] = { - 0, /* \" */ + 0, /* Ap */ 0, /* Dd */ 0, /* Dt */ 0, /* Os */ @@ -116,7 +116,7 @@ static int mdoc_argflags[MDOC_MAX] = { ARGS_DELIM | ARGS_QUOTED, /* Dl */ 0, /* Bd */ 0, /* Ed */ - 0, /* Bl */ + ARGS_QUOTED, /* Bl */ 0, /* El */ 0, /* It */ ARGS_DELIM, /* Ad */ @@ -212,7 +212,6 @@ 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 */ @@ -282,7 +281,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, /* XXX - restore saved zeroed byte. */ if (sv) buf[*pos - 1] = sv; - if ( ! pwarn(mdoc, line, i, WARGVPARM)) + if ( ! pwarn(mdoc, line, i, EARGVPARM)) return(ARGV_ERROR); return(ARGV_WORD); } @@ -351,11 +350,12 @@ mdoc_argv_free(struct mdoc_arg *p) static int -perr(struct mdoc *mdoc, int line, int pos, enum merr code) +perr(struct mdoc *mdoc, int line, int pos, enum merr code, int iserr) { char *p; p = NULL; + switch (code) { case (EMALLOC): p = "memory exhausted"; @@ -366,38 +366,25 @@ perr(struct mdoc *mdoc, int line, int pos, enum merr c case (EARGVAL): p = "argument requires a value"; break; - } - assert(p); - return(mdoc_perr(mdoc, line, pos, p)); -} - - -static int -pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code) -{ - char *p; - int c; - - p = NULL; - c = WARN_SYNTAX; - switch (code) { - case (WQUOTPARM): + case (EQUOTPARM): p = "unexpected quoted parameter"; break; - case (WARGVPARM): + case (EARGVPARM): p = "argument-like parameter"; break; - case (WCOLEMPTY): + case (ECOLEMPTY): p = "last list column is empty"; - c = WARN_COMPAT; break; - case (WTAILWS): + case (ETAILWS): p = "trailing whitespace"; - c = WARN_COMPAT; break; } + assert(p); - return(mdoc_pwarn(mdoc, line, pos, c, p)); + if (iserr) + return(mdoc_perr(mdoc, line, pos, p)); + + return(mdoc_pwarn(mdoc, line, pos, p)); } @@ -470,11 +457,11 @@ args(struct mdoc *mdoc, int line, return(ARGS_EOLN); if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) - if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) + if ( ! pwarn(mdoc, line, *pos, EQUOTPARM)) return(ARGS_ERROR); if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) - if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) + if ( ! pwarn(mdoc, line, *pos, EARGVPARM)) return(ARGS_ERROR); /* @@ -566,10 +553,10 @@ args(struct mdoc *mdoc, int line, } if (p && 0 == *p) - if ( ! pwarn(mdoc, line, *pos, WCOLEMPTY)) + if ( ! pwarn(mdoc, line, *pos, ECOLEMPTY)) return(0); if (p && 0 == *p && p > *v && ' ' == *(p - 1)) - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! pwarn(mdoc, line, *pos, ETAILWS)) return(0); if (p) @@ -581,7 +568,7 @@ args(struct mdoc *mdoc, int line, assert(p); if (p > *v && ' ' == *(p - 1)) - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! pwarn(mdoc, line, *pos, ETAILWS)) return(0); *pos += (int)(p - *v); @@ -613,7 +600,7 @@ args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_WORD); - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! pwarn(mdoc, line, *pos, ETAILWS)) return(ARGS_ERROR); return(ARGS_WORD); @@ -631,7 +618,7 @@ args(struct mdoc *mdoc, int line, (*pos)++; if (0 == buf[*pos]) { - (void)perr(mdoc, line, *pos, EQUOTTERM); + (void)perr(mdoc, line, *pos, EQUOTTERM, 1); return(ARGS_ERROR); } @@ -645,7 +632,7 @@ args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_QWORD); - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! pwarn(mdoc, line, *pos, ETAILWS)) return(ARGS_ERROR); return(ARGS_QWORD); @@ -754,11 +741,9 @@ static int argv_multi(struct mdoc *mdoc, int line, struct mdoc_argv *v, int *pos, char *buf) { - int c, ppos; + int c; char *p; - ppos = *pos; - for (v->sz = 0; ; v->sz++) { if ('-' == buf[*pos]) break; @@ -780,10 +765,7 @@ argv_multi(struct mdoc *mdoc, int line, return(verr(mdoc, EMALLOC)); } - if (v->sz) - return(1); - - return(perr(mdoc, line, ppos, EARGVAL)); + return(1); } @@ -829,7 +811,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, 1)); v->sz = 1; if (NULL == (v->value = calloc(1, sizeof(char *))))