version 1.22, 2009/07/19 08:28:48 |
version 1.31, 2009/08/19 11:58:32 |
Line 45 static int rew_impblock(struct mdoc *, int, int, int |
|
Line 45 static int rew_impblock(struct mdoc *, int, int, int |
|
static int rew_expblock(struct mdoc *, int, int, int); |
static int rew_expblock(struct mdoc *, int, int, int); |
static int rew_subblock(enum mdoc_type, |
static int rew_subblock(enum mdoc_type, |
struct mdoc *, int, int, int); |
struct mdoc *, int, int, int); |
static int rew_last(struct mdoc *, struct mdoc_node *); |
static int rew_last(struct mdoc *, struct mdoc_node *); /* FIXME: make const */ |
static int append_delims(struct mdoc *, int, int *, char *); |
static int append_delims(struct mdoc *, int, int *, char *); |
static int lookup(struct mdoc *, int, int, int, const char *); |
static int lookup(struct mdoc *, int, const char *); |
|
static int lookup_raw(struct mdoc *, const char *); |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
const struct mdoc_node *); |
const struct mdoc_node *); |
|
|
Line 71 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 72 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line_eoln, MDOC_CALLABLE }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ |
Line 253 mdoc_macroend(struct mdoc *mdoc) |
|
Line 254 mdoc_macroend(struct mdoc *mdoc) |
|
} |
} |
|
|
static int |
static int |
lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p) |
lookup(struct mdoc *mdoc, int from, const char *p) |
{ |
{ |
|
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
|
return(MDOC_MAX); |
|
return(lookup_raw(mdoc, p)); |
|
} |
|
|
|
|
|
static int |
|
lookup_raw(struct mdoc *mdoc, const char *p) |
|
{ |
int res; |
int res; |
|
|
res = mdoc_hash_find(mdoc->htab, p); |
if (MDOC_MAX == (res = mdoc_hash_find(mdoc->htab, p))) |
if (MDOC_PARSED & mdoc_macros[from].flags) |
return(MDOC_MAX); |
|
if (MDOC_CALLABLE & mdoc_macros[res].flags) |
return(res); |
return(res); |
if (MDOC_MAX == res) |
|
return(res); |
|
if ( ! mdoc_pwarn(mdoc, line, pos, EMACPARM)) |
|
return(-1); |
|
return(MDOC_MAX); |
return(MDOC_MAX); |
} |
} |
|
|
Line 591 rew_expblock(struct mdoc *mdoc, int tok, int line, int |
|
Line 599 rew_expblock(struct mdoc *mdoc, int tok, int line, int |
|
} |
} |
|
|
|
|
|
/* FIXME: can this be merged with subblock? */ |
static int |
static int |
rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos) |
rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos) |
{ |
{ |
Line 636 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 645 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
assert(mdoc_isdelim(p)); |
assert(mdoc_isdelim(p)); |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(1); |
return(1); |
Line 681 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 689 blk_exp_close(MACRO_PROT_ARGS) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
|
|
for (lastarg = ppos, flushed = j = 0; ; j++) { |
for (flushed = j = 0; ; j++) { |
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
Line 699 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 707 blk_exp_close(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
return(0); |
|
else if (MDOC_MAX != c) { |
|
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_expblock(mdoc, tok, |
if ( ! rew_expblock(mdoc, tok, |
line, ppos)) |
line, ppos)) |
Line 715 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 721 blk_exp_close(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos)) |
if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos)) |
Line 742 in_line(MACRO_PROT_ARGS) |
|
Line 747 in_line(MACRO_PROT_ARGS) |
|
* usually because of reserved words) to squeak by. |
* usually because of reserved words) to squeak by. |
*/ |
*/ |
switch (tok) { |
switch (tok) { |
case (MDOC_Nm): |
case (MDOC_An): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Ar): |
|
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case (MDOC_Fl): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Lk): |
case (MDOC_Lk): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ar): |
case (MDOC_Nm): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pa): |
nc = 1; |
nc = 1; |
break; |
break; |
default: |
default: |
Line 756 in_line(MACRO_PROT_ARGS) |
|
Line 765 in_line(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
for (la = ppos, arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
Line 786 in_line(MACRO_PROT_ARGS) |
|
Line 795 in_line(MACRO_PROT_ARGS) |
|
|
|
/* Quoted words shouldn't be looked-up. */ |
/* Quoted words shouldn't be looked-up. */ |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : |
c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p); |
lookup(mdoc, line, la, tok, p); |
|
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 796 in_line(MACRO_PROT_ARGS) |
|
Line 804 in_line(MACRO_PROT_ARGS) |
|
* or raise a warning. |
* or raise a warning. |
*/ |
*/ |
|
|
if (MDOC_MAX != c && -1 != c) { |
if (MDOC_MAX != c) { |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
Line 816 in_line(MACRO_PROT_ARGS) |
|
Line 824 in_line(MACRO_PROT_ARGS) |
|
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} else if (-1 == c) |
} |
return(0); |
|
|
|
/* |
/* |
* Non-quote-enclosed punctuation. Set up our scope, if |
* Non-quote-enclosed punctuation. Set up our scope, if |
Line 843 in_line(MACRO_PROT_ARGS) |
|
Line 850 in_line(MACRO_PROT_ARGS) |
|
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
Line 984 blk_full(MACRO_PROT_ARGS) |
|
Line 990 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
return(0); |
|
|
|
if (MDOC_MAX == c) { |
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
continue; |
continue; |
} |
} |
|
|
Line 1042 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1044 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* XXX - no known argument macros. */ |
/* XXX - no known argument macros. */ |
|
|
for (lastarg = ppos;; ) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
assert(ARGS_PHRASE != c); |
assert(ARGS_PHRASE != c); |
Line 1054 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1056 blk_part_imp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
return(0); |
|
else if (MDOC_MAX == c) { |
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
continue; |
continue; |
} |
} |
|
|
Line 1103 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1102 blk_part_exp(MACRO_PROT_ARGS) |
|
int lastarg, flushed, j, c, maxargs; |
int lastarg, flushed, j, c, maxargs; |
char *p; |
char *p; |
|
|
lastarg = ppos; |
|
flushed = 0; |
flushed = 0; |
|
|
/* |
/* |
Line 1159 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1157 blk_part_exp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
return(0); |
|
else if (MDOC_MAX != c) { |
|
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_subblock(MDOC_HEAD, mdoc, |
if ( ! rew_subblock(MDOC_HEAD, mdoc, |
tok, line, ppos)) |
tok, line, ppos)) |
Line 1190 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1186 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed) { |
if ( ! flushed) { |
Line 1239 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1234 in_line_argn(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
for (lastarg = ppos, arg = NULL;; ) { |
for (arg = NULL;; ) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
Line 1279 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1274 in_line_argn(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
return(0); |
|
else if (MDOC_MAX != c) { |
|
if ( ! flushed && ! rew_elem(mdoc, tok)) |
if ( ! flushed && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
Line 1299 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1292 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
if ( ! flushed && ! rew_elem(mdoc, tok)) |
if ( ! flushed && ! rew_elem(mdoc, tok)) |
Line 1357 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1349 in_line_eoln(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == w) |
if (ARGS_EOLN == w) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : |
c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p); |
lookup(mdoc, line, la, tok, p); |
|
|
|
if (MDOC_MAX != c && -1 != c) { |
if (MDOC_MAX != c) { |
if ( ! rew_elem(mdoc, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
return(mdoc_macro(mdoc, c, line, la, pos, buf)); |
return(mdoc_macro(mdoc, c, line, la, pos, buf)); |
} else if (-1 == c) |
} |
return(0); |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(rew_elem(mdoc, tok)); |
return(rew_elem(mdoc, tok)); |
Line 1385 obsolete(MACRO_PROT_ARGS) |
|
Line 1374 obsolete(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
|
/* |
|
* Phrases occur within `Bl -column' entries, separated by `Ta' or tabs. |
|
* They're unusual because they're basically free-form text until a |
|
* macro is encountered. |
|
*/ |
static int |
static int |
phrase(struct mdoc *mdoc, int line, int ppos, char *buf) |
phrase(struct mdoc *mdoc, int line, int ppos, char *buf) |
{ |
{ |
int i, la, c, quoted; |
int c, w, la, pos; |
|
char *p; |
|
|
/* |
for (pos = ppos; ; ) { |
* Parse over words in a phrase. We have to handle this |
la = pos; |
* specially because we assume no calling context -- in normal |
|
* circumstances, we switch argument parsing based on whether |
|
* the parent macro accepts quotes, tabs, etc. Here, anything |
|
* goes. |
|
*/ |
|
|
|
for (i = ppos; buf[i]; ) { |
/* Note: no calling context! */ |
assert(' ' != buf[i]); |
w = mdoc_zargs(mdoc, line, &pos, buf, &p); |
la = i; |
|
quoted = 0; |
|
|
|
/* |
if (ARGS_ERROR == w) |
* Read to next token. If quoted (check not escaped), |
return(0); |
* scan ahead to next unescaped quote. If not quoted or |
if (ARGS_EOLN == w) |
* escape-quoted, then scan ahead to next space. |
break; |
*/ |
|
|
|
if ((i && '\"' == buf[i] && '\\' != buf[i - 1]) || |
c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(mdoc, p); |
(0 == i && '\"' == buf[i])) { |
|
for (la = ++i; buf[i]; i++) |
|
if ('\"' != buf[i]) |
|
continue; |
|
else if ('\\' != buf[i - 1]) |
|
break; |
|
if (0 == buf[i]) |
|
return(mdoc_perr(mdoc, line, la, EQUOTPHR)); |
|
quoted = 1; |
|
} else |
|
for ( ; buf[i]; i++) |
|
if (i && ' ' == buf[i]) { |
|
if ('\\' != buf[i - 1]) |
|
break; |
|
} else if (' ' == buf[i]) |
|
break; |
|
|
|
/* If not end-of-line, terminate argument. */ |
|
|
|
if (buf[i]) |
|
buf[i++] = 0; |
|
|
|
/* Read to next argument. */ |
|
|
|
for ( ; buf[i] && ' ' == buf[i]; i++) |
|
/* Spin. */ ; |
|
|
|
/* |
|
* If we're a non-quoted string, try to look up the |
|
* value as a macro and execute it, if found. |
|
*/ |
|
|
|
c = quoted ? MDOC_MAX : |
|
mdoc_hash_find(mdoc->htab, &buf[la]); |
|
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != c) { |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |
if ( ! mdoc_macro(mdoc, c, line, la, &pos, buf)) |
return(0); |
return(0); |
return(append_delims(mdoc, line, &i, buf)); |
return(append_delims(mdoc, line, &pos, buf)); |
} |
} |
|
|
/* A regular word or quoted string. */ |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la])) |
|
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
} |
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|