===================================================================
RCS file: /cvs/mandoc/Attic/argv.c,v
retrieving revision 1.26
retrieving revision 1.32
diff -u -p -r1.26 -r1.32
--- mandoc/Attic/argv.c	2009/01/22 14:56:21	1.26
+++ mandoc/Attic/argv.c	2009/02/26 14:56:27	1.32
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.26 2009/01/22 14:56:21 kristaps Exp $ */
+/* $Id: argv.c,v 1.32 2009/02/26 14:56:27 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,17 +26,16 @@
 #include "private.h"
 
 /*
- * Parse arguments and parameters of macros.  Arguments follow the
- * syntax of `-arg [val [valN...]]', while parameters are free-form text
- * following arguments (if any).  This file must correctly handle the
- * strange punctuation rules dictated by groff.
+ * Routines to parse arguments of macros.  Arguments follow the syntax
+ * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
+ * arguments, multiple arguments per value, no-value arguments, etc.
  */
 
 #define	ARGS_QUOTED	(1 << 0)
 #define	ARGS_DELIM	(1 << 1)
 #define	ARGS_TABSEP	(1 << 2)
 
-static	int		 lookup(int, const char *);
+static	int		 argv_a2arg(int, const char *);
 static	int		 args(struct mdoc *, int, int *, 
 				char *, int, char **);
 static	int		 argv(struct mdoc *, int,
@@ -45,8 +44,6 @@ static	int		 argv_single(struct mdoc *, int, 
 				struct mdoc_arg *, int *, char *);
 static	int		 argv_multi(struct mdoc *, int, 
 				struct mdoc_arg *, int *, char *);
-static	int		 postargv(struct mdoc *, int, 
-				const struct mdoc_arg *, int);
 static	int		 pwarn(struct mdoc *, int, int, int);
 static	int		 perr(struct mdoc *, int, int, int);
 
@@ -60,9 +57,8 @@ static	int		 perr(struct mdoc *, int, int, int);
 /* Error messages. */
 
 #define	EQUOTTERM	(0)
-#define	EOFFSET		(1)
-#define	EARGVAL		(2)
-#define	EARGMANY	(3)
+#define	EARGVAL		(1)
+#define	EARGMANY	(2)
 
 static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* \" */
@@ -78,7 +74,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Ed */
 	0, /* Bl */
 	0, /* El */
-	ARGS_DELIM, /* It */
+	0, /* It */
 	ARGS_DELIM, /* Ad */ 
 	ARGS_DELIM, /* An */
 	ARGS_DELIM, /* Ar */
@@ -184,10 +180,6 @@ perr(struct mdoc *mdoc, int line, int pos, int code)
 		c = mdoc_perr(mdoc, line, pos, 
 				"unterminated quoted parameter");
 		break;
-	case (EOFFSET):
-		c = mdoc_perr(mdoc, line, pos, 
-				"invalid value for offset argument");
-		break;
 	case (EARGVAL):
 		c = mdoc_perr(mdoc, line, pos, 
 				"argument requires a value");
@@ -275,7 +267,7 @@ static int
 args(struct mdoc *mdoc, int line, 
 		int *pos, char *buf, int fl, char **v)
 {
-	int		  i, c;
+	int		  i;
 	char		 *p, *pp;
 
 	assert(*pos > 0);
@@ -298,14 +290,11 @@ args(struct mdoc *mdoc, int line, 
 	 */
 
 	if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
-		for (i = *pos; (c = buf[i]); ) {
-			if ( ! mdoc_iscdelim(c))
+		for (i = *pos; buf[i]; ) {
+			if ( ! mdoc_iscdelim(buf[i]))
 				break;
 			i++;
-			if (0 == buf[i] || ! isspace(c))
-				break;
-			i++;
-			while (buf[i] && isspace(c))
+			while (buf[i] && isspace((int)buf[i]))
 				i++;
 		}
 		if (0 == buf[i]) {
@@ -412,8 +401,8 @@ args(struct mdoc *mdoc, int line, 
 		/* Do non-tabsep look-ahead here. */
 		
 		if ( ! (ARGS_TABSEP & fl))
-			while ((c = buf[*pos])) {
-				if (isspace(c))
+			while (buf[*pos]) {
+				if (isspace((int)buf[*pos]))
 					if ('\\' != buf[*pos - 1])
 						break;
 				(*pos)++;
@@ -474,7 +463,7 @@ args(struct mdoc *mdoc, int line, 
 
 
 static int
-lookup(int tok, const char *argv)
+argv_a2arg(int tok, const char *argv)
 {
 
 	switch (tok) {
@@ -638,33 +627,6 @@ lookup(int tok, const char *argv)
 
 
 static int
-postargv(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)
-{
-
-	switch (v->arg) {
-	case (MDOC_Offset):
-		assert(v->value);
-		assert(v->value[0]);
-		if (xstrcmp(v->value[0], "left"))
-			break;
-		if (xstrcmp(v->value[0], "right"))
-			break;
-		if (xstrcmp(v->value[0], "center"))
-			break;
-		if (xstrcmp(v->value[0], "indent"))
-			break;
-		if (xstrcmp(v->value[0], "indent-two"))
-			break;
-		return(perr(mdoc, line, pos, EOFFSET));
-	default:
-		break;
-	}
-
-	return(1);
-}
-
-
-static int
 argv_multi(struct mdoc *mdoc, int line, 
 		struct mdoc_arg *v, int *pos, char *buf)
 {
@@ -750,7 +712,7 @@ int
 mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		struct mdoc_arg *v, int *pos, char *buf)
 {
-	int		 i, ppos;
+	int		 i;
 	char		*p;
 
 	(void)memset(v, 0, sizeof(struct mdoc_arg));
@@ -782,7 +744,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 	if (buf[*pos])
 		buf[(*pos)++] = 0;
 
-	if (MDOC_ARG_MAX == (v->arg = lookup(tok, p))) {
+	if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) {
 		if ( ! pwarn(mdoc, line, i, WARGVPARM))
 			return(ARGV_ERROR);
 		return(ARGV_WORD);
@@ -793,10 +755,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 
 	/* FIXME: whitespace if no value. */
 
-	ppos = *pos;
 	if ( ! argv(mdoc, line, v, pos, buf))
-		return(ARGV_ERROR);
-	if ( ! postargv(mdoc, line, v, ppos))
 		return(ARGV_ERROR);
 
 	return(ARGV_ARG);