Major refactoring of library. KissXML is now faster and fully read-access thread-safe.

Author: robbiehanson

DDXMLPrivate.h

@@ -2,7 +2,7 @@
 #import <libxml/tree.h>
 
 
-@interface NSString (NSStringAdditions)
+@interface NSString (DDXML)
 
 /**
  * xmlChar - A basic replacement for char, a byte in a UTF-8 encoded string.

DDXMLElementAdditions.h renamed to KissXML/Additions/DDXMLElementAdditions.h

@@ -1,7 +1,7 @@
-#import "NSStringAdditions.h"
+#import "NSString+DDXML.h"
 
 
-@implementation NSString (NSStringAdditions)
+@implementation NSString (DDXML)
 
 - (const xmlChar *)xmlChar
 {

DDXMLElementAdditions.m renamed to KissXML/Additions/DDXMLElementAdditions.m

@@ -1,40 +1,41 @@
-#import "DDXMLDocument.h"
-#import "NSStringAdditions.h"
 #import "DDXMLPrivate.h"
+#import "NSString+DDXML.h"
 
 
 @implementation DDXMLDocument
 
 /**
  * Returns a DDXML wrapper object for the given primitive node.
  * The given node MUST be non-NULL and of the proper type.
- * 
- * If the wrapper object already exists, it is retained/autoreleased and returned.
- * Otherwise a new wrapper object is alloc/init/autoreleased and returned.
 **/
-+ (id)nodeWithPrimitive:(xmlKindPtr)kindPtr
++ (id)nodeWithDocPrimitive:(xmlDocPtr)doc freeOnDealloc:(BOOL)flag
 {
-	// If a wrapper object already exists, the _private variable is pointing to it.
-	
-	xmlDocPtr doc = (xmlDocPtr)kindPtr;
-	if(doc->_private == NULL)
-		return [[[DDXMLDocument alloc] initWithCheckedPrimitive:kindPtr] autorelease];
-	else
-		return [[((DDXMLDocument *)(doc->_private)) retain] autorelease];
+	return [[[DDXMLDocument alloc] initWithDocPrimitive:doc freeOnDealloc:flag] autorelease];
 }
 
-/**
- * Returns a DDXML wrapper object for the given primitive node.
- * The given node MUST be non-NULL and of the proper type.
- * 
- * The given node is checked, meaning a wrapper object for it does not already exist.
-**/
-- (id)initWithCheckedPrimitive:(xmlKindPtr)kindPtr
+- (id)initWithDocPrimitive:(xmlDocPtr)doc freeOnDealloc:(BOOL)flag
 {
-	self = [super initWithCheckedPrimitive:kindPtr];
+	self = [super initWithPrimitive:(xmlKindPtr)doc freeOnDealloc:flag];
 	return self;
 }
 
++ (id)nodeWithPrimitive:(xmlKindPtr)kindPtr freeOnDealloc:(BOOL)flag
+{
+	// Promote initializers which use proper parameter types to enable compiler to catch more mistakes
+	NSAssert(NO, @"Use nodeWithDocPrimitive:freeOnDealloc:");
+	
+	return nil;
+}
+
+- (id)initWithPrimitive:(xmlKindPtr)kindPtr freeOnDealloc:(BOOL)flag
+{
+	// Promote initializers which use proper parameter types to enable compiler to catch more mistakes.
+	NSAssert(NO, @"Use initWithDocPrimitive:freeOnDealloc:");
+	
+	[self release];
+	return nil;
+}
+
 /**
  * Initializes and returns a DDXMLDocument object created from an NSData object.
  * 
@@ -43,7 +44,9 @@ - (id)initWithCheckedPrimitive:(xmlKindPtr)kindPtr
 **/
 - (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSError **)error
 {
-	return [self initWithData:[string dataUsingEncoding:NSUTF8StringEncoding] options:mask error:error];
+	return [self initWithData:[string dataUsingEncoding:NSUTF8StringEncoding]
+	                  options:mask
+	                    error:error];
 }
 
 /**
@@ -54,9 +57,9 @@ - (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSErr
 **/
 - (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError **)error
 {
-	if(data == nil || [data length] == 0)
+	if (data == nil || [data length] == 0)
 	{
-		if(error) *error = [NSError errorWithDomain:@"DDXMLErrorDomain" code:0 userInfo:nil];
+		if (error) *error = [NSError errorWithDomain:@"DDXMLErrorDomain" code:0 userInfo:nil];
 
 		[self release];
 		return nil;
@@ -70,15 +73,15 @@ - (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError **)err
 	xmlKeepBlanksDefault(0);
 
 	xmlDocPtr doc = xmlParseMemory([data bytes], [data length]);
-	if(doc == NULL)
+	if (doc == NULL)
 	{
-		if(error) *error = [NSError errorWithDomain:@"DDXMLErrorDomain" code:1 userInfo:nil];
+		if (error) *error = [NSError errorWithDomain:@"DDXMLErrorDomain" code:1 userInfo:nil];
 
 		[self release];
 		return nil;
 	}
 
-	return [self initWithCheckedPrimitive:(xmlKindPtr)doc];
+	return [self initWithDocPrimitive:doc freeOnDealloc:YES];
 }
 
 /**
@@ -92,8 +95,8 @@ - (DDXMLElement *)rootElement
 
 	xmlNodePtr rootNode = xmlDocGetRootElement(doc);
 
-	if(rootNode != NULL)
-		return [DDXMLElement nodeWithPrimitive:(xmlKindPtr)rootNode];
+	if (rootNode != NULL)
+		return [DDXMLElement nodeWithElementPrimitive:rootNode freeOnDealloc:NO];
 	else
 		return nil;
 }