More use default tags, this time I and U. Also fix a stack overflow

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index ddf82b8bae1089c5dc0e2c55c528a8c4a352c112..f2eca5c61a30419bf429ea80df371be8d8714d17 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.140 2010/12/15 23:39:40 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.144 2010/12/16 17:14:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -170,7 +170,7 @@ static      v_pre    pres_dd[] = { pre_dd, NULL };
 static v_pre    pres_dt[] = { pre_dt, NULL };
 static v_pre    pres_er[] = { NULL, NULL };
 static v_pre    pres_fd[] = { NULL, NULL };
-static v_pre    pres_it[] = { pre_it, NULL };
+static v_pre    pres_it[] = { pre_it, pre_par, NULL };
 static v_pre    pres_os[] = { pre_os, NULL };
 static v_pre    pres_pp[] = { pre_par, NULL };
 static v_pre    pres_sh[] = { pre_sh, NULL };
@@ -904,6 +904,9 @@ pre_an(PRE_ARGS)
 {
        int              i;
 
+       assert(NULL == n->data.An);
+       n->data.An = mandoc_calloc(1, sizeof(struct mdoc_an));
+
        if (NULL == n->args)
                return(1);
        
@@ -912,9 +915,9 @@ pre_an(PRE_ARGS)
                        n->args->argv[i].pos, MANDOCERR_IGNARGV);
 
        if (MDOC_Split == n->args->argv[0].arg)
-               n->data.An.auth = AUTH_split;
+               n->data.An->auth = AUTH_split;
        else if (MDOC_Nosplit == n->args->argv[0].arg)
-               n->data.An.auth = AUTH_nosplit;
+               n->data.An->auth = AUTH_nosplit;
        else
                abort();
 
@@ -1247,14 +1250,14 @@ post_an(POST_ARGS)
        struct mdoc_node *np;
 
        np = mdoc->last;
-       if (AUTH__NONE != np->data.An.auth && np->child)
+       if (AUTH__NONE != np->data.An->auth && np->child)
                return(eerr_eq0(mdoc));
 
        /* 
         * FIXME: make this ewarn and make sure that the front-ends
         * don't print the arguments.
         */
-       if (AUTH__NONE != np->data.An.auth || np->child)
+       if (AUTH__NONE != np->data.An->auth || np->child)
                return(1);
 
        mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);
@@ -1564,21 +1567,20 @@ post_bl(POST_ARGS)
                return(post_bl_block(mdoc));
        if (MDOC_BODY != mdoc->last->type)
                return(1);
-       if (NULL == mdoc->last->child)
-               return(1);
-
-       /*
-        * We only allow certain children of `Bl'.  This is usually on
-        * `It', but apparently `Sm' occurs here and there, so we let
-        * that one through, too.
-        */
 
-       /* LINTED */
        for (n = mdoc->last->child; n; n = n->next) {
-               if (MDOC_BLOCK == n->type && MDOC_It == n->tok)
+               switch (n->tok) {
+               case (MDOC_It):
                        continue;
-               if (MDOC_Sm == n->tok)
+               case (MDOC_Sm):
+                       /* FALLTHROUGH */
+               case (MDOC_Pp):
+                       mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
                        continue;
+               default:
+                       break;
+               }
+
                mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
                return(0);
        }
@@ -1908,6 +1910,8 @@ pre_par(PRE_ARGS)
 
        if (NULL == mdoc->last)
                return(1);
+       if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
+               return(1);
 
        /* 
         * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
@@ -1916,11 +1920,12 @@ pre_par(PRE_ARGS)
 
        if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
                return(1);
-
        if (MDOC_Bl == n->tok && n->data.Bl->comp)
                return(1);
        if (MDOC_Bd == n->tok && n->data.Bd->comp)
                return(1);
+       if (MDOC_It == n->tok && n->parent->data.Bl->comp)
+               return(1);
 
        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
        mdoc_node_delete(mdoc, mdoc->last);