Removed EARGVPARM (superfluous, overly error-generating).

Added `sp' handler.

4 files changed, 35 insertions, 16 deletions

diff --git a/libmdoc.h b/libmdoc.h
index 1b3efc27..db459741 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -44,7 +44,6 @@ struct	mdoc {
 enum	merr {
 	ETAILWS = 0,
 	ECOLEMPTY,
-	EARGVPARM,
 	EQUOTPARM,
 	EQUOTTERM,
 	EMALLOC,
diff --git a/mdoc.c b/mdoc.c
index 3a03978b..dccc52d7 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -26,7 +26,6 @@
 const	char *const __mdoc_merrnames[MERRMAX] = {		 
 	"trailing whitespace", /* ETAILWS */
 	"empty last list column", /* ECOLEMPTY */
-	"argument-like parameter", /* EARGVPARM */
 	"unexpected quoted parameter", /* EQUOTPARM */
 	"unterminated quoted parameter", /* EQUOTTERM */
 	"system: malloc error", /* EMALLOC */
diff --git a/mdoc_argv.c b/mdoc_argv.c
index 2ddafa65..1cdd0582 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -37,7 +37,6 @@
 #define	ARGS_QUOTED	(1 << 0)
 #define	ARGS_DELIM	(1 << 1)
 #define	ARGS_TABSEP	(1 << 2)
-#define	ARGS_ARGVLIKE	(1 << 3)
 
 #define	ARGV_NONE	(1 << 0)
 #define	ARGV_SINGLE	(1 << 1)
@@ -127,7 +126,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Ot */
 	ARGS_DELIM, /* Pa */
 	0, /* Rv */
-	ARGS_DELIM | ARGS_ARGVLIKE, /* St */ 
+	ARGS_DELIM, /* St */ 
 	ARGS_DELIM, /* Va */
 	ARGS_DELIM, /* Vt */ 
 	ARGS_DELIM, /* Xr */
@@ -232,9 +231,6 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 
 	assert(' ' != buf[*pos]);
 
-	if ('-' != buf[*pos] || ARGS_ARGVLIKE & mdoc_argflags[tok])
-		return(ARGV_WORD);
-
 	/* Parse through to the first unescaped space. */
 
 	i = *pos;
@@ -268,8 +264,6 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 		/* XXX - restore saved zeroed byte. */
 		if (sv)
 			buf[*pos - 1] = sv;
-		if ( ! mdoc_pwarn(m, line, i, EARGVPARM))
-			return(ARGV_ERROR);
 		return(ARGV_WORD);
 	}
 
@@ -407,10 +401,6 @@ args(struct mdoc *m, int line, int *pos,
 		if ( ! mdoc_pwarn(m, line, *pos, EQUOTPARM))
 			return(ARGS_ERROR);
 
-	if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) 
-		if ( ! mdoc_pwarn(m, line, *pos, EARGVPARM))
-			return(ARGS_ERROR);
-
 	/* 
 	 * If the first character is a delimiter and we're to look for
 	 * delimited strings, then pass down the buffer seeing if it
diff --git a/mdoc_validate.c b/mdoc_validate.c
index fde2dbab..d3cca68f 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -18,6 +18,8 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -72,7 +74,6 @@ static	int	 eerr_eq0(POST_ARGS);
 static	int	 eerr_eq1(POST_ARGS);
 static	int	 eerr_ge1(POST_ARGS);
 static	int	 eerr_le2(POST_ARGS);
-static	int	 ewarn_eq0(POST_ARGS);
 static	int	 ewarn_ge1(POST_ARGS);
 static	int	 herr_eq0(POST_ARGS);
 static	int	 herr_ge1(POST_ARGS);
@@ -92,6 +93,7 @@ static	int	 post_root(POST_ARGS);
 static	int	 post_sh(POST_ARGS);
 static	int	 post_sh_body(POST_ARGS);
 static	int	 post_sh_head(POST_ARGS);
+static	int	 post_sp(POST_ARGS);
 static	int	 post_st(POST_ARGS);
 static	int	 pre_an(PRE_ARGS);
 static	int	 pre_bd(PRE_ARGS);
@@ -127,6 +129,7 @@ static	v_post	 posts_notext[] = { eerr_eq0, NULL };
 static	v_post	 posts_pf[] = { eerr_eq1, NULL };
 static	v_post	 posts_rv[] = { eerr_eq0, post_args, NULL };
 static	v_post	 posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
+static	v_post	 posts_sp[] = { post_sp, NULL };
 static	v_post	 posts_ss[] = { herr_ge1, NULL };
 static	v_post	 posts_st[] = { eerr_eq1, post_st, NULL };
 static	v_post	 posts_text[] = { eerr_ge1, NULL };
@@ -270,7 +273,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Dx */
 	{ NULL, posts_text },			/* %Q */
 	{ NULL, posts_notext },			/* br */
-	{ NULL, NULL },				/* sp */
+	{ NULL, posts_sp },			/* sp */
 };
 
 
@@ -403,7 +406,6 @@ CHECK_CHILD_DEFN(err, lt, <)			/* err_child_lt() */
 CHECK_CHILD_DEFN(warn, lt, <)			/* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)	/* bwarn_ge1() */
 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)	/* berr_ge1() */
-CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)	/* ewarn_eq0() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)	/* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)	/* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)	/* eerr_le2() */
@@ -1129,6 +1131,35 @@ post_root(POST_ARGS)
 
 
 static int
+post_sp(POST_ARGS)
+{
+	long		 lval;
+	char		*ep, *buf;
+
+	if (NULL == mdoc->last->child)
+		return(1);
+
+	assert(MDOC_TEXT == mdoc->last->child->type);
+	buf = mdoc->last->child->string;
+	assert(buf);
+	
+	/* From OpenBSD's strtol(3). */
+	errno = 0;
+	lval = strtol(buf, &ep, 10);
+	if (buf[0] == '\0' || *ep != '\0')
+		return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+	if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+			(lval > INT_MAX || lval < INT_MIN))
+		return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+	return(1);
+}
+
+
+
+
+static int
 post_st(POST_ARGS)
 {