Implement NSIndexSet enumeration and *PassingTest apis #2268
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
memontic-ms
reviewed
Mar 17, 2017
include/Foundation/NSIndexSet.h
Outdated
| - (NSIndexSet*)indexesWithOptions:(NSEnumerationOptions)opts passingTest:(BOOL (^)(NSUInteger, BOOL*))predicate; | ||
| - (NSUInteger)indexInRange:(NSRange)range options:(NSEnumerationOptions)opts passingTest:(BOOL (^)(NSUInteger, BOOL*))predicate; | ||
| - (NSIndexSet*)indexesInRange:(NSRange)range options:(NSEnumerationOptions)opts passingTest:(BOOL (^)(NSUInteger, BOOL*))predicate; | ||
| - (void)enumerateRangesInRange:(NSRange)range options:(NSEnumerationOptions)opts usingBlock:(void (^)(NSRange, BOOL*))block; |
There was a problem hiding this comment.
opts [](start = 76, length = 4)
nit: Update var names to reflect changes in NSIndexSet.mm
DHowett-MSFT
suggested changes
Mar 17, 2017
Frameworks/Foundation/NSIndexSet.mm
Outdated
| UNIMPLEMENTED(); | ||
| return StubReturn(); | ||
| - (NSUInteger)indexInRange:(NSRange)range options:(NSEnumerationOptions)options passingTest:(BOOL (^)(NSUInteger, BOOL*))predicate { | ||
| NSIndexSet* set = [self indexesInRange:range options:options passingTest:predicate]; |
Frameworks/Foundation/NSIndexSet.mm
Outdated
| - (void)enumerateRangesInRange:(NSRange)range options:(NSEnumerationOptions)opts usingBlock:(void (^)(NSRange, BOOL*))block { | ||
| UNIMPLEMENTED(); | ||
| - (void)enumerateRangesUsingBlock:(void (^)(NSRange, BOOL*))block { | ||
| [self enumerateRangesWithOptions:0 usingBlock:block]; |
There was a problem hiding this comment.
please always call the most-specific version in these shim implementations; you'll avoid an entire level of dynamic dispatch and a stack frame.
| } | ||
|
|
||
| if (indexRange) { | ||
| *indexRange = { j, range.location + range.length - j }; |
| for (NSUInteger i = start; i != end && stop == NO; i += step) { | ||
| NSRange intersection = NSIntersectionRange(range, ranges[i - 1]); | ||
| if (intersection.length != 0) { | ||
| NSUInteger rangeStart = reverse ? intersection.location + intersection.length : intersection.location + 1; |
There was a problem hiding this comment.
you're right, this DOES seem like it should be able to be lifted out/commonized.
There was a problem hiding this comment.
IKR. Unfortunately, in the concurrent case we'd be doing two levels of dispatch_group_async which seems sillier than very similar but not identical code
Frameworks/Foundation/NSIndexSet.mm
Outdated
| } | ||
|
|
||
| return ret; | ||
| }]; | ||
| return (options & NSEnumerationReverse) ? [set lastIndex] : [set firstIndex]; |
There was a problem hiding this comment.
since set will contain only one index, this is no longer necessary
memontic-ms
approved these changes
Mar 17, 2017
DHowett-MSFT
approved these changes
Mar 17, 2017
|
nit: because this is a set, the set will set set |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2076
Fixes #2077