===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.42
retrieving revision 1.48
diff -u -p -r1.42 -r1.48
--- mandoc/mdoc_validate.c	2009/08/20 13:22:48	1.42
+++ mandoc/mdoc_validate.c	2009/10/19 09:40:23	1.48
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.42 2009/08/20 13:22:48 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.48 2009/10/19 09:40:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -74,6 +74,7 @@ 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	 eerr_le1(POST_ARGS);
 static	int	 ewarn_ge1(POST_ARGS);
 static	int	 herr_eq0(POST_ARGS);
 static	int	 herr_ge1(POST_ARGS);
@@ -89,10 +90,10 @@ static	int	 post_it(POST_ARGS);
 static	int	 post_lb(POST_ARGS);
 static	int	 post_nm(POST_ARGS);
 static	int	 post_root(POST_ARGS);
+static	int	 post_rs(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);
@@ -125,8 +126,9 @@ static	v_post	 posts_nd[] = { berr_ge1, NULL };
 static	v_post	 posts_nm[] = { post_nm, NULL };
 static	v_post	 posts_notext[] = { eerr_eq0, NULL };
 static	v_post	 posts_pf[] = { eerr_eq1, NULL };
+static	v_post	 posts_rs[] = { berr_ge1, herr_eq0, post_rs, 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_sp[] = { eerr_le1, 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 };
@@ -193,7 +195,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text },			/* Vt */ 
 	{ NULL, posts_xr },			/* Xr */ 
 	{ NULL, posts_text },			/* %A */
-	{ NULL, posts_text },			/* %B */
+	{ NULL, posts_text },			/* %B */ /* FIXME: can be used outside Rs/Re. */
 	{ NULL, posts_text },			/* %D */
 	{ NULL, posts_text },			/* %I */
 	{ NULL, posts_text },			/* %J */
@@ -201,7 +203,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text },			/* %O */
 	{ NULL, posts_text },			/* %P */
 	{ NULL, posts_text },			/* %R */
-	{ NULL, posts_text },			/* %T */
+	{ NULL, posts_text },			/* %T */ /* FIXME: can be used outside Rs/Re. */
 	{ NULL, posts_text },			/* %V */
 	{ NULL, NULL },				/* Ac */
 	{ NULL, NULL },				/* Ao */
@@ -236,7 +238,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Qo */
 	{ NULL, posts_wline },			/* Qq */
 	{ NULL, NULL },				/* Re */
-	{ NULL, posts_wline },			/* Rs */
+	{ NULL, posts_rs },			/* Rs */
 	{ NULL, NULL },				/* Sc */
 	{ NULL, NULL },				/* So */
 	{ NULL, posts_wline },			/* Sq */
@@ -406,6 +408,7 @@ CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)	/* berr_ge1
 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() */
+CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)	/* eerr_le1() */
 CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0)	/* eerr_eq0() */
 CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)	/* eerr_ge1() */
 CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)	/* herr_eq0() */
@@ -619,25 +622,33 @@ pre_bl(PRE_ARGS)
 		case (MDOC_Inset):
 			/* FALLTHROUGH */
 		case (MDOC_Column):
-			if (-1 != type) 
+			if (type >= 0) 
 				return(mdoc_nerr(mdoc, n, EMULTILIST));
 			type = n->args->argv[pos].arg;
 			break;
+		case (MDOC_Compact):
+			if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+				return(0);
+			break;
 		case (MDOC_Width):
-			if (-1 != width)
+			if (width >= 0)
 				return(mdoc_nerr(mdoc, n, EARGREP));
+			if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+				return(0);
 			width = n->args->argv[pos].arg;
 			break;
 		case (MDOC_Offset):
-			if (-1 != offset)
+			if (offset >= 0)
 				return(mdoc_nerr(mdoc, n, EARGREP));
+			if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+				return(0);
 			offset = n->args->argv[pos].arg;
 			break;
 		default:
 			break;
 		}
 
-	if (-1 == type)
+	if (type < 0)
 		return(mdoc_nerr(mdoc, n, ELISTTYPE));
 
 	/* 
@@ -648,7 +659,7 @@ pre_bl(PRE_ARGS)
 
 	switch (type) {
 	case (MDOC_Tag):
-		if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))
+		if (width < 0 && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))
 			return(0);
 		break;
 	case (MDOC_Column):
@@ -658,7 +669,7 @@ pre_bl(PRE_ARGS)
 	case (MDOC_Inset):
 		/* FALLTHROUGH */
 	case (MDOC_Item):
-		if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH))
+		if (width >= 0 && ! mdoc_nwarn(mdoc, n, ENOWIDTH))
 			return(0);
 		break;
 	default:
@@ -692,8 +703,6 @@ pre_bd(PRE_ARGS)
 		case (MDOC_Filled):
 			/* FALLTHROUGH */
 		case (MDOC_Literal):
-			/* FALLTHROUGH */
-		case (MDOC_File):
 			if (0 == type++) 
 				break;
 			return(mdoc_nerr(mdoc, n, EMULTIDISP));
@@ -1077,9 +1086,7 @@ post_bl(POST_ARGS)
 		if (MDOC_BLOCK == n->type) 
 			if (MDOC_It == n->tok)
 				continue;
-		return(mdoc_verr(mdoc, n->line, n->pos, 
-				"bad child of parent %s",
-				mdoc_macronames[mdoc->last->tok]));
+		return(mdoc_nerr(mdoc, n, EBADCHILD));
 	}
 
 	return(1);
@@ -1127,43 +1134,56 @@ post_root(POST_ARGS)
 
 
 static int
-post_sp(POST_ARGS)
+post_st(POST_ARGS)
 {
-	long		 lval;
-	char		*ep, *buf;
 
-	if (NULL == mdoc->last->child)
+	if (mdoc_a2st(mdoc->last->child->string))
 		return(1);
-	else if ( ! eerr_eq1(mdoc))
-		return(0);
-
-	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 < 0))
-		return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
-
-	return(1);
+	return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));
 }
 
 
-
-
 static int
-post_st(POST_ARGS)
+post_rs(POST_ARGS)
 {
+	struct mdoc_node	*nn;
 
-	if (mdoc_a2st(mdoc->last->child->string))
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
-	return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));
+
+	for (nn = mdoc->last->child; nn; nn = nn->next)
+		switch (nn->tok) {
+		case(MDOC__Q):
+			/* FALLTHROUGH */
+		case(MDOC__C):
+			/* FALLTHROUGH */
+		case(MDOC__A):
+			/* FALLTHROUGH */
+		case(MDOC__B):
+			/* FALLTHROUGH */
+		case(MDOC__D):
+			/* FALLTHROUGH */
+		case(MDOC__I):
+			/* FALLTHROUGH */
+		case(MDOC__J):
+			/* FALLTHROUGH */
+		case(MDOC__N):
+			/* FALLTHROUGH */
+		case(MDOC__O):
+			/* FALLTHROUGH */
+		case(MDOC__P):
+			/* FALLTHROUGH */
+		case(MDOC__R):
+			/* FALLTHROUGH */
+		case(MDOC__T):
+			/* FALLTHROUGH */
+		case(MDOC__V):
+			break;
+		default:
+			return(mdoc_nerr(mdoc, nn, EBADCHILD));
+		}
+
+	return(1);
 }