date handling needs cleanup

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index eba976862a9184355ca6f1eb24f1164f87790ea1..925f4a19074db3e137942643bebff1fbf3481455 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.95 2010/10/01 21:51:13 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.101 2011/01/25 15:17:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,6 +34,7 @@ enum  rew {   /* see rew_dohalt() */
        REWIND_NONE,
        REWIND_THIS,
        REWIND_MORE,
+       REWIND_FORCE,
        REWIND_LATER,
        REWIND_ERROR
 };
@@ -251,23 +252,29 @@ lookup_raw(const char *p)
 static int
 rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
 {
+       struct mdoc_node *n, *np;
 
        assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;
 
        /* LINTED */
        while (mdoc->last != to) {
+               /*
+                * Save the parent here, because we may delete the
+                * m->last node in the post-validation phase and reset
+                * it to m->last->parent, causing a step in the closing
+                * out to be lost.
+                */
+               np = mdoc->last->parent;
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
-               mdoc->last = mdoc->last->parent;
+               n = mdoc->last;
+               mdoc->last = np;
                assert(mdoc->last);
+               mdoc->last->last = n;
        }
 
-       if ( ! mdoc_valid_post(mdoc))
-               return(0);
-       return(mdoc_action_post(mdoc));
+       return(mdoc_valid_post(mdoc));
 }
 
 
@@ -324,6 +331,7 @@ rew_alt(enum mdoct tok)
  *   inside *p, so there is no need to rewind anything at all.
  * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
  * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
+ * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.
  * REWIND_LATER: *p is explicit and still open, postpone rewinding.
  * REWIND_ERROR: No tok block is open at all.
  */
@@ -417,16 +425,13 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type,
                return(REWIND_MORE);
 
        /*
-        * Partial blocks allow delayed rewinding by default.
+        * By default, closing out full blocks
+        * forces closing of broken explicit blocks,
+        * while closing out partial blocks
+        * allows delayed rewinding by default.
         */
-       if (&blk_full != mdoc_macros[tok].fp)
-               return (REWIND_LATER);
-
-       /*
-        * Full blocks can only be rewound when matching
-        * or when there is an explicit rule.
-        */
-       return(REWIND_ERROR);
+       return (&blk_full == mdoc_macros[tok].fp ?
+           REWIND_FORCE : REWIND_LATER);
 }
 
 
@@ -517,9 +522,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok,
        /*
         * Found no matching block for tok.
         * Are you trying to close a block that is not open?
-        * XXX Make this non-fatal.
         */
-       mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE);
        return(0);
 }
 
@@ -537,17 +540,22 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
                        return(1);
                case (REWIND_THIS):
                        break;
+               case (REWIND_FORCE):
+                       mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos,
+                           "%s breaks %s", mdoc_macronames[tok],
+                           mdoc_macronames[n->tok]);
+                       /* FALLTHROUGH */
                case (REWIND_MORE):
                        n = n->parent;
                        continue;
                case (REWIND_LATER):
-                       return(make_pending(n, tok, m, line, ppos));
+                       if (make_pending(n, tok, m, line, ppos) ||
+                           MDOC_BLOCK != t)
+                               return(1);
+                       /* FALLTHROUGH */
                case (REWIND_ERROR):
-                       /* XXX Make this non-fatal. */
-                       mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos,
-                           "%s cannot break %s", mdoc_macronames[tok],
-                           mdoc_macronames[n->tok]);
-                       return 0;
+                       mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
+                       return(1);
                }
                break;
        }
@@ -675,8 +683,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * postpone closing out the current block
                         * until the rew_sub() closing out the sub-block.
                         */
-                       if ( ! make_pending(later, tok, m, line, ppos))
-                               return(0);
+                       make_pending(later, tok, m, line, ppos);
 
                        /*
                         * Mark the place where the formatting - but not
@@ -696,10 +703,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)) {
@@ -790,7 +795,7 @@ in_line(MACRO_PROT_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Fl):
                /* FALLTHROUGH */
-       case (MDOC_Lk):
+       case (MDOC_Mt):
                /* FALLTHROUGH */
        case (MDOC_Nm):
                /* FALLTHROUGH */
@@ -1143,7 +1148,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,9 +1285,7 @@ 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);
+                       make_pending(n, tok, m, line, ppos);
                        if ( ! mdoc_endbody_alloc(m, line, ppos,
                            tok, body, ENDBODY_NOSPACE))
                                return(0);
@@ -1459,6 +1461,8 @@ in_line_argn(MACRO_PROT_ARGS)
        case (MDOC_Ux):
                maxargs = 0;
                break;
+       case (MDOC_Bx):
+               /* FALLTHROUGH */
        case (MDOC_Xr):
                maxargs = 2;
                break;