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/Dictionary: finish removing the assumption that keys and values are

Browse Source 
bridged back from Objective-C verbatim

The internal API assertingGet(KeyType) is dead code now, so no tests.


Swift SVN r18421
This commit is contained in:
Dmitri Hrybenko
2014-05-19 14:56:32 +00:00
parent af11f8f8b7
commit 2bc1088de3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
stdlib/core/Dictionary.swift
View File

@@ -249,7 +249,8 @@ struct _DictionaryElement<KeyType : Hashable, ValueType> {
typealias DictionaryHeapBuffer = HeapBuffer<_DictionaryBody, Element?>
deinit {
let buffer = DictionaryHeapBuffer(reinterpretCast(self) as DictionaryHeapBuffer.Storage)
let buffer = DictionaryHeapBuffer(
reinterpretCast(self) as DictionaryHeapBuffer.Storage)
let body = buffer.value
buffer._value.destroy()
buffer.elementStorage.destroy(body.capacity)
@@ -549,6 +550,8 @@ class _NativeDictionaryStorageKeyNSEnumerator<KeyType : Hashable, ValueType>
}
let (nativeKey, _) = nextIndex.nativeStorage.assertingGet(nextIndex)
nextIndex = nextIndex.succ()
// Not using bridgeToObjectiveC() here because we know that KeyType is
// bridged verbatim.
return _reinterpretCastToAnyObject(nativeKey)
}
}
@@ -970,9 +973,9 @@ enum _VariantDictionaryStorage<KeyType : Hashable, ValueType> :
return native.assertingGet(key)
case .Cocoa(let cocoaStorage):
// FIXME: This assumes that KeyType and ValueType are bridged verbatim.
let anyObjectKey: AnyObject = _reinterpretCastToAnyObject(key)
let anyObjectKey: AnyObject = bridgeToObjectiveCUnconditional(key)
let anyObjectValue: AnyObject = cocoaStorage.assertingGet(anyObjectKey)
return reinterpretCast(anyObjectValue) as ValueType
return bridgeFromObjectiveCUnconditional(anyObjectValue, ValueType.self)
}
}