Give lists their own eqn function.

3 files changed, 64 insertions, 39 deletions

diff --git a/eqn.c b/eqn.c
index 66c55ff1..1d405396 100644
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.22 2011/07/22 00:16:37 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.23 2011/07/22 09:57:04 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -56,6 +56,7 @@ enum	eqnpartt {
 	EQN__MAX
 };
 
+static	enum eqn_rest	 eqn_box(struct eqn_node *, struct eqn_box *);
 static	struct eqn_box	*eqn_box_alloc(struct eqn_box *);
 static	void		 eqn_box_free(struct eqn_box *);
 static	struct eqn_def	*eqn_def_find(struct eqn_node *, 
@@ -63,13 +64,13 @@ static	struct eqn_def	*eqn_def_find(struct eqn_node *,
 static	int		 eqn_do_define(struct eqn_node *);
 static	int		 eqn_do_set(struct eqn_node *);
 static	int		 eqn_do_undef(struct eqn_node *);
+static	enum eqn_rest	 eqn_eqn(struct eqn_node *, struct eqn_box *);
+static	enum eqn_rest	 eqn_list(struct eqn_node *, struct eqn_box *);
 static	const char	*eqn_nexttok(struct eqn_node *, size_t *);
 static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
 static	const char	*eqn_next(struct eqn_node *, 
 				char, size_t *, int);
 static	void		 eqn_rewind(struct eqn_node *);
-static	enum eqn_rest	 eqn_eqn(struct eqn_node *, struct eqn_box *);
-static	enum eqn_rest	 eqn_box(struct eqn_node *, struct eqn_box *);
 
 static	const struct eqnpart eqnparts[EQN__MAX] = {
 	{ { "define", 6 }, eqn_do_define }, /* EQN_DEFINE */
@@ -204,6 +205,51 @@ eqn_eqn(struct eqn_node *ep, struct eqn_box *last)
 }
 
 static enum eqn_rest
+eqn_list(struct eqn_node *ep, struct eqn_box *last)
+{
+	struct eqn_box	*bp;
+	const char	*start;
+	size_t		 sz;
+	enum eqn_rest	 c;
+
+	bp = eqn_box_alloc(last);
+	bp->type = EQN_LIST;
+
+	if (NULL == (start = eqn_nexttok(ep, &sz))) {
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
+		return(EQN_ERR);
+	}
+	if (1 != sz || strncmp("{", start, 1)) {
+		EQN_MSG(MANDOCERR_EQNSYNT, ep);
+		return(EQN_ERR);
+	}
+
+	while (EQN_DESCOPE == (c = eqn_eqn(ep, bp))) {
+		eqn_rewind(ep);
+		start = eqn_nexttok(ep, &sz);
+		assert(start);
+		if (5 != sz || strncmp("above", start, 5))
+			break;
+		bp->last->above = 1;
+	}
+
+	if (EQN_DESCOPE != c) {
+		if (EQN_ERR != c)
+			EQN_MSG(MANDOCERR_EQNSCOPE, ep);
+		return(EQN_ERR);
+	}
+
+	eqn_rewind(ep);
+	start = eqn_nexttok(ep, &sz);
+	assert(start);
+	if (1 == sz && 0 == strncmp("}", start, 1))
+		return(EQN_OK);
+
+	EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
+	return(EQN_ERR);
+}
+
+static enum eqn_rest
 eqn_box(struct eqn_node *ep, struct eqn_box *last)
 {
 	size_t		 sz;
@@ -251,40 +297,9 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 			continue;
 		if (strncmp(eqnpiles[i].name, start, sz))
 			continue;
-		if (NULL == (start = eqn_nexttok(ep, &sz))) {
-			EQN_MSG(MANDOCERR_EQNEOF, ep);
-			return(EQN_ERR);
-		}
-		if (1 != sz || strncmp("{", start, 1)) {
-			EQN_MSG(MANDOCERR_EQNSYNT, ep);
-			return(EQN_ERR);
-		}
-
-		while (EQN_DESCOPE == (c = eqn_eqn(ep, last))) {
-			assert(last->last);
+		if (EQN_OK == (c = eqn_list(ep, last)))
 			last->last->pile = (enum eqn_pilet)i;
-			eqn_rewind(ep);
-			start = eqn_nexttok(ep, &sz);
-			assert(start);
-			if (5 != sz || strncmp("above", start, 5))
-				break;
-			last->last->above = 1;
-		}
-
-		if (EQN_DESCOPE != c) {
-			if (EQN_ERR != c)
-				EQN_MSG(MANDOCERR_EQNSCOPE, ep);
-			return(EQN_ERR);
-		}
-
-		eqn_rewind(ep);
-		start = eqn_nexttok(ep, &sz);
-		assert(start);
-		if (1 == sz && 0 == strncmp("}", start, 1))
-			return(EQN_OK);
-
-		EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
-		return(EQN_ERR);
+		return(c);
 	}
 
 	if (4 == sz && 0 == strncmp("left", start, 4)) {
diff --git a/mandoc.h b/mandoc.h
index 7431e95b..1817e54c 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.89 2011/07/21 23:30:39 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.90 2011/07/22 09:57:04 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -285,7 +285,8 @@ struct	tbl_span {
 enum	eqn_boxt {
 	EQN_ROOT, /* root of parse tree */
 	EQN_TEXT, /* text (number, variable, whatever) */
-	EQN_SUBEXPR /* nested subexpression */
+	EQN_SUBEXPR, /* nested `eqn' subexpression */
+	EQN_LIST /* list of subexpressions */
 };
 
 enum	eqn_markt {
diff --git a/tree.c b/tree.c
index 09ebca30..f8ab4977 100644
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.44 2011/07/21 23:30:39 kristaps Exp $ */
+/*	$Id: tree.c,v 1.45 2011/07/22 09:57:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -276,6 +276,15 @@ print_box(const struct eqn_box *ep, int indent)
 			ep->pos, ep->font, ep->mark);
 		print_box(ep->first, indent + 1);
 		break;
+	case (EQN_LIST):
+		printf("eqn-list(%d, %d, %d, %d, %d, %d, \"%s\", \"%s\")\n", 
+			EQN_DEFSIZE == ep->size ? 0 : ep->size,
+			ep->pos, ep->font, ep->mark,
+			ep->pile, ep->above,
+			ep->left ? ep->left : "",
+			ep->right ? ep->right : "");
+		print_box(ep->first, indent + 1);
+		break;
 	case (EQN_SUBEXPR):
 		printf("eqn-subxpr(%d, %d, %d, %d, %d, %d, \"%s\", \"%s\")\n", 
 			EQN_DEFSIZE == ep->size ? 0 : ep->size,