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

Use dictionary type sugar in the standard library.

Browse Source 
Swift SVN r19264
This commit is contained in:
Doug Gregor
2014-06-26 22:26:58 +00:00
parent 232bc5861a
commit bea1d3d9b3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/objc/Foundation/Foundation.swift
View File

@@ -679,13 +679,13 @@ extension NSDictionary : DictionaryLiteralConvertible {
/// The entry point for bridging `NSDictionary` to `Dictionary`.
@public func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
d: NSDictionary
) -> Dictionary<K, V> {
return Dictionary<K, V>(_cocoaDictionary: reinterpretCast(d))
) -> [K : V] {
return [K : V](_cocoaDictionary: reinterpretCast(d))
}
/// The entry point for bridging `Dictionary` to `NSDictionary`.
@public func _convertDictionaryToNSDictionary<KeyType, ValueType>(
d: Dictionary<KeyType, ValueType>
d: [KeyType : ValueType]
) -> NSDictionary {
switch d._variantStorage {
case .Native(let nativeOwner):
@@ -771,7 +771,7 @@ extension Dictionary : _ConditionallyBridgedToObjectiveC {
@public static func bridgeFromObjectiveCConditional(
x: NSDictionary
) -> Dictionary? {
let anyDict = x as Dictionary<NSObject, AnyObject>
let anyDict = x as [NSObject : AnyObject]
if isBridgedVerbatimToObjectiveC(KeyType.self) &&
isBridgedVerbatimToObjectiveC(ValueType.self) {
return Swift._dictionaryDownCastConditional(anyDict)
@@ -788,7 +788,7 @@ extension Dictionary : _ConditionallyBridgedToObjectiveC {
extension NSDictionary {
@conversion @public
func __conversion() -> Dictionary<NSObject, AnyObject> {
func __conversion() -> [NSObject : AnyObject] {
return _convertNSDictionaryToDictionary(reinterpretCast(self))
}
}
@@ -802,7 +802,7 @@ extension Dictionary {
extension NSDictionary : Reflectable {
@public func getMirror() -> Mirror {
let dict : Dictionary<NSObject,AnyObject> = _convertNSDictionaryToDictionary(self)
let dict : [NSObject : AnyObject] = _convertNSDictionaryToDictionary(self)
return reflect(dict)
}
}