===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.40
retrieving revision 1.43
diff -u -p -r1.40 -r1.43
--- mandoc/Attic/macro.c	2009/01/17 16:15:27	1.40
+++ mandoc/Attic/macro.c	2009/01/19 17:51:32	1.43
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.40 2009/01/17 16:15:27 kristaps Exp $ */
+/* $Id: macro.c,v 1.43 2009/01/19 17:51:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -35,18 +35,16 @@ static	int	  rewind_dohalt(int, enum mdoc_type, 
 #define	REWIND_REWIND	(1 << 0)
 #define	REWIND_NOHALT	(1 << 1)
 #define	REWIND_HALT	(1 << 2)
-static	int	  rewind_dobreak(int, enum mdoc_type, 
-			const struct mdoc_node *);
+static	int	  rewind_dobreak(int, const struct mdoc_node *);
 
 
 static	int	  rewind_elem(struct mdoc *, int);
 static	int	  rewind_impblock(struct mdoc *, int, int, int);
 static	int	  rewind_expblock(struct mdoc *, int, int, int);
-static	int	  rewind_subblock(enum mdoc_type, struct mdoc *, int);
-static	int	  rewind_last(int, int, 
-			struct mdoc *, struct mdoc_node *);
-static	int	  append_delims(struct mdoc *, 
-			int, int, int *, char *);
+static	int	  rewind_subblock(enum mdoc_type, 
+			struct mdoc *, int, int, int);
+static	int	  rewind_last(struct mdoc *, struct mdoc_node *);
+static	int	  append_delims(struct mdoc *, int, int *, char *);
 static	int	  lookup(struct mdoc *, int, int, int, const char *);
 
 
@@ -60,7 +58,6 @@ lookup(struct mdoc *mdoc, int line, int pos, int from,
 		return(res);
 	if (MDOC_MAX == res)
 		return(res);
-
 	if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter"))
 		return(-1);
 	return(MDOC_MAX);
@@ -68,39 +65,24 @@ lookup(struct mdoc *mdoc, int line, int pos, int from,
 
 
 static int
-rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to)
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
 {
 
 	assert(to);
 	mdoc->next = MDOC_NEXT_SIBLING;
-	if (mdoc->last == to) {
+
+	while (mdoc->last != to) {
 		if ( ! mdoc_valid_post(mdoc))
 			return(0);
 		if ( ! mdoc_action_post(mdoc))
 			return(0);
-		mdoc_msg(mdoc, "rewound %s %s to %s %s", 
-				mdoc_type2a(type),
-				mdoc_macronames[tok],
-				mdoc_type2a(mdoc->last->type),
-				mdoc_macronames[mdoc->last->tok]);
-		return(1);
-	}
-
-	do {
 		mdoc->last = mdoc->last->parent;
 		assert(mdoc->last);
-		if ( ! mdoc_valid_post(mdoc))
-			return(0);
-		if ( ! mdoc_action_post(mdoc))
-			return(0);
-		mdoc_msg(mdoc, "rewound %s %s to %s %s",
-				mdoc_type2a(type),
-				mdoc_macronames[tok],
-				mdoc_type2a(mdoc->last->type),
-				mdoc_macronames[mdoc->last->tok]);
-	} while (mdoc->last != to);
+	}
 
-	return(1);
+	if ( ! mdoc_valid_post(mdoc))
+		return(0);
+	return(mdoc_action_post(mdoc));
 }
 
 
@@ -152,10 +134,8 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru
 
 	if (MDOC_ROOT == p->type)
 		return(REWIND_HALT);
-	if (MDOC_TEXT == p->type) 
+	if (MDOC_VALID & p->flags)
 		return(REWIND_NOHALT);
-	if (MDOC_ELEM == p->type) 
-		return(REWIND_NOHALT);
 
 	switch (tok) {
 	/* One-liner implicit-scope. */
@@ -281,7 +261,7 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru
 
 
 static int
-rewind_dobreak(int tok, enum mdoc_type type, const struct mdoc_node *p)
+rewind_dobreak(int tok, const struct mdoc_node *p)
 {
 
 	assert(MDOC_ROOT != p->type);
@@ -289,6 +269,8 @@ rewind_dobreak(int tok, enum mdoc_type type, const str
 		return(1);
 	if (MDOC_TEXT == p->type)
 		return(1);
+	if (MDOC_VALID & p->flags)
+		return(1);
 
 	switch (tok) {
 	/* Implicit rules. */
@@ -330,36 +312,31 @@ rewind_elem(struct mdoc *mdoc, int tok)
 	assert(MDOC_ELEM == n->type);
 	assert(tok == n->tok);
 
-	return(rewind_last(tok, MDOC_ELEM, mdoc, n));
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, int tok)
+rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, 
+		int tok, int line, int ppos)
 {
 	struct mdoc_node *n;
 	int		  c;
 
-	c = rewind_dohalt(tok, type, mdoc->last);
-	if (REWIND_HALT == c)
-		return(1);
-	if (REWIND_REWIND == c)
-		return(rewind_last(tok, type, mdoc, mdoc->last));
-
 	/* LINTED */
-	for (n = mdoc->last->parent; n; n = n->parent) {
+	for (n = mdoc->last; n; n = n->parent) {
 		c = rewind_dohalt(tok, type, n);
 		if (REWIND_HALT == c)
 			return(1);
 		if (REWIND_REWIND == c)
 			break;
-		else if (rewind_dobreak(tok, type, n))
+		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_nerr(mdoc, n, "body scope broken"));
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
 	}
 
 	assert(n);
-	return(rewind_last(tok, type, mdoc, n));
+	return(rewind_last(mdoc, n));
 }
 
 
@@ -369,26 +346,20 @@ rewind_expblock(struct mdoc *mdoc, int tok, int line, 
 	struct mdoc_node *n;
 	int		  c;
 
-	c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last);
-	if (REWIND_HALT == c)
-		return(mdoc_perr(mdoc, line, ppos, "closing macro has no context"));
-	if (REWIND_REWIND == c)
-		return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last));
-
 	/* LINTED */
-	for (n = mdoc->last->parent; n; n = n->parent) {
+	for (n = mdoc->last; n; n = n->parent) {
 		c = rewind_dohalt(tok, MDOC_BLOCK, n);
 		if (REWIND_HALT == c)
 			return(mdoc_perr(mdoc, line, ppos, "closing macro has no context"));
 		if (REWIND_REWIND == c)
 			break;
-		else if (rewind_dobreak(tok, MDOC_BLOCK, n))
+		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_nerr(mdoc, n, "block scope broken"));
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
 	}
 
 	assert(n);
-	return(rewind_last(tok, MDOC_BLOCK, mdoc, n));
+	return(rewind_last(mdoc, n));
 }
 
 
@@ -398,32 +369,25 @@ rewind_impblock(struct mdoc *mdoc, int tok, int line, 
 	struct mdoc_node *n;
 	int		  c;
 
-	c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last);
-	if (REWIND_HALT == c)
-		return(1);
-	if (REWIND_REWIND == c)
-		return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last));
-
 	/* LINTED */
-	for (n = mdoc->last->parent; n; n = n->parent) {
+	for (n = mdoc->last; n; n = n->parent) {
 		c = rewind_dohalt(tok, MDOC_BLOCK, n);
 		if (REWIND_HALT == c)
 			return(1);
 		else if (REWIND_REWIND == c)
 			break;
-		else if (rewind_dobreak(tok, MDOC_BLOCK, n))
+		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_nerr(mdoc, n, "block scope broken"));
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
 	}
 
 	assert(n);
-	return(rewind_last(tok, MDOC_BLOCK, mdoc, n));
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-append_delims(struct mdoc *mdoc, int tok, 
-		int line, int *pos, char *buf)
+append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
 {
 	int		 c, lastarg;
 	char		*p;
@@ -448,7 +412,6 @@ append_delims(struct mdoc *mdoc, int tok, 
 }
 
 
-/* ARGSUSED */
 int
 macro_scoped_close(MACRO_PROT_ARGS)
 {
@@ -466,19 +429,19 @@ macro_scoped_close(MACRO_PROT_ARGS)
 
 	tt = rewind_alt(tok);
 
-	mdoc_msg(mdoc, "parse-quiet: %s closing %s",
+	mdoc_msg(mdoc, "parse: %s closing %s",
 			mdoc_macronames[tok], mdoc_macronames[tt]);
 
 	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
 		if (0 == buf[*pos]) {
-			if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+			if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
 				return(0);
 			return(rewind_expblock(mdoc, tok, line, ppos));
 		}
 		return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters"));
 	}
 
-	if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+	if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
 		return(0);
 
 	lastarg = ppos;
@@ -490,7 +453,7 @@ macro_scoped_close(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
-	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+	for (j = 0; /* No sentinel. */; j++) {
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
@@ -525,31 +488,19 @@ macro_scoped_close(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
 	if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos))
 		return(0);
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, line, pos, buf));
+	return(append_delims(mdoc, line, pos, buf));
 }
 
 
-/*
- * A general text domain macro.  When invoked, this opens a scope that
- * accepts words until either end-of-line, only-punctuation, or a
- * callable macro.  If the word is punctuation (not only-punctuation),
- * then the scope is closed out, the punctuation appended, then the
- * scope opened again.  If any terminating conditions are met, the scope
- * is closed out.  If this is the first macro in the line and
- * only-punctuation remains, this punctuation is flushed.
- */
 int
 macro_text(MACRO_PROT_ARGS)
 {
-	int		  la, lastpunct, c, sz, fl, argc;
+	int		  la, lastpunct, c, fl, argc;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
@@ -558,7 +509,6 @@ macro_text(MACRO_PROT_ARGS)
 
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
 		la = *pos;
-
 		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
 		if (ARGV_EOLN == c)
 			break;
@@ -573,8 +523,8 @@ macro_text(MACRO_PROT_ARGS)
 	}
 
 	if (MDOC_LINEARG_MAX == argc) {
-		mdoc_argv_free(argc, argv);
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
 	}
 
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
@@ -590,9 +540,9 @@ macro_text(MACRO_PROT_ARGS)
 	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
 		fl |= ARGS_QUOTED;
 
-	for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+	lastpunct = 0;
+	for (;;) {
 		la = *pos;
-
 		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
 		if (ARGS_ERROR == c) {
 			mdoc_argv_free(argc, argv);
@@ -618,7 +568,7 @@ macro_text(MACRO_PROT_ARGS)
 				return(0);
 			if (ppos > 1)
 				return(1);
-			return(append_delims(mdoc, tok, line, pos, buf));
+			return(append_delims(mdoc, line, pos, buf));
 		}
 
 		if (mdoc_isdelim(p)) {
@@ -645,31 +595,25 @@ macro_text(MACRO_PROT_ARGS)
 
 	mdoc_argv_free(argc, argv);
 
-	if (sz == MDOC_LINEARG_MAX)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
 	if (0 == lastpunct && ! rewind_elem(mdoc, tok))
 		return(0);
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, line, pos, buf));
+	return(append_delims(mdoc, line, pos, buf));
 }
 
 
-/*
- * Implicit- or explicit-end multi-line scoped macro.
- */
 int
 macro_scoped(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, argc, j, fl;
+	int		  c, lastarg, argc, fl;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
 	assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
 	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
-		if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+		if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
 			return(0);
 		if ( ! rewind_impblock(mdoc, tok, line, ppos))
 			return(0);
@@ -690,8 +634,8 @@ macro_scoped(MACRO_PROT_ARGS)
 	}
 
 	if (MDOC_LINEARG_MAX == argc) {
-		mdoc_argv_free(argc, argv);
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
 	}
 
 	c = mdoc_block_alloc(mdoc, line, ppos, 
@@ -706,7 +650,7 @@ macro_scoped(MACRO_PROT_ARGS)
 	if (0 == buf[*pos]) {
 		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
 			return(0);
-		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 			return(0);
 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 			return(0);
@@ -722,7 +666,7 @@ macro_scoped(MACRO_PROT_ARGS)
 	if (MDOC_TABSEP & mdoc_macros[tok].flags)
 		fl |= ARGS_TABSEP;
 
-	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+	for (;;) {
 		lastarg = *pos;
 		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
 	
@@ -747,12 +691,9 @@ macro_scoped(MACRO_PROT_ARGS)
 		break;
 	}
 
-	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
-	if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+	if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 		return(0);
-	if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf))
+	if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
 		return(0);
 
 	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
@@ -763,15 +704,10 @@ macro_scoped(MACRO_PROT_ARGS)
 }
 
 
-/*
- * When scoped to a line, a macro encompasses all of the contents.  This
- * differs from constants or text macros, where a new macro will
- * terminate the existing context.
- */
 int
 macro_scoped_line(MACRO_PROT_ARGS)
 {
-	int		  lastarg, c, j;
+	int		  lastarg, c;
 	char		  *p;
 
 	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
@@ -784,7 +720,8 @@ macro_scoped_line(MACRO_PROT_ARGS)
 
 	/* XXX - no known argument macros. */
 
-	for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
+	lastarg = ppos;
+	for (;;) {
 		lastarg = *pos;
 		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 
@@ -809,24 +746,17 @@ macro_scoped_line(MACRO_PROT_ARGS)
 		break;
 	}
 
-	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
 	if (1 == ppos) {
-		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 			return(0);
-		if ( ! append_delims(mdoc, tok, line, pos, buf))
+		if ( ! append_delims(mdoc, line, pos, buf))
 			return(0);
-	} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+	} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 		return(0);
 	return(rewind_impblock(mdoc, tok, line, ppos));
 }
 
 
-/*
- * Constant-scope macros accept a fixed number of arguments and behave
- * like constant macros except that they're scoped across lines.
- */
 int
 macro_constant_scoped(MACRO_PROT_ARGS)
 {
@@ -852,7 +782,7 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 	if (0 == maxargs) {
 		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
 			return(0);
-		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 			return(0);
 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 			return(0);
@@ -862,11 +792,11 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+	for (j = 0; /* No sentinel. */; j++) {
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
-			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 				return(0);
 			flushed = 1;
 			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
@@ -886,7 +816,7 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 			return(0);
 		else if (MDOC_MAX != c) {
 			if ( ! flushed) {
-				if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+				if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 					return(0);
 				flushed = 1;
 				if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
@@ -899,7 +829,7 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 		}
 
 		if ( ! flushed && mdoc_isdelim(p)) {
-			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 				return(0);
 			flushed = 1;
 			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
@@ -912,11 +842,8 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
 	if ( ! flushed) {
-		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 			return(0);
 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 			return(0);
@@ -925,16 +852,10 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, line, pos, buf));
+	return(append_delims(mdoc, line, pos, buf));
 }
 
 
-/*
- * Delimited macros are like text macros except that, should punctuation
- * be encountered, the macro isn't re-started with remaining tokens
- * (it's only emitted once).  Delimited macros can have a maximum number
- * of arguments.
- */
 int
 macro_constant_delimited(MACRO_PROT_ARGS)
 {
@@ -976,6 +897,11 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 		return(0);
 	}
 
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
 	mdoc_argv_free(argc, argv);
 
@@ -984,7 +910,7 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+	for (j = 0; /* No sentinel. */; j++) {
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
@@ -1023,28 +949,22 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
-	if ( ! flushed && rewind_elem(mdoc, tok))
+	if ( ! flushed && ! rewind_elem(mdoc, tok))
 		return(0);
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, line, pos, buf));
+	return(append_delims(mdoc, line, pos, buf));
 }
 
 
-/*
- * Constant macros span an entire line:  they constitute a macro and all
- * of its arguments and child data.
- */
 int
 macro_constant(MACRO_PROT_ARGS)
 {
-	int		 c, lastarg, argc, sz, fl;
-	struct mdoc_arg	 argv[MDOC_LINEARG_MAX];
-	char		*p;
+	int		  c, lastarg, argc, fl;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
+	struct mdoc_node *n;
 
 	fl = 0;
 	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
@@ -1065,6 +985,11 @@ macro_constant(MACRO_PROT_ARGS)
 		return(0);
 	}
 
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
 	mdoc_argv_free(argc, argv);
 
@@ -1073,10 +998,7 @@ macro_constant(MACRO_PROT_ARGS)
 
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	if (MDOC_LINEARG_MAX == argc)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
-
-	for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+	for (;;) {
 		lastarg = *pos;
 		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
 		if (ARGS_ERROR == c)
@@ -1098,10 +1020,31 @@ macro_constant(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	if (MDOC_LINEARG_MAX == sz + argc)
-		return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+	if ( ! rewind_elem(mdoc, tok))
+		return(0);
+	if ( ! (MDOC_NOKEEP & mdoc_macros[tok].flags))
+		return(1);
 
-	return(rewind_elem(mdoc, tok));
+	assert(mdoc->last->tok == tok);
+	if (mdoc->last->parent->child == mdoc->last)
+		mdoc->last->parent->child = mdoc->last->prev;
+	if (mdoc->last->prev)
+		mdoc->last->prev->next = NULL;
+
+	n = mdoc->last;
+	assert(NULL == mdoc->last->next);
+
+	if (mdoc->last->prev) {
+		mdoc->last = mdoc->last->prev;
+		mdoc->next = MDOC_NEXT_SIBLING;
+	} else {
+		mdoc->last = mdoc->last->parent;
+		mdoc->next = MDOC_NEXT_CHILD;
+	}
+
+	mdoc_node_freelist(n);
+
+	return(1);
 }
 
 
@@ -1117,9 +1060,24 @@ macro_obsolete(MACRO_PROT_ARGS)
 int
 macro_end(struct mdoc *mdoc)
 {
+	struct mdoc_node *n;
 
 	assert(mdoc->first);
 	assert(mdoc->last);
-	return(rewind_last(mdoc->last->tok, mdoc->last->type,
-				mdoc, mdoc->first));
+
+	/* Scan for open explicit scopes. */
+
+	n = MDOC_VALID & mdoc->last->flags ?
+		mdoc->last->parent : mdoc->last;
+
+	for ( ; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type)
+			continue;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
+			continue;
+		mdoc_nerr(mdoc, n, "macro scope still open on exit");
+		return(0);
+	}
+
+	return(rewind_last(mdoc, mdoc->first));
 }