version 1.15, 2009/07/17 12:27:49 |
version 1.21, 2009/07/20 14:12:27 |
|
|
|
|
/* FIXME .Bf Li raises "macro-like parameter". */ |
/* FIXME .Bf Li raises "macro-like parameter". */ |
|
|
#define ARGS_QUOTED (1 << 0) |
|
#define ARGS_DELIM (1 << 1) |
#define ARGS_DELIM (1 << 1) |
#define ARGS_TABSEP (1 << 2) |
#define ARGS_TABSEP (1 << 2) |
|
|
Line 93 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 92 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Dd */ |
0, /* Dd */ |
0, /* Dt */ |
0, /* Dt */ |
0, /* Os */ |
0, /* Os */ |
ARGS_QUOTED, /* Sh */ |
0, /* Sh */ |
ARGS_QUOTED, /* Ss */ |
0, /* Ss */ |
ARGS_DELIM, /* Pp */ |
ARGS_DELIM, /* Pp */ |
ARGS_DELIM, /* D1 */ |
ARGS_DELIM, /* D1 */ |
ARGS_DELIM | ARGS_QUOTED, /* Dl */ |
ARGS_DELIM, /* Dl */ |
0, /* Bd */ |
0, /* Bd */ |
0, /* Ed */ |
0, /* Ed */ |
ARGS_QUOTED, /* Bl */ |
0, /* Bl */ |
0, /* El */ |
0, /* El */ |
0, /* It */ |
0, /* It */ |
ARGS_DELIM, /* Ad */ |
ARGS_DELIM, /* Ad */ |
ARGS_DELIM, /* An */ |
ARGS_DELIM, /* An */ |
ARGS_DELIM | ARGS_QUOTED, /* Ar */ |
ARGS_DELIM, /* Ar */ |
ARGS_QUOTED, /* Cd */ |
0, /* Cd */ |
ARGS_DELIM, /* Cm */ |
ARGS_DELIM, /* Cm */ |
ARGS_DELIM, /* Dv */ |
ARGS_DELIM, /* Dv */ |
ARGS_DELIM, /* Er */ |
ARGS_DELIM, /* Er */ |
ARGS_DELIM, /* Ev */ |
ARGS_DELIM, /* Ev */ |
0, /* Ex */ |
0, /* Ex */ |
ARGS_DELIM | ARGS_QUOTED, /* Fa */ |
ARGS_DELIM, /* Fa */ |
0, /* Fd */ |
0, /* Fd */ |
ARGS_DELIM, /* Fl */ |
ARGS_DELIM, /* Fl */ |
ARGS_DELIM | ARGS_QUOTED, /* Fn */ |
ARGS_DELIM, /* Fn */ |
ARGS_DELIM | ARGS_QUOTED, /* Ft */ |
ARGS_DELIM, /* Ft */ |
ARGS_DELIM, /* Ic */ |
ARGS_DELIM, /* Ic */ |
0, /* In */ |
0, /* In */ |
ARGS_DELIM | ARGS_QUOTED, /* Li */ |
ARGS_DELIM, /* Li */ |
ARGS_QUOTED, /* Nd */ |
0, /* Nd */ |
ARGS_DELIM, /* Nm */ |
ARGS_DELIM, /* Nm */ |
ARGS_DELIM, /* Op */ |
ARGS_DELIM, /* Op */ |
0, /* Ot */ |
0, /* Ot */ |
Line 130 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 129 static int mdoc_argflags[MDOC_MAX] = { |
|
ARGS_DELIM, /* Va */ |
ARGS_DELIM, /* Va */ |
ARGS_DELIM, /* Vt */ |
ARGS_DELIM, /* Vt */ |
ARGS_DELIM, /* Xr */ |
ARGS_DELIM, /* Xr */ |
ARGS_QUOTED, /* %A */ |
0, /* %A */ |
ARGS_QUOTED, /* %B */ |
0, /* %B */ |
ARGS_QUOTED, /* %D */ |
0, /* %D */ |
ARGS_QUOTED, /* %I */ |
0, /* %I */ |
ARGS_QUOTED, /* %J */ |
0, /* %J */ |
ARGS_QUOTED, /* %N */ |
0, /* %N */ |
ARGS_QUOTED, /* %O */ |
0, /* %O */ |
ARGS_QUOTED, /* %P */ |
0, /* %P */ |
ARGS_QUOTED, /* %R */ |
0, /* %R */ |
ARGS_QUOTED, /* %T */ |
0, /* %T */ |
ARGS_QUOTED, /* %V */ |
0, /* %V */ |
ARGS_DELIM, /* Ac */ |
ARGS_DELIM, /* Ac */ |
0, /* Ao */ |
0, /* Ao */ |
ARGS_DELIM, /* Aq */ |
ARGS_DELIM, /* Aq */ |
Line 180 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 179 static int mdoc_argflags[MDOC_MAX] = { |
|
ARGS_DELIM, /* Sq */ |
ARGS_DELIM, /* Sq */ |
0, /* Sm */ |
0, /* Sm */ |
ARGS_DELIM, /* Sx */ |
ARGS_DELIM, /* Sx */ |
ARGS_DELIM | ARGS_QUOTED, /* Sy */ |
ARGS_DELIM, /* Sy */ |
ARGS_DELIM, /* Tn */ |
ARGS_DELIM, /* Tn */ |
ARGS_DELIM, /* Ux */ |
ARGS_DELIM, /* Ux */ |
ARGS_DELIM, /* Xc */ |
ARGS_DELIM, /* Xc */ |
0, /* Xo */ |
0, /* Xo */ |
ARGS_QUOTED, /* Fo */ |
0, /* Fo */ |
0, /* Fc */ |
0, /* Fc */ |
0, /* Oo */ |
0, /* Oo */ |
ARGS_DELIM, /* Oc */ |
ARGS_DELIM, /* Oc */ |
Line 197 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 196 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Ud */ |
0, /* Ud */ |
0, /* Lb */ |
0, /* Lb */ |
ARGS_DELIM, /* Lp */ |
ARGS_DELIM, /* Lp */ |
ARGS_DELIM | ARGS_QUOTED, /* Lk */ |
ARGS_DELIM, /* Lk */ |
ARGS_DELIM | ARGS_QUOTED, /* Mt */ |
ARGS_DELIM, /* Mt */ |
ARGS_DELIM, /* Brq */ |
ARGS_DELIM, /* Brq */ |
0, /* Bro */ |
0, /* Bro */ |
ARGS_DELIM, /* Brc */ |
ARGS_DELIM, /* Brc */ |
ARGS_QUOTED, /* %C */ |
0, /* %C */ |
0, /* Es */ |
0, /* Es */ |
0, /* En */ |
0, /* En */ |
0, /* Dx */ |
0, /* Dx */ |
ARGS_QUOTED, /* %Q */ |
0, /* %Q */ |
0, /* br */ |
0, /* br */ |
0, /* sp */ |
0, /* sp */ |
}; |
}; |
|
|
mdoc_argv(struct mdoc *m, 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; |
|
char *p, sv; |
char *p, sv; |
struct mdoc_argv tmp; |
struct mdoc_argv tmp; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
Line 233 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 231 mdoc_argv(struct mdoc *m, int line, int tok, |
|
|
|
/* Parse through to the first unescaped space. */ |
/* Parse through to the first unescaped space. */ |
|
|
i = *pos; |
|
p = &buf[++(*pos)]; |
p = &buf[++(*pos)]; |
|
|
assert(*pos > 0); |
assert(*pos > 0); |
Line 330 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 327 mdoc_argv_free(struct mdoc_arg *p) |
|
|
|
|
|
int |
int |
|
mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) |
|
{ |
|
|
|
return(args(m, line, pos, buf, 0, v)); |
|
} |
|
|
|
|
|
int |
mdoc_args(struct mdoc *m, 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) |
{ |
{ |
Line 338 mdoc_args(struct mdoc *m, int line, |
|
Line 343 mdoc_args(struct mdoc *m, int line, |
|
|
|
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
|
|
|
if (MDOC_It != tok) |
|
return(args(m, line, pos, buf, fl, v)); |
|
|
/* |
/* |
* Override per-macro argument flags with context-specific ones. |
* The `It' macro is a special case, as it acquires parameters from its |
* As of now, this is only valid for `It' depending on its list |
* parent `Bl' context, specifically, we're concerned with -column. |
* context. |
|
*/ |
*/ |
|
|
switch (tok) { |
for (n = m->last; n; n = n->parent) |
case (MDOC_It): |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
for (n = m->last; n; n = n->parent) |
break; |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
|
break; |
|
|
|
assert(n); |
assert(n); |
c = (int)(n->args ? n->args->argc : 0); |
c = (int)(n->args ? n->args->argc : 0); |
assert(c > 0); |
assert(c > 0); |
|
|
/* |
/* LINTED */ |
* Using `Bl -column' adds ARGS_TABSEP to the arguments |
for (i = 0; i < c; i++) { |
* and invalidates ARGS_DELIM. Using `Bl -diag' allows |
if (MDOC_Column != n->args->argv[i].arg) |
* for quoted arguments. |
continue; |
*/ |
fl |= ARGS_TABSEP; |
|
fl &= ~ARGS_DELIM; |
/* LINTED */ |
|
for (i = 0; i < c; i++) { |
|
switch (n->args->argv[i].arg) { |
|
case (MDOC_Column): |
|
fl |= ARGS_TABSEP; |
|
fl &= ~ARGS_DELIM; |
|
i = c; |
|
break; |
|
case (MDOC_Diag): |
|
fl |= ARGS_QUOTED; |
|
i = c; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
break; |
break; |
default: |
|
break; |
|
} |
} |
|
|
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
Line 392 args(struct mdoc *m, int line, int *pos, |
|
Line 379 args(struct mdoc *m, int line, int *pos, |
|
int i; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
|
assert(*pos > 0); |
assert(*pos); |
|
assert(' ' != buf[*pos]); |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
|
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
|
if ( ! mdoc_pwarn(m, line, *pos, EQUOTPARM)) |
|
return(ARGS_ERROR); |
|
|
|
/* |
/* |
* If the first character is a delimiter and we're to look for |
* If the first character is a delimiter and we're to look for |
* delimited strings, then pass down the buffer seeing if it |
* delimited strings, then pass down the buffer seeing if it |
Line 412 args(struct mdoc *m, int line, int *pos, |
|
Line 396 args(struct mdoc *m, int line, int *pos, |
|
if ( ! mdoc_iscdelim(buf[i])) |
if ( ! mdoc_iscdelim(buf[i])) |
break; |
break; |
i++; |
i++; |
/* There must be at least one space... */ |
|
if (0 == buf[i] || ' ' != buf[i]) |
if (0 == buf[i] || ' ' != buf[i]) |
break; |
break; |
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
|
/* FIXME: warn about trailing whitespace. */ |
|
|
if (0 == buf[i]) { |
if (0 == buf[i]) { |
*v = &buf[*pos]; |
*v = &buf[*pos]; |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
} |
} |
} |
|
|
/* First parse non-quoted strings. */ |
*v = &buf[*pos]; |
|
|
if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) { |
/* |
*v = &buf[*pos]; |
* First handle TABSEP items, restricted to `Bl -column'. This |
|
* ignores conventional token parsing and instead uses tabs or |
|
* `Ta' macros to separate phrases. Phrases are parsed again |
|
* for arguments at a later phase. |
|
*/ |
|
|
|
if (ARGS_TABSEP & fl) { |
|
/* Scan ahead to tab (can't be escaped). */ |
|
p = strchr(*v, '\t'); |
|
|
|
/* Scan ahead to unescaped `Ta'. */ |
|
for (pp = *v; ; pp++) { |
|
if (NULL == (pp = strstr(pp, "Ta"))) |
|
break; |
|
if (pp > *v && ' ' != *(pp - 1)) |
|
continue; |
|
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
|
break; |
|
} |
|
|
/* |
/* |
* Thar be dragons here! If we're tab-separated, search |
* Adjust new-buffer position to be beyond delimiter |
* ahead for either a tab or the `Ta' macro. |
* mark (e.g., Ta -> end + 2). |
* If a `Ta' is detected, it must be space-buffered before and |
|
* after. If either of these hold true, then prune out the |
|
* extra spaces and call it an argument. |
|
*/ |
*/ |
|
if (p && pp) { |
|
*pos += pp < p ? 2 : 1; |
|
p = pp < p ? pp : p; |
|
} else if (p && ! pp) { |
|
*pos += 1; |
|
} else if (pp && ! p) { |
|
p = pp; |
|
*pos += 2; |
|
} else |
|
p = strchr(*v, 0); |
|
|
if (ARGS_TABSEP & fl) { |
/* Whitespace check for eoln case... */ |
/* Scan ahead to unescaped tab. */ |
if (0 == *p && ' ' == *(p - 1)) |
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
|
p = strchr(*v, '\t'); |
*pos += (int)(p - *v); |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Strip delimiter's preceding whitespace. */ |
|
pp = p - 1; |
|
while (pp > *v && ' ' == *pp) { |
|
if (pp > *v && '\\' == *(pp - 1)) |
|
break; |
|
pp--; |
|
} |
|
*(pp + 1) = 0; |
|
|
for (pp = *v; ; pp++) { |
/* Strip delimiter's proceeding whitespace. */ |
if (NULL == (pp = strstr(pp, "Ta"))) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
break; |
/* Skip ahead. */ ; |
if (pp > *v && ' ' != *(pp - 1)) |
|
continue; |
|
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
|
break; |
|
} |
|
|
|
/* Choose delimiter tab/Ta. */ |
return(ARGS_PHRASE); |
|
} |
|
|
if (p && pp) |
/* |
p = (p < pp ? p : pp); |
* Process a quoted literal. A quote begins with a double-quote |
else if ( ! p && pp) |
* and ends with a double-quote NOT preceded by a double-quote. |
p = pp; |
* Whitespace is NOT involved in literal termination. |
|
*/ |
|
|
/* Strip delimiter's preceding whitespace. */ |
if ('\"' == buf[*pos]) { |
|
*v = &buf[++(*pos)]; |
|
|
if (p && p > *v) { |
for ( ; buf[*pos]; (*pos)++) { |
pp = p - 1; |
if ('\"' != buf[*pos]) |
while (pp > *v && ' ' == *pp) |
continue; |
pp--; |
if ('\"' != buf[*pos + 1]) |
if (pp == *v && ' ' == *pp) |
break; |
*pp = 0; |
(*pos)++; |
else if (' ' == *pp) |
} |
*(pp + 1) = 0; |
|
} |
|
|
|
/* ...in- and proceding whitespace. */ |
if (0 == buf[*pos]) { |
|
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
|
return(ARGS_ERROR); |
|
return(ARGS_QWORD); |
|
} |
|
|
if (p && ('\t' != *p)) { |
buf[(*pos)++] = 0; |
*p++ = 0; |
|
*p++ = 0; |
|
} else if (p) |
|
*p++ = 0; |
|
|
|
if (p) { |
|
while (' ' == *p) |
|
p++; |
|
if (0 != *p) |
|
*(p - 1) = 0; |
|
*pos += (int)(p - *v); |
|
} |
|
|
|
if (p && 0 == *p) |
|
if ( ! mdoc_pwarn(m, line, *pos, ECOLEMPTY)) |
|
return(ARGS_ERROR); |
|
if (p && 0 == *p && p > *v && ' ' == *(p - 1)) |
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
|
|
if (p) |
|
return(ARGS_PHRASE); |
|
|
|
/* Configure the eoln case, too. */ |
|
|
|
p = strchr(*v, 0); |
|
assert(p); |
|
|
|
if (p > *v && ' ' == *(p - 1)) |
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
*pos += (int)(p - *v); |
|
|
|
return(ARGS_PHRASE); |
|
} |
|
|
|
/* Do non-tabsep look-ahead here. */ |
|
|
|
if ( ! (ARGS_TABSEP & fl)) |
|
while (buf[*pos]) { |
|
if (' ' == buf[*pos]) |
|
if ('\\' != buf[*pos - 1]) |
|
break; |
|
(*pos)++; |
|
} |
|
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_QWORD); |
|
|
buf[(*pos)++] = 0; |
while (' ' == buf[*pos]) |
|
(*pos)++; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
return(ARGS_WORD); |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
|
if ( ! (ARGS_TABSEP & fl)) |
return(ARGS_QWORD); |
while (buf[*pos] && ' ' == buf[*pos]) |
|
(*pos)++; |
|
|
|
if (buf[*pos]) |
|
return(ARGS_WORD); |
|
|
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
|
|
return(ARGS_WORD); |
|
} |
} |
|
|
/* |
/* |
* If we're a quoted string (and quoted strings are allowed), |
* A non-quoted term progresses until either the end of line or |
* then parse ahead to the next quote. If none's found, it's an |
* a non-escaped whitespace. |
* error. After, parse to the next word. |
|
*/ |
*/ |
|
|
*v = &buf[++(*pos)]; |
for ( ; buf[*pos]; (*pos)++) |
|
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
|
break; |
|
|
while (buf[*pos] && '\"' != buf[*pos]) |
if (0 == buf[*pos]) |
(*pos)++; |
return(ARGS_WORD); |
|
|
if (0 == buf[*pos]) { |
|
(void)mdoc_perr(m, line, *pos, EQUOTTERM); |
|
return(ARGS_ERROR); |
|
} |
|
|
|
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
if (0 == buf[*pos]) |
|
return(ARGS_QWORD); |
|
|
|
while (buf[*pos] && ' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (buf[*pos]) |
if (0 == buf[*pos]) |
return(ARGS_QWORD); |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
|
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_WORD); |
return(ARGS_ERROR); |
|
|
|
return(ARGS_QWORD); |
|
} |
} |
|
|
|
|
Line 684 argv_multi(struct mdoc *m, int line, |
|
Line 643 argv_multi(struct mdoc *m, int line, |
|
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, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == c) |
Line 716 argv_opt_single(struct mdoc *m, int line, |
|
Line 675 argv_opt_single(struct mdoc *m, int line, |
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
return(1); |
return(1); |
|
|
c = args(m, line, pos, buf, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
Line 744 argv_single(struct mdoc *m, int line, |
|
Line 703 argv_single(struct mdoc *m, int line, |
|
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = args(m, line, pos, buf, ARGS_QUOTED, &p); |
c = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |