===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- mandoc/Attic/macro.c	2008/12/29 18:08:44	1.11
+++ mandoc/Attic/macro.c	2008/12/30 19:06:03	1.15
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.11 2008/12/29 18:08:44 kristaps Exp $ */
+/* $Id: macro.c,v 1.15 2008/12/30 19:06:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,6 +28,8 @@
 #include "private.h"
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
+/* FIXME: prologue check should be in macro_call. */
+/* FIXME: prologue macros should be part of macro_constant. */
 
 #define	_CC(p)	((const char **)p)
 
@@ -36,39 +38,14 @@ static	int	  scope_rewind_imp(struct mdoc *, int, int)
 static	int	  append_text(struct mdoc *, int, 
 			int, int, char *[]);
 static	int	  append_const(struct mdoc *, int, int, int, char *[]);
+static	int	  append_constarg(struct mdoc *, int, int, 
+			 int, const struct mdoc_arg *);
 static	int	  append_scoped(struct mdoc *, int, int, int, 
 			const char *[], int, const struct mdoc_arg *);
 static	int	  append_delims(struct mdoc *, int, int *, char *);
 
 
 static int
-append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
-{
-	int		 c, lastarg;
-	char		*p;
-
-	if (0 == buf[*pos])
-		return(1);
-
-	mdoc_msg(mdoc, *pos, "`%s' flushing punctuation",
-			mdoc_macronames[tok]);
-
-	for (;;) {
-		lastarg = *pos;
-		c = mdoc_args(mdoc, tok, 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);
-	}
-
-	return(1);
-}
-
-
-static int
 scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok)
 {
 	struct mdoc_node *n;
@@ -87,15 +64,8 @@ scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok)
 		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
 	}
 
-	if (n) {
+	if (n)
 		mdoc->last = n;
-		mdoc_msg(mdoc, ppos, "scope: rewound implicit `%s'",
-				mdoc_macronames[tok]);
-		return(1);
-	} 
-
-	mdoc_msg(mdoc, ppos, "scope: new implicit `%s'", 
-			mdoc_macronames[tok]);
 	return(1);
 }
 
@@ -116,68 +86,67 @@ scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok,
 		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
 	}
 
-	if (NULL == (mdoc->last = n))
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
+	if ((mdoc->last = n))
+		return(1);
+	return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
+}
 
-	mdoc_msg(mdoc, ppos, "scope: rewound explicit `%s' to `%s'",
-			mdoc_macronames[tok], mdoc_macronames[dst]);
 
+static int
+append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
+{
+	int		 c, lastarg;
+	char		*p;
+
+	if (0 == buf[*pos])
+		return(1);
+
+	for (;;) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, tok, 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);
+	}
+
 	return(1);
 }
 
 
 static int
+append_constarg(struct mdoc *mdoc, int tok, int pos, 
+		int argc, const struct mdoc_arg *argv)
+{
+
+	if ( ! mdoc_valid(mdoc, tok, pos, 0, NULL, argc, argv))
+		return(0);
+	mdoc_elem_alloc(mdoc, pos, tok, argc, argv, 0, NULL);
+	return(1);
+}
+
+
+static int
 append_scoped(struct mdoc *mdoc, int tok, int pos, 
 		int sz, const char *args[], 
 		int argc, const struct mdoc_arg *argv)
 {
 	enum mdoc_sec	  sec;
-	struct mdoc_node *node;
 
+	if ( ! mdoc_valid(mdoc, tok, pos, sz, args, argc, argv))
+		return(0);
+
 	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
 	case (MDOC_Sh):
-		if (0 == sz) 
-			return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-
 		sec = mdoc_atosec((size_t)sz, _CC(args));
-		if (SEC_CUSTOM != sec && sec < mdoc->sec_lastn)
-			if ( ! mdoc_warn(mdoc, tok, pos, WARN_SEC_OO))
-				return(0);
-
-		if (SEC_BODY == mdoc->sec_last && SEC_NAME != sec)
-			return(mdoc_err(mdoc, tok, pos, ERR_SEC_NAME));
-
 		if (SEC_CUSTOM != sec)
 			mdoc->sec_lastn = sec;
 		mdoc->sec_last = sec;
 		break;
-
-	case (MDOC_Ss):
-		if (0 == sz) 
-			return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-		break;
-	
-	case (MDOC_Bd):
-		assert(mdoc->last);
-		node = mdoc->last->parent; 
-		/* LINTED */
-		for ( ; node; node = node->parent) {
-			if (node->type != MDOC_BLOCK)
-				continue;
-			if (node->data.block.tok != MDOC_Bd)
-				continue;
-			return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NONEST));
-		}
-		break;
-
-	case (MDOC_Bl):
-		break;
-
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
 	default:
-		abort();
-		/* NOTREACHED */
+		break;
 	}
 
 	mdoc_block_alloc(mdoc, pos, tok, (size_t)argc, argv);
@@ -192,60 +161,26 @@ append_const(struct mdoc *mdoc, int tok, 
 		int pos, int sz, char *args[])
 {
 
+	if ( ! mdoc_valid(mdoc, tok, pos, sz, _CC(args), 0, NULL))
+		return(0);
+
 	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
 	case (MDOC_At):
-		/* This needs special handling. */
 		if (0 == sz)
 			break;
-		else if (sz > 2)
-			return(mdoc_err(mdoc, tok, pos, ERR_ARGS_LE2));
-
-		if (ATT_DEFAULT != mdoc_atoatt(args[0])) {
-			mdoc_elem_alloc(mdoc, pos, tok, 0, 
-					NULL, 1, _CC(&args[0]));
-		} else {
+		if (ATT_DEFAULT == mdoc_atoatt(args[0])) {
 			mdoc_elem_alloc(mdoc, pos, tok, 
 					0, NULL, 0, NULL);
-			if (mdoc_isdelim(args[0]))
-				return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT));
 			mdoc_word_alloc(mdoc, pos, args[0]);
-		}
+		} else
+			mdoc_elem_alloc(mdoc, pos, tok, 0, 
+					NULL, 1, _CC(&args[0]));
 
-		if (1 == sz)
-			return(1);
-		if (mdoc_isdelim(args[1]))
-			return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT));
-		mdoc_word_alloc(mdoc, pos, args[1]);
+		if (sz > 1)
+			mdoc_word_alloc(mdoc, pos, args[1]);
 		return(1);
-
-	case (MDOC_Bx):
-		/* FALLTHROUGH */
-	case (MDOC_Bsx):
-		/* FALLTHROUGH */
-	case (MDOC_Os):
-		/* FALLTHROUGH */
-	case (MDOC_Fx):
-		/* FALLTHROUGH */
-	case (MDOC_Nx):
-		assert(sz <= 1);
-		break;
-
-	case (MDOC_Ux):
-		assert(0 == sz);
-		break;
-
-	case (MDOC_Bt):
-		/* FALLTHROUGH */
-	case (MDOC_Ud):
-		if (0 == sz)
-			break;
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ0));
-
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
 	default:
-		abort();
-		/* NOTREACHED */
+		break;
 	}
 
 	mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
@@ -258,67 +193,8 @@ append_text(struct mdoc *mdoc, int tok, 
 		int pos, int sz, char *args[])
 {
 
-	assert(sz >= 0);
-	args[sz] = NULL;
-
-	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
-	case (MDOC_Pp):
-		if (0 == sz)
-			break;
-		if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_EQ0))
-			return(0);
-		break;
-
-	case (MDOC_Ft):
-		/* FALLTHROUGH */
-	case (MDOC_Li):
-		/* FALLTHROUGH */
-	case (MDOC_Ms):
-		/* FALLTHROUGH */
-	case (MDOC_Pa):
-		/* FALLTHROUGH */
-	case (MDOC_Tn):
-		if (0 < sz)
-			break;
-		if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1))
-			return(0);
-		break;
-
-	case (MDOC_Ar):
-		/* FALLTHROUGH */
-	case (MDOC_Cm):
-		/* FALLTHROUGH */
-	case (MDOC_Fl):
-		/* These can have no arguments. */
-		break;
-
-	case (MDOC_Ad):
-		/* FALLTHROUGH */
-	case (MDOC_Em):
-		/* FALLTHROUGH */
-	case (MDOC_Er):
-		/* FALLTHROUGH */
-	case (MDOC_Ev):
-		/* FALLTHROUGH */
-	case (MDOC_Fa):
-		/* FALLTHROUGH */
-	case (MDOC_Dv):
-		/* FALLTHROUGH */
-	case (MDOC_Ic):
-		/* FALLTHROUGH */
-	case (MDOC_Va):
-		/* FALLTHROUGH */
-	case (MDOC_Vt):
-		if (0 < sz) 
-			break;
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
-	default:
-		abort();
-		/* NOTREACHED */
-	}
-
+	if ( ! mdoc_valid(mdoc, tok, pos, sz, _CC(args), 0, NULL))
+		return(0);
 	mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
 	return(1);
 }
@@ -327,8 +203,8 @@ append_text(struct mdoc *mdoc, int tok, 
 int
 macro_text(MACRO_PROT_ARGS)
 {
-	int		  lastarg, lastpunct, c, j;
-	char		 *args[MDOC_LINEARG_MAX], *p;
+	int		  lastarg, lastpunct, c, j, fl;
+	char		 *args[MDOC_LINEARG_MAX];
 
 	if (SEC_PROLOGUE == mdoc->sec_lastn)
 		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
@@ -361,7 +237,11 @@ macro_text(MACRO_PROT_ARGS)
 	j = 0;
 	lastarg = ppos;
 	lastpunct = 0;
+	fl = ARGS_DELIM;
 
+	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+		fl |= ARGS_QUOTED;
+
 again:
 	if (j == MDOC_LINEARG_MAX)
 		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
@@ -376,7 +256,7 @@ again:
 
 	lastarg = *pos;
 
-	switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &args[j])) {
+	switch (mdoc_args(mdoc, tok, pos, buf, fl, &args[j])) {
 	case (ARGS_ERROR):
 		return(0);
 	case (ARGS_WORD):
@@ -427,11 +307,10 @@ again:
 	 * is non-terminal punctuation.
 	 */
 
-	p = args[j];
 	if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
 		return(0);
 
-	mdoc_word_alloc(mdoc, lastarg, p);
+	mdoc_word_alloc(mdoc, lastarg, args[j]);
 	j = 0;
 	lastpunct = 1;
 
@@ -512,6 +391,8 @@ macro_prologue_os(MACRO_PROT_ARGS)
 	int		  lastarg, j;
 	char		 *args[MDOC_LINEARG_MAX];
 
+	/* FIXME: if we use `Os' again... ? */
+
 	if (SEC_PROLOGUE != mdoc->sec_lastn)
 		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
 	if (0 == mdoc->meta.title[0])
@@ -590,7 +471,7 @@ again:
 		return(0);
 	
 	if (0 == j) {
-		if (xstrcmp("$Mdocdate: December 29 2008 $", args[j])) {
+		if (xstrcmp("$Mdocdate: December 30 2008 $", args[j])) {
 			mdoc->meta.date = time(NULL);
 			goto again;
 		} else if (xstrcmp("$Mdocdate:", args[j])) 
@@ -951,7 +832,7 @@ int
 macro_constant_delimited(MACRO_PROT_ARGS)
 {
 	int		  lastarg, flushed, c, maxargs;
-	char		 *p, *pp;
+	char		 *p;
 
 	if (SEC_PROLOGUE == mdoc->sec_lastn)
 		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
@@ -998,10 +879,8 @@ again:
 	/* Accepts no arguments: flush out symbol and continue. */
 
 	if (0 == maxargs) {
-		pp = p;
 		if ( ! append_const(mdoc, tok, ppos, 0, &p))
 			return(0);
-		p = pp;
 		flushed = 1;
 	}
 
@@ -1026,10 +905,8 @@ again:
 		flushed = 1;
 		goto again;
 	} else if ( ! flushed) {
-		pp = p;
 		if ( ! append_const(mdoc, tok, ppos, 0, &p))
 			return(0);
-		p = pp;
 		flushed = 1;
 	}
 
@@ -1042,13 +919,16 @@ again:
 int
 macro_constant(MACRO_PROT_ARGS)
 {
-	int		  lastarg, j;
+	int		  lastarg, j, fl;
 	char		 *args[MDOC_LINEARG_MAX];
 
 	if (SEC_PROLOGUE == mdoc->sec_lastn)
 		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
 
-	j = 0;
+	j = fl = 0;
+	lastarg = ppos;
+	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+		fl = ARGS_QUOTED;
 
 again:
 	if (j == MDOC_LINEARG_MAX)
@@ -1056,7 +936,7 @@ again:
 
 	lastarg = *pos;
 
-	switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) {
+	switch (mdoc_args(mdoc, tok, pos, buf, fl, &args[j])) {
 	case (ARGS_ERROR):
 		return(0);
 	case (ARGS_WORD):
@@ -1075,4 +955,46 @@ again:
 	j++;
 	goto again;
 	/* NOTREACHED */
+}
+
+
+int
+macro_constant_argv(MACRO_PROT_ARGS)
+{
+	int		  c, lastarg, j;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+
+	if (SEC_PROLOGUE == mdoc->sec_lastn)
+		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+
+	lastarg = *pos;
+
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, tok, &argv[j], pos, buf);
+		if (0 == c)
+			break;
+		else if (1 == c)
+			continue;
+
+		mdoc_argv_free(j, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == j) {
+		mdoc_argv_free(j, argv);
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	}
+
+	c = append_constarg(mdoc, tok, ppos, j, argv);
+	mdoc_argv_free(j, argv);
+	return(c);
+}
+
+
+int
+macro_obsolete(MACRO_PROT_ARGS)
+{
+
+	return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE));
 }