diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-02-01 16:47:39 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-01 16:47:39 +0000 |
| commit | b2d12509d3ab529895994da811b70600c81ee10e (patch) | |
| tree | 7bdf222801ea58d0db827dfef5923d61ee2e09ca | |
| parent | 4ac6265c00a615f1c73a9e93009e46865afcdfd9 (diff) | |
| download | mandoc-b2d12509d3ab529895994da811b70600c81ee10e.tar.gz mandoc-b2d12509d3ab529895994da811b70600c81ee10e.tar.zst mandoc-b2d12509d3ab529895994da811b70600c81ee10e.zip | |
The function rew_sub() tries to rewind any all all kinds of blocks
and elements under any and all circumstances, even handling some
bad block nesting now and then. Little surprisingly, this ends up
in excessive complexity and has caused many bugs in the past.
Start to slowly disentangle this mess by replacing calls to rew_sub()
immediately following mdoc_head_alloc() by the much simpler rew_last().
Gets rid of the first two rew_sub() calls out of twenty.
No functional change.
| -rw-r--r-- | mdoc_macro.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 56ae7983..6034055b 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,7 +1,7 @@ -/* $Id: mdoc_macro.c,v 1.161 2014/12/22 23:27:32 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.162 2015/02/01 16:47:39 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1137,7 +1137,7 @@ blk_full(MACRO_PROT_ARGS) if (tok == MDOC_Nd) { head = mdoc_head_alloc(mdoc, line, ppos, tok); - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + rew_last(mdoc, head); body = mdoc_body_alloc(mdoc, line, ppos, tok); } @@ -1274,8 +1274,7 @@ blk_part_imp(MACRO_PROT_ARGS) */ blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL); - mdoc_head_alloc(mdoc, line, ppos, tok); - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + rew_last(mdoc, mdoc_head_alloc(mdoc, line, ppos, tok)); /* * Open the body scope "on-demand", that is, after we've |