version 1.24, 2009/01/21 17:56:32 |
version 1.26, 2009/01/22 14:56:21 |
|
|
#define ARGS_TABSEP (1 << 2) |
#define ARGS_TABSEP (1 << 2) |
|
|
static int lookup(int, const char *); |
static int lookup(int, const char *); |
static int parse(struct mdoc *, int, |
static int args(struct mdoc *, int, int *, |
|
char *, int, char **); |
|
static int argv(struct mdoc *, int, |
struct mdoc_arg *, int *, char *); |
struct mdoc_arg *, int *, char *); |
static int parse_single(struct mdoc *, int, |
static int argv_single(struct mdoc *, int, |
struct mdoc_arg *, int *, char *); |
struct mdoc_arg *, int *, char *); |
static int parse_multi(struct mdoc *, int, |
static int argv_multi(struct mdoc *, int, |
struct mdoc_arg *, int *, char *); |
struct mdoc_arg *, int *, char *); |
static int postparse(struct mdoc *, int, |
static int postargv(struct mdoc *, int, |
const struct mdoc_arg *, int); |
const struct mdoc_arg *, int); |
static int pwarn(struct mdoc *, int, int, int); |
static int pwarn(struct mdoc *, int, int, int); |
|
static int perr(struct mdoc *, int, int, int); |
|
|
|
/* Warning messages. */ |
|
|
#define WQUOTPARM (0) |
#define WQUOTPARM (0) |
#define WARGVPARM (1) |
#define WARGVPARM (1) |
|
#define WCOLEMPTY (2) |
|
#define WTAILWS (3) |
|
|
|
/* Error messages. */ |
|
|
|
#define EQUOTTERM (0) |
|
#define EOFFSET (1) |
|
#define EARGVAL (2) |
|
#define EARGMANY (3) |
|
|
static int mdoc_argflags[MDOC_MAX] = { |
static int mdoc_argflags[MDOC_MAX] = { |
0, /* \" */ |
0, /* \" */ |
0, /* Dd */ |
0, /* Dd */ |
Line 161 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 175 static int mdoc_argflags[MDOC_MAX] = { |
|
|
|
|
|
static int |
static int |
|
perr(struct mdoc *mdoc, int line, int pos, int code) |
|
{ |
|
int c; |
|
|
|
switch (code) { |
|
case (EQUOTTERM): |
|
c = mdoc_perr(mdoc, line, pos, |
|
"unterminated quoted parameter"); |
|
break; |
|
case (EOFFSET): |
|
c = mdoc_perr(mdoc, line, pos, |
|
"invalid value for offset argument"); |
|
break; |
|
case (EARGVAL): |
|
c = mdoc_perr(mdoc, line, pos, |
|
"argument requires a value"); |
|
break; |
|
case (EARGMANY): |
|
c = mdoc_perr(mdoc, line, pos, |
|
"too many values for argument"); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
return(c); |
|
} |
|
|
|
|
|
static int |
pwarn(struct mdoc *mdoc, int line, int pos, int code) |
pwarn(struct mdoc *mdoc, int line, int pos, int code) |
{ |
{ |
int c; |
int c; |
Line 174 pwarn(struct mdoc *mdoc, int line, int pos, int code) |
|
Line 218 pwarn(struct mdoc *mdoc, int line, int pos, int code) |
|
c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, |
c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, |
"argument-like parameter"); |
"argument-like parameter"); |
break; |
break; |
|
case (WCOLEMPTY): |
|
c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, |
|
"last list column is empty"); |
|
break; |
|
case (WTAILWS): |
|
c = mdoc_pwarn(mdoc, line, pos, WARN_COMPAT, |
|
"trailing whitespace"); |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
|
|
mdoc_args(struct mdoc *mdoc, int line, |
mdoc_args(struct mdoc *mdoc, int line, |
int *pos, char *buf, int tok, char **v) |
int *pos, char *buf, int tok, char **v) |
{ |
{ |
int i, c, fl; |
int fl, c, i; |
char *p, *pp; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(*pos > 0); |
|
|
|
if (0 == buf[*pos]) |
|
return(ARGS_EOLN); |
|
|
|
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
|
|
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
|
if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) |
|
return(ARGS_ERROR); |
|
|
|
if ('-' == buf[*pos]) |
|
if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) |
|
return(ARGS_ERROR); |
|
|
|
/* |
/* |
* First see if we should use TABSEP (Bl -column). This |
* First see if we should use TABSEP (Bl -column). This |
* invalidates the use of ARGS_DELIM. |
* invalidates the use of ARGS_DELIM. |
Line 218 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 256 mdoc_args(struct mdoc *mdoc, int line, |
|
assert(n); |
assert(n); |
c = (int)n->data.block.argc; |
c = (int)n->data.block.argc; |
assert(c > 0); |
assert(c > 0); |
|
|
|
/* LINTED */ |
for (i = 0; i < c; i++) { |
for (i = 0; i < c; i++) { |
if (MDOC_Column != n->data.block.argv[i].arg) |
if (MDOC_Column != n->data.block.argv[i].arg) |
continue; |
continue; |
fl |= ARGS_TABSEP; |
fl |= ARGS_TABSEP; |
fl &= ~ARGS_DELIM; |
fl &= ~ARGS_DELIM; |
|
break; |
} |
} |
} |
} |
|
|
|
return(args(mdoc, line, pos, buf, fl, v)); |
|
} |
|
|
|
|
|
static int |
|
args(struct mdoc *mdoc, int line, |
|
int *pos, char *buf, int fl, char **v) |
|
{ |
|
int i, c; |
|
char *p, *pp; |
|
|
|
assert(*pos > 0); |
|
|
|
if (0 == buf[*pos]) |
|
return(ARGS_EOLN); |
|
|
|
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
|
if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) |
|
return(ARGS_ERROR); |
|
|
|
if ('-' == buf[*pos]) |
|
if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) |
|
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 318 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 383 mdoc_args(struct mdoc *mdoc, int line, |
|
p++; |
p++; |
if (0 != *p) |
if (0 != *p) |
*(p - 1) = 0; |
*(p - 1) = 0; |
else if (0 == *p) |
|
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "empty final token")) /* FIXME: verbiage */ |
|
return(0); |
|
*pos += p - *v; |
*pos += p - *v; |
} |
} |
|
|
/* Configure the eoln case, too. */ |
if (p && 0 == *p) |
|
if ( ! pwarn(mdoc, line, *pos, WCOLEMPTY)) |
|
return(0); |
|
if (p && 0 == *p && p > *v && ' ' == *(p - 1)) |
|
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
|
return(0); |
|
|
if (NULL == p) { |
if (p) |
p = strchr(*v, 0); |
return(ARGS_WORD); |
assert(p); |
|
|
|
/*if (p > *v && ' ' == *(p - 1)) |
/* Configure the eoln case, too. */ |
Warn about whitespace. */ |
|
|
|
*pos += p - *v; |
p = strchr(*v, 0); |
} |
assert(p); |
|
|
|
if (p > *v && ' ' == *(p - 1)) |
|
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
|
return(0); |
|
*pos += p - *v; |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
|
|
Line 364 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 434 mdoc_args(struct mdoc *mdoc, int line, |
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line")) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
Line 382 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 452 mdoc_args(struct mdoc *mdoc, int line, |
|
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
(void)mdoc_perr(mdoc, line, *pos, "unterminated quoted parameter"); |
(void)perr(mdoc, line, *pos, EQUOTTERM); |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
} |
} |
|
|
Line 396 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 466 mdoc_args(struct mdoc *mdoc, int line, |
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line")) |
if ( ! pwarn(mdoc, line, *pos, WTAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
Line 568 lookup(int tok, const char *argv) |
|
Line 638 lookup(int tok, const char *argv) |
|
|
|
|
|
static int |
static int |
postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos) |
postargv(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos) |
{ |
{ |
|
|
switch (v->arg) { |
switch (v->arg) { |
Line 585 postparse(struct mdoc *mdoc, int line, const struct md |
|
Line 655 postparse(struct mdoc *mdoc, int line, const struct md |
|
break; |
break; |
if (xstrcmp(v->value[0], "indent-two")) |
if (xstrcmp(v->value[0], "indent-two")) |
break; |
break; |
return(mdoc_perr(mdoc, line, pos, "invalid offset value")); |
return(perr(mdoc, line, pos, EOFFSET)); |
default: |
default: |
break; |
break; |
} |
} |
Line 595 postparse(struct mdoc *mdoc, int line, const struct md |
|
Line 665 postparse(struct mdoc *mdoc, int line, const struct md |
|
|
|
|
|
static int |
static int |
parse_multi(struct mdoc *mdoc, int line, |
argv_multi(struct mdoc *mdoc, int line, |
struct mdoc_arg *v, int *pos, char *buf) |
struct mdoc_arg *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int c, ppos; |
Line 609 parse_multi(struct mdoc *mdoc, int line, |
|
Line 679 parse_multi(struct mdoc *mdoc, int line, |
|
for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) { |
for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) { |
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
break; |
break; |
c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) { |
if (ARGS_ERROR == c) { |
free(v->value); |
free(v->value); |
return(0); |
return(0); |
Line 622 parse_multi(struct mdoc *mdoc, int line, |
|
Line 692 parse_multi(struct mdoc *mdoc, int line, |
|
return(1); |
return(1); |
|
|
free(v->value); |
free(v->value); |
return(mdoc_perr(mdoc, line, ppos, 0 == v->sz ? |
if (0 == v->sz) |
"argument requires a value" : |
return(perr(mdoc, line, ppos, EARGVAL)); |
"too many values to argument")); |
|
|
return(perr(mdoc, line, ppos, EARGMANY)); |
} |
} |
|
|
|
|
static int |
static int |
parse_single(struct mdoc *mdoc, int line, |
argv_single(struct mdoc *mdoc, int line, |
struct mdoc_arg *v, int *pos, char *buf) |
struct mdoc_arg *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int c, ppos; |
Line 637 parse_single(struct mdoc *mdoc, int line, |
|
Line 708 parse_single(struct mdoc *mdoc, int line, |
|
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
return(mdoc_perr(mdoc, line, ppos, "argument requires a value")); |
return(perr(mdoc, line, ppos, EARGVAL)); |
|
|
v->sz = 1; |
v->sz = 1; |
v->value = xcalloc(1, sizeof(char *)); |
v->value = xcalloc(1, sizeof(char *)); |
Line 651 parse_single(struct mdoc *mdoc, int line, |
|
Line 722 parse_single(struct mdoc *mdoc, int line, |
|
|
|
|
|
static int |
static int |
parse(struct mdoc *mdoc, int line, |
argv(struct mdoc *mdoc, int line, |
struct mdoc_arg *v, int *pos, char *buf) |
struct mdoc_arg *v, int *pos, char *buf) |
{ |
{ |
|
|
Line 664 parse(struct mdoc *mdoc, int line, |
|
Line 735 parse(struct mdoc *mdoc, int line, |
|
case(MDOC_Width): |
case(MDOC_Width): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(MDOC_Offset): |
case(MDOC_Offset): |
return(parse_single(mdoc, line, v, pos, buf)); |
return(argv_single(mdoc, line, v, pos, buf)); |
case(MDOC_Column): |
case(MDOC_Column): |
return(parse_multi(mdoc, line, v, pos, buf)); |
return(argv_multi(mdoc, line, v, pos, buf)); |
default: |
default: |
break; |
break; |
} |
} |
Line 680 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 751 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
struct mdoc_arg *v, int *pos, char *buf) |
struct mdoc_arg *v, int *pos, char *buf) |
{ |
{ |
int i, ppos; |
int i, ppos; |
char *argv; |
char *p; |
|
|
(void)memset(v, 0, sizeof(struct mdoc_arg)); |
(void)memset(v, 0, sizeof(struct mdoc_arg)); |
|
|
Line 693 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 764 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
return(ARGV_WORD); |
return(ARGV_WORD); |
|
|
i = *pos; |
i = *pos; |
argv = &buf[++(*pos)]; |
p = &buf[++(*pos)]; |
|
|
v->line = line; |
v->line = line; |
v->pos = *pos; |
v->pos = *pos; |
|
|
assert(*pos > 0); |
assert(*pos > 0); |
|
|
|
/* LINTED */ |
while (buf[*pos]) { |
while (buf[*pos]) { |
if (isspace((int)buf[*pos])) |
if (isspace((int)buf[*pos])) |
if ('\\' != buf[*pos - 1]) |
if ('\\' != buf[*pos - 1]) |
Line 709 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 782 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, argv))) { |
if (MDOC_ARG_MAX == (v->arg = lookup(tok, p))) { |
if ( ! mdoc_pwarn(mdoc, line, i, WARN_SYNTAX, "argument-like parameter")) |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
} |
} |
Line 721 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 794 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
/* FIXME: whitespace if no value. */ |
/* FIXME: whitespace if no value. */ |
|
|
ppos = *pos; |
ppos = *pos; |
if ( ! parse(mdoc, line, v, pos, buf)) |
if ( ! argv(mdoc, line, v, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
if ( ! postparse(mdoc, line, v, ppos)) |
if ( ! postargv(mdoc, line, v, ppos)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
return(ARGV_ARG); |
return(ARGV_ARG); |