diff options
| -rw-r--r-- | mandoc.h | 6 | ||||
| -rw-r--r-- | read.c | 4 | ||||
| -rw-r--r-- | roff.c | 8 |
3 files changed, 12 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.130 2014/07/02 20:19:11 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.131 2014/07/03 21:23:54 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -83,7 +83,9 @@ enum mandocerr { MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping .nf */ MANDOCERR_LINESCOPE, /* line scope broken: macro breaks macro */ - /* related to missing macro arguments */ + /* related to missing arguments */ + MANDOCERR_REQ_EMPTY, /* skipping empty request: request */ + MANDOCERR_COND_EMPTY, /* conditional request controls empty scope */ MANDOCERR_MACRO_EMPTY, /* skipping empty macro: macro */ MANDOCERR_ARGCWARN, /* argument count wrong */ MANDOCERR_DISPTYPE, /* missing display type */ @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.57 2014/07/02 13:10:45 schwarze Exp $ */ +/* $Id: read.c,v 1.58 2014/07/03 21:23:54 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -128,6 +128,8 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "line scope broken", /* related to missing macro arguments */ + "skipping empty request", + "conditional request controls empty scope", "skipping empty macro", "argument count wrong", "missing display type", @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.215 2014/07/01 00:32:29 schwarze Exp $ */ +/* $Id: roff.c,v 1.216 2014/07/03 21:23:54 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -917,7 +917,8 @@ roff_block(ROFF_ARGS) if (ROFF_ig != tok) { if ('\0' == *cp) { - mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); + mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, + ln, ppos, roffs[tok].name); return(ROFF_IGN); } @@ -1285,7 +1286,8 @@ roff_cond(ROFF_ARGS) */ if ('\0' == (*bufp)[pos]) - mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); + mandoc_msg(MANDOCERR_COND_EMPTY, r->parse, + ln, ppos, roffs[tok].name); r->last->endspan = 1; |