version 1.41, 2010/03/29 04:52:14 |
version 1.44, 2010/05/15 22:44:04 |
|
|
}; |
}; |
|
|
static int blk_close(MACRO_PROT_ARGS); |
static int blk_close(MACRO_PROT_ARGS); |
static int blk_dotted(MACRO_PROT_ARGS); |
|
static int blk_exp(MACRO_PROT_ARGS); |
static int blk_exp(MACRO_PROT_ARGS); |
static int blk_imp(MACRO_PROT_ARGS); |
static int blk_imp(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
Line 82 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 81 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, MAN_NSCOPED }, /* Sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* Sp */ |
{ in_line_eoln, 0 }, /* Vb */ |
{ in_line_eoln, 0 }, /* Vb */ |
{ in_line_eoln, 0 }, /* Ve */ |
{ in_line_eoln, 0 }, /* Ve */ |
{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* de */ |
|
{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* dei */ |
|
{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* am */ |
|
{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ami */ |
|
{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ig */ |
|
{ blk_dotted, 0 }, /* . */ |
|
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
Line 106 rew_warn(struct man *m, struct man_node *n, enum merr |
|
Line 99 rew_warn(struct man *m, struct man_node *n, enum merr |
|
return(1); |
return(1); |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
return(1); |
return(1); |
if (MAN_NOCLOSE & man_macros[n->tok].flags) |
|
return(1); |
|
return(man_nwarn(m, n, er)); |
return(man_nwarn(m, n, er)); |
} |
} |
|
|
Line 187 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 178 rew_dohalt(enum mant tok, enum man_type type, const st |
|
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: |
* Next follow the implicit scope-smashings as defined by man.7: |
* section, sub-section, etc. |
* section, sub-section, etc. |
*/ |
*/ |
Line 273 rew_scope(enum man_type type, struct man *m, enum mant |
|
Line 246 rew_scope(enum man_type type, struct man *m, enum mant |
|
* instruction that's mowing over explicit scopes. |
* instruction that's mowing over explicit scopes. |
*/ |
*/ |
assert(n); |
assert(n); |
if (MAN_NOCLOSE & man_macros[tok].flags) |
|
return(man_unscope(m, n, WROFFSCOPE)); |
|
|
|
return(man_unscope(m, n, WERRMAX)); |
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 */ |
|
int |
|
blk_dotted(MACRO_PROT_ARGS) |
|
{ |
|
enum mant ntok; |
|
struct man_node *nn; |
|
|
|
/* Check for any of the following parents... */ |
|
|
|
for (nn = m->last->parent; nn; nn = nn->parent) |
|
if (nn->tok == MAN_de || nn->tok == MAN_dei || |
|
nn->tok == MAN_am || |
|
nn->tok == MAN_ami || |
|
nn->tok == MAN_ig) { |
|
ntok = nn->tok; |
|
break; |
|
} |
|
|
|
if (NULL == nn) { |
|
if ( ! man_pwarn(m, line, ppos, WNOSCOPE)) |
|
return(0); |
|
return(1); |
|
} |
|
|
|
if ( ! rew_scope(MAN_BODY, m, ntok)) |
|
return(0); |
|
if ( ! rew_scope(MAN_BLOCK, m, ntok)) |
|
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); |
|
} |
|
|
|
|
|
/* |
|
* Close out a generic explicit macro. |
* Close out a generic explicit macro. |
*/ |
*/ |
/* ARGSUSED */ |
/* ARGSUSED */ |
Line 388 blk_exp(MACRO_PROT_ARGS) |
|
Line 299 blk_exp(MACRO_PROT_ARGS) |
|
* anywhere. |
* anywhere. |
*/ |
*/ |
|
|
if ( ! (MAN_NOCLOSE & man_macros[tok].flags)) { |
if ( ! rew_scope(MAN_BODY, m, tok)) |
if ( ! rew_scope(MAN_BODY, m, tok)) |
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)) |
return(0); |
return(0); |