===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.23
retrieving revision 1.32
diff -u -p -r1.23 -r1.32
--- mandoc/Attic/macro.c	2009/01/05 17:57:08	1.23
+++ mandoc/Attic/macro.c	2009/01/12 12:52:21	1.32
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.23 2009/01/05 17:57:08 kristaps Exp $ */
+/* $Id: macro.c,v 1.32 2009/01/12 12:52:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -29,114 +29,153 @@
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 
-static	int	  rewind_elem(struct mdoc *, int, int);
-static	int	  rewind_impblock(struct mdoc *, int, int);
-static	int	  rewind_expblock(struct mdoc *, int, int, int);
-static	int	  rewind_head(struct mdoc *, int, int);
-static	int	  rewind_body(struct mdoc *, int, int, int);
-static	int	  append_delims(struct mdoc *, int, int *, char *);
+static	int	  rewind_elem(struct mdoc *, int);
+static	int	  rewind_impblock(struct mdoc *, int);
+static	int	  rewind_expblock(struct mdoc *, int);
+static	int	  rewind_head(struct mdoc *, int);
+static	int	  rewind_body(struct mdoc *, int);
+static	int	  rewind_last(struct mdoc *, struct mdoc_node *);
+static	int	  append_delims(struct mdoc *, 
+			int, int, int *, char *);
+static	int	  lookup(struct mdoc *, int, int, int, const char *);
 
 
 static int
-rewind_elem(struct mdoc *mdoc, int ppos, int tok)
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
+	int		 res;
+
+	res = mdoc_find(mdoc, p);
+	if (MDOC_PARSED & mdoc_macros[from].flags)
+		return(res);
+	if (MDOC_MAX == res)
+		return(res);
+
+	if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX_MACLIKE))
+		return(-1);
+	return(MDOC_MAX);
+}
+
+
+static int
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
+{
+
+	assert(to);
+	mdoc->next = MDOC_NEXT_SIBLING;
+	if (mdoc->last == to) {
+		if ( ! mdoc_valid_post(mdoc))
+			return(0);
+		if ( ! mdoc_action_post(mdoc))
+			return(0);
+		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);
+	} while (mdoc->last != to);
+
+	return(1);
+}
+
+
+static int
+rewind_elem(struct mdoc *mdoc, int tok)
+{
 	struct mdoc_node *n;
 
 	n = mdoc->last;
 	if (MDOC_ELEM != n->type)
 		n = n->parent;
 	assert(MDOC_ELEM == n->type);
-	assert(tok == n->data.elem.tok);
+	assert(tok == n->tok);
 
-	mdoc->last = n;
-	mdoc->next = MDOC_NEXT_SIBLING;
-	if ( ! mdoc_valid_post(mdoc, tok, ppos))
-		return(0);
-	return(mdoc_action(mdoc, tok, ppos));
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_body(struct mdoc *mdoc, int tok)
 {
 	struct mdoc_node *n;
+	int		  t;
 
+	assert(mdoc->last);
+
 	/* LINTED */
 	for (n = mdoc->last; n; n = n->parent) {
 		if (MDOC_BODY != n->type) 
 			continue;
-		if (tt == n->data.head.tok)
+		if (tok == (t = n->tok))
 			break;
-		if ( ! (MDOC_EXPLICIT & mdoc_macros[tt].flags))
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
 			continue;
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
 	}
 
-	mdoc->last = n ? n : mdoc->last;
-	mdoc->next = MDOC_NEXT_SIBLING;
-	/* XXX - no validation, we do this only for blocks/elements. */
-	return(1);
+	assert(n);
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-rewind_head(struct mdoc *mdoc, int ppos, int tok)
+rewind_head(struct mdoc *mdoc, int tok)
 {
 	struct mdoc_node *n;
 	int		  t;
 
+	assert(mdoc->last);
+
 	/* LINTED */
 	for (n = mdoc->last; n; n = n->parent) {
 		if (MDOC_HEAD != n->type) 
 			continue;
-		if (tok == (t = n->data.head.tok))
+		if (tok == (t = n->tok))
 			break;
 		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
 			continue;
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
 	}
 
-	mdoc->last = n ? n : mdoc->last;
-	mdoc->next = MDOC_NEXT_SIBLING;
-	/* XXX - no validation, we do this only for blocks/elements. */
-	return(1);
+	assert(n);
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-rewind_expblock(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_expblock(struct mdoc *mdoc, int tok)
 {
 	struct mdoc_node *n;
 	int		  t;
 
-	assert(mdoc->last);
+	n = mdoc->last ? mdoc->last->parent : NULL;
 
 	/* LINTED */
-	for (n = mdoc->last->parent; n; n = n->parent) {
-		if (MDOC_BLOCK != n->type) 
+	for ( ; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type)
 			continue;
-		if (tt == (t = n->data.block.tok))
+		if (tok == (t = n->tok))
 			break;
 		if (MDOC_NESTED & mdoc_macros[t].flags)
 			continue;
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
 	}
 
-	if (NULL == (mdoc->last = n))
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
-	mdoc->next = MDOC_NEXT_SIBLING;
-	if ( ! mdoc_valid_post(mdoc, tok, ppos))
-		return(0);
-	return(mdoc_action(mdoc, tok, ppos));
+	assert(n);
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-rewind_impblock(struct mdoc *mdoc, int ppos, int tok)
+rewind_impblock(struct mdoc *mdoc, int tok)
 {
-	struct mdoc_node *n;
 	int		  t;
+	struct mdoc_node *n;
 
 	n = mdoc->last ? mdoc->last->parent : NULL;
 
@@ -144,28 +183,24 @@ rewind_impblock(struct mdoc *mdoc, int ppos, int tok)
 	for ( ; n; n = n->parent) {
 		if (MDOC_BLOCK != n->type) 
 			continue;
-		if (tok == (t = n->data.block.tok))
+		if (tok == (t = n->tok))
 			break;
 		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
 			continue;
 		if (MDOC_NESTED & mdoc_macros[tok].flags)
 			return(1);
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
 	}
 
 	if (NULL == n)
 		return(1);
-
-	mdoc->next = MDOC_NEXT_SIBLING;
-	mdoc->last = n;
-	if ( ! mdoc_valid_post(mdoc, tok, ppos))
-		return(0);
-	return(mdoc_action(mdoc, tok, ppos));
+	return(rewind_last(mdoc, n));
 }
 
 
 static int
-append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
+append_delims(struct mdoc *mdoc, int tok, 
+		int line, int *pos, char *buf)
 {
 	int		 c, lastarg;
 	char		*p;
@@ -175,13 +210,14 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, ch
 
 	for (;;) {
 		lastarg = *pos;
-		c = mdoc_args(mdoc, tok, pos, buf, 0, &p);
+		c = mdoc_args(mdoc, line, pos, buf, 0, &p);
 		if (ARGS_ERROR == c)
 			return(0);
 		else if (ARGS_EOLN == c)
 			break;
 		assert(mdoc_isdelim(p));
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
@@ -193,7 +229,7 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, ch
 int
 macro_close_explicit(MACRO_PROT_ARGS)
 {
-	int		 tt, j, c, lastarg, maxargs, flushed;
+	int	 	 tt, j, c, lastarg, maxargs, flushed;
 	char		*p;
 
 	switch (tok) {
@@ -257,21 +293,20 @@ macro_close_explicit(MACRO_PROT_ARGS)
 	}
 
 	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-		if ( ! rewind_expblock(mdoc, ppos, tok, tt))
-			return(0);
-		if (0 != buf[*pos])
-			return(mdoc_err(mdoc, tok, *pos, ERR_ARGS_EQ0));
-		return(1);
+		if (0 == buf[*pos])
+			return(rewind_expblock(mdoc, tt));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0));
 	}
 
-	if ( ! rewind_body(mdoc, ppos, tok, tt))
+	if ( ! rewind_body(mdoc, tt))
 		return(0);
 
 	lastarg = ppos;
 	flushed = 0;
 
 	if (maxargs > 0) {
-		mdoc_tail_alloc(mdoc, ppos, tt);
+		if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+			return(0);
 		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
@@ -279,12 +314,12 @@ macro_close_explicit(MACRO_PROT_ARGS)
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
-			if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+			if ( ! rewind_expblock(mdoc, tt))
 				return(0);
 			flushed = 1;
 		}
 
-		c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -292,31 +327,33 @@ macro_close_explicit(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
 			if ( ! flushed) {
-				if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+				if ( ! rewind_expblock(mdoc, tt))
 					return(0);
 				flushed = 1;
 			}
-			if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
 				return(0);
 			break;
-		}
+		} 
 
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	if ( ! flushed) 
-		if ( ! rewind_expblock(mdoc, ppos, tok, tt))
-			return(0);
+	if ( ! flushed && ! rewind_expblock(mdoc, tt))
+		return(0);
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, pos, buf));
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
@@ -332,17 +369,17 @@ macro_close_explicit(MACRO_PROT_ARGS)
 int
 macro_text(MACRO_PROT_ARGS)
 {
-	int		  lastarg, lastpunct, c, sz, fl, argc;
+	int		  la, lastpunct, c, sz, fl, argc;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
-	lastarg = ppos;
+	la = ppos;
 	lastpunct = 0;
 
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
-		lastarg = *pos;
+		la = *pos;
 
-		c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
 		if (ARGV_EOLN == c || ARGV_WORD == c)
 			break;
 		else if (ARGV_ARG == c)
@@ -351,28 +388,39 @@ macro_text(MACRO_PROT_ARGS)
 		return(0);
 	}
 
-	if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc, argv);
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv);
+
+	if (0 == c) {
+		mdoc_argv_free(argc, argv);
 		return(0);
 	}
 
+	mdoc->next = MDOC_NEXT_CHILD;
+
 	fl = ARGS_DELIM;
 	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
 		fl |= ARGS_QUOTED;
 
-	mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
-	mdoc->next = MDOC_NEXT_CHILD;
-
 	for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
-		lastarg = *pos;
+		la = *pos;
 
 		if (lastpunct) {
-			mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
+			c = mdoc_elem_alloc(mdoc, line, 
+					la, tok, argc, argv);
+			if (0 == c) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
 			mdoc->next = MDOC_NEXT_CHILD;
 			lastpunct = 0;
 		}
 
-		c = mdoc_args(mdoc, tok, pos, buf, fl, &p);
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
 		if (ARGS_ERROR == c) {
 			mdoc_argv_free(argc, argv);
 			return(0);
@@ -383,63 +431,67 @@ macro_text(MACRO_PROT_ARGS)
 		if (ARGS_PUNCT == c)
 			break;
 
-		if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-			if ( ! rewind_elem(mdoc, ppos, tok)) {
+		if (-1 == (c = lookup(mdoc, line, la, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! rewind_elem(mdoc, tok)) {
 				mdoc_argv_free(argc, argv);
 				return(0);
 			}
 			mdoc_argv_free(argc, argv);
-			if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+
+			c = mdoc_macro(mdoc, c, line, la, pos, buf);
+			if (0 == c)
 				return(0);
 			if (ppos > 1)
 				return(1);
-			return(append_delims(mdoc, tok, pos, buf));
+			return(append_delims(mdoc, tok, line, pos, buf));
 		}
 
 		if (mdoc_isdelim(p)) {
-			if ( ! rewind_elem(mdoc, ppos, tok)) {
+			if ( ! rewind_elem(mdoc, tok)) {
 				mdoc_argv_free(argc, argv);
 				return(0);
 			}
 			lastpunct = 1;
 		}
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, la, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	mdoc_argv_free(argc, argv);
 
 	if (sz == MDOC_LINEARG_MAX)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	if ( ! rewind_elem(mdoc, ppos, tok))
+	if ( ! rewind_elem(mdoc, tok))
 		return(0);
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, pos, buf));
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
 /*
- * Multi-line-scoped macro.
+ * Implicit- or explicit-end multi-line scoped macro.
  */
 int
 macro_scoped(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, argc;
+	int		  c, lastarg, argc, j;
 	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_impblock(mdoc, ppos, tok))
+		if ( ! rewind_impblock(mdoc, tok))
 			return(0);
 
-	lastarg = ppos;
-
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
 		lastarg = *pos;
-		c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
 		if (ARGV_EOLN == c || ARGV_WORD == c)
 			break;
 		else if (ARGV_ARG == c)
@@ -448,33 +500,70 @@ macro_scoped(MACRO_PROT_ARGS)
 		return(0);
 	}
 
-	if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc, argv);
-		return(0);
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 	}
 
-	mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv);
-	mdoc->next = MDOC_NEXT_CHILD;
-
+	c = mdoc_block_alloc(mdoc, line, ppos, 
+			tok, (size_t)argc, argv);
 	mdoc_argv_free(argc, argv);
 
-	/* XXX - Assumes header isn't parsed! */
+	if (0 == c)
+		return(0);
 
-	if (0 != buf[*pos]) {
-		mdoc_head_alloc(mdoc, ppos, tok);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	if (0 == buf[*pos]) {
+		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+			return(0);
+		if ( ! rewind_head(mdoc, tok))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
 		mdoc->next = MDOC_NEXT_CHILD;
+		return(1);
+	}
 
-		mdoc_word_alloc(mdoc, lastarg, &buf[*pos]);
-		mdoc->next = MDOC_NEXT_SIBLING;
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
 
-		if ( ! rewind_head(mdoc, ppos, tok))
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+	
+		if (ARGS_ERROR == c)
 			return(0);
+		if (ARGS_PUNCT == c)
+			break;
+		if (ARGS_EOLN == c)
+			break;
+	
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX == c) {
+			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+				return(0);
+			mdoc->next = MDOC_NEXT_SIBLING;
+			continue;
+		} 
 
-		while (buf[*pos])
-			(*pos)++;
+		if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+			return(0);
+		break;
 	}
 
-	mdoc_body_alloc(mdoc, ppos, tok);
+	if (j == MDOC_LINEARG_MAX)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	if ( ! rewind_head(mdoc, tok))
+		return(0);
+	if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf))
+		return(0);
+
+	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	return(1);
@@ -492,22 +581,19 @@ macro_scoped_line(MACRO_PROT_ARGS)
 	int		  lastarg, c, j;
 	char		  *p;
 
-	mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	mdoc_head_alloc(mdoc, ppos, tok);
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	/* XXX - no known argument macros. */
 
-	if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
-		return(0);
-
-	/* Process line parameters. */
-
 	for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
 		lastarg = *pos;
-		c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 
 		if (ARGS_ERROR == c)
 			return(0);
@@ -516,30 +602,37 @@ macro_scoped_line(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (MDOC_MAX == (c = mdoc_find(mdoc, p))) {
-			mdoc_word_alloc(mdoc, lastarg, p);
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX == c) {
+			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+				return(0);
 			mdoc->next = MDOC_NEXT_SIBLING;
 			continue;
-		}
+		} 
 
-		if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+		if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
 			return(0);
 		break;
 	}
 
 	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
 	if (1 == ppos) {
-		if ( ! rewind_head(mdoc, ppos, tok))
+		if ( ! rewind_head(mdoc, tok))
 			return(0);
-		if ( ! append_delims(mdoc, tok, pos, buf))
+		if ( ! append_delims(mdoc, tok, line, pos, buf))
 			return(0);
 	}
-	return(rewind_impblock(mdoc, ppos, tok));
+	return(rewind_impblock(mdoc, tok));
 }
 
 
+/*
+ * 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)
 {
@@ -558,17 +651,20 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 		break;
 	}
 
-	if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
-		return(0);
-
-	mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+		return(0); 
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	if (0 == maxargs) {
-		mdoc_body_alloc(mdoc, ppos, tok);
+		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+			return(0);
+		if ( ! rewind_head(mdoc, tok))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
 		flushed = 1;
-	} else
-		mdoc_head_alloc(mdoc, ppos, tok);
+	} else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
 
 	mdoc->next = MDOC_NEXT_CHILD;
 
@@ -576,14 +672,15 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
-			if ( ! rewind_head(mdoc, ppos, tok))
+			if ( ! rewind_head(mdoc, tok))
 				return(0);
 			flushed = 1;
-			mdoc_body_alloc(mdoc, ppos, tok);
+			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+				return(0);
 			mdoc->next = MDOC_NEXT_CHILD;
 		}
 
-		c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -591,44 +688,50 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
 			if ( ! flushed) {
-				if ( ! rewind_head(mdoc, ppos, tok))
+				if ( ! rewind_head(mdoc, tok))
 					return(0);
 				flushed = 1;
-				mdoc_body_alloc(mdoc, ppos, tok);
+				if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+					return(0);
 				mdoc->next = MDOC_NEXT_CHILD;
 			}
-			if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
 				return(0);
 			break;
 		}
 
 		if ( ! flushed && mdoc_isdelim(p)) {
-			if ( ! rewind_head(mdoc, ppos, tok))
+			if ( ! rewind_head(mdoc, tok))
 				return(0);
 			flushed = 1;
-			mdoc_body_alloc(mdoc, ppos, tok);
+			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+				return(0);
 			mdoc->next = MDOC_NEXT_CHILD;
 		}
 	
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
 	if ( ! flushed) {
-		if ( ! rewind_head(mdoc, ppos, tok))
+		if ( ! rewind_head(mdoc, tok))
 			return(0);
-		mdoc_body_alloc(mdoc, ppos, tok);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
 		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, pos, buf));
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
@@ -641,7 +744,8 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 int
 macro_constant_delimited(MACRO_PROT_ARGS)
 {
-	int		  lastarg, flushed, j, c, maxargs;
+	int		  lastarg, flushed, j, c, maxargs, argc;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
 	lastarg = ppos;
@@ -653,6 +757,8 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 	case (MDOC_Ns):
 		/* FALLTHROUGH */
 	case (MDOC_Ux):
+		/* FALLTHROUGH */
+	case (MDOC_St):
 		maxargs = 0;
 		break;
 	default:
@@ -660,19 +766,35 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 		break;
 	}
 
-	mdoc_elem_alloc(mdoc, lastarg, tok, 0, NULL);
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c || ARGV_WORD == c)
+			break;
+		else if (ARGV_ARG == c)
+			continue;
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
+
+	if (0 == c)
+		return(0);
+
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
-			if ( ! rewind_elem(mdoc, ppos, tok))
+			if ( ! rewind_elem(mdoc, tok))
 				return(0);
 			flushed = 1;
 		}
 
-		c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -680,34 +802,37 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-			if ( ! flushed && ! rewind_elem(mdoc, ppos, tok))
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! flushed && ! rewind_elem(mdoc, tok))
 				return(0);
 			flushed = 1;
-			if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
 				return(0);
 			break;
 		}
 
 		if ( ! flushed && mdoc_isdelim(p)) {
-			if ( ! rewind_elem(mdoc, ppos, tok))
+			if ( ! rewind_elem(mdoc, tok))
 				return(0);
 			flushed = 1;
 		}
 	
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if (MDOC_LINEARG_MAX == j)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	if ( ! flushed && rewind_elem(mdoc, ppos, tok))
+	if ( ! flushed && rewind_elem(mdoc, tok))
 		return(0);
 
 	if (ppos > 1)
 		return(1);
-	return(append_delims(mdoc, tok, pos, buf));
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
@@ -722,13 +847,15 @@ macro_constant(MACRO_PROT_ARGS)
 	struct mdoc_arg	 argv[MDOC_LINEARG_MAX];
 	char		*p;
 
+	/* FIXME: parsing macros! */
+
 	fl = 0;
 	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
 		fl = ARGS_QUOTED;
 
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
 		lastarg = *pos;
-		c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
 		if (ARGV_EOLN == c) 
 			break;
 		else if (ARGV_ARG == c)
@@ -740,32 +867,34 @@ macro_constant(MACRO_PROT_ARGS)
 		return(0);
 	}
 
-	if (MDOC_LINEARG_MAX == argc) {
-		mdoc_argv_free(argc, argv);
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-	}
+	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
 
-	mdoc_elem_alloc(mdoc, ppos, tok, argc, argv);
+	if (0 == c)
+		return(0);
+
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	mdoc_argv_free(argc, argv);
+	if (MDOC_LINEARG_MAX == argc)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
 	for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
 		lastarg = *pos;
-		c = mdoc_args(mdoc, tok, pos, buf, fl, &p);
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_EOLN == c)
 			break;
 
-		mdoc_word_alloc(mdoc, lastarg, p);
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if (MDOC_LINEARG_MAX == sz + argc)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	return(rewind_elem(mdoc, ppos, tok));
+	return(rewind_elem(mdoc, tok));
 }
 
 
@@ -774,5 +903,15 @@ int
 macro_obsolete(MACRO_PROT_ARGS)
 {
 
-	return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE));
+	return(mdoc_pwarn(mdoc, line, ppos, WARN_IGN_OBSOLETE));
+}
+
+
+int
+macro_end(struct mdoc *mdoc)
+{
+
+	assert(mdoc->first);
+	assert(mdoc->last);
+	return(rewind_last(mdoc, mdoc->first));
 }