version 1.66, 2009/03/11 00:39:58 |
version 1.71, 2009/03/12 23:05:21 |
|
|
|
|
/* FIXME: .Fl, .Ar, .Cd handling of `|'. */ |
/* FIXME: .Fl, .Ar, .Cd handling of `|'. */ |
|
|
static int macro_obsolete(MACRO_PROT_ARGS); |
static int macro_obsolete(MACRO_PROT_ARGS); |
static int macro_constant(MACRO_PROT_ARGS); |
static int macro_constant(MACRO_PROT_ARGS); |
static int macro_constant_scoped(MACRO_PROT_ARGS); |
static int macro_constant_scoped(MACRO_PROT_ARGS); |
static int macro_constant_delimited(MACRO_PROT_ARGS); |
static int macro_constant_delimited(MACRO_PROT_ARGS); |
static int macro_text(MACRO_PROT_ARGS); |
static int macro_text(MACRO_PROT_ARGS); |
static int macro_scoped(MACRO_PROT_ARGS); |
static int macro_scoped(MACRO_PROT_ARGS); |
static int macro_scoped_close(MACRO_PROT_ARGS); |
static int macro_scoped_close(MACRO_PROT_ARGS); |
static int macro_scoped_line(MACRO_PROT_ARGS); |
static int macro_scoped_line(MACRO_PROT_ARGS); |
|
static int macro_phrase(struct mdoc *, int, int, char *); |
|
|
#define REWIND_REWIND (1 << 0) |
#define REWIND_REWIND (1 << 0) |
#define REWIND_NOHALT (1 << 1) |
#define REWIND_NOHALT (1 << 1) |
Line 88 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 89 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ macro_text, MDOC_PARSED }, /* An */ |
{ macro_text, MDOC_PARSED }, /* An */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ macro_constant, 0 }, /* Cd */ |
{ macro_constant, MDOC_CALLABLE }, /* Cd */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ |
Line 127 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 128 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */ |
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */ |
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */ |
{ macro_constant_delimited, 0 }, /* At */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* At */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */ |
{ macro_scoped, MDOC_EXPLICIT }, /* Bf */ |
{ macro_scoped, MDOC_EXPLICIT }, /* Bf */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */ |
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */ |
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Bsx */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Bx */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */ |
{ macro_constant, 0 }, /* Db */ |
{ macro_constant, 0 }, /* Db */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */ |
Line 142 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 143 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_scoped_close, MDOC_EXPLICIT }, /* Ef */ |
{ macro_scoped_close, MDOC_EXPLICIT }, /* Ef */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Fx */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ macro_text, MDOC_PARSED }, /* Ms */ |
{ macro_text, MDOC_PARSED }, /* Ms */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Nx */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Ox */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Pf */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Pf */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */ |
Line 165 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 166 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
{ macro_constant_delimited, MDOC_PARSED }, /* Ux */ |
{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */ |
/* XXX - .Fo supposed to be (but isn't) callable. */ |
/* XXX - .Fo supposed to be (but isn't) callable. */ |
Line 187 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 188 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */ |
{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */ |
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */ |
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */ |
|
{ macro_constant, 0 }, /* %C */ |
}; |
}; |
|
|
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
|
|
|
|
|
/* |
|
* This is called at the end of parsing. It must traverse up the tree, |
|
* closing out open [implicit] scopes. Obviously, open explicit scopes |
|
* are errors. |
|
*/ |
|
int |
|
macro_end(struct mdoc *mdoc) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
assert(mdoc->first); |
|
assert(mdoc->last); |
|
|
|
/* Scan for open explicit scopes. */ |
|
|
|
n = MDOC_VALID & mdoc->last->flags ? |
|
mdoc->last->parent : mdoc->last; |
|
|
|
for ( ; n; n = n->parent) { |
|
if (MDOC_BLOCK != n->type) |
|
continue; |
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
|
continue; |
|
return(mdoc_nerr(mdoc, n, |
|
"macro scope still open on exit")); |
|
} |
|
|
|
return(rewind_last(mdoc, mdoc->first)); |
|
} |
|
|
|
|
static int |
static int |
perr(struct mdoc *mdoc, int line, int pos, int type) |
perr(struct mdoc *mdoc, int line, int pos, int type) |
{ |
{ |
Line 890 macro_text(MACRO_PROT_ARGS) |
|
Line 923 macro_text(MACRO_PROT_ARGS) |
|
* TEXT (`Another.') |
* TEXT (`Another.') |
* |
* |
* Note that the `.It' macro, possibly the most difficult (as it has |
* Note that the `.It' macro, possibly the most difficult (as it has |
* embedded scope, etc.) is handled by this routine. |
* embedded scope, etc.) is handled by this routine. It handles |
|
* columnar output, where columns are "phrases" and denote multiple |
|
* block heads. |
*/ |
*/ |
static int |
static int |
macro_scoped(MACRO_PROT_ARGS) |
macro_scoped(MACRO_PROT_ARGS) |
{ |
{ |
int c, lastarg; |
int c, lastarg, reopen; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
Line 947 macro_scoped(MACRO_PROT_ARGS) |
|
Line 982 macro_scoped(MACRO_PROT_ARGS) |
|
|
|
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
|
|
|
/* Indicate that columnar scope shouldn't be reopened. */ |
|
reopen = 0; |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
for (;;) { |
for (;;) { |
Line 958 macro_scoped(MACRO_PROT_ARGS) |
|
Line 996 macro_scoped(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
if (ARGS_PHRASE == c) { |
if (ARGS_PHRASE == c) { |
|
if (reopen && ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
|
|
/* |
/* |
if ( ! mdoc_phrase(mdoc, line, lastarg, buf)) |
* Phrases are self-contained macro phrases used |
|
* in the columnar output of a macro. They need |
|
* special handling. |
|
*/ |
|
if ( ! macro_phrase(mdoc, line, lastarg, buf)) |
return(0); |
return(0); |
*/ |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) |
|
return(0); |
|
|
|
reopen = 1; |
continue; |
continue; |
} |
} |
|
|
/* FIXME: if .It -column, the lookup must be for a |
|
* sub-line component. BLAH. */ |
|
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
return(0); |
return(0); |
|
|
Line 1348 macro_constant(MACRO_PROT_ARGS) |
|
Line 1394 macro_constant(MACRO_PROT_ARGS) |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
|
|
|
arg = NULL; |
arg = NULL; |
|
|
for (;;) { |
for (;;) { |
Line 1409 macro_obsolete(MACRO_PROT_ARGS) |
|
Line 1453 macro_obsolete(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
/* |
static int |
* This is called at the end of parsing. It must traverse up the tree, |
macro_phrase(struct mdoc *mdoc, int line, int ppos, char *buf) |
* closing out open [implicit] scopes. Obviously, open explicit scopes |
|
* are errors. |
|
*/ |
|
int |
|
macro_end(struct mdoc *mdoc) |
|
{ |
{ |
struct mdoc_node *n; |
int i, la, c; |
|
|
assert(mdoc->first); |
for (i = ppos; buf[i]; ) { |
assert(mdoc->last); |
assert(' ' != buf[i]); |
|
|
/* Scan for open explicit scopes. */ |
la = i; |
|
if ('\"' == buf[i]) { |
|
la = ++i; |
|
while (buf[i] && '\"' != buf[i]) |
|
i++; |
|
if (0 == buf[i]) |
|
return(mdoc_err(mdoc, "unterminated quoted parameter")); |
|
} else |
|
while (buf[i] && ! isspace ((unsigned char)buf[i])) |
|
i++; |
|
|
n = MDOC_VALID & mdoc->last->flags ? |
if (buf[i]) |
mdoc->last->parent : mdoc->last; |
buf[i++] = 0; |
|
|
for ( ; n; n = n->parent) { |
while (buf[i] && isspace((unsigned char)buf[i])) |
if (MDOC_BLOCK != n->type) |
i++; |
continue; |
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
if (MDOC_MAX != (c = mdoc_tokhash_find(mdoc->htab, &buf[la]))) { |
continue; |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |
return(mdoc_nerr(mdoc, n, |
return(0); |
"macro scope still open on exit")); |
return(append_delims(mdoc, line, &i, buf)); |
|
} |
|
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la])) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
|
while (buf[i] && isspace((unsigned char)buf[i])) |
|
i++; |
} |
} |
|
|
return(rewind_last(mdoc, mdoc->first)); |
return(1); |
} |
} |