From 5e8dea30d01017a3651dedc1f6eda3d2b1e6f8d1 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 22 Dec 2010 11:15:16 +0000 Subject: Implement reference-counted version of original union mdoc_data. This simplifies clean-up and allows for more types without extra hassle. Also made in-line literal types in -T[x]html use CODE instead of SPAN to match how literal blocks use PRE. --- mdoc.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'mdoc.h') diff --git a/mdoc.h b/mdoc.h index 31fb0a3e..1041a303 100644 --- a/mdoc.h +++ b/mdoc.h @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.108 2010/12/16 17:14:48 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.109 2010/12/22 11:15:16 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -358,11 +358,20 @@ struct mdoc_an { * of iterating through the mdoc_arg pointers of a node: defaults are * provided, etc. */ -union mdoc_data { - struct mdoc_an *An; - struct mdoc_bd *Bd; - struct mdoc_bf *Bf; - struct mdoc_bl *Bl; +union mdoc_data { + struct mdoc_an An; + struct mdoc_bd Bd; + struct mdoc_bf Bf; + struct mdoc_bl Bl; +}; + +/* + * Reference-counted structure for containing normalised arguments of + * certain macros (those listed in union mdoc_data). + */ +struct mdoc_norm { + int refcnt; + union mdoc_data d; }; /* @@ -387,6 +396,7 @@ struct mdoc_node { #define MDOC_ENDED (1 << 5) /* rendering has been ended */ enum mdoc_type type; /* AST node type */ enum mdoc_sec sec; /* current named section */ + struct mdoc_norm *norm; /* ref-counted, normalised args */ /* FIXME: these can be union'd to shave a few bytes. */ struct mdoc_arg *args; /* BLOCK/ELEM */ struct mdoc_node *pending; /* BLOCK */ @@ -395,7 +405,6 @@ struct mdoc_node { struct mdoc_node *tail; /* BLOCK */ char *string; /* TEXT */ enum mdoc_endbody end; /* BODY */ - union mdoc_data data; }; /* -- cgit v1.2.3-56-ge451