summaryrefslogtreecommitdiffstats
path: root/mdoc_macro.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-11-30 13:04:14 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-11-30 13:04:14 +0000
commit049fb69debd067e5a4044e7157aa2ba07399b931 (patch)
treea48f2696723aa8e3771cf7ff26d3dd566e4d3ffb /mdoc_macro.c
parenta955ef6146dcabdef4d8cb7da75c04f1744d0853 (diff)
downloadmandoc-049fb69debd067e5a4044e7157aa2ba07399b931.tar.gz
mdoc_action.c is no more. Attic it and remove it from the Makefile.
Remove references to MDOC_ACTED (it was only assertions) and the pre- and post-action functions.
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r--mdoc_macro.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 34ffd86b..ba1df2c1 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -259,15 +259,11 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
while (mdoc->last != to) {
if ( ! mdoc_valid_post(mdoc))
return(0);
- if ( ! mdoc_action_post(mdoc))
- return(0);
mdoc->last = mdoc->last->parent;
assert(mdoc->last);
}
- if ( ! mdoc_valid_post(mdoc))
- return(0);
- return(mdoc_action_post(mdoc));
+ return(mdoc_valid_post(mdoc));
}
@@ -696,10 +692,8 @@ blk_exp_close(MACRO_PROT_ARGS)
if (later &&
MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
continue;
- if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) {
- assert( ! (MDOC_ACTED & n->flags));
+ if (MDOC_CALLABLE & mdoc_macros[n->tok].flags)
later = n;
- }
}
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
@@ -1143,7 +1137,6 @@ blk_full(MACRO_PROT_ARGS)
if (MDOC_BLOCK == n->type &&
MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
! (MDOC_VALID & n->flags)) {
- assert( ! (MDOC_ACTED & n->flags));
n->pending = head;
return(1);
}
@@ -1281,7 +1274,6 @@ blk_part_imp(MACRO_PROT_ARGS)
if (MDOC_BLOCK == n->type &&
MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
! (MDOC_VALID & n->flags)) {
- assert( ! (MDOC_ACTED & n->flags));
if ( ! make_pending(n, tok, m, line, ppos))
return(0);
if ( ! mdoc_endbody_alloc(m, line, ppos,