version 1.84, 2012/11/16 18:41:18 |
version 1.85, 2012/11/17 00:26:33 |
Line 275 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 275 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
* one mandatory value, an optional single value, or no value. |
* one mandatory value, an optional single value, or no value. |
*/ |
*/ |
enum margverr |
enum margverr |
mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
mdoc_argv(struct mdoc *mdoc, int line, enum mdoct tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
char *p, sv; |
char *p, sv; |
Line 342 mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
|
Line 342 mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
|
|
|
switch (argvflags[tmp.arg]) { |
switch (argvflags[tmp.arg]) { |
case (ARGV_SINGLE): |
case (ARGV_SINGLE): |
if ( ! argv_single(m, line, &tmp, pos, buf)) |
if ( ! argv_single(mdoc, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
break; |
break; |
case (ARGV_MULTI): |
case (ARGV_MULTI): |
if ( ! argv_multi(m, line, &tmp, pos, buf)) |
if ( ! argv_multi(mdoc, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
break; |
break; |
case (ARGV_NONE): |
case (ARGV_NONE): |
Line 407 argn_free(struct mdoc_arg *p, int iarg) |
|
Line 407 argn_free(struct mdoc_arg *p, int iarg) |
|
} |
} |
|
|
enum margserr |
enum margserr |
mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) |
mdoc_zargs(struct mdoc *mdoc, int line, int *pos, char *buf, char **v) |
{ |
{ |
|
|
return(args(m, line, pos, buf, ARGSFL_NONE, v)); |
return(args(mdoc, line, pos, buf, ARGSFL_NONE, v)); |
} |
} |
|
|
enum margserr |
enum margserr |
mdoc_args(struct mdoc *m, int line, int *pos, |
mdoc_args(struct mdoc *mdoc, int line, int *pos, |
char *buf, enum mdoct tok, char **v) |
char *buf, enum mdoct tok, char **v) |
{ |
{ |
enum argsflag fl; |
enum argsflag fl; |
Line 423 mdoc_args(struct mdoc *m, int line, int *pos, |
|
Line 423 mdoc_args(struct mdoc *m, int line, int *pos, |
|
fl = mdocargs[tok].flags; |
fl = mdocargs[tok].flags; |
|
|
if (MDOC_It != tok) |
if (MDOC_It != tok) |
return(args(m, line, pos, buf, fl, v)); |
return(args(mdoc, line, pos, buf, fl, v)); |
|
|
/* |
/* |
* We know that we're in an `It', so it's reasonable to expect |
* We know that we're in an `It', so it's reasonable to expect |
Line 432 mdoc_args(struct mdoc *m, int line, int *pos, |
|
Line 432 mdoc_args(struct mdoc *m, int line, int *pos, |
|
* safe fall-back into the default behaviour. |
* safe fall-back into the default behaviour. |
*/ |
*/ |
|
|
for (n = m->last; n; n = n->parent) |
for (n = mdoc->last; n; n = n->parent) |
if (MDOC_Bl == n->tok) |
if (MDOC_Bl == n->tok) |
if (LIST_column == n->norm->Bl.type) { |
if (LIST_column == n->norm->Bl.type) { |
fl = ARGSFL_TABSEP; |
fl = ARGSFL_TABSEP; |
break; |
break; |
} |
} |
|
|
return(args(m, line, pos, buf, fl, v)); |
return(args(mdoc, line, pos, buf, fl, v)); |
} |
} |
|
|
static enum margserr |
static enum margserr |
args(struct mdoc *m, int line, int *pos, |
args(struct mdoc *mdoc, int line, int *pos, |
char *buf, enum argsflag fl, char **v) |
char *buf, enum argsflag fl, char **v) |
{ |
{ |
char *p, *pp; |
char *p, *pp; |
enum margserr rc; |
enum margserr rc; |
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & m->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
/* |
/* |
* If we're not in a partial phrase and the flag for |
* If we're not in a partial phrase and the flag for |
* being a phrase literal is still set, the punctuation |
* being a phrase literal is still set, the punctuation |
* is unterminated. |
* is unterminated. |
*/ |
*/ |
if (MDOC_PHRASELIT & m->flags) |
if (MDOC_PHRASELIT & mdoc->flags) |
mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE); |
|
|
m->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
} |
} |
|
|
Line 483 args(struct mdoc *m, int line, int *pos, |
|
Line 483 args(struct mdoc *m, int line, int *pos, |
|
pp = NULL; |
pp = NULL; |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
if ( ! (MDOC_PHRASELIT & m->flags)) |
if ( ! (MDOC_PHRASELIT & mdoc->flags)) |
for (pp = *v; ; pp++) { |
for (pp = *v; ; pp++) { |
if (NULL == (pp = strstr(pp, "Ta"))) |
if (NULL == (pp = strstr(pp, "Ta"))) |
break; |
break; |
Line 517 args(struct mdoc *m, int line, int *pos, |
|
Line 517 args(struct mdoc *m, int line, int *pos, |
|
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if ('\0' == *p && ' ' == *(p - 1)) |
if ('\0' == *p && ' ' == *(p - 1)) |
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE); |
|
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
Line 543 args(struct mdoc *m, int line, int *pos, |
|
Line 543 args(struct mdoc *m, int line, int *pos, |
|
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) { |
if (MDOC_PHRASELIT & mdoc->flags || '\"' == buf[*pos]) { |
if ( ! (MDOC_PHRASELIT & m->flags)) |
if ( ! (MDOC_PHRASELIT & mdoc->flags)) |
*v = &buf[++(*pos)]; |
*v = &buf[++(*pos)]; |
|
|
if (MDOC_PPHRASE & m->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
m->flags |= MDOC_PHRASELIT; |
mdoc->flags |= MDOC_PHRASELIT; |
|
|
for ( ; buf[*pos]; (*pos)++) { |
for ( ; buf[*pos]; (*pos)++) { |
if ('\"' != buf[*pos]) |
if ('\"' != buf[*pos]) |
Line 559 args(struct mdoc *m, int line, int *pos, |
|
Line 559 args(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & m->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
m->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
buf[(*pos)++] = '\0'; |
buf[(*pos)++] = '\0'; |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) |
Line 575 args(struct mdoc *m, int line, int *pos, |
|
Line 575 args(struct mdoc *m, int line, int *pos, |
|
(*pos)++; |
(*pos)++; |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) |
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
p = &buf[*pos]; |
p = &buf[*pos]; |
*v = mandoc_getarg(m->parse, &p, line, pos); |
*v = mandoc_getarg(mdoc->parse, &p, line, pos); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
Line 637 args_checkpunct(const char *buf, int i) |
|
Line 637 args_checkpunct(const char *buf, int i) |
|
} |
} |
|
|
static int |
static int |
argv_multi(struct mdoc *m, int line, |
argv_multi(struct mdoc *mdoc, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
enum margserr ac; |
enum margserr ac; |
Line 646 argv_multi(struct mdoc *m, int line, |
|
Line 646 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; |
ac = args(m, line, pos, buf, ARGSFL_NONE, &p); |
ac = args(mdoc, line, pos, buf, ARGSFL_NONE, &p); |
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
Line 663 argv_multi(struct mdoc *m, int line, |
|
Line 663 argv_multi(struct mdoc *m, int line, |
|
} |
} |
|
|
static int |
static int |
argv_single(struct mdoc *m, int line, |
argv_single(struct mdoc *mdoc, 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; |
|
|
ac = args(m, line, pos, buf, ARGSFL_NONE, &p); |
ac = args(mdoc, 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) |