version 1.43, 2010/05/08 07:30:19 |
version 1.50, 2010/05/30 23:59:59 |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
|
|
mdoc_args(struct mdoc *m, int line, int *pos, |
mdoc_args(struct mdoc *m, int line, int *pos, |
char *buf, enum mdoct tok, char **v) |
char *buf, enum mdoct tok, char **v) |
{ |
{ |
int fl, c, i; |
int fl; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
fl = mdoc_argflags[tok]; |
fl = mdoc_argflags[tok]; |
Line 346 mdoc_args(struct mdoc *m, int line, int *pos, |
|
Line 347 mdoc_args(struct mdoc *m, int line, int *pos, |
|
if (MDOC_It != tok) |
if (MDOC_It != tok) |
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
|
|
/* |
|
* The `It' macro is a special case, as it acquires parameters from its |
|
* parent `Bl' context, specifically, we're concerned with -column. |
|
*/ |
|
|
|
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
if (MDOC_Bl == n->tok) |
break; |
break; |
|
|
assert(n); |
if (n && LIST_column == n->data.list) { |
c = (int)(n->args ? n->args->argc : 0); |
|
assert(c > 0); |
|
|
|
/* LINTED */ |
|
for (i = 0; i < c; i++) { |
|
if (MDOC_Column != n->args->argv[i].arg) |
|
continue; |
|
fl |= ARGS_TABSEP; |
fl |= ARGS_TABSEP; |
fl &= ~ARGS_DELIM; |
fl &= ~ARGS_DELIM; |
break; |
|
} |
} |
|
|
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
Line 398 args(struct mdoc *m, int line, int *pos, |
|
Line 386 args(struct mdoc *m, int line, int *pos, |
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) { |
|
if (MDOC_PPHRASE & m->flags) |
|
return(ARGS_EOLN); |
|
/* |
|
* If we're not in a partial phrase and the flag for |
|
* being a phrase literal is still set, the punctuation |
|
* is unterminated. |
|
*/ |
|
if (MDOC_PHRASELIT & m->flags) |
|
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE)) |
|
return(ARGS_ERROR); |
|
|
|
m->flags &= ~MDOC_PHRASELIT; |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
} |
|
|
/* |
/* |
* If the first character is a delimiter and we're to look for |
* If the first character is a closing delimiter and we're to |
* delimited strings, then pass down the buffer seeing if it |
* look for delimited strings, then pass down the buffer seeing |
* follows the pattern of [[::delim::][ ]+]+. |
* if it follows the pattern of [[::delim::][ ]+]+. Note that |
|
* we ONLY care about closing delimiters. |
*/ |
*/ |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) { |
if ((fl & ARGS_DELIM) && DELIM_CLOSE == mdoc_iscdelim(buf[*pos])) { |
for (i = *pos; buf[i]; ) { |
for (i = *pos; buf[i]; ) { |
if ( mdoc_iscdelim(buf[i]) < 2) |
enum mdelim d = mdoc_iscdelim(buf[i]); |
|
if (DELIM_NONE == d || DELIM_OPEN == d) |
break; |
break; |
i++; |
i++; |
if (0 == buf[i] || ' ' != buf[i]) |
if ('\0' == buf[i] || ' ' != buf[i]) |
break; |
break; |
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
if (0 == buf[i]) { |
if ('\0' == buf[i]) { |
*v = &buf[*pos]; |
*v = &buf[*pos]; |
if (' ' != buf[i - 1]) |
if (' ' != buf[i - 1]) |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
if (ARGS_NOWARN & fl) |
if (ARGS_NOWARN & fl) |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
} |
Line 443 args(struct mdoc *m, int line, int *pos, |
|
Line 446 args(struct mdoc *m, int line, int *pos, |
|
if (ARGS_TABSEP & fl) { |
if (ARGS_TABSEP & fl) { |
/* Scan ahead to tab (can't be escaped). */ |
/* Scan ahead to tab (can't be escaped). */ |
p = strchr(*v, '\t'); |
p = strchr(*v, '\t'); |
|
pp = NULL; |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
for (pp = *v; ; pp++) { |
if ( ! (MDOC_PHRASELIT & m->flags)) |
if (NULL == (pp = strstr(pp, "Ta"))) |
for (pp = *v; ; pp++) { |
break; |
if (NULL == (pp = strstr(pp, "Ta"))) |
if (pp > *v && ' ' != *(pp - 1)) |
break; |
continue; |
if (pp > *v && ' ' != *(pp - 1)) |
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
continue; |
break; |
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
} |
break; |
|
} |
|
|
/* By default, assume a phrase. */ |
/* By default, assume a phrase. */ |
rc = ARGS_PHRASE; |
rc = ARGS_PHRASE; |
Line 471 args(struct mdoc *m, int line, int *pos, |
|
Line 476 args(struct mdoc *m, int line, int *pos, |
|
} else if (pp && ! p) { |
} else if (pp && ! p) { |
p = pp; |
p = pp; |
*pos += 2; |
*pos += 2; |
} else |
} else { |
|
rc = ARGS_PEND; |
p = strchr(*v, 0); |
p = strchr(*v, 0); |
|
} |
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
Line 503 args(struct mdoc *m, int line, int *pos, |
|
Line 510 args(struct mdoc *m, int line, int *pos, |
|
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
if ('\"' == buf[*pos]) { |
if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) { |
*v = &buf[++(*pos)]; |
if ( ! (MDOC_PHRASELIT & m->flags)) |
|
*v = &buf[++(*pos)]; |
|
|
|
if (MDOC_PPHRASE & m->flags) |
|
m->flags |= MDOC_PHRASELIT; |
|
|
for ( ; buf[*pos]; (*pos)++) { |
for ( ; buf[*pos]; (*pos)++) { |
if ('\"' != buf[*pos]) |
if ('\"' != buf[*pos]) |
continue; |
continue; |
Line 514 args(struct mdoc *m, int line, int *pos, |
|
Line 525 args(struct mdoc *m, int line, int *pos, |
|
(*pos)++; |
(*pos)++; |
} |
} |
|
|
if (0 == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (ARGS_NOWARN & fl) |
if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
buf[(*pos)++] = 0; |
m->flags &= ~MDOC_PHRASELIT; |
|
buf[(*pos)++] = '\0'; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
Line 546 args(struct mdoc *m, int line, int *pos, |
|
Line 558 args(struct mdoc *m, int line, int *pos, |
|
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
break; |
break; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
buf[(*pos)++] = 0; |
buf[(*pos)++] = '\0'; |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
Line 727 argv_single(struct mdoc *m, int line, |
|
Line 739 argv_single(struct mdoc *m, int line, |
|
ppos = *pos; |
ppos = *pos; |
|
|
ac = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == ac) |
if (ARGS_EOLN == ac) { |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
} else if (ARGS_ERROR == ac) |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
return(0); |
|
|
v->sz = 1; |
v->sz = 1; |
v->value = mandoc_malloc(sizeof(char *)); |
v->value = mandoc_malloc(sizeof(char *)); |