Disentangle the MANDOCERR_CHILD message, which reported three

completely different things, into three distinct messages.
Also mention the macro names we are talking about.

diff --git a/mandoc.h b/mandoc.h
index 2ab25442a276ec2135c7246ddf7aa619005b3f34..f0005e61023ef4f7feaad204dc3ef1cbd44531e1 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.128 2014/07/02 11:43:20 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.129 2014/07/02 13:10:45 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -76,8 +76,9 @@ enum  mandocerr {
        MANDOCERR_PAR_MOVE, /* moving paragraph macro out of list: macro */
        MANDOCERR_NS_SKIP, /* skipping no-space macro */
        MANDOCERR_BLOCK_NEST, /* blocks badly nested: macro ... */
-       MANDOCERR_CHILD, /* child violates parent syntax */
        MANDOCERR_BD_NEST, /* nested displays are not portable: macro ... */
+       MANDOCERR_BL_MOVE, /* moving content out of list: macro */
+       MANDOCERR_VT_CHILD, /* .Vt block has child macro: macro */
        MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping .fi */
        MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping .nf */
        MANDOCERR_LINESCOPE, /* line scope broken: macro breaks macro */
@@ -136,6 +137,7 @@ enum        mandocerr {
        MANDOCERR_MACRO, /* skipping unknown macro */
        MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
        MANDOCERR_ARGCOUNT, /* argument count wrong */
+       MANDOCERR_RS_SKIP, /* skipping invalid content in .Rs block: macro */
        MANDOCERR_STRAYTA, /* skipping column outside column list */
        MANDOCERR_NOSCOPE, /* skipping end of block that is not open */
        MANDOCERR_SCOPEBROKEN, /* missing end of block */

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 1aa743da2fc76e0e98651056f94c28e08fcd4a4e..52bd51b2f8205b40c62ac2b8a974c15238b4b91f 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.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>
@@ -1117,7 +1117,8 @@ post_vt(POST_ARGS)
 
        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);
 }
@@ -1613,7 +1614,9 @@ post_bl(POST_ARGS)
                        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.
@@ -1782,7 +1785,8 @@ post_rs(POST_ARGS)
                }
 
                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);
        }
 

diff --git a/read.c b/read.c
index d1b0af1c84000df4d70b8717fe3f5e388cca5f50..a60f42f970776e1abe2593ed9553ce1ab7f02341 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.56 2014/07/02 11:43:20 schwarze Exp $ */
+/*     $Id: read.c,v 1.57 2014/07/02 13:10:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -120,8 +120,9 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "moving paragraph macro out of list",
        "skipping no-space macro",
        "blocks badly nested",
-       "child violates parent syntax",
        "nested displays are not portable",
+       "moving content out of list",
+       ".Vt block has child macro",
        "fill mode already enabled, skipping .fi",
        "fill mode already disabled, skipping .nf",
        "line scope broken",
@@ -180,6 +181,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "skipping unknown macro",
        "NOT IMPLEMENTED, please use groff: skipping request",
        "argument count wrong",
+       "skipping invalid content in .Rs block",
        "skipping column outside column list",
        "skipping end of block that is not open",
        "missing end of block",