Added ARC Support

I have added in the checks for Automatic Reference Counting by the LLVM
compiler. This is just a compile-time option for the code, so that it can be
used in retain/release schemes as well as ARC schemes. It's a pretty simple
matter of removing the unnecessary calls that the compiler adds in anyway.

Author: drbobbeaty

NSData+Base64.m

@@ -300,12 +300,12 @@ - (NSString *)base64EncodedString
 	char *outputBuffer =
 		NewBase64Encode([self bytes], [self length], true, &outputLength);
 
-	NSString *result =
-		[[[NSString alloc]
-			initWithBytes:outputBuffer
-			length:outputLength
-			encoding:NSASCIIStringEncoding]
-		autorelease];
+	NSString *result =[[NSString alloc] initWithBytes:outputBuffer
+											   length:outputLength
+											 encoding:NSASCIIStringEncoding];
+#if ! __has_feature(objc_arc)
+	[result autorelease];
+#endif
 	free(outputBuffer);
 	return result;
 }

NSStringAdditions.m

@@ -7,8 +7,11 @@ + (NSString *)stringByGeneratingUUID {
     CFStringRef temporaryUUIDString = CFUUIDCreateString(nil, UUIDReference);
 
     CFRelease(UUIDReference);
-    
+#if ! __has_feature(objc_arc)
     return [NSMakeCollectable(temporaryUUIDString) autorelease];
+#else
+    return (__bridge_transfer NSString*)temporaryUUIDString;
+#endif
 }
 
 #pragma mark -

XMLRPCConnection.m

@@ -36,22 +36,30 @@ @implementation XMLRPCConnection
 - (id)initWithXMLRPCRequest: (XMLRPCRequest *)request delegate: (id<XMLRPCConnectionDelegate>)delegate manager: (XMLRPCConnectionManager *)manager {
     self = [super init];
     if (self) {
+#if ! __has_feature(objc_arc)
         myManager = [manager retain];
         myRequest = [request retain];
         myIdentifier = [[NSString stringByGeneratingUUID] retain];
+#else
+        myManager = manager;
+        myRequest = request;
+        myIdentifier = [NSString stringByGeneratingUUID];
+#endif
         myData = [[NSMutableData alloc] init];
 
         myConnection = [[NSURLConnection alloc] initWithRequest: [request request] delegate: self];
 
+#if ! __has_feature(objc_arc)
         myDelegate = [delegate retain];
+#endif
 
         if (myConnection) {
             NSLog(@"The connection, %@, has been established!", myIdentifier);
         } else {
             NSLog(@"The connection, %@, could not be established!", myIdentifier);
-            
+#if ! __has_feature(objc_arc)
             [self release];
-            
+#endif
             return nil;
         }
     }
@@ -63,13 +71,21 @@ - (id)initWithXMLRPCRequest: (XMLRPCRequest *)request delegate: (id<XMLRPCConnec
 
 + (XMLRPCResponse *)sendSynchronousXMLRPCRequest: (XMLRPCRequest *)request error: (NSError **)error {
     NSHTTPURLResponse *response = nil;
+#if ! __has_feature(objc_arc)
     NSData *data = [[[NSURLConnection sendSynchronousRequest: [request request] returningResponse: &response error: error] retain] autorelease];
+#else
+    NSData *data = [NSURLConnection sendSynchronousRequest: [request request] returningResponse: &response error: error];
+#endif
 
     if (response) {
         NSInteger statusCode = [response statusCode];
 
         if ((statusCode < 400) && data) {
+#if ! __has_feature(objc_arc)
             return [[[XMLRPCResponse alloc] initWithData: data] autorelease];
+#else
+            return [[XMLRPCResponse alloc] initWithData: data];
+#endif
         }
     }
 
@@ -79,7 +95,11 @@ + (XMLRPCResponse *)sendSynchronousXMLRPCRequest: (XMLRPCRequest *)request error
 #pragma mark -
 
 - (NSString *)identifier {
+#if ! __has_feature(objc_arc)
     return [[myIdentifier retain] autorelease];
+#else
+    return myIdentifier;
+#endif
 }
 
 #pragma mark -
@@ -97,6 +117,7 @@ - (void)cancel {
 #pragma mark -
 
 - (void)dealloc {    
+#if ! __has_feature(objc_arc)
     [myManager release];
     [myRequest release];
     [myIdentifier release];
@@ -105,6 +126,7 @@ - (void)dealloc {
     [myDelegate release];
 
     [super dealloc];
+#endif
 }
 
 @end
@@ -144,7 +166,11 @@ - (void)connection:(NSURLConnection *)connection
 }
 
 - (void)connection: (NSURLConnection *)connection didFailWithError: (NSError *)error {
+#if ! __has_feature(objc_arc)
     XMLRPCRequest *request = [[myRequest retain] autorelease];
+#else
+    XMLRPCRequest *request = myRequest;
+#endif
 
     NSLog(@"The connection, %@, failed with the following error: %@", myIdentifier, [error localizedDescription]);
 
@@ -169,8 +195,13 @@ - (void)connection: (NSURLConnection *)connection didCancelAuthenticationChallen
 
 - (void)connectionDidFinishLoading: (NSURLConnection *)connection {
     if (myData && ([myData length] > 0)) {
+#if ! __has_feature(objc_arc)
         XMLRPCResponse *response = [[[XMLRPCResponse alloc] initWithData: myData] autorelease];
         XMLRPCRequest *request = [[myRequest retain] autorelease];
+#else
+        XMLRPCResponse *response = [[XMLRPCResponse alloc] initWithData: myData];
+        XMLRPCRequest *request = myRequest;
+#endif
 
         [myDelegate request: request didReceiveResponse: response];
     }

XMLRPCConnectionManager.m

@@ -45,11 +45,17 @@ + (XMLRPCConnectionManager *)sharedManager {
 
 - (NSString *)spawnConnectionWithXMLRPCRequest: (XMLRPCRequest *)request delegate: (id<XMLRPCConnectionDelegate>)delegate {
     XMLRPCConnection *newConnection = [[XMLRPCConnection alloc] initWithXMLRPCRequest: request delegate: delegate manager: self];
+#if ! __has_feature(objc_arc)
     NSString *identifier = [[[newConnection identifier] retain] autorelease];
+#else
+    NSString *identifier = [newConnection identifier];
+#endif
 
     [myConnections setObject: newConnection forKey: identifier];
 
+#if ! __has_feature(objc_arc)
     [newConnection release];
+#endif
 
     return identifier;
 }
@@ -100,10 +106,10 @@ - (void)finalize {
 
 - (void)dealloc {
     [self closeConnections];
-    
+#if ! __has_feature(objc_arc)
     [myConnections release];
-    
     [super dealloc];
+#endif
 }
 
 @end

XMLRPCDefaultEncoder.m

@@ -78,6 +78,7 @@ - (NSString *)encode {
 #pragma mark -
 
 - (void)setMethod: (NSString *)method withParameters: (NSArray *)parameters {
+#if ! __has_feature(objc_arc)
     if (myMethod)    {
         [myMethod release];
     }
@@ -97,6 +98,10 @@ - (void)setMethod: (NSString *)method withParameters: (NSArray *)parameters {
     } else {
         myParameters = [parameters retain];
     }
+#else
+	myMethod = method;
+	myParameters = parameters;
+#endif
 }
 
 #pragma mark -
@@ -112,10 +117,12 @@ - (NSArray *)parameters {
 #pragma mark -
 
 - (void)dealloc {
+#if ! __has_feature(objc_arc)
     [myMethod release];
     [myParameters release];
 
     [super dealloc];
+#endif
 }
 
 @end
@@ -145,7 +152,7 @@ - (NSString *)encodeObject: (id)object {
         return [self encodeArray: object];
     } else if ([object isKindOfClass: [NSDictionary class]]) {
         return [self encodeDictionary: object];
-    } else if (((CFBooleanRef)object == kCFBooleanTrue) || ((CFBooleanRef)object == kCFBooleanFalse)) {
+    } else if (((__bridge_retained CFBooleanRef)object == kCFBooleanTrue) || ((__bridge_retained CFBooleanRef)object == kCFBooleanFalse)) {
         return [self encodeBoolean: (CFBooleanRef)object];
     } else if ([object isKindOfClass: [NSNumber class]]) {
         return [self encodeNumber: object];

XMLRPCEventBasedParser.m

@@ -50,10 +50,12 @@ - (BOOL)isFault {
 #pragma mark -
 
 - (void)dealloc {
+#if ! __has_feature(objc_arc)
     [myParser release];
     [myParserDelegate release];
 
     [super dealloc];
+#endif
 }
 
 @end

XMLRPCEventBasedParserDelegate.m

@@ -49,9 +49,10 @@ - (id)initWithParent: (XMLRPCEventBasedParserDelegate *)parent {
 #pragma mark -
 
 - (void)setParent: (XMLRPCEventBasedParserDelegate *)parent {
+#if ! __has_feature(objc_arc)
     [parent retain];
-    
     [myParent release];
+#endif
 
     myParent = parent;
 }
@@ -73,9 +74,10 @@ - (XMLRPCElementType)elementType {
 #pragma mark -
 
 - (void)setElementKey: (NSString *)elementKey {
+#if ! __has_feature(objc_arc)
     [elementKey retain];
-    
     [myElementKey release];
+#endif
 
     myElementKey = elementKey;
 }
@@ -87,9 +89,10 @@ - (NSString *)elementKey {
 #pragma mark -
 
 - (void)setElementValue: (id)elementValue {
+#if ! __has_feature(objc_arc)
     [elementValue retain];
-    
     [myElementValue release];
+#endif
 
     myElementValue = elementValue;
 }
@@ -101,11 +104,13 @@ - (id)elementValue {
 #pragma mark -
 
 - (void)dealloc {
+#if ! __has_feature(objc_arc)
     [myChildren release];
     [myElementKey release];
     [myElementValue release];
 
     [super dealloc];
+#endif
 }
 
 @end
@@ -127,27 +132,27 @@ - (void)parser: (NSXMLParser *)parser didStartElement: (NSString *)element names
         [myChildren addObject: parserDelegate];
 
         [parser setDelegate: parserDelegate];
-        
+#if ! __has_feature(objc_arc)
         [parserDelegate release];
-        
+#endif
         return;
     }
 
     if ([element isEqualToString: @"array"]) {
         NSMutableArray *array = [[NSMutableArray alloc] init];
 
         [self setElementValue: array];
-        
+#if ! __has_feature(objc_arc)
         [array release];
-        
+#endif
         [self setElementType: XMLRPCElementTypeArray];
     } else if ([element isEqualToString: @"struct"]) {
         NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
 
         [self setElementValue: dictionary];
-        
+#if ! __has_feature(objc_arc)
         [dictionary release];
-        
+#endif
         [self setElementType: XMLRPCElementTypeDictionary];
     } else if ([element isEqualToString: @"int"] || [element isEqualToString: @"i4"]) {
         [self setElementType: XMLRPCElementTypeInteger];
@@ -170,49 +175,49 @@ - (void)parser: (NSXMLParser *)parser didEndElement: (NSString *)element namespa
 
         if ((myElementType != XMLRPCElementTypeArray) && ![self isDictionaryElementType: myElementType]) {
             elementValue = [self parseString: myElementValue];
-            
+#if ! __has_feature(objc_arc)
             [myElementValue release];
-            
+#endif
             myElementValue = nil;
         }
 
         switch (myElementType) {
             case XMLRPCElementTypeInteger:
                 myElementValue = [self parseInteger: elementValue];
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             case XMLRPCElementTypeDouble:
                 myElementValue = [self parseDouble: elementValue];
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             case XMLRPCElementTypeBoolean:
                 myElementValue = [self parseBoolean: elementValue];
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             case XMLRPCElementTypeString:
             case XMLRPCElementTypeName:
                 myElementValue = elementValue;
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             case XMLRPCElementTypeDate:
                 myElementValue = [self parseDate: elementValue];
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             case XMLRPCElementTypeData:
                 myElementValue = [self parseData: elementValue];
-                
+#if ! __has_feature(objc_arc)
                 [myElementValue retain];
-                
+#endif
                 break;
             default:
                 break;
@@ -296,9 +301,9 @@ - (NSDate *)parseDateString: (NSString *)dateString withFormat: (NSString *)form
     [dateFormatter setDateFormat: format];
 
     result = [dateFormatter dateFromString: dateString];
-    
+#if ! __has_feature(objc_arc)
     [dateFormatter release];
-    
+#endif
     return result;
 }