Use NSArray/NSMutableArray and NSSet/NSMutableSet in NSOrderedSet #1816
Conversation
This file contains hidden or 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
amorde
commented
Jan 6, 2019
| NSRequiresConcreteImplementation() | ||
| } | ||
| return NSGeneratorEnumerator(_orderedStorage.map { __SwiftValue.fetch(nonOptional: $0) }.makeIterator()) | ||
| return _orderedStorage.objectEnumerator() |
There was a problem hiding this comment.
This has the interesting side effect of making these enumerators behave similar to Darwin - they will now break if mutation occurs during iteration. The previous implementation made a copy of the all the objects using map and therefore did not have this issue.
| @@ -62,6 +61,126 @@ class TestNSOrderedSet : XCTestCase { | |||
| index += 1 | |||
| } | |||
| } | |||
|
|
|||
| func test_enumerationUsingBlock() { | |||
There was a problem hiding this comment.
This test was copied from NSArray tests for coverage on concurrent enumeration
| @@ -544,7 +581,8 @@ extension NSMutableOrderedSet { | |||
| } | |||
|
|
|||
| open func intersectSet(_ other: Set<AnyHashable>) { | |||
| for case let item as AnyHashable in self where !other.contains(item) { | |||
| let objects = Array(self) | |||
| for case let item as AnyHashable in objects where !other.contains(item) { | |||
There was a problem hiding this comment.
since the enumerator now breaks if mutation occurs, we have to make a copy here
|
@swift-ci please test |
|
@swift-ci please test and merge |
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.
Taking another stab at #1367
This cleans up a lot of the implementation since we can defer work to
NS{Mutable}ArrayandNS{Mutable}Set