[android] Fix issue #995

NSArray/NSMutableArray/NSDictionary/NSMutableDictionary now can be used with Objective-C subscripting. See http://clang.llvm.org/docs/ObjectiveCLiterals.html Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
crystax · Sep 22, 2015 · 4154746 · 4154746
1 parent 17ef786
commit 4154746
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 1 deletion.
diff --git a/Foundation/NSArray/NSArray.h b/Foundation/NSArray/NSArray.h
@@ -31,7 +31,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 + arrayWithObjects:(id *)objects count:(NSUInteger)count;
 
 - (NSUInteger)count;
-- objectAtIndex:(NSUInteger)index;
+- (id)objectAtIndex:(NSUInteger)index;
+- (id)objectAtIndexedSubscript:(NSUInteger)index;
 
 - (void)getObjects:(id *)objects;
 - (void)getObjects:(id *)objects range:(NSRange)range;

diff --git a/Foundation/NSArray/NSArray.m b/Foundation/NSArray/NSArray.m
@@ -237,6 +237,10 @@ -(NSUInteger)count {
    return nil;
 }
 
+-(id)objectAtIndexedSubscript:(NSUInteger)index {
+   return [self objectAtIndex:index];
+}
+
 -(void)getObjects:(id *)objects {
    NSUInteger i,count=[self count];
 

diff --git a/Foundation/NSArray/NSMutableArray.h b/Foundation/NSArray/NSMutableArray.h
@@ -44,4 +44,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 - (void)sortUsingDescriptors:(NSArray *)descriptors;
 - (void)filterUsingPredicate:(NSPredicate *)predicate;
 
+- (void)setObject:(id)value atIndexedSubscript:(NSUInteger)idx;
+
 @end
diff --git a/Foundation/NSArray/NSMutableArray.m b/Foundation/NSArray/NSMutableArray.m
@@ -366,6 +366,9 @@ -(void)replaceObjectAtIndex:(NSUInteger)index withObject:object {
    NSInvalidAbstractInvocation();
 }
 
+- (void)setObject:(id)value atIndexedSubscript:(NSUInteger)index {
+   [self replaceObjectAtIndex:index withObject:value];
+}
 
 -(void)replaceObjectsInRange:(NSRange)range
         withObjectsFromArray:(NSArray *)array {

diff --git a/Foundation/NSDictionary/NSDictionary.h b/Foundation/NSDictionary/NSDictionary.h
@@ -31,6 +31,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 + dictionaryWithContentsOfURL:(NSURL *)url;
 
 - objectForKey:key;
+- (id)objectForKeyedSubscript:(id<NSCopying>)key;
 - (NSUInteger)count;
 - (NSEnumerator *)keyEnumerator;
 - (NSEnumerator *)objectEnumerator;

diff --git a/Foundation/NSDictionary/NSDictionary.m b/Foundation/NSDictionary/NSDictionary.m
@@ -277,6 +277,10 @@ -(void)encodeWithCoder:(NSCoder *)coder {
    return nil;
 }
 
+- (id)objectForKeyedSubscript:(id<NSCopying>)key {
+   return [self objectForKey:key];
+}
+
 -(NSUInteger)count {
    NSInvalidAbstractInvocation();
    return 0;

diff --git a/Foundation/NSDictionary/NSMutableDictionary.h b/Foundation/NSDictionary/NSMutableDictionary.h
@@ -22,4 +22,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 - (void)removeAllObjects;
 - (void)removeObjectsForKeys:(NSArray *)keys;
 
+- (void)setObject:(id)value forKeyedSubscript:(id<NSCopying>)key;
+
 @end
diff --git a/Foundation/NSDictionary/NSMutableDictionary.m b/Foundation/NSDictionary/NSMutableDictionary.m
@@ -86,4 +86,8 @@ -(void)removeObjectsForKeys:(NSArray *)keys {
     [self removeObjectForKey:[keys objectAtIndex:count]];
 }
 
+- (void)setObject:(id)value forKeyedSubscript:(id<NSCopying>)key {
+    [self setObject:value forKey:key];
+}
+
 @end