version 1.55, 2011/01/12 16:55:22 |
version 1.56, 2011/03/17 11:56:17 |
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 *, |
static void rew_warn(struct man *, |
struct man_node *, enum mandocerr); |
struct man_node *, enum mandocerr); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX] = { |
Line 88 const struct man_macro * const man_macros = __man_macr |
|
Line 88 const struct man_macro * const man_macros = __man_macr |
|
/* |
/* |
* Warn when "n" is an explicit non-roff macro. |
* Warn when "n" is an explicit non-roff macro. |
*/ |
*/ |
static int |
static void |
rew_warn(struct man *m, struct man_node *n, enum mandocerr er) |
rew_warn(struct man *m, struct man_node *n, enum mandocerr er) |
{ |
{ |
|
|
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) |
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) |
return(1); |
return; |
if (MAN_VALID & n->flags) |
if (MAN_VALID & n->flags) |
return(1); |
return; |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
return(1); |
return; |
return(man_nmsg(m, n, er)); |
|
|
assert(er < MANDOCERR_FATAL); |
|
man_nmsg(m, n, er); |
} |
} |
|
|
|
|
Line 123 man_unscope(struct man *m, const struct man_node *to, |
|
Line 125 man_unscope(struct man *m, const struct man_node *to, |
|
* out to be lost. |
* out to be lost. |
*/ |
*/ |
n = m->last->parent; |
n = m->last->parent; |
if ( ! rew_warn(m, m->last, er)) |
rew_warn(m, m->last, er); |
return(0); |
|
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
m->last = n; |
m->last = n; |
assert(m->last); |
assert(m->last); |
} |
} |
|
|
if ( ! rew_warn(m, m->last, er)) |
rew_warn(m, m->last, er); |
return(0); |
|
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
|
|
Line 279 blk_close(MACRO_PROT_ARGS) |
|
Line 279 blk_close(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == nn) |
if (NULL == nn) |
if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE)) |
man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
return(0); |
|
|
|
if ( ! rew_scope(MAN_BODY, m, ntok)) |
if ( ! rew_scope(MAN_BODY, m, ntok)) |
return(0); |
return(0); |