===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.44
retrieving revision 1.49
diff -u -p -r1.44 -r1.49
--- mandoc/Attic/macro.c	2009/01/20 12:51:28	1.44
+++ mandoc/Attic/macro.c	2009/01/22 14:56:21	1.49
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.44 2009/01/20 12:51:28 kristaps Exp $ */
+/* $Id: macro.c,v 1.49 2009/01/22 14:56:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -80,6 +80,7 @@
 #define	REWIND_REWIND	(1 << 0)
 #define	REWIND_NOHALT	(1 << 1)
 #define	REWIND_HALT	(1 << 2)
+
 static	int	  rewind_dohalt(int, enum mdoc_type, 
 			const struct mdoc_node *);
 static	int	  rewind_alt(int);
@@ -92,9 +93,66 @@ static	int	  rewind_subblock(enum mdoc_type, 
 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 *);
+static	int	  pwarn(struct mdoc *, int, int, int);
+static	int	  perr(struct mdoc *, int, int, int);
 
+#define	WMACPARM	(1)
+#define	WOBS		(2)
 
+#define	ENOCTX		(1)
+#define	ENOPARMS	(2)
+#define	EARGVLIM	(3)
+
+
 static int
+perr(struct mdoc *mdoc, int line, int pos, int type)
+{
+	int		 c;
+
+	switch (type) {
+	case (ENOCTX):
+		c = mdoc_perr(mdoc, line, pos, 
+				"closing macro has prior context");
+		break;
+	case (ENOPARMS):
+		c = mdoc_perr(mdoc, line, pos, 
+				"macro doesn't expect parameters");
+		break;
+	case (EARGVLIM):
+		c = mdoc_perr(mdoc, line, pos, 
+				"argument hard-limit %d reached",
+				MDOC_LINEARG_MAX);
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+	return(c);
+}
+
+static int
+pwarn(struct mdoc *mdoc, int line, int pos, int type)
+{
+	int		 c;
+
+	switch (type) {
+	case (WMACPARM):
+		c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+				"macro-like parameter");
+		break;
+	case (WOBS):
+		c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+				"macro is marked obsolete");
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+	return(c);
+}
+
+
+static int
 lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
 	int		 res;
@@ -104,7 +162,7 @@ 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"))
+	if ( ! pwarn(mdoc, line, pos, WMACPARM))
 		return(-1);
 	return(MDOC_MAX);
 }
@@ -117,6 +175,7 @@ rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
 	assert(to);
 	mdoc->next = MDOC_NEXT_SIBLING;
 
+	/* LINTED */
 	while (mdoc->last != to) {
 		if ( ! mdoc_valid_post(mdoc))
 			return(0);
@@ -396,7 +455,7 @@ rewind_expblock(struct mdoc *mdoc, int tok, int line, 
 	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"));
+			return(perr(mdoc, line, ppos, ENOCTX));
 		if (REWIND_REWIND == c)
 			break;
 		else if (rewind_dobreak(tok, n))
@@ -444,6 +503,8 @@ append_delims(struct mdoc *mdoc, int line, int *pos, c
 	for (;;) {
 		lastarg = *pos;
 		c = mdoc_args(mdoc, line, pos, buf, 0, &p);
+		assert(ARGS_PHRASE != c);
+
 		if (ARGS_ERROR == c)
 			return(0);
 		else if (ARGS_EOLN == c)
@@ -488,7 +549,7 @@ macro_scoped_close(MACRO_PROT_ARGS)
 				return(0);
 			return(rewind_expblock(mdoc, tok, line, ppos));
 		}
-		return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters"));
+		return(perr(mdoc, line, ppos, ENOPARMS));
 	}
 
 	if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
@@ -512,7 +573,9 @@ macro_scoped_close(MACRO_PROT_ARGS)
 			flushed = 1;
 		}
 
-		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
+
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -574,7 +637,7 @@ macro_scoped_close(MACRO_PROT_ARGS)
 int
 macro_text(MACRO_PROT_ARGS)
 {
-	int		  la, lastpunct, c, fl, argc;
+	int		  la, lastpunct, c, w, argc;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
@@ -598,7 +661,7 @@ macro_text(MACRO_PROT_ARGS)
 
 	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc - 1, argv);
-		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+		return(perr(mdoc, line, ppos, EARGVLIM));
 	}
 
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
@@ -610,42 +673,43 @@ macro_text(MACRO_PROT_ARGS)
 
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	fl = ARGS_DELIM;
-	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
-		fl |= ARGS_QUOTED;
-
 	lastpunct = 0;
 	for (;;) {
 		la = *pos;
-		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
-		if (ARGS_ERROR == c) {
+		w = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
+
+		if (ARGS_ERROR == w) {
 			mdoc_argv_free(argc, argv);
 			return(0);
 		}
 
-		if (ARGS_EOLN == c)
+		if (ARGS_EOLN == w)
 			break;
-		if (ARGS_PUNCT == c)
+		if (ARGS_PUNCT == w)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, la, tok, p)))
-			return(0);
-		else if (MDOC_MAX != c) {
+		c = ARGS_QWORD == w ? MDOC_MAX :
+			lookup(mdoc, line, la, tok, p);
+
+		if (MDOC_MAX != c && -1 != c) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
 				mdoc_argv_free(argc, argv);
 				return(0);
 			}
 			mdoc_argv_free(argc, argv);
-
 			c = mdoc_macro(mdoc, c, line, la, pos, buf);
 			if (0 == c)
 				return(0);
 			if (ppos > 1)
 				return(1);
 			return(append_delims(mdoc, line, pos, buf));
+		} else if (-1 == c) {
+			mdoc_argv_free(argc, argv);
+			return(0);
 		}
 
-		if (mdoc_isdelim(p)) {
+		if (ARGS_QWORD != w && mdoc_isdelim(p)) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
 				mdoc_argv_free(argc, argv);
 				return(0);
@@ -704,12 +768,14 @@ macro_text(MACRO_PROT_ARGS)
 int
 macro_scoped(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, argc, fl;
+	int		  c, lastarg, argc;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
 	assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
+	/* First rewind extant implicit scope. */
+
 	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
 		if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
 			return(0);
@@ -717,6 +783,8 @@ macro_scoped(MACRO_PROT_ARGS)
 			return(0);
 	}
 
+	/* Parse arguments. */
+
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
 		lastarg = *pos;
 		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
@@ -733,7 +801,7 @@ macro_scoped(MACRO_PROT_ARGS)
 
 	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc - 1, argv);
-		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+		return(perr(mdoc, line, ppos, EARGVLIM));
 	}
 
 	c = mdoc_block_alloc(mdoc, line, ppos, 
@@ -760,24 +828,32 @@ macro_scoped(MACRO_PROT_ARGS)
 		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
 
-	fl = ARGS_DELIM;
-	if (MDOC_TABSEP & mdoc_macros[tok].flags)
-		fl |= ARGS_TABSEP;
-
 	for (;;) {
 		lastarg = *pos;
-		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
-	
+		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
 			break;
 		if (ARGS_EOLN == c)
 			break;
+
+		if (ARGS_PHRASE == c) {
+			/*
+			if ( ! mdoc_phrase(mdoc, line, lastarg, buf))
+				return(0);
+			*/
+			continue;
+		}
+
+		/* FIXME: if .It -column, the lookup must be for a
+		 * sub-line component.  BLAH. */
 	
 		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
 			return(0);
-		else if (MDOC_MAX == c) {
+
+		if (MDOC_MAX == c) {
 			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 				return(0);
 			mdoc->next = MDOC_NEXT_SIBLING;
@@ -788,7 +864,7 @@ macro_scoped(MACRO_PROT_ARGS)
 			return(0);
 		break;
 	}
-
+	
 	if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 		return(0);
 	if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
@@ -843,7 +919,8 @@ macro_scoped_line(MACRO_PROT_ARGS)
 	lastarg = ppos;
 	for (;;) {
 		lastarg = *pos;
-		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
 
 		if (ARGS_ERROR == c)
 			return(0);
@@ -939,7 +1016,9 @@ macro_constant_scoped(MACRO_PROT_ARGS)
 			mdoc->next = MDOC_NEXT_CHILD;
 		}
 
-		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
+
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -1047,7 +1126,7 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 
 	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc - 1, argv);
-		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+		return(perr(mdoc, line, ppos, EARGVLIM));
 	}
 
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
@@ -1067,7 +1146,9 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 			flushed = 1;
 		}
 
-		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
+
 		if (ARGS_ERROR == c)
 			return(0);
 		if (ARGS_PUNCT == c)
@@ -1113,23 +1194,19 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 int
 macro_constant(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, argc, fl;
+	int		  c, w, la, argc;
 	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 	char		 *p;
 
 	assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
-	fl = 0;
-	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
-		fl = ARGS_QUOTED;
-
 	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
-		lastarg = *pos;
+		la = *pos;
 		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
 		if (ARGV_EOLN == c) 
 			break;
 		if (ARGV_WORD == c) {
-			*pos = lastarg;
+			*pos = la;
 			break;
 		} else if (ARGV_ARG == c)
 			continue;
@@ -1140,7 +1217,7 @@ macro_constant(MACRO_PROT_ARGS)
 
 	if (MDOC_LINEARG_MAX == argc) {
 		mdoc_argv_free(argc - 1, argv);
-		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+		return(perr(mdoc, line, ppos, EARGVLIM));
 	}
 
 	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
@@ -1152,23 +1229,26 @@ macro_constant(MACRO_PROT_ARGS)
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	for (;;) {
-		lastarg = *pos;
-		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
-		if (ARGS_ERROR == c)
+		la = *pos;
+		w = mdoc_args(mdoc, line, pos, buf, tok, &p);
+		assert(ARGS_PHRASE != c);
+
+		if (ARGS_ERROR == w)
 			return(0);
-		if (ARGS_EOLN == c)
+		if (ARGS_EOLN == w)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-			return(0);
-		else if (MDOC_MAX != c) {
+		c = ARGS_QWORD == w ? MDOC_MAX :
+			lookup(mdoc, line, la, tok, p);
+
+		if (MDOC_MAX != c && -1 != c) {
 			if ( ! rewind_elem(mdoc, tok))
 				return(0);
-			return(mdoc_macro(mdoc, c, line, 
-						lastarg, pos, buf));
-		}
+			return(mdoc_macro(mdoc, c, line, la, pos, buf));
+		} else if (-1 == c)
+			return(0);
 
-		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+		if ( ! mdoc_word_alloc(mdoc, line, la, p))
 			return(0);
 		mdoc->next = MDOC_NEXT_SIBLING;
 	}
@@ -1182,7 +1262,7 @@ int
 macro_obsolete(MACRO_PROT_ARGS)
 {
 
-	return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete"));
+	return(pwarn(mdoc, line, ppos, WOBS));
 }
 
 
@@ -1209,8 +1289,7 @@ macro_end(struct mdoc *mdoc)
 			continue;
 		if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
 			continue;
-		mdoc_nerr(mdoc, n, "macro scope still open on exit");
-		return(0);
+		return(mdoc_nerr(mdoc, n, "macro scope still open on exit"));
 	}
 
 	return(rewind_last(mdoc, mdoc->first));