added support for NSMapTable collections

leoschweizer · Oct 5, 2015 · 5a307a6 · 5a307a6
1 parent 0d83566
commit 5a307a6
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 0 deletions.
diff --git a/Example/Tests/MappingTests.m b/Example/Tests/MappingTests.m
@@ -75,6 +75,19 @@ - (void)testMapOnString {
 	XCTAssertEqualObjects(result, @"ABC");
 }
 
+- (void)testMapOnMapTable {
+	NSMapTable *sut = [NSMapTable strongToStrongObjectsMapTable];
+	[sut setObject:@1 forKey:@"foo"];
+	[sut setObject:@2 forKey:@"bar"];
+	NSMapTable *result = [sut map:^id(OCAssociation *each) {
+		return [@([each.value integerValue] * 2) asAssociationWithKey:each.key];
+	}];
+	XCTAssertTrue([result isKindOfClass:sut.class]);
+	XCTAssertEqual(result.count, 2);
+	XCTAssertEqualObjects([result objectForKey:@"foo"], @2);
+	XCTAssertEqualObjects([result objectForKey:@"bar"], @4);
+}
+
 - (void)testInjectIntoOnArray {
 	id result = [@[@1, @2, @3] inject:@0 into:^id(id running, id each) {
 		return @([running integerValue] + [each integerValue]);

diff --git a/Lib/Internal/OCCollectionCapabilities.h b/Lib/Internal/OCCollectionCapabilities.h
@@ -27,6 +27,11 @@
 @end
 
 
+@interface NSMapTable (OCCollectionCapabilities) <OCEnumerableCollection, OCMutableCollectionConstruction>
+
+@end
+
+
 @interface NSNull (OCCollectionCapabilities) <OCEnumerableCollection>
 
 @end

diff --git a/Lib/Internal/OCCollectionCapabilities.m b/Lib/Internal/OCCollectionCapabilities.m
@@ -57,6 +57,31 @@ - (id)oc_createCollectionOfMyKindFromMutableCollection:(id)collection {
 @end
 
 
+@implementation NSMapTable (OCCollectionCapabilities)
+
+- (id)oc_createMutableInstanceOfMyKind {
+	return [[NSMapTable alloc] initWithKeyPointerFunctions:self.keyPointerFunctions valuePointerFunctions:self.valuePointerFunctions capacity:self.count];
+}
+
+- (NSEnumerator *)oc_collectionEnumerator {
+	return [[OCMapTableEnumerator alloc] initWithMapTable:self];
+}
+
+- (void)oc_addObject:(id)obj toMutableCollection:(id)collection {
+	NSMapTable *mapTable = collection;
+	OCAssociation *association = obj;
+	[mapTable setObject:association.value forKey:association.key];
+}
+
+- (id)oc_createCollectionOfMyKindFromMutableCollection:(id)collection {
+	// there are no mutable/immutable variants of NSMapTable, so it is
+	// safe to just return colleciton here
+	return collection;
+}
+
+@end
+
+
 @implementation NSPointerArray (OCCollectionCapabilities)
 
 - (void)oc_addObject:(id)object {

diff --git a/Lib/Internal/OCEnumerators.h b/Lib/Internal/OCEnumerators.h
@@ -25,6 +25,13 @@
 @end
 
 
+@interface OCMapTableEnumerator : NSEnumerator
+
+- (instancetype)initWithMapTable:(NSMapTable *)mapTable;
+
+@end
+
+
 @interface OCNullEnumerator : NSEnumerator
 
 @end
diff --git a/Lib/Internal/OCEnumerators.m b/Lib/Internal/OCEnumerators.m
@@ -125,6 +125,39 @@ - (id)nextObject {
 @end
 
 
+@interface OCMapTableEnumerator ()
+
+@property (nonatomic, readonly) NSMapTable *mapTable;
+@property (nonatomic, readonly) NSEnumerator *keyEnumerator;
+
+@end
+
+
+@implementation OCMapTableEnumerator
+
+- (instancetype)initWithMapTable:(NSMapTable *)mapTable {
+	if (self = [super init]) {
+		_mapTable = mapTable;
+		_keyEnumerator = [_mapTable keyEnumerator];
+	}
+	return self;
+}
+
+- (id)nextObject {
+
+	id nextKey = [self.keyEnumerator nextObject];
+	if (!nextKey) {
+		return nil;
+	}
+
+	id nextValue = [self.mapTable objectForKey:nextKey];
+	return [nextKey asAssociationWithValue:nextValue];
+
+}
+
+@end
+
+
 @implementation OCNullEnumerator
 
 - (id)nextObject {