Skip to content

Use Array.reserveCapacity in NSArray/NSMutableArray #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2015
Merged

Use Array.reserveCapacity in NSArray/NSMutableArray #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Foundation/NSArray.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NS
}

public required init(objects: UnsafePointer<AnyObject?>, count cnt: Int) {
_storage.reserveCapacity(cnt)
for idx in 0..<cnt {
_storage.append(objects[idx]!)
}
Expand Down Expand Up @@ -500,6 +501,10 @@ public class NSMutableArray : NSArray {

public init(capacity numItems: Int) {
super.init(objects: nil, count: 0)

if self.dynamicType === NSMutableArray.self {
_storage.reserveCapacity(numItems)
}
}

public required convenience init(objects: UnsafePointer<AnyObject?>, count cnt: Int) {
Expand Down Expand Up @@ -599,6 +604,7 @@ public class NSMutableArray : NSArray {
public func replaceObjectsInRange(range: NSRange, withObjectsFromArray otherArray: [AnyObject], range otherRange: NSRange) { NSUnimplemented() }
public func replaceObjectsInRange(range: NSRange, withObjectsFromArray otherArray: [AnyObject]) {
if self.dynamicType === NSMutableArray.self {
_storage.reserveCapacity(count - range.length + otherArray.count)
for var idx = 0; idx < range.length; idx++ {
_storage[idx + range.location] = otherArray[idx]
}
Expand All @@ -622,6 +628,10 @@ public class NSMutableArray : NSArray {
public func insertObjects(objects: [AnyObject], atIndexes indexes: NSIndexSet) {
precondition(objects.count == indexes.count)

if self.dynamicType === NSMutableArray.self {
_storage.reserveCapacity(count + indexes.count)
}

var objectIdx = 0
indexes.enumerateIndexesUsingBlock() { (insertionIndex, _) in
self.insertObject(objects[objectIdx++], atIndex: insertionIndex)
Expand Down