As per schwarze@'s suggestions, roll back the refcount structure in

favour of a simpler shim for normalised data in the node allocation and
free routines.  This removes the need to bump and copy references within
validator handlers, removes a pointer redirect, and also kills the
refcount structure itself.  Data is assumed to "live" either in a
MDOC_BLOCK or MDOC_ELEM and is copied accordingly.

1 files changed, 58 insertions, 78 deletions

diff --git a/mdoc_validate.c b/mdoc_validate.c
index f0ae72c1..aa65061c 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -41,16 +41,6 @@
 #define	PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define	POST_ARGS struct mdoc *mdoc
 
-#define	NORM_BUMP(dst, src) do { \
-		(dst)->norm = (src)->norm; \
-		((dst)->norm->refcnt)++; \
-	} while (/* CONSTCOND */ 0)
-#define	NORM_ALLOC(dst) do { \
-		(dst)->norm = \
-			mandoc_calloc(1, sizeof(struct mdoc_norm)); \
-		(dst)->norm->refcnt = 1; \
-	} while (/* CONSTCOND */ 0)
-
 #define	NUMSIZ	  32
 #define	DATESIZE  32
 
@@ -619,12 +609,9 @@ pre_bl(PRE_ARGS)
 		assert(np);
 		assert(MDOC_BLOCK == np->type);
 		assert(MDOC_Bl == np->tok);
-		NORM_BUMP(n, np);
 		return(1);
 	}
 
-	NORM_ALLOC(n);
-
 	/* 
 	 * First figure out which kind of list to use: bind ourselves to
 	 * the first mentioned list type and warn about any remaining
@@ -673,18 +660,18 @@ pre_bl(PRE_ARGS)
 			break;
 		/* Set list arguments. */
 		case (MDOC_Compact):
-			dup = n->norm->d.Bl.comp;
+			dup = n->norm->Bl.comp;
 			comp = 1;
 			break;
 		case (MDOC_Width):
-			dup = (NULL != n->norm->d.Bl.width);
+			dup = (NULL != n->norm->Bl.width);
 			width = n->args->argv[i].value[0];
 			break;
 		case (MDOC_Offset):
 			/* NB: this can be empty! */
 			if (n->args->argv[i].sz) {
 				offs = n->args->argv[i].value[0];
-				dup = (NULL != n->norm->d.Bl.offs);
+				dup = (NULL != n->norm->Bl.offs);
 				break;
 			}
 			mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
@@ -699,36 +686,36 @@ pre_bl(PRE_ARGS)
 			mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
 
 		if (comp && ! dup)
-			n->norm->d.Bl.comp = comp;
+			n->norm->Bl.comp = comp;
 		if (offs && ! dup)
-			n->norm->d.Bl.offs = offs;
+			n->norm->Bl.offs = offs;
 		if (width && ! dup)
-			n->norm->d.Bl.width = width;
+			n->norm->Bl.width = width;
 
 		/* Check: multiple list types. */
 
-		if (LIST__NONE != lt && n->norm->d.Bl.type != LIST__NONE)
+		if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)
 			mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);
 
 		/* Assign list type. */
 
-		if (LIST__NONE != lt && n->norm->d.Bl.type == LIST__NONE) {
-			n->norm->d.Bl.type = lt;
+		if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {
+			n->norm->Bl.type = lt;
 			/* Set column information, too. */
 			if (LIST_column == lt) {
-				n->norm->d.Bl.ncols = 
+				n->norm->Bl.ncols = 
 					n->args->argv[i].sz;
-				n->norm->d.Bl.cols = (const char **)
+				n->norm->Bl.cols = (const char **)
 					n->args->argv[i].value;
 			}
 		}
 
 		/* The list type should come first. */
 
-		if (n->norm->d.Bl.type == LIST__NONE)
-			if (n->norm->d.Bl.width || 
-					n->norm->d.Bl.offs || 
-					n->norm->d.Bl.comp)
+		if (n->norm->Bl.type == LIST__NONE)
+			if (n->norm->Bl.width || 
+					n->norm->Bl.offs || 
+					n->norm->Bl.comp)
 				mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
 
 		continue;
@@ -736,9 +723,9 @@ pre_bl(PRE_ARGS)
 
 	/* Allow lists to default to LIST_item. */
 
-	if (LIST__NONE == n->norm->d.Bl.type) {
+	if (LIST__NONE == n->norm->Bl.type) {
 		mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);
-		n->norm->d.Bl.type = LIST_item;
+		n->norm->Bl.type = LIST_item;
 	}
 
 	/* 
@@ -747,9 +734,9 @@ pre_bl(PRE_ARGS)
 	 * and must also be warned.
 	 */
 
-	switch (n->norm->d.Bl.type) {
+	switch (n->norm->Bl.type) {
 	case (LIST_tag):
-		if (n->norm->d.Bl.width)
+		if (n->norm->Bl.width)
 			break;
 		mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
 		break;
@@ -762,7 +749,7 @@ pre_bl(PRE_ARGS)
 	case (LIST_inset):
 		/* FALLTHROUGH */
 	case (LIST_item):
-		if (n->norm->d.Bl.width)
+		if (n->norm->Bl.width)
 			mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
 		break;
 	default:
@@ -791,12 +778,9 @@ pre_bd(PRE_ARGS)
 		assert(np);
 		assert(MDOC_BLOCK == np->type);
 		assert(MDOC_Bd == np->tok);
-		NORM_BUMP(n, np);
 		return(1);
 	}
 
-	NORM_ALLOC(n);
-
 	/* LINTED */
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
 		dt = DISP__NONE;
@@ -826,14 +810,14 @@ pre_bd(PRE_ARGS)
 			/* NB: this can be empty! */
 			if (n->args->argv[i].sz) {
 				offs = n->args->argv[i].value[0];
-				dup = (NULL != n->norm->d.Bd.offs);
+				dup = (NULL != n->norm->Bd.offs);
 				break;
 			}
 			mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
 			break;
 		case (MDOC_Compact):
 			comp = 1;
-			dup = n->norm->d.Bd.comp;
+			dup = n->norm->Bd.comp;
 			break;
 		default:
 			abort();
@@ -848,24 +832,24 @@ pre_bd(PRE_ARGS)
 		/* Make our auxiliary assignments. */
 
 		if (offs && ! dup)
-			n->norm->d.Bd.offs = offs;
+			n->norm->Bd.offs = offs;
 		if (comp && ! dup)
-			n->norm->d.Bd.comp = comp;
+			n->norm->Bd.comp = comp;
 
 		/* Check whether a type has already been assigned. */
 
-		if (DISP__NONE != dt && n->norm->d.Bd.type != DISP__NONE)
+		if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE)
 			mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);
 
 		/* Make our type assignment. */
 
-		if (DISP__NONE != dt && n->norm->d.Bd.type == DISP__NONE)
-			n->norm->d.Bd.type = dt;
+		if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)
+			n->norm->Bd.type = dt;
 	}
 
-	if (DISP__NONE == n->norm->d.Bd.type) {
+	if (DISP__NONE == n->norm->Bd.type) {
 		mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
-		n->norm->d.Bd.type = DISP_ragged;
+		n->norm->Bd.type = DISP_ragged;
 	}
 
 	return(1);
@@ -910,8 +894,6 @@ pre_an(PRE_ARGS)
 {
 	int		 i;
 
-	NORM_ALLOC(n);
-
 	if (NULL == n->args)
 		return(1);
 	
@@ -920,9 +902,9 @@ pre_an(PRE_ARGS)
 			n->args->argv[i].pos, MANDOCERR_IGNARGV);
 
 	if (MDOC_Split == n->args->argv[0].arg)
-		n->norm->d.An.auth = AUTH_split;
+		n->norm->An.auth = AUTH_split;
 	else if (MDOC_Nosplit == n->args->argv[0].arg)
-		n->norm->d.An.auth = AUTH_nosplit;
+		n->norm->An.auth = AUTH_nosplit;
 	else
 		abort();
 
@@ -1004,14 +986,12 @@ post_bf(POST_ARGS)
 		assert(np);
 		assert(MDOC_HEAD == np->type);
 		assert(MDOC_Bf == np->tok);
-		NORM_BUMP(mdoc->last, np);
 		return(1);
 	}
 
 	np = mdoc->last;
 	assert(MDOC_BLOCK == np->parent->type);
 	assert(MDOC_Bf == np->parent->tok);
-	NORM_ALLOC(np);
 
 	/* 
 	 * Cannot have both argument and parameter.
@@ -1031,11 +1011,11 @@ post_bf(POST_ARGS)
 	if (np->parent->args) {
 		arg = np->parent->args->argv[0].arg;
 		if (MDOC_Emphasis == arg)
-			np->norm->d.Bf.font = FONT_Em;
+			np->norm->Bf.font = FONT_Em;
 		else if (MDOC_Literal == arg)
-			np->norm->d.Bf.font = FONT_Li;
+			np->norm->Bf.font = FONT_Li;
 		else if (MDOC_Symbolic == arg)
-			np->norm->d.Bf.font = FONT_Sy;
+			np->norm->Bf.font = FONT_Sy;
 		else
 			abort();
 		return(1);
@@ -1044,11 +1024,11 @@ post_bf(POST_ARGS)
 	/* Extract parameter into data. */
 
 	if (0 == strcmp(np->child->string, "Em"))
-		np->norm->d.Bf.font = FONT_Em;
+		np->norm->Bf.font = FONT_Em;
 	else if (0 == strcmp(np->child->string, "Li"))
-		np->norm->d.Bf.font = FONT_Li;
+		np->norm->Bf.font = FONT_Li;
 	else if (0 == strcmp(np->child->string, "Sy"))
-		np->norm->d.Bf.font = FONT_Sy;
+		np->norm->Bf.font = FONT_Sy;
 	else 
 		mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
 
@@ -1254,14 +1234,14 @@ post_an(POST_ARGS)
 	struct mdoc_node *np;
 
 	np = mdoc->last;
-	if (AUTH__NONE != np->norm->d.An.auth && np->child)
+	if (AUTH__NONE != np->norm->An.auth && np->child)
 		return(eerr_eq0(mdoc));
 
 	/* 
 	 * FIXME: make this ewarn and make sure that the front-ends
 	 * don't print the arguments.
 	 */
-	if (AUTH__NONE != np->norm->d.An.auth || np->child)
+	if (AUTH__NONE != np->norm->An.auth || np->child)
 		return(1);
 
 	mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);
@@ -1281,7 +1261,7 @@ post_it(POST_ARGS)
 		return(1);
 
 	n = mdoc->last->parent->parent;
-	lt = n->norm->d.Bl.type;
+	lt = n->norm->Bl.type;
 
 	if (LIST__NONE == lt) {
 		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
@@ -1320,7 +1300,7 @@ post_it(POST_ARGS)
 			mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
 		break;
 	case (LIST_column):
-		cols = (int)n->norm->d.Bl.ncols;
+		cols = (int)n->norm->Bl.ncols;
 
 		assert(NULL == mdoc->last->head->child);
 
@@ -1364,17 +1344,17 @@ post_bl_block(POST_ARGS)
 
 	n = mdoc->last;
 
-	if (LIST_tag == n->norm->d.Bl.type && 
-			NULL == n->norm->d.Bl.width) {
+	if (LIST_tag == n->norm->Bl.type && 
+			NULL == n->norm->Bl.width) {
 		if ( ! post_bl_block_tag(mdoc))
 			return(0);
-	} else if (NULL != n->norm->d.Bl.width) {
+	} else if (NULL != n->norm->Bl.width) {
 		if ( ! post_bl_block_width(mdoc))
 			return(0);
 	} else 
 		return(1);
 
-	assert(n->norm->d.Bl.width);
+	assert(n->norm->Bl.width);
 	return(1);
 }
 
@@ -1398,9 +1378,9 @@ post_bl_block_width(POST_ARGS)
 	 * the macro's width as set in share/tmac/mdoc/doc-common.
 	 */
 
-	if (0 == strcmp(n->norm->d.Bl.width, "Ds"))
+	if (0 == strcmp(n->norm->Bl.width, "Ds"))
 		width = 6;
-	else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->d.Bl.width)))
+	else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
 		return(1);
 	else if (0 == (width = mdoc_macro2len(tok)))  {
 		mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
@@ -1422,7 +1402,7 @@ post_bl_block_width(POST_ARGS)
 	n->args->argv[i].value[0] = mandoc_strdup(buf);
 
 	/* Set our width! */
-	n->norm->d.Bl.width = n->args->argv[i].value[0];
+	n->norm->Bl.width = n->args->argv[i].value[0];
 	return(1);
 }
 
@@ -1488,7 +1468,7 @@ post_bl_block_tag(POST_ARGS)
 	n->args->argv[i].value[0] = mandoc_strdup(buf);
 
 	/* Set our width! */
-	n->norm->d.Bl.width = n->args->argv[i].value[0];
+	n->norm->Bl.width = n->args->argv[i].value[0];
 	return(1);
 }
 
@@ -1499,7 +1479,7 @@ post_bl_head(POST_ARGS)
 	struct mdoc_node *np, *nn, *nnp;
 	int		  i, j;
 
-	if (LIST_column != mdoc->last->norm->d.Bl.type)
+	if (LIST_column != mdoc->last->norm->Bl.type)
 		/* FIXME: this should be ERROR class... */
 		return(hwarn_eq0(mdoc));
 
@@ -1516,7 +1496,7 @@ post_bl_head(POST_ARGS)
 	 * lists, but I'll leave that for another day.
 	 */
 
-	if (mdoc->last->norm->d.Bl.ncols && mdoc->last->nchild) {
+	if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) {
 		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
 		return(0);
 	} else if (NULL == mdoc->last->child)
@@ -1542,8 +1522,8 @@ post_bl_head(POST_ARGS)
 	np->args->argv[j].value = mandoc_malloc
 		((size_t)mdoc->last->nchild * sizeof(char *));
 
-	mdoc->last->norm->d.Bl.ncols = np->args->argv[j].sz;
-	mdoc->last->norm->d.Bl.cols = (const char **)np->args->argv[j].value;
+	mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
+	mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;
 
 	for (i = 0, nn = mdoc->last->child; nn; i++) {
 		np->args->argv[j].value[i] = nn->string;
@@ -1925,11 +1905,11 @@ pre_par(PRE_ARGS)
 
 	if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
 		return(1);
-	if (MDOC_Bl == n->tok && n->norm->d.Bl.comp)
+	if (MDOC_Bl == n->tok && n->norm->Bl.comp)
 		return(1);
-	if (MDOC_Bd == n->tok && n->norm->d.Bd.comp)
+	if (MDOC_Bd == n->tok && n->norm->Bd.comp)
 		return(1);
-	if (MDOC_It == n->tok && n->parent->norm->d.Bl.comp)
+	if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
 		return(1);
 
 	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
@@ -1954,9 +1934,9 @@ pre_literal(PRE_ARGS)
 		mdoc->flags |= MDOC_LITERAL;
 		break;
 	case (MDOC_Bd):
-		if (DISP_literal == n->norm->d.Bd.type)
+		if (DISP_literal == n->norm->Bd.type)
 			mdoc->flags |= MDOC_LITERAL;
-		if (DISP_unfilled == n->norm->d.Bd.type)
+		if (DISP_unfilled == n->norm->Bd.type)
 			mdoc->flags |= MDOC_LITERAL;
 		break;
 	default: