colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-21 01:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: CPSet enumerateObjectsUsingBlock: will honor the stop variable

Browse Source 
Test case also added.

Deprecated the very old behaviour that the block could return YES to abort the enumeration.
This commit is contained in:
Martin Carlberg
2019-10-18 13:01:04 +02:00
parent ce4fa3c027
commit dad49354aa
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPSet/_CPSet.j
+9 -6
View File
@@ -320,16 +320,19 @@
/*!
Enumberates over the objects in a set using a given function.
@param aFunction a callback for each itteration, should be of the format: function(anObject).
@param aFunction a callback for each itteration, should be of the format: function(anObject, stop).
*/
- (void)enumerateObjectsUsingBlock:(Function)aFunction
- (void)enumerateObjectsUsingBlock:(Function /*(id anObject, @ref BOOL stop)*/)aFunction
{
var object,
objectEnumerator = [self objectEnumerator];
objectEnumerator = [self objectEnumerator],
shouldStop = NO;
while ((object = [objectEnumerator nextObject]) !== nil)
if (aFunction(object))
break;
while (!shouldStop && (object = [objectEnumerator nextObject]) != nil) {
if (aFunction(object, @ref(shouldStop)) !== undefined) {
throw "DEPRECATED: The method enumerateObjectsUsingBlock: does not support returning a value in the block to stop the iteration. Please use the stop variable";
}
}
}
// FIXME: stop is broken.
Tests/Foundation/CPSetTest.j
+30
View File
@@ -368,4 +368,34 @@
[self assertTrue:[set2 member:dict2] === dict1];
}
- (void)testEnumateObjectsUsingBlock
{
var input0 = [],
input1 = [CPSet setWithArray:[1, 3, "b"]],
output = [CPMutableDictionary dictionary],
idx = 0,
outputFunction = function(anObject)
{
[output setValue:anObject forKey:"" + idx++];
};
[input0 enumerateObjectsUsingBlock:outputFunction];
[self assert:0 equals:[output count] message:@"output when enumerating empty set"];
[input1 enumerateObjectsUsingBlock:outputFunction];
[self assert:3 equals:[output count] message:@"output when enumerating input1"];
var stoppingFunction = function(anObject, stop)
{
[output setValue:anObject forKey:"" + idx++];
if ([output count] > 1)
@deref(stop) = YES;
}
output = [CPMutableDictionary dictionary];
idx = 0;
[input1 enumerateObjectsUsingBlock:stoppingFunction];
[self assert:2 equals:[output count] message:@"output when enumerating input1 and stopping after 2"];
}
@end