version 1.35, 2010/03/24 20:10:53 |
version 1.41, 2010/03/29 04:52:14 |
|
|
enum rew { |
enum rew { |
REW_REWIND, |
REW_REWIND, |
REW_NOHALT, |
REW_NOHALT, |
REW_HALT, |
REW_HALT |
}; |
}; |
|
|
static int blk_close(MACRO_PROT_ARGS); |
static int blk_close(MACRO_PROT_ARGS); |
Line 43 static enum rew rew_dohalt(enum mant, enum man_type, |
|
Line 43 static enum rew rew_dohalt(enum mant, enum man_type, |
|
const struct man_node *); |
const struct man_node *); |
static enum rew rew_block(enum mant, enum man_type, |
static enum rew rew_block(enum mant, enum man_type, |
const struct man_node *); |
const struct man_node *); |
|
static int rew_warn(struct man *, |
|
struct man_node *, enum merr); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
Line 91 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 93 const struct man_macro __man_macros[MAN_MAX] = { |
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
|
|
|
|
|
/* |
|
* Warn when "n" is an explicit non-roff macro. |
|
*/ |
|
static int |
|
rew_warn(struct man *m, struct man_node *n, enum merr er) |
|
{ |
|
|
|
if (er == WERRMAX || MAN_BLOCK != n->type) |
|
return(1); |
|
if (MAN_VALID & n->flags) |
|
return(1); |
|
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
|
return(1); |
|
if (MAN_NOCLOSE & man_macros[n->tok].flags) |
|
return(1); |
|
return(man_nwarn(m, n, er)); |
|
} |
|
|
|
|
|
/* |
|
* Rewind scope. If a code "er" != WERRMAX has been provided, it will |
|
* be used if an explicit block scope is being closed out. |
|
*/ |
int |
int |
man_unscope(struct man *m, const struct man_node *n) |
man_unscope(struct man *m, const struct man_node *n, enum merr er) |
{ |
{ |
|
|
assert(n); |
assert(n); |
|
|
/* LINTED */ |
/* LINTED */ |
while (m->last != n) { |
while (m->last != n) { |
|
if ( ! rew_warn(m, m->last, er)) |
|
return(0); |
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
if ( ! man_action_post(m)) |
if ( ! man_action_post(m)) |
Line 107 man_unscope(struct man *m, const struct man_node *n) |
|
Line 134 man_unscope(struct man *m, const struct man_node *n) |
|
assert(m->last); |
assert(m->last); |
} |
} |
|
|
|
if ( ! rew_warn(m, m->last, er)) |
|
return(0); |
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
if ( ! man_action_post(m)) |
if ( ! man_action_post(m)) |
Line 140 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 169 rew_dohalt(enum mant tok, enum man_type type, const st |
|
{ |
{ |
enum rew c; |
enum rew c; |
|
|
|
/* We cannot progress beyond the root ever. */ |
if (MAN_ROOT == n->type) |
if (MAN_ROOT == n->type) |
return(REW_HALT); |
return(REW_HALT); |
|
|
assert(n->parent); |
assert(n->parent); |
|
|
|
/* Normal nodes shouldn't go to the level of the root. */ |
if (MAN_ROOT == n->parent->type) |
if (MAN_ROOT == n->parent->type) |
return(REW_REWIND); |
return(REW_REWIND); |
|
|
|
/* Already-validated nodes should be closed out. */ |
if (MAN_VALID & n->flags) |
if (MAN_VALID & n->flags) |
return(REW_NOHALT); |
return(REW_NOHALT); |
|
|
/* Rewind to ourselves, first. */ |
/* First: rewind to ourselves. */ |
if (type == n->type && tok == n->tok) |
if (type == n->type && tok == n->tok) |
return(REW_REWIND); |
return(REW_REWIND); |
|
|
|
/* |
|
* If we're a roff macro, then we can close out anything that |
|
* stands between us and our parent context. |
|
*/ |
|
if (MAN_NOCLOSE & man_macros[tok].flags) |
|
return(REW_NOHALT); |
|
|
|
/* |
|
* Don't clobber roff macros: this is a bit complicated. If the |
|
* current macro is a roff macro, halt immediately and don't |
|
* rewind. If it's not, and the parent is, then close out the |
|
* current scope and halt at the parent. |
|
*/ |
|
if (MAN_NOCLOSE & man_macros[n->tok].flags) |
|
return(REW_HALT); |
|
if (MAN_NOCLOSE & man_macros[n->parent->tok].flags) |
|
return(REW_REWIND); |
|
|
|
/* |
|
* Next follow the implicit scope-smashings as defined by man.7: |
|
* section, sub-section, etc. |
|
*/ |
|
|
switch (tok) { |
switch (tok) { |
case (MAN_SH): |
case (MAN_SH): |
break; |
break; |
Line 210 rew_scope(enum man_type type, struct man *m, enum mant |
|
Line 268 rew_scope(enum man_type type, struct man *m, enum mant |
|
break; |
break; |
} |
} |
|
|
/* Rewind until the current point. */ |
/* |
|
* Rewind until the current point. Warn if we're a roff |
|
* instruction that's mowing over explicit scopes. |
|
*/ |
assert(n); |
assert(n); |
return(man_unscope(m, n)); |
if (MAN_NOCLOSE & man_macros[tok].flags) |
|
return(man_unscope(m, n, WROFFSCOPE)); |
|
|
|
return(man_unscope(m, n, WERRMAX)); |
} |
} |
|
|
|
|
|
/* |
|
* Closure for dotted macros (de, dei, am, ami, ign). This must handle |
|
* any of these as the parent node, so it needs special handling. |
|
* Beyond this, it's the same as blk_close(). |
|
*/ |
/* ARGSUSED */ |
/* ARGSUSED */ |
int |
int |
blk_dotted(MACRO_PROT_ARGS) |
blk_dotted(MACRO_PROT_ARGS) |
Line 224 blk_dotted(MACRO_PROT_ARGS) |
|
Line 292 blk_dotted(MACRO_PROT_ARGS) |
|
enum mant ntok; |
enum mant ntok; |
struct man_node *nn; |
struct man_node *nn; |
|
|
|
/* Check for any of the following parents... */ |
|
|
for (nn = m->last->parent; nn; nn = nn->parent) |
for (nn = m->last->parent; nn; nn = nn->parent) |
if (nn->tok == MAN_de || nn->tok == MAN_dei || |
if (nn->tok == MAN_de || nn->tok == MAN_dei || |
nn->tok == MAN_am || |
nn->tok == MAN_am || |
Line 244 blk_dotted(MACRO_PROT_ARGS) |
|
Line 314 blk_dotted(MACRO_PROT_ARGS) |
|
if ( ! rew_scope(MAN_BLOCK, m, ntok)) |
if ( ! rew_scope(MAN_BLOCK, m, ntok)) |
return(0); |
return(0); |
|
|
|
/* |
|
* XXX: manually adjust our next-line status. roff macros are, |
|
* for the moment, ignored, so we don't want to close out bodies |
|
* and so on. |
|
*/ |
|
|
|
switch (m->last->type) { |
|
case (MAN_BODY): |
|
m->next = MAN_NEXT_CHILD; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Restore flags set when we got here and also stipulate that we |
|
* don't post-process the line when exiting the macro op |
|
* function in man_pmacro(). |
|
*/ |
|
m->flags = m->svflags; |
|
m->flags |= MAN_ILINE; |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
|
/* |
|
* Close out a generic explicit macro. |
|
*/ |
/* ARGSUSED */ |
/* ARGSUSED */ |
int |
int |
blk_close(MACRO_PROT_ARGS) |
blk_close(MACRO_PROT_ARGS) |
Line 286 blk_exp(MACRO_PROT_ARGS) |
|
Line 381 blk_exp(MACRO_PROT_ARGS) |
|
{ |
{ |
int w, la; |
int w, la; |
char *p; |
char *p; |
struct man_node *n; |
|
|
|
/* |
/* |
* Close out prior scopes. "Regular" explicit macros cannot be |
* Close out prior scopes. "Regular" explicit macros cannot be |
Line 299 blk_exp(MACRO_PROT_ARGS) |
|
Line 393 blk_exp(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
if ( ! rew_scope(MAN_BLOCK, m, tok)) |
if ( ! rew_scope(MAN_BLOCK, m, tok)) |
return(0); |
return(0); |
|
} else { |
|
/* |
|
* Save our state; we restore it when exiting from the |
|
* roff instruction block. |
|
*/ |
|
m->svflags = m->flags; |
|
m->flags = 0; |
} |
} |
|
|
if ( ! man_block_alloc(m, line, ppos, tok)) |
if ( ! man_block_alloc(m, line, ppos, tok)) |
Line 306 blk_exp(MACRO_PROT_ARGS) |
|
Line 407 blk_exp(MACRO_PROT_ARGS) |
|
if ( ! man_head_alloc(m, line, ppos, tok)) |
if ( ! man_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
|
n = m->last; |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = man_args(m, line, pos, buf, &p); |
w = man_args(m, line, pos, buf, &p); |
Line 475 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 574 in_line_eoln(MACRO_PROT_ARGS) |
|
int |
int |
man_macroend(struct man *m) |
man_macroend(struct man *m) |
{ |
{ |
struct man_node *n; |
|
|
|
n = MAN_VALID & m->last->flags ? |
return(man_unscope(m, m->first, WEXITSCOPE)); |
m->last->parent : m->last; |
|
|
|
for ( ; n; n = n->parent) { |
|
if (MAN_BLOCK != n->type) |
|
continue; |
|
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
|
continue; |
|
if ( ! man_nwarn(m, n, WEXITSCOPE)) |
|
return(0); |
|
} |
|
|
|
return(man_unscope(m, m->first)); |
|
} |
} |
|
|