version 1.7, 2009/01/05 16:11:14 |
version 1.10, 2009/01/09 15:07:04 |
|
|
|
|
|
|
static int lookup(int, const char *); |
static int lookup(int, const char *); |
static int parse(struct mdoc *, int, |
static int parse(struct mdoc *, int, int, |
struct mdoc_arg *, int *, char *); |
struct mdoc_arg *, int *, char *); |
static int postparse(struct mdoc *, int, |
static int postparse(struct mdoc *, int, |
const struct mdoc_arg *, int); |
const struct mdoc_arg *, int); |
|
|
|
|
int |
int |
mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v) |
mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v) |
{ |
{ |
int i; |
int i; |
|
|
Line 42 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
Line 42 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
|
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) |
if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_QUOTED)) |
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_QUOTED)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_ARGLIKE)) |
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_ARGLIKE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
Line 89 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
Line 89 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN)) |
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_WS_EOLN)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
Line 107 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
Line 107 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
(void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_UNQUOTE); |
(void)mdoc_perr(mdoc, line, *pos, ERR_SYNTAX_UNQUOTE); |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
} |
} |
|
|
Line 121 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
Line 121 mdoc_args(struct mdoc *mdoc, int tok, int *pos, char * |
|
if (buf[*pos]) |
if (buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN)) |
if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_WS_EOLN)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
Line 133 lookup(int tok, const char *argv) |
|
Line 133 lookup(int tok, const char *argv) |
|
{ |
{ |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Bf): |
|
if (xstrcmp(argv, "emphasis")) |
|
return(MDOC_Emphasis); |
|
else if (xstrcmp(argv, "literal")) |
|
return(MDOC_Literal); |
|
else if (xstrcmp(argv, "symbolic")) |
|
return(MDOC_Symbolic); |
|
break; |
|
|
|
case (MDOC_An): |
case (MDOC_An): |
if (xstrcmp(argv, "split")) |
if (xstrcmp(argv, "split")) |
return(MDOC_Split); |
return(MDOC_Split); |
Line 162 lookup(int tok, const char *argv) |
|
Line 153 lookup(int tok, const char *argv) |
|
return(MDOC_Offset); |
return(MDOC_Offset); |
break; |
break; |
|
|
|
case (MDOC_Bf): |
|
if (xstrcmp(argv, "emphasis")) |
|
return(MDOC_Emphasis); |
|
else if (xstrcmp(argv, "literal")) |
|
return(MDOC_Literal); |
|
else if (xstrcmp(argv, "symbolic")) |
|
return(MDOC_Symbolic); |
|
break; |
|
|
case (MDOC_Bk): |
case (MDOC_Bk): |
if (xstrcmp(argv, "words")) |
if (xstrcmp(argv, "words")) |
return(MDOC_Words); |
return(MDOC_Words); |
Line 283 lookup(int tok, const char *argv) |
|
Line 283 lookup(int tok, const char *argv) |
|
break; |
break; |
|
|
default: |
default: |
abort(); |
break; |
/* NOTREACHED */ |
|
} |
} |
|
|
return(MDOC_ARG_MAX); |
return(MDOC_ARG_MAX); |
Line 292 lookup(int tok, const char *argv) |
|
Line 291 lookup(int tok, const char *argv) |
|
|
|
|
|
static int |
static int |
postparse(struct mdoc *mdoc, int tok, const struct mdoc_arg *v, int pos) |
postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos) |
{ |
{ |
|
|
switch (v->arg) { |
switch (v->arg) { |
Line 309 postparse(struct mdoc *mdoc, int tok, const struct mdo |
|
Line 308 postparse(struct mdoc *mdoc, int tok, const struct mdo |
|
break; |
break; |
if (xstrcmp(v->value[0], "indent-two")) |
if (xstrcmp(v->value[0], "indent-two")) |
break; |
break; |
return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_ARGBAD)); |
return(mdoc_perr(mdoc, line, pos, ERR_SYNTAX_ARGBAD)); |
default: |
default: |
break; |
break; |
} |
} |
Line 319 postparse(struct mdoc *mdoc, int tok, const struct mdo |
|
Line 318 postparse(struct mdoc *mdoc, int tok, const struct mdo |
|
|
|
|
|
static int |
static int |
parse(struct mdoc *mdoc, int tok, |
parse(struct mdoc *mdoc, int line, int tok, |
struct mdoc_arg *v, int *pos, char *buf) |
struct mdoc_arg *v, int *pos, char *buf) |
{ |
{ |
char *p; |
char *p; |
Line 336 parse(struct mdoc *mdoc, int tok, |
|
Line 335 parse(struct mdoc *mdoc, int tok, |
|
/* |
/* |
* This has a single value for an argument. |
* This has a single value for an argument. |
*/ |
*/ |
c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p); |
c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN != c) { |
return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL)); |
v->sz = 1; |
|
v->value = xcalloc(1, sizeof(char *)); |
v->sz = 1; |
v->value[0] = p; |
v->value = xcalloc(1, sizeof(char *)); |
break; |
v->value[0] = p; |
} |
break; |
return(mdoc_perr(mdoc, line, ppos, ERR_SYNTAX_ARGVAL)); |
|
|
case(MDOC_Column): |
case(MDOC_Column): |
/* |
/* |
Line 356 parse(struct mdoc *mdoc, int tok, |
|
Line 355 parse(struct mdoc *mdoc, int tok, |
|
v->sz = 0; |
v->sz = 0; |
v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *)); |
v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *)); |
for (i = 0; i < MDOC_LINEARG_MAX; i++) { |
for (i = 0; i < MDOC_LINEARG_MAX; i++) { |
c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p); |
c = mdoc_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 366 parse(struct mdoc *mdoc, int tok, |
|
Line 365 parse(struct mdoc *mdoc, int tok, |
|
} |
} |
if (0 == i) { |
if (0 == i) { |
free(v->value); |
free(v->value); |
return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL)); |
return(mdoc_perr(mdoc, line, ppos, |
|
ERR_SYNTAX_ARGVAL)); |
} else if (MDOC_LINEARG_MAX == i) |
} else if (MDOC_LINEARG_MAX == i) |
return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGMANY)); |
return(mdoc_perr(mdoc, line, ppos, |
|
ERR_SYNTAX_ARGMANY)); |
|
|
v->sz = i; |
v->sz = i; |
break; |
break; |
Line 384 parse(struct mdoc *mdoc, int tok, |
|
Line 385 parse(struct mdoc *mdoc, int tok, |
|
|
|
|
|
int |
int |
mdoc_argv(struct mdoc *mdoc, int tok, |
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; |
Line 410 mdoc_argv(struct mdoc *mdoc, int tok, |
|
Line 411 mdoc_argv(struct mdoc *mdoc, int tok, |
|
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
|
|
if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) { |
if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) { |
(void)mdoc_err(mdoc, tok, i, ERR_SYNTAX_ARG); |
(void)mdoc_pwarn(mdoc, line, i, WARN_SYNTAX_ARGLIKE); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
} |
} |
|
|
while (buf[*pos] && isspace(buf[*pos])) |
while (buf[*pos] && isspace(buf[*pos])) |
Line 420 mdoc_argv(struct mdoc *mdoc, int tok, |
|
Line 421 mdoc_argv(struct mdoc *mdoc, int tok, |
|
/* FIXME: whitespace if no value. */ |
/* FIXME: whitespace if no value. */ |
|
|
ppos = *pos; |
ppos = *pos; |
if ( ! parse(mdoc, tok, v, pos, buf)) |
if ( ! parse(mdoc, line, tok, v, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
if ( ! postparse(mdoc, tok, v, ppos)) |
if ( ! postparse(mdoc, line, v, ppos)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
return(ARGV_ARG); |
return(ARGV_ARG); |