version 1.68, 2011/03/17 10:59:27 |
version 1.69, 2011/03/17 11:09:36 |
|
|
static enum mdocargt argv_a2arg(enum mdoct, const char *); |
static enum mdocargt argv_a2arg(enum mdoct, const char *); |
static enum margserr args(struct mdoc *, int, int *, |
static enum margserr args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
static int args_checkpunct(const char *); |
static int args_checkpunct(struct mdoc *, |
|
const char *, int, int, int); |
static int argv(struct mdoc *, 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, |
Line 361 static enum margserr |
|
Line 362 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; |
|
char *p, *pp; |
char *p, *pp; |
enum margserr rc; |
enum margserr rc; |
|
|
Line 399 args(struct mdoc *m, int line, int *pos, |
|
Line 399 args(struct mdoc *m, int line, int *pos, |
|
|
|
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
|
if (ARGS_DELIM & fl && args_checkpunct(&buf[*pos])) { |
if (ARGS_DELIM & fl && args_checkpunct(m, buf, *pos, line, fl)) |
i = strlen(&buf[*pos]) + *pos; |
|
if (i && ' ' != buf[i - 1]) |
|
return(ARGS_PUNCT); |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_PUNCT); |
|
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
|
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
|
|
|
/* |
/* |
* First handle TABSEP items, restricted to `Bl -column'. This |
* First handle TABSEP items, restricted to `Bl -column'. This |
Line 549 args(struct mdoc *m, int line, int *pos, |
|
Line 542 args(struct mdoc *m, int line, int *pos, |
|
* whitespace may separate these tokens. |
* whitespace may separate these tokens. |
*/ |
*/ |
static int |
static int |
args_checkpunct(const char *p) |
args_checkpunct(struct mdoc *m, const char *buf, int i, int ln, int fl) |
{ |
{ |
int i, j; |
int j; |
char buf[DELIMSZ]; |
char dbuf[DELIMSZ]; |
enum mdelim d; |
enum mdelim d; |
|
|
i = 0; |
|
|
|
/* First token must be a close-delimiter. */ |
/* First token must be a close-delimiter. */ |
|
|
for (j = 0; p[i] && ' ' != p[i] && j < DELIMSZ; j++, i++) |
for (j = 0; buf[i] && ' ' != buf[i] && j < DELIMSZ; j++, i++) |
buf[j] = p[i]; |
dbuf[j] = buf[i]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return(0); |
|
|
buf[j] = '\0'; |
dbuf[j] = '\0'; |
if (DELIM_CLOSE != mandoc_isdelim(buf)) |
if (DELIM_CLOSE != mandoc_isdelim(dbuf)) |
return(0); |
return(0); |
|
|
while (' ' == p[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
|
|
/* Remaining must NOT be open/none. */ |
/* Remaining must NOT be open/none. */ |
|
|
while (p[i]) { |
while (buf[i]) { |
j = 0; |
j = 0; |
while (p[i] && ' ' != p[i] && j < DELIMSZ) |
while (buf[i] && ' ' != buf[i] && j < DELIMSZ) |
buf[j++] = p[i++]; |
dbuf[j++] = buf[i++]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return(0); |
|
|
buf[j] = '\0'; |
dbuf[j] = '\0'; |
d = mandoc_isdelim(buf); |
d = mandoc_isdelim(dbuf); |
if (DELIM_NONE == d || DELIM_OPEN == d) |
if (DELIM_NONE == d || DELIM_OPEN == d) |
return(0); |
return(0); |
|
|
while (' ' == p[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
return('\0' == p[i]); |
if ( ! (ARGS_NOWARN & fl) && i && ' ' == buf[i - 1]) |
|
mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); |
|
|
|
return('\0' == buf[i]); |
} |
} |
|
|
/* |
/* |