===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -p -r1.13 -r1.15
--- mandoc/eqn.c	2011/07/21 11:34:53	1.13
+++ mandoc/eqn.c	2011/07/21 12:30:44	1.15
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.13 2011/07/21 11:34:53 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.15 2011/07/21 12:30:44 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -48,15 +48,18 @@ static	void		 eqn_box_free(struct eqn_box *);
 static	struct eqn_def	*eqn_def_find(struct eqn_node *, 
 				const char *, size_t);
 static	int		 eqn_do_define(struct eqn_node *);
-static	int		 eqn_do_ign2(struct eqn_node *);
+static	int		 eqn_do_set(struct eqn_node *);
 static	int		 eqn_do_undef(struct eqn_node *);
 static	const char	*eqn_nexttok(struct eqn_node *, size_t *);
-static	const char	*eqn_next(struct eqn_node *, char, size_t *);
-static	int		 eqn_box(struct eqn_node *, struct eqn_box *);
+static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
+static	const char	*eqn_next(struct eqn_node *, 
+				char, size_t *, int);
+static	int		 eqn_box(struct eqn_node *, 
+				struct eqn_box *, struct eqn_box **);
 
 static	const struct eqnpart eqnparts[EQN__MAX] = {
 	{ "define", 6, eqn_do_define }, /* EQN_DEFINE */
-	{ "set", 3, eqn_do_ign2 }, /* EQN_SET */
+	{ "set", 3, eqn_do_set }, /* EQN_SET */
 	{ "undef", 5, eqn_do_undef }, /* EQN_UNDEF */
 };
 
@@ -117,7 +120,8 @@ eqn_alloc(int pos, int line, struct mparse *parse)
 enum rofferr
 eqn_end(struct eqn_node *ep)
 {
-	struct eqn_box	*root;
+	struct eqn_box	*root, *last;
+	int		 c;
 
 	ep->eqn.root = root = 
 		mandoc_calloc(1, sizeof(struct eqn_box));
@@ -127,21 +131,38 @@ eqn_end(struct eqn_node *ep)
 		return(ROFF_IGN);
 
 	/*
-	 * Validate the expression.
-	 * Use the grammar found in the literature.
+	 * Run the parser.
+	 * If we return before reaching the end of our input, our scope
+	 * is still open somewhere.
+	 * If we return alright but don't have a symmetric scoping, then
+	 * something's not right either.
+	 * Otherwise, return the equation.
 	 */
 
-	return(eqn_box(ep, root) < 0 ? ROFF_IGN : ROFF_EQN);
+	if ((c = eqn_box(ep, root, &last)) > 0) {
+		EQN_MSG(MANDOCERR_EQNNSCOPE, ep);
+		c = 0;
+	} else if (0 == c && last != root)
+		EQN_MSG(MANDOCERR_EQNSCOPE, ep);
+
+	return(1 == c ? ROFF_EQN : ROFF_IGN);
 }
 
 static int
-eqn_box(struct eqn_node *ep, struct eqn_box *last)
+eqn_box(struct eqn_node *ep, struct eqn_box *last, struct eqn_box **sv)
 {
 	size_t		 sz;
 	const char	*start;
-	int		 i, nextc;
+	int		 c, i, nextc;
 	struct eqn_box	*bp;
 
+	/* 
+	 * Mark our last level of subexpression. 
+	 * Also mark whether that the next node should be a
+	 * subexpression node.
+	 */
+
+	*sv = last;
 	nextc = 1;
 again:
 	if (NULL == (start = eqn_nexttok(ep, &sz)))
@@ -158,19 +179,39 @@ again:
 		goto again;
 	} 
 
-	bp = mandoc_calloc(1, sizeof(struct eqn_box));
-	bp->type = EQN_TEXT;
+	/* Exit this [hopefully] subexpression. */
 
+	if (sz == 1 && 0 == strncmp("}", start, 1)) 
+		return(1);
+
+	bp = mandoc_calloc(1, sizeof(struct eqn_box));
 	if (nextc)
 		last->child = bp;
 	else
 		last->next = bp;
 
+	last = bp;
+
+	/* 
+	 * See if we're to open a new subexpression.
+	 * If so, mark our node as such and descend.
+	 */
+
+	if (sz == 1 && 0 == strncmp("{", start, 1)) {
+		bp->type = EQN_SUBEXPR;
+		c = eqn_box(ep, bp, sv);
+
+		nextc = 0;
+		goto again;
+	}
+
+	/* A regular text node. */
+
+	bp->type = EQN_TEXT;
 	bp->text = mandoc_malloc(sz + 1);
 	*bp->text = '\0';
 	strlcat(bp->text, start, sz + 1);
 
-	last = bp;
 	nextc = 0;
 	goto again;
 }
@@ -206,14 +247,21 @@ eqn_box_free(struct eqn_box *bp)
 }
 
 static const char *
+eqn_nextrawtok(struct eqn_node *ep, size_t *sz)
+{
+
+	return(eqn_next(ep, '"', sz, 0));
+}
+
+static const char *
 eqn_nexttok(struct eqn_node *ep, size_t *sz)
 {
 
-	return(eqn_next(ep, '"', sz));
+	return(eqn_next(ep, '"', sz, 1));
 }
 
 static const char *
-eqn_next(struct eqn_node *ep, char quote, size_t *sz)
+eqn_next(struct eqn_node *ep, char quote, size_t *sz, int repl)
 {
 	char		*start, *next;
 	int		 q, diff, lim;
@@ -265,7 +313,7 @@ again:
 
 	/* Quotes aren't expanded for values. */
 
-	if (q)
+	if (q || ! repl)
 		return(start);
 
 	if (NULL != (def = eqn_def_find(ep, start, *sz))) {
@@ -289,13 +337,13 @@ again:
 }
 
 static int
-eqn_do_ign2(struct eqn_node *ep)
+eqn_do_set(struct eqn_node *ep)
 {
 	const char	*start;
 
-	if (NULL == (start = eqn_nexttok(ep, NULL)))
+	if (NULL == (start = eqn_nextrawtok(ep, NULL)))
 		EQN_MSG(MANDOCERR_EQNARGS, ep);
-	else if (NULL == (start = eqn_nexttok(ep, NULL)))
+	else if (NULL == (start = eqn_nextrawtok(ep, NULL)))
 		EQN_MSG(MANDOCERR_EQNARGS, ep);
 	else
 		return(1);
@@ -311,7 +359,7 @@ eqn_do_define(struct eqn_node *ep)
 	struct eqn_def	*def;
 	int		 i;
 
-	if (NULL == (start = eqn_nexttok(ep, &sz))) {
+	if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
 		EQN_MSG(MANDOCERR_EQNARGS, ep);
 		return(0);
 	}
@@ -344,7 +392,7 @@ eqn_do_define(struct eqn_node *ep)
 		def = &ep->defs[i];
 	}
 
-	start = eqn_next(ep, ep->data[(int)ep->cur], &sz);
+	start = eqn_next(ep, ep->data[(int)ep->cur], &sz, 0);
 
 	if (NULL == start) {
 		EQN_MSG(MANDOCERR_EQNARGS, ep);
@@ -355,9 +403,6 @@ eqn_do_define(struct eqn_node *ep)
 	def->val = mandoc_realloc(def->val, sz + 1);
 	memcpy(def->val, start, sz);
 	def->val[(int)sz] = '\0';
-
-	/*fprintf(stderr, "Defining: [%s], [%s]\n", 
-			def->key, def->val);*/
 	return(1);
 }
 
@@ -368,7 +413,7 @@ eqn_do_undef(struct eqn_node *ep)
 	struct eqn_def	*def;
 	size_t		 sz;
 
-	if (NULL == (start = eqn_nexttok(ep, &sz))) {
+	if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
 		EQN_MSG(MANDOCERR_EQNARGS, ep);
 		return(0);
 	} else if (NULL != (def = eqn_def_find(ep, start, sz)))