averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: replace _CocoaArrayType with _SwiftNSArrayRequiredOverridesType

Browse Source 
Swift SVN r21972
This commit is contained in:
Dmitri Hrybenko
2014-09-16 12:53:00 +00:00
parent 9b62c620a7
commit e6e17ac7d4
9 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/core/ArrayBuffer.swift
View File

@@ -33,7 +33,7 @@ class _IndirectArrayBuffer {
self.needsElementTypeCheck = needsElementTypeCheck
}
init(cocoa: _CocoaArrayType, needsElementTypeCheck: Bool) {
init(cocoa: _SwiftNSArrayRequiredOverridesType, needsElementTypeCheck: Bool) {
self.buffer = cocoa
self.isMutable = false
self.isCocoa = true
@@ -81,9 +81,9 @@ class _IndirectArrayBuffer {
buffer != nil ? unsafeBitCast(buffer, _ContiguousArrayStorage<T>.self) : nil)
}
func getCocoa() -> _CocoaArrayType {
func getCocoa() -> _SwiftNSArrayRequiredOverridesType {
_sanityCheck(isCocoa)
return unsafeBitCast(buffer!, _CocoaArrayType.self)
return unsafeBitCast(buffer!, _SwiftNSArrayRequiredOverridesType.self)
}
}
@@ -109,7 +109,7 @@ public struct _ArrayBuffer<T> : _ArrayBufferType {
))
}
public init(_ cocoa: _CocoaArrayType) {
public init(_ cocoa: _SwiftNSArrayRequiredOverridesType) {
_sanityCheck(_isClassOrObjCExistential(T.self))
storage = Builtin.castToNativeObject(
_IndirectArrayBuffer(
@@ -157,7 +157,7 @@ extension _ArrayBuffer {
/// Convert to an NSArray.
/// Precondition: _isBridgedToObjectiveC(Element.self)
/// O(1) if the element type is bridged verbatim, O(N) otherwise
public func _asCocoaArray() -> _CocoaArrayType {
public func _asCocoaArray() -> _SwiftNSArrayRequiredOverridesType {
_sanityCheck(
_isBridgedToObjectiveC(T.self),
"Array element type is not bridged to ObjectiveC")
@@ -466,7 +466,7 @@ extension _ArrayBuffer {
}
}
var _nonNative: _CocoaArrayType? {
var _nonNative: _SwiftNSArrayRequiredOverridesType? {
if !_isClassOrObjCExistential(T.self) {
return nil
}