Adding ARC support

Author: robby

objc-promise.xcodeproj/project.pbxproj

@@ -340,6 +340,7 @@
 		7823C8B8162CE9EB000342B4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/objc_promise.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "objc-promise/objc-promise-Prefix.pch";
@@ -352,6 +353,7 @@
 		7823C8B9162CE9EB000342B4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/objc_promise.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "objc-promise/objc-promise-Prefix.pch";

objc-promise/Deferred.m

@@ -21,22 +21,17 @@ - (void)transitionToState:(PromiseState)state
 
             shouldComplete = YES;
 
-            blocksToExecute = [_callbackBindings retain];
+            blocksToExecute = _callbackBindings;
 
-            [_callbackBindings release];
             _callbackBindings = nil;
         }
     }
 
     if (shouldComplete) {
         for (bound_block block in blocksToExecute) {
             [self executeBlock:block];
-            
-            Block_release(block);
         }
     }
-    
-    [blocksToExecute release];
 }
 
 @end
@@ -53,7 +48,7 @@ - (id)init
 
 + (Deferred *)deferred
 {
-    return [[[Deferred alloc] init] autorelease];
+    return [[Deferred alloc] init];
 }
 
 - (Promise *)promise
@@ -63,7 +58,7 @@ - (Promise *)promise
 
 - (Promise *)resolve:(id)result
 {
-    _result = [result retain];
+    _result = result;
 
     [self transitionToState:Resolved];
 
@@ -72,7 +67,7 @@ - (Promise *)resolve:(id)result
 
 - (Promise *)reject:(NSError *)reason
 {
-    _reason = [reason retain];
+    _reason = reason;
 
     [self transitionToState:Rejected];
 

objc-promise/Promise.h

@@ -57,3 +57,11 @@ typedef enum {
 - (Promise *)timeout:(NSTimeInterval)interval;
 
 @end
+
+
+@interface Promise (Private)
+
+- (void)executeBlock:(bound_block)block;
+
+@end
+

objc-promise/Promise.m

@@ -17,7 +17,7 @@ - (id)initWithQueue:(dispatch_queue_t)queue
         _callbackBindings = [[NSMutableArray alloc] init];
         _state = Incomplete;
 
-        _queue = [queue retain];
+        _queue = queue;
 
         _stateLock = [[NSObject alloc] init];
         _result = nil;
@@ -32,7 +32,7 @@ - (BOOL)bindOrCallBlock:(bound_block)block
 
     @synchronized (_stateLock) {
         if (_state == Incomplete) {
-            [_callbackBindings addObject:Block_copy(block)];
+            [_callbackBindings addObject: block];
 
             blockWasBound = YES;
         }
@@ -96,22 +96,11 @@ - (id)init
 
 - (void)dealloc
 {
-    [_callbackBindings release];
     _callbackBindings = nil;
-    
-    [_stateLock release];
     _stateLock = nil;
-    
-    [_result release];
     _result = nil;
-    
-    [_reason release];
     _reason = nil;
-    
-    [_queue release];
     _queue = nil;
-    
-    [super dealloc];
 }
 
 - (BOOL)isResolved
@@ -174,15 +163,10 @@ - (Promise *)when:(resolved_block)resolvedBlock
 {
     __block Promise *this = self;
 
-    // retain the block until we can call with the result
-    Block_copy(resolvedBlock);
-    
     [this bindOrCallBlock:^{
         if (this.isResolved) {
             resolvedBlock(this.result);
         }
-        
-        Block_release(resolvedBlock);
     }];
 
     return this;
@@ -192,15 +176,10 @@ - (Promise *)failed:(rejected_block)rejectedBlock
 {
     __block Promise *this = self;
 
-    // retain the block until we can call with the result
-    Block_copy(rejectedBlock);
-    
     [this bindOrCallBlock:^{
         if (this.isRejected) {
             rejectedBlock(this.reason);
         }
-        
-        Block_release(rejectedBlock);
     }];
 
     return this;
@@ -210,13 +189,8 @@ - (Promise *)any:(any_block)anyBlock
 {
     __block Promise *this = self;
 
-    // retain the block until we can call with the result
-    Block_copy(anyBlock);
-    
     [this bindOrCallBlock:^{
         anyBlock();
-        
-        Block_release(anyBlock);
     }];
 
     return this;
@@ -245,7 +219,7 @@ - (Promise *)on:(dispatch_queue_t)queue
 
     [self chainTo:deferred];
 
-    return [deferred autorelease];
+    return deferred;
 }
 
 - (Promise *)onMainQueue
@@ -263,7 +237,7 @@ - (Promise *)timeout:(NSTimeInterval)interval
 
     // use the current dispatch queue if no queue is bound
     if (queue == nil) {
-        queue = dispatch_get_current_queue();
+        queue = dispatch_get_main_queue();
     }
 
     dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
@@ -274,7 +248,6 @@ - (Promise *)timeout:(NSTimeInterval)interval
     NSLog(@"1. %@", [NSDate date]);
     void (^eventHandler)(void) = ^{
         dispatch_source_cancel(timer);
-        dispatch_release(timer);
 
         NSLog(@"2. %@", [NSDate date]);
         [toTimeout reject:[NSError errorWithDomain:@"Timeout" code:100 userInfo:nil]];
@@ -284,7 +257,6 @@ - (Promise *)timeout:(NSTimeInterval)interval
     dispatch_source_set_event_handler(timer, eventHandler);
     dispatch_resume(timer);
 
-    [toTimeout release];
     NSLog(@"3. %@", [NSDate date]);
 
     return [toTimeout promise];