No need to assert() that a pointer is non-null right before dereferencing it.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 51e916086d7c5d23e5ee49e24b0e7d3356486a37..15eee4936e5437e94a9176c94f3379ed97826b27 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.83 2014/07/07 19:18:15 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.89 2014/08/18 16:36:54 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,9 +16,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -49,8 +49,6 @@ static        enum rew         rew_dohalt(enum mant, enum man_type,
                                const struct man_node *);
 static enum rew         rew_block(enum mant, enum man_type,
                                const struct man_node *);
-static void             rew_warn(struct man *,
-                               struct man_node *, enum mandocerr);
 
 const  struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* br */
@@ -102,28 +100,61 @@ man_unscope(struct man *man, const struct man_node *to)
 {
        struct man_node *n;
 
-       man->next = MAN_NEXT_SIBLING;
        to = to->parent;
        n = man->last;
        while (n != to) {
-               if (NULL == to &&
-                   MAN_BLOCK == n->type &&
-                   0 == (MAN_VALID & n->flags) &&
-                   MAN_EXPLICIT & man_macros[n->tok].flags)
-                       mandoc_msg(MANDOCERR_SCOPEEXIT,
-                           man->parse, n->line, n->pos,
-                           man_macronames[n->tok]);
+
+               /* Reached the end of the document? */
+
+               if (to == NULL && ! (n->flags & MAN_VALID)) {
+                       if (man->flags & (MAN_BLINE | MAN_ELINE) &&
+                           man_macros[n->tok].flags & MAN_SCOPED) {
+                               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
                 * in the post-validation phase.
                 * Save a pointer to the parent such that
                 * we know where to continue the iteration.
                 */
+
                man->last = n;
                n = n->parent;
                if ( ! man_valid_post(man))
                        return(0);
        }
+
+       /*
+        * If we ended up at the parent of the node we were
+        * supposed to rewind to, that means the target node
+        * got deleted, so add the next node we parse as a child
+        * of the parent instead of as a sibling of the target.
+        */
+
+       man->next = (man->last == to) ?
+           MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
+
        return(1);
 }
 
@@ -270,7 +301,8 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn) {
-               man_pmsg(man, line, ppos, MANDOCERR_NOSCOPE);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
+                   line, ppos, man_macronames[tok]);
                if ( ! rew_scope(MAN_BLOCK, man, MAN_PP))
                        return(0);
        } else
@@ -416,13 +448,6 @@ in_line_eoln(MACRO_PROT_ARGS)
                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);
        man->next = MAN_NEXT_SIBLING;