===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.24
retrieving revision 1.39
diff -u -p -r1.24 -r1.39
--- mandoc/mdoc_argv.c	2009/08/20 09:07:24	1.24
+++ mandoc/mdoc_argv.c	2010/05/07 05:48:29	1.39
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_argv.c,v 1.24 2009/08/20 09:07:24 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.39 2010/05/07 05:48:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -23,6 +27,7 @@
 #include <string.h>
 
 #include "libmdoc.h"
+#include "libmandoc.h"
 
 /*
  * Routines to parse arguments of macros.  Arguments follow the syntax
@@ -39,8 +44,8 @@
 
 #define	MULTI_STEP	 5
 
-static	int		 argv_a2arg(int, const char *);
-static	int		 args(struct mdoc *, int, int *, 
+static	int		 argv_a2arg(enum mdoct, const char *);
+static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, int, char **);
 static	int		 argv(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
@@ -59,8 +64,8 @@ static	int mdoc_argvflags[MDOC_ARG_MAX] = {
 	ARGV_NONE,	/* MDOC_Ragged */
 	ARGV_NONE,	/* MDOC_Unfilled */
 	ARGV_NONE,	/* MDOC_Literal */
-	ARGV_NONE,	/* MDOC_File */
-	ARGV_SINGLE,	/* MDOC_Offset */
+	ARGV_SINGLE,	/* MDOC_File */
+	ARGV_OPT_SINGLE, /* MDOC_Offset */
 	ARGV_NONE,	/* MDOC_Bullet */
 	ARGV_NONE,	/* MDOC_Dash */
 	ARGV_NONE,	/* MDOC_Hyphen */
@@ -74,7 +79,7 @@ static	int mdoc_argvflags[MDOC_ARG_MAX] = {
 	ARGV_MULTI,	/* MDOC_Column */
 	ARGV_SINGLE,	/* MDOC_Width */
 	ARGV_NONE,	/* MDOC_Compact */
-	ARGV_OPT_SINGLE, /* MDOC_Std */
+	ARGV_NONE,	/* MDOC_Std */
 	ARGV_NONE,	/* MDOC_Filled */
 	ARGV_NONE,	/* MDOC_Words */
 	ARGV_NONE,	/* MDOC_Emphasis */
@@ -203,6 +208,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* %Q */
 	0, /* br */
 	0, /* sp */
+	0, /* %U */
 };
 
 
@@ -212,7 +218,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
  * one mandatory value, an optional single value, or no value.
  */
 int
-mdoc_argv(struct mdoc *m, int line, int tok,
+mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
 		struct mdoc_arg **v, int *pos, char *buf)
 {
 	char		 *p, sv;
@@ -265,24 +271,13 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 	if ( ! argv(m, line, &tmp, pos, buf))
 		return(ARGV_ERROR);
 
-	if (NULL == (arg = *v)) {
-		*v = calloc(1, sizeof(struct mdoc_arg));
-		if (NULL == *v) {
-			(void)mdoc_nerr(m, m->last, EMALLOC);
-			return(ARGV_ERROR);
-		}
-		arg = *v;
-	} 
+	if (NULL == (arg = *v))
+		arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg));
 
 	arg->argc++;
-	arg->argv = realloc(arg->argv, arg->argc * 
-			sizeof(struct mdoc_argv));
+	arg->argv = mandoc_realloc
+		(arg->argv, arg->argc * sizeof(struct mdoc_argv));
 
-	if (NULL == arg->argv) {
-		(void)mdoc_nerr(m, m->last, EMALLOC);
-		return(ARGV_ERROR);
-	}
-
 	(void)memcpy(&arg->argv[(int)arg->argc - 1], 
 			&tmp, sizeof(struct mdoc_argv));
 
@@ -293,7 +288,7 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 void
 mdoc_argv_free(struct mdoc_arg *p)
 {
-	int		 i, j;
+	int		 i;
 
 	if (NULL == p)
 		return;
@@ -305,23 +300,32 @@ mdoc_argv_free(struct mdoc_arg *p)
 	}
 	assert(p->argc);
 
-	/* LINTED */
-	for (i = 0; i < (int)p->argc; i++) {
-		if (0 == p->argv[i].sz)
-			continue;
-		/* LINTED */
-		for (j = 0; j < (int)p->argv[i].sz; j++) 
-			free(p->argv[i].value[j]);
+	for (i = (int)p->argc - 1; i >= 0; i--)
+		mdoc_argn_free(p, i);
 
-		free(p->argv[i].value);
-	}
-
 	free(p->argv);
 	free(p);
 }
 
 
-int
+void
+mdoc_argn_free(struct mdoc_arg *p, int iarg)
+{
+	struct mdoc_argv *arg = &p->argv[iarg];
+	int		  j;
+
+	if (arg->sz && arg->value) {
+		for (j = (int)arg->sz - 1; j >= 0; j--) 
+			free(arg->value[j]);
+		free(arg->value);
+	}
+
+	for (--p->argc; iarg < (int)p->argc; iarg++)
+		p->argv[iarg] = p->argv[iarg+1];
+}
+
+
+enum margserr
 mdoc_zargs(struct mdoc *m, int line, int *pos, 
 		char *buf, int flags, char **v)
 {
@@ -330,14 +334,14 @@ mdoc_zargs(struct mdoc *m, int line, int *pos, 
 }
 
 
-int
-mdoc_args(struct mdoc *m, int line, 
-		int *pos, char *buf, int tok, char **v)
+enum margserr
+mdoc_args(struct mdoc *m, int line, int *pos, 
+		char *buf, enum mdoct tok, char **v)
 {
 	int		  fl, c, i;
 	struct mdoc_node *n;
 
-	fl = (0 == tok) ? 0 : mdoc_argflags[tok];
+	fl = mdoc_argflags[tok];
 
 	if (MDOC_It != tok)
 		return(args(m, line, pos, buf, fl, v));
@@ -368,7 +372,7 @@ mdoc_args(struct mdoc *m, int line, 
 }
 
 
-static int
+static enum margserr
 args(struct mdoc *m, int line, int *pos, 
 		char *buf, int fl, char **v)
 {
@@ -402,9 +406,9 @@ args(struct mdoc *m, int line, int *pos, 
 	 * follows the pattern of [[::delim::][ ]+]+.
 	 */
 
-	if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
+	if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) {
 		for (i = *pos; buf[i]; ) {
-			if ( ! mdoc_iscdelim(buf[i]))
+			if ( mdoc_iscdelim(buf[i]) < 2)
 				break;
 			i++;
 			if (0 == buf[i] || ' ' != buf[i])
@@ -553,7 +557,7 @@ args(struct mdoc *m, int line, int *pos, 
 
 
 static int
-argv_a2arg(int tok, const char *argv)
+argv_a2arg(enum mdoct tok, const char *p)
 {
 
 	/*
@@ -566,80 +570,82 @@ argv_a2arg(int tok, const char *argv)
 
 	switch (tok) {
 	case (MDOC_An):
-		if (0 == strcmp(argv, "split"))
+		if (0 == strcmp(p, "split"))
 			return(MDOC_Split);
-		else if (0 == strcmp(argv, "nosplit"))
+		else if (0 == strcmp(p, "nosplit"))
 			return(MDOC_Nosplit);
 		break;
 
 	case (MDOC_Bd):
-		if (0 == strcmp(argv, "ragged"))
+		if (0 == strcmp(p, "ragged"))
 			return(MDOC_Ragged);
-		else if (0 == strcmp(argv, "unfilled"))
+		else if (0 == strcmp(p, "unfilled"))
 			return(MDOC_Unfilled);
-		else if (0 == strcmp(argv, "filled"))
+		else if (0 == strcmp(p, "filled"))
 			return(MDOC_Filled);
-		else if (0 == strcmp(argv, "literal"))
+		else if (0 == strcmp(p, "literal"))
 			return(MDOC_Literal);
-		else if (0 == strcmp(argv, "file"))
+		else if (0 == strcmp(p, "file"))
 			return(MDOC_File);
-		else if (0 == strcmp(argv, "offset"))
+		else if (0 == strcmp(p, "offset"))
 			return(MDOC_Offset);
-		else if (0 == strcmp(argv, "compact"))
+		else if (0 == strcmp(p, "compact"))
 			return(MDOC_Compact);
+		else if (0 == strcmp(p, "centered"))
+			return(MDOC_Centred);
 		break;
 
 	case (MDOC_Bf):
-		if (0 == strcmp(argv, "emphasis"))
+		if (0 == strcmp(p, "emphasis"))
 			return(MDOC_Emphasis);
-		else if (0 == strcmp(argv, "literal"))
+		else if (0 == strcmp(p, "literal"))
 			return(MDOC_Literal);
-		else if (0 == strcmp(argv, "symbolic"))
+		else if (0 == strcmp(p, "symbolic"))
 			return(MDOC_Symbolic);
 		break;
 
 	case (MDOC_Bk):
-		if (0 == strcmp(argv, "words"))
+		if (0 == strcmp(p, "words"))
 			return(MDOC_Words);
 		break;
 
 	case (MDOC_Bl):
-		if (0 == strcmp(argv, "bullet"))
+		if (0 == strcmp(p, "bullet"))
 			return(MDOC_Bullet);
-		else if (0 == strcmp(argv, "dash"))
+		else if (0 == strcmp(p, "dash"))
 			return(MDOC_Dash);
-		else if (0 == strcmp(argv, "hyphen"))
+		else if (0 == strcmp(p, "hyphen"))
 			return(MDOC_Hyphen);
-		else if (0 == strcmp(argv, "item"))
+		else if (0 == strcmp(p, "item"))
 			return(MDOC_Item);
-		else if (0 == strcmp(argv, "enum"))
+		else if (0 == strcmp(p, "enum"))
 			return(MDOC_Enum);
-		else if (0 == strcmp(argv, "tag"))
+		else if (0 == strcmp(p, "tag"))
 			return(MDOC_Tag);
-		else if (0 == strcmp(argv, "diag"))
+		else if (0 == strcmp(p, "diag"))
 			return(MDOC_Diag);
-		else if (0 == strcmp(argv, "hang"))
+		else if (0 == strcmp(p, "hang"))
 			return(MDOC_Hang);
-		else if (0 == strcmp(argv, "ohang"))
+		else if (0 == strcmp(p, "ohang"))
 			return(MDOC_Ohang);
-		else if (0 == strcmp(argv, "inset"))
+		else if (0 == strcmp(p, "inset"))
 			return(MDOC_Inset);
-		else if (0 == strcmp(argv, "column"))
+		else if (0 == strcmp(p, "column"))
 			return(MDOC_Column);
-		else if (0 == strcmp(argv, "width"))
+		else if (0 == strcmp(p, "width"))
 			return(MDOC_Width);
-		else if (0 == strcmp(argv, "offset"))
+		else if (0 == strcmp(p, "offset"))
 			return(MDOC_Offset);
-		else if (0 == strcmp(argv, "compact"))
+		else if (0 == strcmp(p, "compact"))
 			return(MDOC_Compact);
-		else if (0 == strcmp(argv, "nested"))
+		else if (0 == strcmp(p, "nested"))
 			return(MDOC_Nested);
 		break;
 	
 	case (MDOC_Rv):
 		/* FALLTHROUGH */
 	case (MDOC_Ex):
-		if (0 == strcmp(argv, "std"))
+		if (0 == strcmp(p, "std"))
 			return(MDOC_Std);
 		break;
 	default:
@@ -666,16 +672,11 @@ argv_multi(struct mdoc *m, int line, 
 		else if (ARGS_EOLN == c)
 			break;
 
-		if (0 == v->sz % MULTI_STEP) {
-			v->value = realloc(v->value, 
+		if (0 == v->sz % MULTI_STEP)
+			v->value = mandoc_realloc(v->value, 
 				(v->sz + MULTI_STEP) * sizeof(char *));
-			if (NULL == v->value) {
-				(void)mdoc_nerr(m, m->last, EMALLOC);
-				return(ARGV_ERROR);
-			}
-		}
-		if (NULL == (v->value[(int)v->sz] = strdup(p)))
-			return(mdoc_nerr(m, m->last, EMALLOC));
+
+		v->value[(int)v->sz] = mandoc_strdup(p);
 	}
 
 	return(1);
@@ -699,10 +700,8 @@ argv_opt_single(struct mdoc *m, int line, 
 		return(1);
 
 	v->sz = 1;
-	if (NULL == (v->value = calloc(1, sizeof(char *))))
-		return(mdoc_nerr(m, m->last, EMALLOC));
-	if (NULL == (v->value[0] = strdup(p)))
-		return(mdoc_nerr(m, m->last, EMALLOC));
+	v->value = mandoc_malloc(sizeof(char *));
+	v->value[0] = mandoc_strdup(p);
 
 	return(1);
 }
@@ -727,10 +726,8 @@ argv_single(struct mdoc *m, int line, 
 		return(mdoc_perr(m, line, ppos, EARGVAL));
 
 	v->sz = 1;
-	if (NULL == (v->value = calloc(1, sizeof(char *))))
-		return(mdoc_nerr(m, m->last, EMALLOC));
-	if (NULL == (v->value[0] = strdup(p)))
-		return(mdoc_nerr(m, m->last, EMALLOC));
+	v->value = mandoc_malloc(sizeof(char *));
+	v->value[0] = mandoc_strdup(p);
 
 	return(1);
 }