===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.26
retrieving revision 1.30
diff -u -p -r1.26 -r1.30
--- mandoc/Attic/validate.c	2009/01/12 16:39:57	1.26
+++ mandoc/Attic/validate.c	2009/01/15 17:38:58	1.30
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.26 2009/01/12 16:39:57 kristaps Exp $ */
+/* $Id: validate.c,v 1.30 2009/01/15 17:38:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -41,11 +41,13 @@ static	int	pre_prologue(struct mdoc *, struct mdoc_nod
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 
 static	int	headchild_err_ge1(struct mdoc *);
+static	int	headchild_warn_ge1(struct mdoc *);
 static	int	headchild_err_eq0(struct mdoc *);
 static	int	elemchild_err_eq0(struct mdoc *);
 static	int	elemchild_err_ge1(struct mdoc *);
 static	int	elemchild_warn_eq0(struct mdoc *);
 static	int	bodychild_warn_ge1(struct mdoc *);
+static	int	bodychild_err_eq0(struct mdoc *);
 static	int	elemchild_warn_ge1(struct mdoc *);
 static	int	post_sh(struct mdoc *);
 static	int	post_bl(struct mdoc *);
@@ -56,16 +58,14 @@ static	v_pre	pres_d1[] = { pre_display, NULL };
 static	v_pre	pres_bd[] = { pre_display, pre_bd, NULL };
 static	v_pre	pres_bl[] = { pre_bl, NULL };
 static	v_pre	pres_it[] = { pre_it, NULL };
-static	v_post	posts_bd[] = { headchild_err_eq0, 
-			bodychild_warn_ge1, NULL };
 
+static	v_post	posts_bd[] = { headchild_err_eq0, bodychild_warn_ge1, NULL };
 static	v_post	posts_text[] = { elemchild_err_ge1, NULL };
 static	v_post	posts_wtext[] = { elemchild_warn_ge1, NULL };
 static	v_post	posts_notext[] = { elemchild_err_eq0, NULL };
-static	v_post	posts_sh[] = { headchild_err_ge1, 
-			bodychild_warn_ge1, post_sh, NULL };
-static	v_post	posts_bl[] = { headchild_err_eq0, 
-			bodychild_warn_ge1, post_bl, NULL };
+static	v_post	posts_wline[] = { headchild_warn_ge1, bodychild_err_eq0, NULL };
+static	v_post	posts_sh[] = { headchild_err_ge1, bodychild_warn_ge1, post_sh, NULL };
+static	v_post	posts_bl[] = { headchild_err_eq0, bodychild_warn_ge1, post_bl, NULL };
 static	v_post	posts_it[] = { post_it, NULL };
 static	v_post	posts_ss[] = { headchild_err_ge1, NULL };
 static	v_post	posts_pp[] = { elemchild_warn_eq0, NULL };
@@ -79,8 +79,10 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ pres_prologue, NULL }, /* Os */
 	/* FIXME: preceding Pp. */ 
 	/* FIXME: NAME section internal ordering. */
+	/* FIXME: can only be a child of root. */
 	{ NULL, posts_sh }, /* Sh */ 
 	/* FIXME: preceding Pp. */
+	/* FIXME: can only be a child of Sh. */
 	{ NULL, posts_ss }, /* Ss */ 
 	/* FIXME: proceeding... */
 	{ NULL, posts_pp }, /* Pp */ 
@@ -114,7 +116,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text }, /* Li */
 	{ NULL, posts_wtext }, /* Nd */
 	{ NULL, NULL }, /* Nm */  /* FIXME: If name not set? */
-	{ NULL, posts_wtext }, /* Op */
+	{ NULL, posts_wline }, /* Op */
 	{ NULL, NULL }, /* Ot */
 	{ NULL, NULL }, /* Pa */
 	{ NULL, posts_notext }, /* Rv */ /* -std required */
@@ -135,18 +137,18 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text }, /* %V */
 	{ NULL, NULL }, /* Ac */
 	{ NULL, NULL }, /* Ao */
-	{ NULL, posts_wtext }, /* Aq */
+	{ NULL, posts_wline }, /* Aq */
 	{ NULL, NULL }, /* At */ /* FIXME */
 	{ NULL, NULL }, /* Bc */
 	{ NULL, NULL }, /* Bf */ 
 	{ NULL, NULL }, /* Bo */
-	{ NULL, posts_wtext }, /* Bq */
+	{ NULL, posts_wline }, /* Bq */
 	{ NULL, NULL }, /* Bsx */
 	{ NULL, NULL }, /* Bx */
 	{ NULL, NULL }, /* Db */ /* FIXME: boolean */
 	{ NULL, NULL }, /* Dc */
 	{ NULL, NULL }, /* Do */
-	{ NULL, posts_wtext }, /* Dq */
+	{ NULL, posts_wline }, /* Dq */
 	{ NULL, NULL }, /* Ec */
 	{ NULL, NULL }, /* Ef */ /* -symbolic, etc. */
 	{ NULL, posts_text }, /* Em */ 
@@ -160,16 +162,16 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL }, /* Pc */
 	{ NULL, NULL }, /* Pf */ /* FIXME: 2 or more arguments */
 	{ NULL, NULL }, /* Po */
-	{ NULL, posts_wtext }, /* Pq */ /* FIXME: ignore following Sh/Ss */
+	{ NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */
 	{ NULL, NULL }, /* Qc */
-	{ NULL, posts_wtext }, /* Ql */
+	{ NULL, posts_wline }, /* Ql */
 	{ NULL, NULL }, /* Qo */
-	{ NULL, posts_wtext }, /* Qq */
+	{ NULL, posts_wline }, /* Qq */
 	{ NULL, NULL }, /* Re */
 	{ NULL, NULL }, /* Rs */
 	{ NULL, NULL }, /* Sc */
 	{ NULL, NULL }, /* So */
-	{ NULL, posts_wtext }, /* Sq */
+	{ NULL, posts_wline }, /* Sq */
 	{ NULL, NULL }, /* Sm */ /* FIXME: boolean */
 	{ NULL, posts_text }, /* Sx */
 	{ NULL, posts_text }, /* Sy */
@@ -191,6 +193,18 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 
 
 static int
+bodychild_err_eq0(struct mdoc *mdoc)
+{
+
+	if (MDOC_BODY != mdoc->last->type)
+		return(1);
+	if (NULL == mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_EQ0));
+}
+
+
+static int
 bodychild_warn_ge1(struct mdoc *mdoc)
 {
 
@@ -261,6 +275,18 @@ headchild_err_eq0(struct mdoc *mdoc)
 
 
 static int
+headchild_warn_ge1(struct mdoc *mdoc)
+{
+
+	if (MDOC_HEAD != mdoc->last->type)
+		return(1);
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_GE1));
+}
+
+
+static int
 headchild_err_ge1(struct mdoc *mdoc)
 {
 
@@ -286,7 +312,7 @@ pre_display(struct mdoc *mdoc, struct mdoc_node *node)
 				break;
 	if (NULL == n)
 		return(1);
-	return(mdoc_verr(mdoc, node, ERR_SCOPE_NONEST));
+	return(mdoc_nerr(mdoc, node, ERR_SCOPE_NONEST));
 }
 
 
@@ -369,6 +395,8 @@ pre_bd(struct mdoc *mdoc, struct mdoc_node *node)
 			/* FALLTHROUGH */
 		case (MDOC_Unfilled):
 			/* FALLTHROUGH */
+		case (MDOC_Filled):
+			/* FALLTHROUGH */
 		case (MDOC_Literal):
 			/* FALLTHROUGH */
 		case (MDOC_File):
@@ -399,9 +427,9 @@ pre_it(struct mdoc *mdoc, struct mdoc_node *node)
 	assert(MDOC_It == mdoc->last->tok);
 
 	if (MDOC_BODY != mdoc->last->parent->type) 
-		return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
+		return(mdoc_nerr(mdoc, node, ERR_SYNTAX_PARENTBAD));
 	if (MDOC_Bl != mdoc->last->parent->tok)
-		return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
+		return(mdoc_nerr(mdoc, node, ERR_SYNTAX_PARENTBAD));
 
 	return(1);
 }
@@ -412,7 +440,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 {
 
 	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_verr(mdoc, node, ERR_SEC_NPROLOGUE));
+		return(mdoc_nerr(mdoc, node, ERR_SEC_NPROLOGUE));
 	assert(MDOC_ELEM == node->type);
 
 	/* Check for ordering. */
@@ -421,15 +449,15 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 	case (MDOC_Os):
 		if (mdoc->meta.title[0] && mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, ERR_SEC_PROLOGUE_OO));
 	case (MDOC_Dt):
 		if (0 == mdoc->meta.title[0] && mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, ERR_SEC_PROLOGUE_OO));
 	case (MDOC_Dd):
 		if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, ERR_SEC_PROLOGUE_OO));
 	default:
 		abort();
 		/* NOTREACHED */
@@ -455,7 +483,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 		/* NOTREACHED */
 	}
 
-	return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_REP));
+	return(mdoc_nerr(mdoc, node, ERR_SEC_PROLOGUE_REP));
 }
 
 
@@ -590,7 +618,7 @@ post_bl(struct mdoc *mdoc)
 	}
 	if (NULL == n)
 		return(1);
-	return(mdoc_verr(mdoc, n, ERR_SYNTAX_CHILDBAD));
+	return(mdoc_nerr(mdoc, n, ERR_SYNTAX_CHILDBAD));
 }