Fix formatting of empty .Bl -inset item heads.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 1aa743da2fc76e0e98651056f94c28e08fcd4a4e..7eb6ef1725cb773e8a30201c0201e5c16e08f2a7 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.220 2014/07/02 11:43:20 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.224 2014/07/03 23:24:56 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1117,7 +1117,8 @@ post_vt(POST_ARGS)
 
        for (n = mdoc->last->child; n; n = n->next)
                if (MDOC_TEXT != n->type)
 
        for (n = mdoc->last->child; n; n = n->next)
                if (MDOC_TEXT != n->type)

-                       mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
+                       mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);

 
        return(1);
 }
 
        return(1);
 }


@@ -1269,27 +1270,24 @@ post_it(POST_ARGS)
 {
        int               i, cols;
        enum mdoc_list    lt;
 {
        int               i, cols;
        enum mdoc_list    lt;

-       struct mdoc_node *n, *c;
+       struct mdoc_node *nbl, *nit, *nch;

        enum mandocerr    er;
 
        enum mandocerr    er;
 

-       if (MDOC_BLOCK != mdoc->last->type)
+       nit = mdoc->last;
+       if (MDOC_BLOCK != nit->type)

                return(1);
 
                return(1);
 

-       n = mdoc->last->parent->parent;
-       lt = n->norm->Bl.type;
+       nbl = nit->parent->parent;
+       lt = nbl->norm->Bl.type;

 
        if (LIST__NONE == lt) {
 
        if (LIST__NONE == lt) {

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
+               mdoc_nmsg(mdoc, nit, MANDOCERR_LISTTYPE);

                return(1);
        }
 
        switch (lt) {
        case LIST_tag:
                return(1);
        }
 
        switch (lt) {
        case LIST_tag:

-               if (mdoc->last->head->child)
-                       break;
-               /* FIXME: give this a dummy value. */
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
-               break;
+               /* FALLTHROUGH */

        case LIST_hang:
                /* FALLTHROUGH */
        case LIST_ohang:
        case LIST_hang:
                /* FALLTHROUGH */
        case LIST_ohang:


@@ -1297,8 +1295,10 @@ post_it(POST_ARGS)
        case LIST_inset:
                /* FALLTHROUGH */
        case LIST_diag:
        case LIST_inset:
                /* FALLTHROUGH */
        case LIST_diag:

-               if (NULL == mdoc->last->head->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
+               if (NULL == nit->head->child)
+                       mandoc_msg(MANDOCERR_IT_NOHEAD,
+                           mdoc->parse, nit->line, nit->pos,
+                           mdoc_argnames[nbl->args->argv[0].arg]);

                break;
        case LIST_bullet:
                /* FALLTHROUGH */
                break;
        case LIST_bullet:
                /* FALLTHROUGH */


@@ -1307,23 +1307,23 @@ post_it(POST_ARGS)
        case LIST_enum:
                /* FALLTHROUGH */
        case LIST_hyphen:
        case LIST_enum:
                /* FALLTHROUGH */
        case LIST_hyphen:

-               if (NULL == mdoc->last->body->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
+               if (NULL == nit->body->child)
+                       mdoc_nmsg(mdoc, nit, MANDOCERR_NOBODY);

                /* FALLTHROUGH */
        case LIST_item:
                /* FALLTHROUGH */
        case LIST_item:

-               if (mdoc->last->head->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
+               if (NULL != nit->head->child)
+                       mdoc_nmsg(mdoc, nit, MANDOCERR_ARGSLOST);

                break;
        case LIST_column:
                break;
        case LIST_column:

-               cols = (int)n->norm->Bl.ncols;
+               cols = (int)nbl->norm->Bl.ncols;

 
 

-               assert(NULL == mdoc->last->head->child);
+               assert(NULL == nit->head->child);

 
 

-               if (NULL == mdoc->last->body->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
+               if (NULL == nit->body->child)
+                       mdoc_nmsg(mdoc, nit, MANDOCERR_NOBODY);

 
 

-               for (i = 0, c = mdoc->last->child; c; c = c->next)
-                       if (MDOC_BODY == c->type)
+               for (i = 0, nch = nit->child; nch; nch = nch->next)
+                       if (MDOC_BODY == nch->type)

                                i++;
 
                if (i < cols)
                                i++;
 
                if (i < cols)


@@ -1333,8 +1333,7 @@ post_it(POST_ARGS)
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 

-               mandoc_vmsg(er, mdoc->parse,
-                   mdoc->last->line, mdoc->last->pos,
+               mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos,

                    "columns == %d (have %d)", cols, i);
                return(MANDOCERR_ARGCOUNT == er);
        default:
                    "columns == %d (have %d)", cols, i);
                return(MANDOCERR_ARGCOUNT == er);
        default:


@@ -1613,7 +1612,9 @@ post_bl(POST_ARGS)
                        continue;
                }
 
                        continue;
                }
 

-               mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD);
+               mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
+                   nchild->line, nchild->pos,
+                   mdoc_macronames[nchild->tok]);

 
                /*
                 * Move the node out of the Bl block.
 
                /*
                 * Move the node out of the Bl block.


@@ -1665,11 +1666,12 @@ ebool(struct mdoc *mdoc)
 {
 
        if (NULL == mdoc->last->child) {
 {
 
        if (NULL == mdoc->last->child) {

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY);
-               mdoc_node_delete(mdoc, mdoc->last);
+               if (MDOC_Sm == mdoc->last->tok)
+                       mdoc->flags ^= MDOC_SMOFF;

                return(1);
        }
                return(1);
        }

-       check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);
+
+       check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2);

 
        assert(MDOC_TEXT == mdoc->last->child->type);
 
 
        assert(MDOC_TEXT == mdoc->last->child->type);
 


@@ -1725,7 +1727,9 @@ post_st(POST_ARGS)
        const char               *p;
 
        if (NULL == (ch = mdoc->last->child)) {
        const char               *p;
 
        if (NULL == (ch = mdoc->last->child)) {

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY);
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   mdoc_macronames[mdoc->last->tok]);

                mdoc_node_delete(mdoc, mdoc->last);
                return(1);
        }
                mdoc_node_delete(mdoc, mdoc->last);
                return(1);
        }


@@ -1782,7 +1786,8 @@ post_rs(POST_ARGS)
                }
 
                next = nn->next;
                }
 
                next = nn->next;

-               mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD);
+               mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse,
+                   nn->line, nn->pos, mdoc_macronames[nn->tok]);

                mdoc_node_delete(mdoc, nn);
        }
 
                mdoc_node_delete(mdoc, nn);
        }