version 1.37, 2010/04/03 14:02:10 |
version 1.44, 2010/05/09 10:17:02 |
|
|
#define MULTI_STEP 5 |
#define MULTI_STEP 5 |
|
|
static int argv_a2arg(enum mdoct, const char *); |
static int argv_a2arg(enum mdoct, const char *); |
static int args(struct mdoc *, int, int *, |
static enum margserr args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
static int argv(struct mdoc *, int, |
static int argv(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
Line 217 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 217 static int mdoc_argflags[MDOC_MAX] = { |
|
* [value0...], which may either have a single mandatory value, at least |
* [value0...], which may either have a single mandatory value, at least |
* one mandatory value, an optional single value, or no value. |
* one mandatory value, an optional single value, or no value. |
*/ |
*/ |
int |
enum margverr |
mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
Line 325 mdoc_argn_free(struct mdoc_arg *p, int iarg) |
|
Line 325 mdoc_argn_free(struct mdoc_arg *p, int iarg) |
|
} |
} |
|
|
|
|
int |
enum margserr |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
char *buf, int flags, char **v) |
char *buf, int flags, char **v) |
{ |
{ |
Line 334 mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
Line 334 mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
|
|
int |
enum margserr |
mdoc_args(struct mdoc *m, int line, int *pos, |
mdoc_args(struct mdoc *m, int line, int *pos, |
char *buf, enum mdoct tok, char **v) |
char *buf, enum mdoct tok, char **v) |
{ |
{ |
Line 372 mdoc_args(struct mdoc *m, int line, int *pos, |
|
Line 372 mdoc_args(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
|
|
static int |
static enum margserr |
args(struct mdoc *m, int line, int *pos, |
args(struct mdoc *m, int line, int *pos, |
char *buf, int fl, char **v) |
char *buf, int fl, char **v) |
{ |
{ |
int i; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
enum margserr rc; |
|
|
/* |
/* |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
Line 397 args(struct mdoc *m, int line, int *pos, |
|
Line 398 args(struct mdoc *m, int line, int *pos, |
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
|
/* |
/* |
Line 453 args(struct mdoc *m, int line, int *pos, |
|
Line 454 args(struct mdoc *m, int line, int *pos, |
|
break; |
break; |
} |
} |
|
|
|
/* By default, assume a phrase. */ |
|
rc = ARGS_PHRASE; |
|
|
/* |
/* |
* Adjust new-buffer position to be beyond delimiter |
* Adjust new-buffer position to be beyond delimiter |
* mark (e.g., Ta -> end + 2). |
* mark (e.g., Ta -> end + 2). |
*/ |
*/ |
if (p && pp) { |
if (p && pp) { |
*pos += pp < p ? 2 : 1; |
*pos += pp < p ? 2 : 1; |
|
rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE; |
p = pp < p ? pp : p; |
p = pp < p ? pp : p; |
} else if (p && ! pp) { |
} else if (p && ! pp) { |
|
rc = ARGS_PPHRASE; |
*pos += 1; |
*pos += 1; |
} else if (pp && ! p) { |
} else if (pp && ! p) { |
p = pp; |
p = pp; |
*pos += 2; |
*pos += 2; |
} else |
} else { |
|
rc = ARGS_PEND; |
p = strchr(*v, 0); |
p = strchr(*v, 0); |
|
} |
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
Line 488 args(struct mdoc *m, int line, int *pos, |
|
Line 496 args(struct mdoc *m, int line, int *pos, |
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(ARGS_PHRASE); |
return(rc); |
} |
} |
|
|
/* |
/* |
|
|
argv_multi(struct mdoc *m, 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; |
enum margserr ac; |
char *p; |
char *p; |
|
|
for (v->sz = 0; ; v->sz++) { |
for (v->sz = 0; ; v->sz++) { |
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
break; |
break; |
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (0 == v->sz % MULTI_STEP) |
if (0 == v->sz % MULTI_STEP) |
|
|
argv_opt_single(struct mdoc *m, 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; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
return(1); |
return(1); |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
return(1); |
return(1); |
|
|
v->sz = 1; |
v->sz = 1; |
|
|
argv_single(struct mdoc *m, 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 ppos; |
|
enum margserr ac; |
char *p; |
char *p; |
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
|
|
v->sz = 1; |
v->sz = 1; |