===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.1
retrieving revision 1.17
diff -u -p -r1.1 -r1.17
--- mandoc/Attic/validate.c	2008/11/29 14:14:21	1.1
+++ mandoc/Attic/validate.c	2009/01/07 15:53:00	1.17
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.1 2008/11/29 14:14:21 kristaps Exp $ */
+/* $Id: validate.c,v 1.17 2009/01/07 15:53:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,350 +16,235 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/param.h>
-
 #include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "libmdocml.h"
 #include "private.h"
 
-#ifdef	__linux__ /* FIXME */
-#define	strlcat		strncat
-#endif
 
-struct	md_valid {
-	const struct md_args	*args;
-	const struct md_rbuf	*rbuf;
-	struct md_mbuf	*mbuf;
-	struct rofftree	*tree;
+typedef	int	(*v_pre)(struct mdoc *, int, int, 
+			int, const struct mdoc_arg *);
+typedef	int	(*v_post)(struct mdoc *, int, int);
 
-	size_t		 indent;
-	size_t		 pos;
 
-	int		 flags;
-#define	MD_LITERAL	(1 << 0)
+struct	valids {
+	v_pre	 pre;
+	v_post	*post;
 };
 
-static	void		 roffmsg(void *arg, enum roffmsg, 
-				const char *, const char *, char *);
-static	int		 roffhead(void *);
-static	int		 rofftail(void *);
-static	int		 roffin(void *, int, int *, char **);
-static	int		 roffdata(void *, char *);
-static	int		 roffout(void *, int);
-static	int		 roffblkin(void *, int);
-static	int		 roffblkout(void *, int);
-static	int		 roffspecial(void *, int);
 
-static	int		 mbuf_newline(struct md_valid *);
-static	int		 mbuf_indent(struct md_valid *);
-static	int		 mbuf_data(struct md_valid *, char *);
+static	int	pre_sh(struct mdoc *, int, int, 
+			int, const struct mdoc_arg *);
+static	int	post_headchild_err_ge1(struct mdoc *, int, int);
+static	int	post_headchild_err_le8(struct mdoc *, int, int);
+static	int	post_bodychild_warn_ge1(struct mdoc *, int, int);
 
+static v_post	posts_sh[] = { post_headchild_err_ge1, 
+			post_bodychild_warn_ge1, 
+			post_headchild_err_le8, NULL };
 
-static int
-mbuf_indent(struct md_valid *p)
-{
-	size_t		 i;
 
-	assert(0 == p->pos);
+const	struct valids mdoc_valids[MDOC_MAX] = {
+	{ NULL, NULL }, /* \" */
+	{ NULL, NULL }, /* Dd */ /* TODO */
+	{ NULL, NULL }, /* Dt */ /* TODO */
+	{ NULL, NULL }, /* Os */ /* TODO */
+	{ pre_sh, posts_sh }, /* Sh */ /* FIXME: preceding Pp. */
+	{ NULL, NULL }, /* Ss */ /* FIXME: preceding Pp. */
+	{ NULL, NULL }, /* Pp */ 
+	{ NULL, NULL }, /* D1 */
+	{ NULL, NULL }, /* Dl */
+	{ NULL, NULL }, /* Bd */ /* FIXME: preceding Pp. */
+	{ NULL, NULL }, /* Ed */
+	{ NULL, NULL }, /* Bl */ /* FIXME: preceding Pp. */
+	{ NULL, NULL }, /* El */
+	{ NULL, NULL }, /* It */
+	{ NULL, NULL }, /* Ad */ 
+	{ NULL, NULL }, /* An */
+	{ NULL, NULL }, /* Ar */
+	{ NULL, NULL }, /* Cd */
+	{ NULL, NULL }, /* Cm */
+	{ NULL, NULL }, /* Dv */ 
+	{ NULL, NULL }, /* Er */ 
+	{ NULL, NULL }, /* Ev */ 
+	{ NULL, NULL }, /* Ex */
+	{ NULL, NULL }, /* Fa */ 
+	{ NULL, NULL }, /* Fd */ 
+	{ NULL, NULL }, /* Fl */
+	{ NULL, NULL }, /* Fn */ 
+	{ NULL, NULL }, /* Ft */ 
+	{ NULL, NULL }, /* Ic */ 
+	{ NULL, NULL }, /* In */ 
+	{ NULL, NULL }, /* Li */
+	{ NULL, NULL }, /* Nd */ 
+	{ NULL, NULL }, /* Nm */ 
+	{ NULL, NULL }, /* Op */
+	{ NULL, NULL }, /* Ot */
+	{ NULL, NULL }, /* Pa */
+	{ NULL, NULL }, /* Rv */
+	{ NULL, NULL }, /* St */
+	{ NULL, NULL }, /* Va */
+	{ NULL, NULL }, /* Vt */ 
+	{ NULL, NULL }, /* Xr */
+	{ NULL, NULL }, /* %A */
+	{ NULL, NULL }, /* %B */
+	{ NULL, NULL }, /* %D */
+	{ NULL, NULL }, /* %I */
+	{ NULL, NULL }, /* %J */
+	{ NULL, NULL }, /* %N */
+	{ NULL, NULL }, /* %O */
+	{ NULL, NULL }, /* %P */
+	{ NULL, NULL }, /* %R */
+	{ NULL, NULL }, /* %T */
+	{ NULL, NULL }, /* %V */
+	{ NULL, NULL }, /* Ac */
+	{ NULL, NULL }, /* Ao */
+	{ NULL, NULL }, /* Aq */
+	{ NULL, NULL }, /* At */ /* FIXME */
+	{ NULL, NULL }, /* Bc */
+	{ NULL, NULL }, /* Bf */ 
+	{ NULL, NULL }, /* Bo */
+	{ NULL, NULL }, /* Bq */
+	{ NULL, NULL }, /* Bsx */
+	{ NULL, NULL }, /* Bx */
+	{ NULL, NULL }, /* Db */
+	{ NULL, NULL }, /* Dc */
+	{ NULL, NULL }, /* Do */
+	{ NULL, NULL }, /* Dq */
+	{ NULL, NULL }, /* Ec */
+	{ NULL, NULL }, /* Ef */ /* -symbolic, etc. */
+	{ NULL, NULL }, /* Em */ 
+	{ NULL, NULL }, /* Eo */
+	{ NULL, NULL }, /* Fx */
+	{ NULL, NULL }, /* Ms */
+	{ NULL, NULL }, /* No */
+	{ NULL, NULL }, /* Ns */
+	{ NULL, NULL }, /* Nx */
+	{ NULL, NULL }, /* Ox */
+	{ NULL, NULL }, /* Pc */
+	{ NULL, NULL }, /* Pf */ /* 2 or more arguments */
+	{ NULL, NULL }, /* Po */
+	{ NULL, NULL }, /* Pq */ /* FIXME: ignore following Sh/Ss */
+	{ NULL, NULL }, /* Qc */
+	{ NULL, NULL }, /* Ql */
+	{ NULL, NULL }, /* Qo */
+	{ NULL, NULL }, /* Qq */
+	{ NULL, NULL }, /* Re */
+	{ NULL, NULL }, /* Rs */
+	{ NULL, NULL }, /* Sc */
+	{ NULL, NULL }, /* So */
+	{ NULL, NULL }, /* Sq */
+	{ NULL, NULL }, /* Sm */
+	{ NULL, NULL }, /* Sx */
+	{ NULL, NULL }, /* Sy */
+	{ NULL, NULL }, /* Tn */
+	{ NULL, NULL }, /* Ux */
+	{ NULL, NULL }, /* Xc */
+	{ NULL, NULL }, /* Xo */
+	{ NULL, NULL }, /* Fo */ 
+	{ NULL, NULL }, /* Fc */ 
+	{ NULL, NULL }, /* Oo */
+	{ NULL, NULL }, /* Oc */
+	{ NULL, NULL }, /* Bk */
+	{ NULL, NULL }, /* Ek */
+	{ NULL, NULL }, /* Bt */
+	{ NULL, NULL }, /* Hf */
+	{ NULL, NULL }, /* Fr */
+	{ NULL, NULL }, /* Ud */
+};
 
-	for (i = 0; i < MIN(p->indent, 4); i++)
-		if ( ! md_buf_putstring(p->mbuf, "    "))
-			return(0);
 
-	p->pos = i * 4;
-	return(1);
-}
-
-
 static int
-mbuf_atnewline(struct md_valid *p)
+post_bodychild_warn_ge1(struct mdoc *mdoc, int tok, int pos)
 {
 
-	return(p->pos == MIN(4, p->indent));
-}
-
-
-static int
-mbuf_newline(struct md_valid *p)
-{
-
-	if (mbuf_atnewline(p))
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
-	if ( ! md_buf_putchar(p->mbuf, '\n'))
-		return(0);
+	if (mdoc->last->child)
+		return(1);
 
-	p->pos = 0;
-	return(mbuf_indent(p));
+	return(mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1));
 }
 
 
 static int
-mbuf_data(struct md_valid *p, char *buf)
+post_headchild_err_ge1(struct mdoc *mdoc, int tok, int pos)
 {
-	size_t		 sz;
-	char		*bufp;
 
-	assert(p->mbuf);
-	assert(0 != p->indent);
-
-	if (MD_LITERAL & p->flags)
-		return(md_buf_putstring(p->mbuf, buf));
-
-	if (0 == p->pos)
-		mbuf_indent(p);
-
-	/*
-	 * Indent if we're at the beginning of a line.  Don't indent
-	 * more than 16 or so characters.
-	 */
-
-	while (*buf) {
-		while (*buf && isspace(*buf))
-			buf++;
-
-		if (0 == *buf)
-			break;
-
-		bufp = buf;
-		while (*buf && ! isspace(*buf))
-			buf++;
-
-		if (0 != *buf)
-			*buf++ = 0;
-
-		/* Process word. */
-
-		sz = strlen(bufp);
-		
-		if (sz + p->pos < 72) {
-			if ( ! md_buf_putstring(p->mbuf, bufp))
-				return(0);
-
-			/* FIXME: check punctuation. */
-
-			if ( ! md_buf_putchar(p->mbuf, ' '))
-				return(0);
-			p->pos += sz + 1;
-			continue;
-		}
-
-		if ( ! mbuf_newline(p))
-			return(0);
-
-		if ( ! md_buf_putstring(p->mbuf, bufp))
-			return(0);
-
-		/* FIXME: check punctuation. */
-
-		if ( ! md_buf_putchar(p->mbuf, ' '))
-			return(0);
-		p->pos += sz + 1;
-	}
-
-	return(1);
+	if (MDOC_HEAD != mdoc->last->type)
+		return(1);
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
 }
 
 
-int
-md_line_valid(void *arg, char *buf)
-{
-	struct md_valid	*p;
-
-	p = (struct md_valid *)arg;
-	return(roff_engine(p->tree, buf));
-}
-
-
-int
-md_exit_valid(void *data, int flush)
-{
-	int		 c;
-	struct md_valid	*p;
-
-	p = (struct md_valid *)data;
-	c = roff_free(p->tree, flush);
-	free(p);
-
-	return(c);
-}
-
-
-void *
-md_init_valid(const struct md_args *args,
-		struct md_mbuf *mbuf, const struct md_rbuf *rbuf)
-{
-	struct roffcb	 cb;
-	struct md_valid	*p;
-
-	cb.roffhead = roffhead;
-	cb.rofftail = rofftail;
-	cb.roffin = roffin;
-	cb.roffout = roffout;
-	cb.roffblkin = roffblkin;
-	cb.roffblkout = roffblkout;
-	cb.roffspecial = roffspecial;
-	cb.roffmsg = roffmsg;
-	cb.roffdata = roffdata;
-
-	if (NULL == (p = calloc(1, sizeof(struct md_valid))))
-		err(1, "malloc");
-
-	p->args = args;
-	p->mbuf = mbuf;
-	p->rbuf = rbuf;
-
-	assert(mbuf);
-
-	if (NULL == (p->tree = roff_alloc(&cb, p))) {
-		free(p);
-		return(NULL);
-	}
-
-	return(p);
-}
-
-
-/* ARGSUSED */
 static int
-roffhead(void *arg)
+post_headchild_err_le8(struct mdoc *mdoc, int tok, int pos)
 {
+	int		  i;
+	struct mdoc_node *n;
 
-	return(1);
-}
-
-
-static int
-rofftail(void *arg)
-{
-	struct md_valid	*p;
-
-	assert(arg);
-	p = (struct md_valid *)arg;
-
-	if (mbuf_atnewline(p))
+	if (MDOC_HEAD != mdoc->last->type)
 		return(1);
-
-	return(md_buf_putchar(p->mbuf, '\n'));
+	for (i = 0, n = mdoc->last->child; n; n = n->next, i++)
+		/* Do nothing. */ ;
+	if (i <= 8)
+		return(1);
+	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_LE8));
 }
 
 
 static int
-roffspecial(void *arg, int tok)
+pre_sh(struct mdoc *mdoc, int tok, int pos,
+		int argc, const struct mdoc_arg *argv)
 {
 
 	return(1);
 }
 
 
-static int
-roffblkin(void *arg, int tok)
+int
+mdoc_valid_pre(struct mdoc *mdoc, int tok, int pos, 
+		int argc, const struct mdoc_arg *argv)
 {
-	struct md_valid	*p;
 
-	assert(arg);
-	p = (struct md_valid *)arg;
-
-	if ( ! mbuf_atnewline(p)) {
-		if ( ! md_buf_putchar(p->mbuf, '\n'))
-			return(0);
-		p->pos = 0;
-		if ( ! mbuf_indent(p))
-			return(0);
-	}
-
-	if ( ! md_buf_putstring(p->mbuf, toknames[tok]))
-		return(0);
-
-	if ( ! md_buf_putchar(p->mbuf, '\n'))
-		return(0);
-
-	p->pos = 0;
-	p->indent++;
-
-	return(mbuf_indent(p));
+	if (NULL == mdoc_valids[tok].pre)
+		return(1);
+	return((*mdoc_valids[tok].pre)(mdoc, tok, pos, argc, argv));
 }
 
 
-static int
-roffblkout(void *arg, int tok)
+int
+mdoc_valid_post(struct mdoc *mdoc, int pos)
 {
-	struct md_valid	*p;
+	v_post		*p;
+	int		 t;
 
-	assert(arg);
-	p = (struct md_valid *)arg;
-
-	if ( ! md_buf_putchar(p->mbuf, '\n'))
-		return(0);
-
-	p->pos = 0;
-	p->indent--;
-
-	return(mbuf_indent(p));
-}
-
-
-static int
-roffin(void *arg, int tok, int *argcp, char **argvp)
-{
-
-	return(1);
-}
-
-
-static int
-roffout(void *arg, int tok)
-{
-
-	return(1);
-}
-
-
-
-static void
-roffmsg(void *arg, enum roffmsg lvl, 
-		const char *buf, const char *pos, char *msg)
-{
-	char		*level;
-	struct md_valid	*p;
-
-	assert(arg);
-	p = (struct md_valid *)arg;
-
-	switch (lvl) {
-	case (ROFF_WARN):
-		if ( ! (MD_WARN_ALL & p->args->warnings))
-			return;
-		level = "warning";
+	switch (mdoc->last->type) {
+	case (MDOC_BODY):
+		t = mdoc->last->data.body.tok;
 		break;
-	case (ROFF_ERROR):
-		level = "error";
+	case (MDOC_ELEM):
+		t = mdoc->last->data.elem.tok;
 		break;
+	case (MDOC_BLOCK):
+		t = mdoc->last->data.block.tok;
+		break;
+	case (MDOC_HEAD):
+		t = mdoc->last->data.head.tok;
+		break;
 	default:
-		abort();
+		return(1);
 	}
-	
-	if (pos)
-		(void)fprintf(stderr, "%s:%zu: %s: %s\n", 
-				p->rbuf->name, p->rbuf->line, level, msg);
-	else
-		(void)fprintf(stderr, "%s: %s: %s\n", 
-				p->rbuf->name, level, msg);
 
-}
+	if (NULL == mdoc_valids[t].post)
+		return(1);
 
+	for (p = mdoc_valids[t].post; *p; p++)
+		if ( ! (*p)(mdoc, t, pos)) 
+			return(0);
 
-static int
-roffdata(void *arg, char *buf)
-{
-	struct md_valid	*p;
-
-	assert(arg);
-	p = (struct md_valid *)arg;
-	return(mbuf_data(p, buf));
+	return(1);
 }
+