version 1.6, 2009/06/17 11:02:06 |
version 1.11, 2009/07/06 13:04:52 |
|
|
*/ |
*/ |
|
|
/* FIXME .Bf Li raises "macro-like parameter". */ |
/* FIXME .Bf Li raises "macro-like parameter". */ |
|
/* FIXME .Bl -column should deprecate old-groff syntax. */ |
|
|
#define ARGS_QUOTED (1 << 0) |
#define ARGS_QUOTED (1 << 0) |
#define ARGS_DELIM (1 << 1) |
#define ARGS_DELIM (1 << 1) |
|
|
|
|
#define MULTI_STEP 5 |
#define MULTI_STEP 5 |
|
|
enum mwarn { |
|
WQUOTPARM, |
|
WARGVPARM, |
|
WCOLEMPTY, |
|
WTAILWS |
|
}; |
|
|
|
enum merr { |
|
EQUOTTERM, |
|
EMALLOC, |
|
EARGVAL |
|
}; |
|
|
|
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 **); |
Line 70 static int argv_opt_single(struct mdoc *, int, |
|
Line 58 static int argv_opt_single(struct mdoc *, int, |
|
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); |
|
static int perr(struct mdoc *, int, int, enum merr); |
|
|
|
#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) |
|
|
|
/* Per-argument flags. */ |
/* Per-argument flags. */ |
|
|
static int mdoc_argvflags[MDOC_ARG_MAX] = { |
static int mdoc_argvflags[MDOC_ARG_MAX] = { |
Line 118 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 102 static int mdoc_argflags[MDOC_MAX] = { |
|
ARGS_DELIM | ARGS_QUOTED, /* Dl */ |
ARGS_DELIM | ARGS_QUOTED, /* Dl */ |
0, /* Bd */ |
0, /* Bd */ |
0, /* Ed */ |
0, /* Ed */ |
0, /* Bl */ |
ARGS_QUOTED, /* Bl */ |
0, /* El */ |
0, /* El */ |
0, /* It */ |
0, /* It */ |
ARGS_DELIM, /* Ad */ |
ARGS_DELIM, /* Ad */ |
Line 234 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 218 static int mdoc_argflags[MDOC_MAX] = { |
|
* one mandatory value, an optional single value, or no value. |
* one mandatory value, an optional single value, or no value. |
*/ |
*/ |
int |
int |
mdoc_argv(struct mdoc *mdoc, int line, int tok, |
mdoc_argv(struct mdoc *m, int line, int tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
int i; |
int i; |
Line 283 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 267 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
/* XXX - restore saved zeroed byte. */ |
/* XXX - restore saved zeroed byte. */ |
if (sv) |
if (sv) |
buf[*pos - 1] = sv; |
buf[*pos - 1] = sv; |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
if ( ! mdoc_pwarn(m, line, i, EARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
} |
} |
Line 291 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 275 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
while (buf[*pos] && ' ' == buf[*pos]) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if ( ! argv(mdoc, line, &tmp, pos, buf)) |
if ( ! argv(m, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) { |
*v = calloc(1, sizeof(struct mdoc_arg)); |
*v = calloc(1, sizeof(struct mdoc_arg)); |
if (NULL == *v) { |
if (NULL == *v) { |
(void)verr(mdoc, EMALLOC); |
(void)mdoc_nerr(m, m->last, EMALLOC); |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
} |
} |
arg = *v; |
arg = *v; |
Line 308 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 292 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
sizeof(struct mdoc_argv)); |
sizeof(struct mdoc_argv)); |
|
|
if (NULL == arg->argv) { |
if (NULL == arg->argv) { |
(void)verr(mdoc, EMALLOC); |
(void)mdoc_nerr(m, m->last, EMALLOC); |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
} |
} |
|
|
Line 350 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 334 mdoc_argv_free(struct mdoc_arg *p) |
|
} |
} |
|
|
|
|
|
|
static int |
|
perr(struct mdoc *mdoc, int line, int pos, enum merr code) |
|
{ |
|
char *p; |
|
|
|
p = NULL; |
|
switch (code) { |
|
case (EMALLOC): |
|
p = "memory exhausted"; |
|
break; |
|
case (EQUOTTERM): |
|
p = "unterminated quoted parameter"; |
|
break; |
|
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): |
|
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; |
Line 419 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 351 mdoc_args(struct mdoc *mdoc, int line, |
|
|
|
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; |
|
|
Line 454 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 386 mdoc_args(struct mdoc *mdoc, int line, |
|
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; |
Line 471 args(struct mdoc *mdoc, int line, |
|
Line 403 args(struct mdoc *mdoc, int line, |
|
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); |
|
|
/* |
/* |
Line 567 args(struct mdoc *mdoc, int line, |
|
Line 499 args(struct mdoc *mdoc, int line, |
|
} |
} |
|
|
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) |
Line 582 args(struct mdoc *mdoc, int line, |
|
Line 514 args(struct mdoc *mdoc, int line, |
|
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); |
|
|
Line 614 args(struct mdoc *mdoc, int line, |
|
Line 546 args(struct mdoc *mdoc, int line, |
|
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); |
Line 632 args(struct mdoc *mdoc, int line, |
|
Line 564 args(struct mdoc *mdoc, int line, |
|
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
(void)perr(mdoc, line, *pos, EQUOTTERM); |
(void)mdoc_perr(m, line, *pos, EQUOTTERM); |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
} |
} |
|
|
Line 646 args(struct mdoc *mdoc, int line, |
|
Line 578 args(struct mdoc *mdoc, int line, |
|
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); |
Line 752 argv_a2arg(int tok, const char *argv) |
|
Line 684 argv_a2arg(int tok, const char *argv) |
|
|
|
|
|
static int |
static int |
argv_multi(struct mdoc *mdoc, int line, |
argv_multi(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int c; |
char *p; |
char *p; |
|
|
ppos = *pos; |
|
|
|
for (v->sz = 0; ; v->sz++) { |
for (v->sz = 0; ; v->sz++) { |
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
break; |
break; |
c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == c) |
Line 773 argv_multi(struct mdoc *mdoc, int line, |
|
Line 703 argv_multi(struct mdoc *mdoc, int line, |
|
v->value = realloc(v->value, |
v->value = realloc(v->value, |
(v->sz + MULTI_STEP) * sizeof(char *)); |
(v->sz + MULTI_STEP) * sizeof(char *)); |
if (NULL == v->value) { |
if (NULL == v->value) { |
(void)verr(mdoc, EMALLOC); |
(void)mdoc_nerr(m, m->last, EMALLOC); |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
} |
} |
} |
} |
if (NULL == (v->value[(int)v->sz] = strdup(p))) |
if (NULL == (v->value[(int)v->sz] = strdup(p))) |
return(verr(mdoc, EMALLOC)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
} |
} |
|
|
if (v->sz) |
return(1); |
return(1); |
|
|
|
return(perr(mdoc, line, ppos, EARGVAL)); |
|
} |
} |
|
|
|
|
static int |
static int |
argv_opt_single(struct mdoc *mdoc, int line, |
argv_opt_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c; |
int c; |
Line 798 argv_opt_single(struct mdoc *mdoc, int line, |
|
Line 725 argv_opt_single(struct mdoc *mdoc, int line, |
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
return(1); |
return(1); |
|
|
c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
Line 806 argv_opt_single(struct mdoc *mdoc, int line, |
|
Line 733 argv_opt_single(struct mdoc *mdoc, int line, |
|
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
return(verr(mdoc, EMALLOC)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
if (NULL == (v->value[0] = strdup(p))) |
if (NULL == (v->value[0] = strdup(p))) |
return(verr(mdoc, EMALLOC)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
return(1); |
return(1); |
} |
} |
Line 818 argv_opt_single(struct mdoc *mdoc, int line, |
|
Line 745 argv_opt_single(struct mdoc *mdoc, int line, |
|
* Parse a single, mandatory value from the stream. |
* Parse a single, mandatory value from the stream. |
*/ |
*/ |
static int |
static int |
argv_single(struct mdoc *mdoc, int line, |
argv_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int c, ppos; |
Line 826 argv_single(struct mdoc *mdoc, int line, |
|
Line 753 argv_single(struct mdoc *mdoc, int line, |
|
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
return(perr(mdoc, line, ppos, EARGVAL)); |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
return(verr(mdoc, EMALLOC)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
if (NULL == (v->value[0] = strdup(p))) |
if (NULL == (v->value[0] = strdup(p))) |
return(verr(mdoc, EMALLOC)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
return(1); |
return(1); |
} |
} |