version 1.84, 2014/07/07 21:36:20 |
version 1.87, 2014/07/30 23:01:39 |
Line 49 static enum rew rew_dohalt(enum mant, enum man_type, |
|
Line 49 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 void rew_warn(struct man *, |
|
struct man_node *, enum mandocerr); |
|
|
|
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 106 man_unscope(struct man *man, const struct man_node *to |
|
Line 104 man_unscope(struct man *man, const struct man_node *to |
|
to = to->parent; |
to = to->parent; |
n = man->last; |
n = man->last; |
while (n != to) { |
while (n != to) { |
if (NULL == to && |
|
MAN_BLOCK == n->type && |
/* Reached the end of the document? */ |
0 == (MAN_VALID & n->flags) && |
|
MAN_EXPLICIT & man_macros[n->tok].flags) |
if (to == NULL && ! (n->flags & MAN_VALID)) { |
mandoc_msg(MANDOCERR_BLK_NOEND, |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man->parse, n->line, n->pos, |
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macronames[n->tok]); |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
|
man->parse, n->line, n->pos, |
|
"EOF breaks %s", |
|
man_macronames[n->tok]); |
|
if (man->flags & MAN_ELINE) |
|
man->flags &= ~MAN_ELINE; |
|
else { |
|
assert(n->type == MAN_HEAD); |
|
n = n->parent; |
|
man->flags &= ~MAN_BLINE; |
|
} |
|
man->last = n; |
|
n = n->parent; |
|
man_node_delete(man, man->last); |
|
continue; |
|
} |
|
if (n->type == MAN_BLOCK && |
|
man_macros[n->tok].flags & MAN_EXPLICIT) |
|
mandoc_msg(MANDOCERR_BLK_NOEND, |
|
man->parse, n->line, n->pos, |
|
man_macronames[n->tok]); |
|
} |
|
|
/* |
/* |
* We might delete the man->last node |
* We might delete the man->last node |
* in the post-validation phase. |
* in the post-validation phase. |
Line 415 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 435 in_line_eoln(MACRO_PROT_ARGS) |
|
assert( ! (MAN_NSCOPED & man_macros[tok].flags)); |
assert( ! (MAN_NSCOPED & man_macros[tok].flags)); |
man->flags |= MAN_ELINE; |
man->flags |= MAN_ELINE; |
return(1); |
return(1); |
} |
|
|
|
/* Set ignorable context, if applicable. */ |
|
|
|
if (MAN_NSCOPED & man_macros[tok].flags) { |
|
assert( ! (MAN_SCOPED & man_macros[tok].flags)); |
|
man->flags |= MAN_ILINE; |
|
} |
} |
|
|
assert(MAN_ROOT != man->last->type); |
assert(MAN_ROOT != man->last->type); |