version 1.20, 2009/07/20 14:09:38 |
version 1.24, 2009/08/20 09:07:24 |
|
|
* There's no limit to the number or arguments that may be allocated. |
* There's no limit to the number or arguments that may be allocated. |
*/ |
*/ |
|
|
/* FIXME .Bf Li raises "macro-like parameter". */ |
|
|
|
#define ARGS_DELIM (1 << 1) |
|
#define ARGS_TABSEP (1 << 2) |
|
|
|
#define ARGV_NONE (1 << 0) |
#define ARGV_NONE (1 << 0) |
#define ARGV_SINGLE (1 << 1) |
#define ARGV_SINGLE (1 << 1) |
#define ARGV_MULTI (1 << 2) |
#define ARGV_MULTI (1 << 2) |
Line 327 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 322 mdoc_argv_free(struct mdoc_arg *p) |
|
|
|
|
|
int |
int |
mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
char *buf, int flags, char **v) |
{ |
{ |
|
|
return(args(m, line, pos, buf, 0, v)); |
return(args(m, line, pos, buf, flags, v)); |
} |
} |
|
|
|
|
|
|
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, psv; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
|
|
/* |
|
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
|
* `.Xx val'), which can have all sorts of properties: |
|
* |
|
* ARGS_DELIM: use special handling if encountering trailing |
|
* delimiters in the form of [[::delim::][ ]+]+. |
|
* |
|
* ARGS_NOWARN: don't post warnings. This is only used when |
|
* re-parsing delimiters, as the warnings have already been |
|
* posted. |
|
* |
|
* ARGS_TABSEP: use special handling for tab/`Ta' separated |
|
* phrases like in `Bl -column'. |
|
*/ |
|
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
Line 403 args(struct mdoc *m, int line, int *pos, |
|
Line 414 args(struct mdoc *m, int line, int *pos, |
|
i++; |
i++; |
} |
} |
|
|
/* FIXME: warn about trailing whitespace. */ |
|
|
|
if (0 == buf[i]) { |
if (0 == buf[i]) { |
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
if (' ' != buf[i - 1]) |
|
return(ARGS_PUNCT); |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_PUNCT); |
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
} |
} |
} |
Line 421 args(struct mdoc *m, int line, int *pos, |
|
Line 436 args(struct mdoc *m, int line, int *pos, |
|
*/ |
*/ |
|
|
if (ARGS_TABSEP & fl) { |
if (ARGS_TABSEP & fl) { |
psv = *pos; |
|
|
|
/* Scan ahead to tab (can't be escaped). */ |
/* Scan ahead to tab (can't be escaped). */ |
p = strchr(*v, '\t'); |
p = strchr(*v, '\t'); |
|
|
Line 436 args(struct mdoc *m, int line, int *pos, |
|
Line 449 args(struct mdoc *m, int line, int *pos, |
|
break; |
break; |
} |
} |
|
|
|
/* |
|
* Adjust new-buffer position to be beyond delimiter |
|
* mark (e.g., Ta -> end + 2). |
|
*/ |
if (p && pp) { |
if (p && pp) { |
*pos += pp < p ? 2 : 1; |
*pos += pp < p ? 2 : 1; |
p = pp < p ? pp : p; |
p = pp < p ? pp : p; |
Line 447 args(struct mdoc *m, int line, int *pos, |
|
Line 464 args(struct mdoc *m, int line, int *pos, |
|
} else |
} else |
p = strchr(*v, 0); |
p = strchr(*v, 0); |
|
|
if (0 == *p && ' ' == *(p - 1)) |
/* Whitespace check for eoln case... */ |
|
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
*p = 0; |
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
/* Strip delimiter's preceding whitespace. */ |
/* Strip delimiter's preceding whitespace. */ |
|
|
pp = p - 1; |
pp = p - 1; |
while (pp > *v && ' ' == *pp) { |
while (pp > *v && ' ' == *pp) { |
if (pp > *v && '\\' == *(pp - 1)) |
if (pp > *v && '\\' == *(pp - 1)) |
Line 465 args(struct mdoc *m, int line, int *pos, |
|
Line 481 args(struct mdoc *m, int line, int *pos, |
|
*(pp + 1) = 0; |
*(pp + 1) = 0; |
|
|
/* Strip delimiter's proceeding whitespace. */ |
/* Strip delimiter's proceeding whitespace. */ |
|
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
Line 490 args(struct mdoc *m, int line, int *pos, |
|
Line 505 args(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_QWORD); |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
Line 503 args(struct mdoc *m, int line, int *pos, |
|
Line 520 args(struct mdoc *m, int line, int *pos, |
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
Line 527 args(struct mdoc *m, int line, int *pos, |
|
Line 544 args(struct mdoc *m, int line, int *pos, |
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|