version 1.29, 2009/02/23 15:34:53 |
version 1.35, 2009/03/03 22:28:21 |
|
|
#define ARGS_DELIM (1 << 1) |
#define ARGS_DELIM (1 << 1) |
#define ARGS_TABSEP (1 << 2) |
#define ARGS_TABSEP (1 << 2) |
|
|
static int lookup(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, |
static int argv(struct mdoc *, int, |
Line 74 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 74 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Ed */ |
0, /* Ed */ |
0, /* Bl */ |
0, /* Bl */ |
0, /* El */ |
0, /* El */ |
ARGS_DELIM, /* It */ |
0, /* It */ |
ARGS_DELIM, /* Ad */ |
ARGS_DELIM, /* Ad */ |
ARGS_DELIM, /* An */ |
ARGS_DELIM, /* An */ |
ARGS_DELIM, /* Ar */ |
ARGS_DELIM, /* Ar */ |
Line 251 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 251 mdoc_args(struct mdoc *mdoc, int line, |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; i < c; i++) { |
for (i = 0; i < c; i++) { |
if (MDOC_Column != n->data.block.argv[i].arg) |
switch (n->data.block.argv[i].arg) { |
continue; |
case (MDOC_Column): |
fl |= ARGS_TABSEP; |
fl |= ARGS_TABSEP; |
fl &= ~ARGS_DELIM; |
fl &= ~ARGS_DELIM; |
break; |
i = c; |
|
break; |
|
case (MDOC_Diag): |
|
fl |= ARGS_QUOTED; |
|
i = c; |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
} |
} |
|
|
|
|
args(struct mdoc *mdoc, int line, |
args(struct mdoc *mdoc, int line, |
int *pos, char *buf, int fl, char **v) |
int *pos, char *buf, int fl, char **v) |
{ |
{ |
int i, c; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
|
assert(*pos > 0); |
assert(*pos > 0); |
Line 290 args(struct mdoc *mdoc, int line, |
|
Line 298 args(struct mdoc *mdoc, int line, |
|
*/ |
*/ |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
for (i = *pos; (c = buf[i]); ) { |
for (i = *pos; buf[i]; ) { |
if ( ! mdoc_iscdelim(c)) |
if ( ! mdoc_iscdelim(buf[i])) |
break; |
break; |
i++; |
i++; |
if (0 == buf[i] || ! isspace(c)) |
/* There must be at least one space... */ |
|
if (0 == buf[i] || ! isspace((int)buf[i])) |
break; |
break; |
i++; |
i++; |
while (buf[i] && isspace(c)) |
while (buf[i] && isspace((int)buf[i])) |
i++; |
i++; |
} |
} |
if (0 == buf[i]) { |
if (0 == buf[i]) { |
Line 375 args(struct mdoc *mdoc, int line, |
|
Line 384 args(struct mdoc *mdoc, int line, |
|
p++; |
p++; |
if (0 != *p) |
if (0 != *p) |
*(p - 1) = 0; |
*(p - 1) = 0; |
*pos += p - *v; |
*pos += (int)(p - *v); |
} |
} |
|
|
if (p && 0 == *p) |
if (p && 0 == *p) |
Line 396 args(struct mdoc *mdoc, int line, |
|
Line 405 args(struct mdoc *mdoc, int line, |
|
if (p > *v && ' ' == *(p - 1)) |
if (p > *v && ' ' == *(p - 1)) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
return(0); |
return(0); |
*pos += p - *v; |
*pos += (int)(p - *v); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
Line 404 args(struct mdoc *mdoc, int line, |
|
Line 413 args(struct mdoc *mdoc, int line, |
|
/* Do non-tabsep look-ahead here. */ |
/* Do non-tabsep look-ahead here. */ |
|
|
if ( ! (ARGS_TABSEP & fl)) |
if ( ! (ARGS_TABSEP & fl)) |
while ((c = buf[*pos])) { |
while (buf[*pos]) { |
if (isspace(c)) |
if (isspace((int)buf[*pos])) |
if ('\\' != buf[*pos - 1]) |
if ('\\' != buf[*pos - 1]) |
break; |
break; |
(*pos)++; |
(*pos)++; |
Line 466 args(struct mdoc *mdoc, int line, |
|
Line 475 args(struct mdoc *mdoc, int line, |
|
|
|
|
|
static int |
static int |
lookup(int tok, const char *argv) |
argv_a2arg(int tok, const char *argv) |
{ |
{ |
|
|
switch (tok) { |
switch (tok) { |
Line 650 argv_multi(struct mdoc *mdoc, int line, |
|
Line 659 argv_multi(struct mdoc *mdoc, int line, |
|
return(0); |
return(0); |
} else if (ARGS_EOLN == c) |
} else if (ARGS_EOLN == c) |
break; |
break; |
v->value[v->sz] = p; |
v->value[(int)v->sz] = p; |
} |
} |
|
|
if (0 < v->sz && v->sz < MDOC_LINEARG_MAX) |
if (0 < v->sz && v->sz < MDOC_LINEARG_MAX) |
Line 747 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 756 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
if (buf[*pos]) |
if (buf[*pos]) |
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
|
|
if (MDOC_ARG_MAX == (v->arg = lookup(tok, p))) { |
if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) { |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |