version 1.7, 2009/07/12 21:45:44 |
version 1.8, 2009/07/12 22:35:08 |
|
|
|
|
#define MULTI_STEP 5 |
#define MULTI_STEP 5 |
|
|
enum mwarn { |
|
WQUOTPARM, |
|
WARGVPARM, |
|
WCOLEMPTY, |
|
WTAILWS |
|
}; |
|
|
|
static int argv_a2arg(int, const char *); |
static int argv_a2arg(int, const char *); |
static int args(struct mdoc *, int, int *, |
static int args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
|
|
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_multi(struct mdoc *, int, |
static int argv_multi(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int pwarn(struct mdoc *, int, int, enum mwarn); |
|
|
|
/* Per-argument flags. */ |
/* Per-argument flags. */ |
|
|
|
|
/* XXX - restore saved zeroed byte. */ |
/* XXX - restore saved zeroed byte. */ |
if (sv) |
if (sv) |
buf[*pos - 1] = sv; |
buf[*pos - 1] = sv; |
if ( ! pwarn(m, line, i, WARGVPARM)) |
if ( ! mdoc_pwarn(m, line, i, EARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
} |
} |
|
|
} |
} |
|
|
|
|
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): |
|
p = "unexpected quoted parameter"; |
|
break; |
|
case (WARGVPARM): |
|
p = "argument-like parameter"; |
|
break; |
|
case (WCOLEMPTY): |
|
p = "last list column is empty"; |
|
c = WARN_COMPAT; |
|
break; |
|
case (WTAILWS): |
|
p = "trailing whitespace"; |
|
c = WARN_COMPAT; |
|
break; |
|
} |
|
assert(p); |
|
return(mdoc_pwarn(mdoc, line, pos, c, p)); |
|
} |
|
|
|
|
|
int |
int |
mdoc_args(struct mdoc *mdoc, int line, |
mdoc_args(struct mdoc *m, int line, |
int *pos, char *buf, int tok, char **v) |
int *pos, char *buf, int tok, char **v) |
{ |
{ |
int fl, c, i; |
int fl, c, i; |
|
|
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_It): |
case (MDOC_It): |
for (n = mdoc->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
break; |
break; |
|
|
|
|
break; |
break; |
} |
} |
|
|
return(args(mdoc, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
} |
} |
|
|
|
|
static int |
static int |
args(struct mdoc *mdoc, int line, |
args(struct mdoc *m, int line, |
int *pos, char *buf, int fl, char **v) |
int *pos, char *buf, int fl, char **v) |
{ |
{ |
int i; |
int i; |
|
|
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
|
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTPARM)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) |
if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) |
if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) |
if ( ! mdoc_pwarn(m, line, *pos, EARGVPARM)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
/* |
/* |
|
|
} |
} |
|
|
if (p && 0 == *p) |
if (p && 0 == *p) |
if ( ! pwarn(mdoc, line, *pos, WCOLEMPTY)) |
if ( ! mdoc_pwarn(m, line, *pos, ECOLEMPTY)) |
return(0); |
return(0); |
if (p && 0 == *p && p > *v && ' ' == *(p - 1)) |
if (p && 0 == *p && p > *v && ' ' == *(p - 1)) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(0); |
return(0); |
|
|
if (p) |
if (p) |
|
|
assert(p); |
assert(p); |
|
|
if (p > *v && ' ' == *(p - 1)) |
if (p > *v && ' ' == *(p - 1)) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(0); |
return(0); |
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
|
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
(void)mdoc_perr(mdoc, line, *pos, EQUOTTERM); |
(void)mdoc_perr(m, line, *pos, EQUOTTERM); |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
} |
} |
|
|
|
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |