Put NSParameterAssert all over the place to prevent crashes, exceptio…

…ns instead; far more explicit. Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
BlocksKit · Dec 20, 2011 · eccc522 · eccc522
1 parent ad5620e
commit eccc522
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 47 deletions.
diff --git a/BlocksKit/NSArray+BlocksKit.m b/BlocksKit/NSArray+BlocksKit.m
@@ -8,18 +8,24 @@
 @implementation NSArray (BlocksKit)
 
 - (void)each:(BKSenderBlock)block {
+	NSParameterAssert(block);
+
      [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
         block(obj);
     }];
 }
 
 - (void)apply:(BKSenderBlock)block {
+	NSParameterAssert(block);
+
 	[self enumerateObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
 		block(obj);
 	}];
 }
 
 - (id)match:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSUInteger index = [self indexOfObjectPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
         return block(obj);
     }];
@@ -31,6 +37,8 @@ - (id)match:(BKValidationBlock)block {
 }
 
 - (NSArray *)select:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSArray *result = [self objectsAtIndexes:[self indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
         return block(obj);
     }]];
@@ -42,6 +50,8 @@ - (NSArray *)select:(BKValidationBlock)block {
 }
 
 - (NSArray *)reject:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSArray *result = [self objectsAtIndexes:[self indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
         return !block(obj);
     }]];
@@ -53,6 +63,8 @@ - (NSArray *)reject:(BKValidationBlock)block {
 }
 
 - (NSArray *)map:(BKTransformBlock)block {
+	NSParameterAssert(block);
+
     NSMutableArray *result = [NSMutableArray arrayWithCapacity:self.count];
 
     [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
@@ -67,6 +79,8 @@ - (NSArray *)map:(BKTransformBlock)block {
 }
 
 - (id)reduce:(id)initial withBlock:(BKAccumulationBlock)block {
+	NSParameterAssert(block);
+
     __block id result = nil;
     BK_SET_RETAINED(result, initial);
 

diff --git a/BlocksKit/NSDictionary+BlocksKit.m b/BlocksKit/NSDictionary+BlocksKit.m
@@ -8,18 +8,24 @@
 @implementation NSDictionary (BlocksKit)
 
 - (void)each:(BKKeyValueBlock)block {
+	NSParameterAssert(block);
+
     [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
         block(key, obj);
     }];
 }
 
 - (void)apply:(BKKeyValueBlock)block {
+	NSParameterAssert(block);
+
 	[self enumerateKeysAndObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(id key, id obj, BOOL *stop) {
 		block(key, obj);
 	}];
 }
 
 - (NSDictionary *)select:(BKKeyValueValidationBlock)block {
+	NSParameterAssert(block);
+
     NSMutableDictionary *list = [NSMutableDictionary dictionaryWithCapacity:self.count];
 
     [self each:^(id key, id obj) {
@@ -34,6 +40,8 @@ - (NSDictionary *)select:(BKKeyValueValidationBlock)block {
 }
 
 - (NSDictionary *)reject:(BKKeyValueValidationBlock)block {
+	NSParameterAssert(block);
+
     NSMutableDictionary *list = [NSMutableDictionary dictionaryWithCapacity:self.count];
 
     [self each:^(id key, id obj) {
@@ -48,6 +56,8 @@ - (NSDictionary *)reject:(BKKeyValueValidationBlock)block {
 }
 
 - (NSDictionary *)map:(BKKeyValueTransformBlock)block {
+	NSParameterAssert(block);
+
     NSMutableDictionary *result = [NSMutableDictionary dictionaryWithCapacity:self.count];
 
     [self each:^(id key, id obj) {

diff --git a/BlocksKit/NSIndexSet+BlocksKit.m b/BlocksKit/NSIndexSet+BlocksKit.m
@@ -8,24 +8,32 @@
 @implementation NSIndexSet (BlocksKit)
 
 - (void)each:(BKIndexBlock)block {
+	NSParameterAssert(block);
+
     [self enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
         block(idx);
     }];
 }
 
 - (void)apply:(BKIndexBlock)block {
+	NSParameterAssert(block);
+
 	[self enumerateIndexesWithOptions:NSEnumerationConcurrent usingBlock:^(NSUInteger idx, BOOL *stop) {
 		block(idx);
 	}];
 }
 
 - (NSUInteger)match:(BKIndexValidationBlock)block {
+	NSParameterAssert(block);
+
     return [self indexPassingTest:^BOOL(NSUInteger idx, BOOL *stop) {
         return block(idx);
     }];
 }
 
 - (NSIndexSet *)select:(BKIndexValidationBlock)block {
+	NSParameterAssert(block);
+
     NSIndexSet *list = [self indexesPassingTest:^BOOL(NSUInteger idx, BOOL *stop) {
         return block(idx);
     }];
@@ -36,7 +44,9 @@ - (NSIndexSet *)select:(BKIndexValidationBlock)block {
     return list;
 }
 
-- (NSIndexSet *)reject:(BKIndexValidationBlock)block {    
+- (NSIndexSet *)reject:(BKIndexValidationBlock)block {  
+	NSParameterAssert(block);
+
     NSIndexSet *list = [self indexesPassingTest:^BOOL(NSUInteger idx, BOOL *stop) {
         return !block(idx);
     }];
@@ -48,6 +58,8 @@ - (NSIndexSet *)reject:(BKIndexValidationBlock)block {
 }
 
 - (NSIndexSet *)map:(BKIndexTransformBlock)block {
+	NSParameterAssert(block);
+
     NSMutableIndexSet *list = [NSMutableIndexSet indexSet];
 
     [self enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {

diff --git a/BlocksKit/NSInvocation+BlocksKit.m b/BlocksKit/NSInvocation+BlocksKit.m
@@ -47,6 +47,7 @@ - (void)dealloc {
 @implementation NSInvocation (BlocksKit)
 
 + (NSInvocation *)invocationWithTarget:(id)target block:(BKSenderBlock)block {
+	NSParameterAssert(block);
     BKInvocationGrabber *grabber = [BKInvocationGrabber grabberWithTarget:target];
     block(grabber);
     return grabber.invocation;

diff --git a/BlocksKit/NSMutableArray+BlocksKit.m b/BlocksKit/NSMutableArray+BlocksKit.m
@@ -8,6 +8,8 @@
 @implementation NSMutableArray (BlocksKit)
 
 - (void)performSelect:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSIndexSet *list = [self indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
         return !block(obj);
     }];
@@ -19,6 +21,8 @@ - (void)performSelect:(BKValidationBlock)block {
 }
 
 - (void)performReject:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSIndexSet *list = [self indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
         return block(obj);
     }];
@@ -30,6 +34,8 @@ - (void)performReject:(BKValidationBlock)block {
 }
 
 - (void)performMap:(BKTransformBlock)block {
+	NSParameterAssert(block);
+
     NSMutableArray *new = BK_AUTORELEASE([self mutableCopy]);
 
     [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {

diff --git a/BlocksKit/NSMutableDictionary+BlocksKit.m b/BlocksKit/NSMutableDictionary+BlocksKit.m
@@ -8,6 +8,9 @@
 @implementation NSMutableDictionary (BlocksKit)
 
 - (void)performSelect:(BKKeyValueValidationBlock)block {
+	NSParameterAssert(block);
+
+
     NSMutableArray *keys = [NSMutableArray arrayWithCapacity:self.count];
 
     [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
@@ -19,6 +22,9 @@ - (void)performSelect:(BKKeyValueValidationBlock)block {
 }
 
 - (void)performReject:(BKKeyValueValidationBlock)block {
+	NSParameterAssert(block);
+
+
     NSMutableArray *keys = [NSMutableArray arrayWithCapacity:self.count];
 
     [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
@@ -30,6 +36,9 @@ - (void)performReject:(BKKeyValueValidationBlock)block {
 }
 
 - (void)performMap:(BKKeyValueTransformBlock)block {
+	NSParameterAssert(block);
+
+
     NSMutableDictionary *new = BK_AUTORELEASE([self mutableCopy]);
 
     [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {

diff --git a/BlocksKit/NSMutableIndexSet+BlocksKit.m b/BlocksKit/NSMutableIndexSet+BlocksKit.m
@@ -8,6 +8,9 @@
 @implementation NSMutableIndexSet (BlocksKit)
 
 - (void)performSelect:(BKIndexValidationBlock)block {
+	NSParameterAssert(block);
+
+
     NSIndexSet *list = [self indexesPassingTest:^BOOL(NSUInteger idx, BOOL *stop) {
         return !block(idx);
     }];
@@ -19,6 +22,9 @@ - (void)performSelect:(BKIndexValidationBlock)block {
 }
 
 - (void)performReject:(BKIndexValidationBlock)block {
+	NSParameterAssert(block);
+
+
     NSIndexSet *list = [self indexesPassingTest:^BOOL(NSUInteger idx, BOOL *stop) {
         return block(idx);
     }];
@@ -30,6 +36,9 @@ - (void)performReject:(BKIndexValidationBlock)block {
 }
 
 - (void)performMap:(BKIndexTransformBlock)block {
+	NSParameterAssert(block);
+
+
     NSMutableIndexSet *new = BK_AUTORELEASE([self mutableCopy]);
 
     [self enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {

diff --git a/BlocksKit/NSMutableSet+BlocksKit.m b/BlocksKit/NSMutableSet+BlocksKit.m
@@ -8,6 +8,8 @@
 @implementation NSMutableSet (BlocksKit)
 
 - (void)performSelect:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
     NSSet *list = [self objectsPassingTest:^BOOL(id obj, BOOL *stop) {
         return block(obj);
     }];
@@ -16,6 +18,9 @@ - (void)performSelect:(BKValidationBlock)block {
 }
 
 - (void)performReject:(BKValidationBlock)block {
+	NSParameterAssert(block);
+
+
     NSSet *list = [self objectsPassingTest:^BOOL(id obj, BOOL *stop) {
         return !block(obj);
     }];
@@ -24,6 +29,9 @@ - (void)performReject:(BKValidationBlock)block {
 }
 
 - (void)performMap:(BKTransformBlock)block {
+	NSParameterAssert(block);
+
+
     NSMutableSet *new = [NSMutableSet setWithCapacity:self.count];
 
     [self enumerateObjectsUsingBlock:^(id obj, BOOL *stop) {

diff --git a/BlocksKit/NSObject+BlockObservation.m b/BlocksKit/NSObject+BlockObservation.m
@@ -67,6 +67,10 @@ - (NSString *)addObserverForKeyPath:(NSString *)keyPath task:(BKObservationBlock
 }
 
 - (void)addObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier task:(BKObservationBlock)task {
+	NSParameterAssert(keyPath);
+	NSParameterAssert(identifier);
+	NSParameterAssert(task);
+
     __block BKObserver *newObserver = nil;
 
     dispatch_sync(BKObserverMutationQueue(), ^{
@@ -91,6 +95,10 @@ - (NSString *)addObserverForKeyPath:(NSString *)keyPath options:(NSKeyValueObser
 }
 
 - (void)addObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options task:(BKObservationBlock)task {
+	NSParameterAssert(keyPath);
+	NSParameterAssert(identifier);
+	NSParameterAssert(task);
+
     __block BKObserver *newObserver = nil;
 
     dispatch_sync(BKObserverMutationQueue(), ^{
@@ -109,6 +117,9 @@ - (void)addObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identif
 }
 
 - (void)removeObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier {
+	NSParameterAssert(keyPath);
+	NSParameterAssert(identifier);
+
     dispatch_sync(BKObserverMutationQueue(), ^{
         NSString *token = [NSString stringWithFormat:@"%@_%@", keyPath, identifier];
         NSMutableDictionary *dict = [self associatedValueForKey:&kObserverBlocksKey];

diff --git a/BlocksKit/NSObject+BlocksKit.m b/BlocksKit/NSObject+BlocksKit.m
@@ -6,21 +6,18 @@
 #import "NSObject+BlocksKit.h"
 #import <objc/runtime.h>
 
-typedef void(^BKInternalWrappingBlock)(BOOL cancel);
+typedef void(^BKInternalWrappingBlock)(BOOL);
 
-static inline dispatch_time_t BKTimeDelay(NSTimeInterval time) {
-    int64_t delta = (NSEC_PER_SEC * time);
-    return dispatch_time(DISPATCH_TIME_NOW, delta);
-}
+#define BKTimeDelay(t) dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * t)
 
 @implementation NSObject (BlocksKit)
 
 - (id)performBlock:(BKSenderBlock)block afterDelay:(NSTimeInterval)delay {
-    if (!block) return nil;
+    NSParameterAssert(block);
 
     __block BOOL cancelled = NO;
-
-    BKInternalWrappingBlock wrapper = ^(BOOL cancel) {
+	    
+    void(^wrapper)(BOOL) = ^(BOOL cancel) {
         if (cancel) {
             cancelled = YES;
             return;
@@ -36,11 +33,11 @@ - (id)performBlock:(BKSenderBlock)block afterDelay:(NSTimeInterval)delay {
 }
 
 + (id)performBlock:(BKBlock)block afterDelay:(NSTimeInterval)delay {
-    if (!block) return nil;
+    NSParameterAssert(block);
 
     __block BOOL cancelled = NO;
 
-    BKInternalWrappingBlock wrapper = ^(BOOL cancel) {
+    void(^wrapper)(BOOL) = ^(BOOL cancel) {
         if (cancel) {
             cancelled = YES;
             return;
@@ -54,10 +51,9 @@ + (id)performBlock:(BKBlock)block afterDelay:(NSTimeInterval)delay {
 }
 
 + (void)cancelBlock:(id)block {
-    if (!block)
-        return;
-    BKInternalWrappingBlock wrapper = block;
-    wrapper(YES);
+    NSParameterAssert(block);
+	void(^wrapper)(BOOL) = block;
+	wrapper(YES);
 }
 
 @end