version 1.46, 2009/03/10 15:01:54 |
version 1.51, 2009/03/14 05:21:58 |
|
|
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 **); |
static int argv(struct mdoc *, int, int, |
static int argv(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_single(struct mdoc *, int, |
static int argv_single(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
Line 94 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 94 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
ARGV_MULTI, /* MDOC_Column */ |
ARGV_MULTI, /* MDOC_Column */ |
ARGV_SINGLE, /* MDOC_Width */ |
ARGV_SINGLE, /* MDOC_Width */ |
ARGV_NONE, /* MDOC_Compact */ |
ARGV_NONE, /* MDOC_Compact */ |
ARGV_SINGLE, /* MDOC_Std */ |
ARGV_OPT_SINGLE, /* MDOC_Std */ |
ARGV_NONE, /* MDOC_Filled */ |
ARGV_NONE, /* MDOC_Filled */ |
ARGV_NONE, /* MDOC_Words */ |
ARGV_NONE, /* MDOC_Words */ |
ARGV_NONE, /* MDOC_Emphasis */ |
ARGV_NONE, /* MDOC_Emphasis */ |
|
ARGV_NONE, /* MDOC_Symbolic */ |
ARGV_NONE /* MDOC_Symbolic */ |
ARGV_NONE /* MDOC_Symbolic */ |
}; |
}; |
|
|
Line 213 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 214 static int mdoc_argflags[MDOC_MAX] = { |
|
ARGS_DELIM, /* Lp */ |
ARGS_DELIM, /* Lp */ |
ARGS_DELIM | ARGS_QUOTED, /* Lk */ |
ARGS_DELIM | ARGS_QUOTED, /* Lk */ |
ARGS_DELIM | ARGS_QUOTED, /* Mt */ |
ARGS_DELIM | ARGS_QUOTED, /* Mt */ |
|
ARGS_DELIM, /* Brq */ |
|
0, /* Bro */ |
|
ARGS_DELIM, /* Brc */ |
|
ARGS_QUOTED, /* %C */ |
}; |
}; |
|
|
|
|
Line 253 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 258 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
|
|
/* |
/* |
* XXX: save the nullified byte as we'll restore it if this |
* XXX: save the nullified byte as we'll restore it if this |
* doesn't end up being a command after all. |
* doesn't end up being a command after all. This is a little |
|
* bit hacky. I don't like it, but it works for now. |
*/ |
*/ |
|
|
|
sv = 0; |
if (buf[*pos]) { |
if (buf[*pos]) { |
sv = buf[*pos]; |
sv = buf[*pos]; |
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
Line 272 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 279 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
*/ |
*/ |
|
|
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
/* Restore saved byte. */ |
/* XXX - restore saved byte. */ |
buf[*pos - 1] = sv; |
if (sv) |
|
buf[*pos - 1] = sv; |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
Line 284 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 292 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
|
|
/* FIXME: whitespace if no value. */ |
/* FIXME: whitespace if no value. */ |
|
|
if ( ! argv(mdoc, tok, line, &tmp, pos, buf)) |
if ( ! argv(mdoc, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) { |
Line 570 args(struct mdoc *mdoc, int line, |
|
Line 578 args(struct mdoc *mdoc, int line, |
|
return(0); |
return(0); |
|
|
if (p) |
if (p) |
return(ARGS_WORD); |
return(ARGS_PHRASE); |
|
|
/* Configure the eoln case, too. */ |
/* Configure the eoln case, too. */ |
|
|
Line 582 args(struct mdoc *mdoc, int line, |
|
Line 590 args(struct mdoc *mdoc, int line, |
|
return(0); |
return(0); |
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
return(ARGS_WORD); |
return(ARGS_PHRASE); |
} |
} |
|
|
/* Do non-tabsep look-ahead here. */ |
/* Do non-tabsep look-ahead here. */ |
Line 682 argv_a2arg(int tok, const char *argv) |
|
Line 690 argv_a2arg(int tok, const char *argv) |
|
return(MDOC_File); |
return(MDOC_File); |
else if (xstrcmp(argv, "offset")) |
else if (xstrcmp(argv, "offset")) |
return(MDOC_Offset); |
return(MDOC_Offset); |
|
else if (xstrcmp(argv, "compact")) |
|
return(MDOC_Compact); |
break; |
break; |
|
|
case (MDOC_Bf): |
case (MDOC_Bf): |
Line 727 argv_a2arg(int tok, const char *argv) |
|
Line 737 argv_a2arg(int tok, const char *argv) |
|
return(MDOC_Offset); |
return(MDOC_Offset); |
else if (xstrcmp(argv, "compact")) |
else if (xstrcmp(argv, "compact")) |
return(MDOC_Compact); |
return(MDOC_Compact); |
|
else if (xstrcmp(argv, "nested")) |
|
return(MDOC_Nested); |
break; |
break; |
|
|
case (MDOC_Rv): |
case (MDOC_Rv): |
Line 829 argv_single(struct mdoc *mdoc, int line, |
|
Line 841 argv_single(struct mdoc *mdoc, int line, |
|
* multiple parameters. |
* multiple parameters. |
*/ |
*/ |
static int |
static int |
argv(struct mdoc *mdoc, int tok, int line, |
argv(struct mdoc *mdoc, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int fl; |
|
|
|
v->sz = 0; |
v->sz = 0; |
v->value = NULL; |
v->value = NULL; |
fl = mdoc_argvflags[v->arg]; |
|
|
|
/* |
switch (mdoc_argvflags[v->arg]) { |
* Override the default per-argument value. |
|
*/ |
|
|
|
switch (tok) { |
|
case (MDOC_Ex): |
|
fl = ARGV_OPT_SINGLE; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
switch (fl) { |
|
case (ARGV_SINGLE): |
case (ARGV_SINGLE): |
return(argv_single(mdoc, line, v, pos, buf)); |
return(argv_single(mdoc, line, v, pos, buf)); |
case (ARGV_MULTI): |
case (ARGV_MULTI): |