version 1.81, 2011/09/18 14:14:15 |
version 1.83, 2012/04/15 15:26:49 |
|
|
enum argvflag { |
enum argvflag { |
ARGV_NONE, /* no args to flag (e.g., -split) */ |
ARGV_NONE, /* no args to flag (e.g., -split) */ |
ARGV_SINGLE, /* one arg to flag (e.g., -file xxx) */ |
ARGV_SINGLE, /* one arg to flag (e.g., -file xxx) */ |
ARGV_MULTI, /* multiple args (e.g., -column xxx yyy) */ |
ARGV_MULTI /* multiple args (e.g., -column xxx yyy) */ |
ARGV_OPT_SINGLE /* optional arg (e.g., -offset [xxx]) */ |
|
}; |
}; |
|
|
struct mdocarg { |
struct mdocarg { |
Line 57 static enum margserr args(struct mdoc *, int, int *, |
|
Line 56 static enum margserr args(struct mdoc *, int, int *, |
|
static int args_checkpunct(const char *, int); |
static int args_checkpunct(const char *, int); |
static int argv_multi(struct mdoc *, int, |
static int argv_multi(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_opt_single(struct mdoc *, int, |
|
struct mdoc_argv *, int *, char *); |
|
static int argv_single(struct mdoc *, int, |
static int argv_single(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
|
|
Line 69 static const enum argvflag argvflags[MDOC_ARG_MAX] = { |
|
Line 66 static const enum argvflag argvflags[MDOC_ARG_MAX] = { |
|
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_SINGLE, /* MDOC_File */ |
ARGV_SINGLE, /* MDOC_File */ |
ARGV_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_SINGLE, /* MDOC_Offset */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Hyphen */ |
ARGV_NONE, /* MDOC_Hyphen */ |
Line 351 mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
|
Line 348 mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
|
if ( ! argv_multi(m, line, &tmp, pos, buf)) |
if ( ! argv_multi(m, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
break; |
break; |
case (ARGV_OPT_SINGLE): |
|
if ( ! argv_opt_single(m, line, &tmp, pos, buf)) |
|
return(ARGV_ERROR); |
|
break; |
|
case (ARGV_NONE): |
case (ARGV_NONE): |
break; |
break; |
} |
} |
Line 669 argv_multi(struct mdoc *m, int line, |
|
Line 662 argv_multi(struct mdoc *m, int line, |
|
} |
} |
|
|
static int |
static int |
argv_opt_single(struct mdoc *m, int line, |
argv_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if ('-' == buf[*pos]) |
|
return(1); |
|
|
|
ac = args(m, line, pos, buf, ARGSFL_NONE, &p); |
ac = args(m, line, pos, buf, ARGSFL_NONE, &p); |
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
return(1); |
return(1); |
|
|
v->sz = 1; |
|
v->value = mandoc_malloc(sizeof(char *)); |
|
v->value[0] = mandoc_strdup(p); |
|
|
|
return(1); |
|
} |
|
|
|
static int |
|
argv_single(struct mdoc *m, int line, |
|
struct mdoc_argv *v, int *pos, char *buf) |
|
{ |
|
int ppos; |
|
enum margserr ac; |
|
char *p; |
|
|
|
ppos = *pos; |
|
|
|
ac = args(m, line, pos, buf, ARGSFL_NONE, &p); |
|
if (ARGS_EOLN == ac) { |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT); |
|
return(0); |
|
} else if (ARGS_ERROR == ac) |
|
return(0); |
|
|
|
v->sz = 1; |
v->sz = 1; |
v->value = mandoc_malloc(sizeof(char *)); |
v->value = mandoc_malloc(sizeof(char *)); |