Disentangle the MANDOCERR_CHILD message, which reported three

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index ec72c2ab37b4a58adf74b61a48d66d0788b483c2..52bd51b2f8205b40c62ac2b8a974c15238b4b91f 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.219 2014/07/02 05:52:25 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.221 2014/07/02 13:10:45 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>


@@ -591,7 +591,9 @@ pre_display(PRE_ARGS)
                                break;
 
        if (node)
                                break;
 
        if (node)

-               mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
+               mandoc_vmsg(MANDOCERR_BD_NEST,
+                   mdoc->parse, n->line, n->pos,
+                   "%s in Bd", mdoc_macronames[n->tok]);

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


@@ -1115,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);
 }


@@ -1611,7 +1614,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.


@@ -1780,7 +1785,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);
        }
 


@@ -1903,7 +1909,7 @@ post_ns(POST_ARGS)
 {
 
        if (MDOC_LINE & mdoc->last->flags)
 {
 
        if (MDOC_LINE & mdoc->last->flags)

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS);
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP);

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