Improve and test the messages about empty macros,

in particular reporting the macro names involved.

diff --git a/mandoc.h b/mandoc.h
index f0005e61023ef4f7feaad204dc3ef1cbd44531e1..2848d2bcd64333aefb8a2f3be412c60b5dfb1f14 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.129 2014/07/02 13:10:45 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.130 2014/07/02 20:19:11 schwarze Exp $ */

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


@@ -84,7 +84,7 @@ enum  mandocerr {
        MANDOCERR_LINESCOPE, /* line scope broken: macro breaks macro */
 
        /* related to missing macro arguments */
        MANDOCERR_LINESCOPE, /* line scope broken: macro breaks macro */
 
        /* related to missing macro arguments */

-       MANDOCERR_MACROEMPTY, /* skipping empty macro */
+       MANDOCERR_MACRO_EMPTY, /* skipping empty macro: macro */

        MANDOCERR_ARGCWARN, /* argument count wrong */
        MANDOCERR_DISPTYPE, /* missing display type */
        MANDOCERR_LISTFIRST, /* list type must come first */
        MANDOCERR_ARGCWARN, /* argument count wrong */
        MANDOCERR_DISPTYPE, /* missing display type */
        MANDOCERR_LISTFIRST, /* list type must come first */

diff --git a/mdoc_macro.c b/mdoc_macro.c
index da836a741b352cad64dec285e57e00e0465fe5ba..a4a4da012243aef861766a4cd9c52169255c7131 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.134 2014/07/02 11:43:20 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.135 2014/07/02 20:19:11 schwarze Exp $ */

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


@@ -919,8 +919,9 @@ in_line(MACRO_PROT_ARGS)
                                        return(0);
                        } else if ( ! nc && 0 == cnt) {
                                mdoc_argv_free(arg);
                                        return(0);
                        } else if ( ! nc && 0 == cnt) {
                                mdoc_argv_free(arg);

-                               mdoc_pmsg(mdoc, line, ppos,
-                                   MANDOCERR_MACROEMPTY);
+                               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                                   mdoc->parse, line, ppos,
+                                   mdoc_macronames[tok]);

                        }
 
                        if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
                        }
 
                        if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))


@@ -1005,7 +1006,8 @@ in_line(MACRO_PROT_ARGS)
                        return(0);
        } else if ( ! nc && 0 == cnt) {
                mdoc_argv_free(arg);
                        return(0);
        } else if ( ! nc && 0 == cnt) {
                mdoc_argv_free(arg);

-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);

        }
 
        if ( ! nl)
        }
 
        if ( ! nl)

diff --git a/mdoc_validate.c b/mdoc_validate.c
index e43e00df0323996115b193bd2cf4236add2a6734..4beb2196ca8fa579b14008d0c4bd1fff59a7ec35 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.222 2014/07/02 19:55:10 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.223 2014/07/02 20:19:11 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>


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