Consolidated Cast operators for Array and Dictionary

Author: dwarfland

Source/Array.swift

@@ -172,26 +172,33 @@ public struct Array<T>
 	}
 
 	//
-	// Operators
+	// Casts
 	//
 
+	// Cast from/to native array
+
 	public static func __implicit(_ array: T[]) -> [T] {
 		return [T](arrayLiteral: array)
 	}
 
-	public static func __explicit(_ array: T[]) -> [T] {
-		return [T](arrayLiteral: array)
+	public static func __implicit(_ array: [T]) -> T[] {
+		return array.nativeArray
 	}
 
+	// Cast from/to platform type
+
 	public static func __implicit(_ list: PlatformList<T>) -> [T] {
 		return [T](list)
 	}
 
-	public static func __explicit(_ list: PlatformList<T>) -> [T] {
-		return [T](list)
+	public static func __implicit(_ array: [T]) -> PlatformList<T> {
+		return array.platformList
 	}
 
-	#if ISLAND && DARWIN
+	// Darwin only: cast from/to Cocoa type
+
+	#if DARWIN
+	#if ISLAND
 	public static func __implicit(_ array: NSArray<T>) -> [T] {
 		return List<T>(array)
 	}
@@ -203,44 +210,33 @@ public struct Array<T>
 	public static func __implicit(_ list: [T]) -> NSMutableArray<T> {
 		return list.list.ToNSMutableArray()
 	}
-	#endif
-
-	#if COCOA
-	public static func __implicit(_ list: PlatformImmutableList<T>) -> [T] {
-		return [T](list)
-	}
-
-	public static func __explicit(_ list: PlatformImmutableList<T>) -> [T] {
-		return [T](list)
+	#else
+	public static func __implicit(_ array: [T]) -> PlatformImmutableList<T> {
+		return array.platformList
 	}
 	#endif
+	#endif
 
-	public static func __implicit(_ array: [T]) -> T[] {
-		return array.nativeArray
-	}
-
-	public static func __explicit(_ array: [T]) -> T[] {
-		return array.nativeArray
-	}
-
-	public static func __implicit(_ array: [T]) -> PlatformList<T> {
-		return array.platformList
-	}
+	// Cocoa only: cast from/to different generic Cocoa type
 
-	public static func __explicit(_ array: [T]) -> PlatformList<T> {
-		return array.platformList
+	#if TOFFEE || DARWIN
+	public static func __explicit<U>(_ array: NSArray<U>) -> [T] {
+		return (array as! NSArray<T>) as! [T]
 	}
 
-	#if COCOA
-	public static func __implicit(_ array: [T]) -> PlatformImmutableList<T> {
-		return array.platformList
+	public static func __explicit<U>(_ array: [T]) -> NSArray<U> {
+		return (array as! NSArray<U>) as! NSArray<U>
 	}
 
-	public static func __explicit(_ array: [T]) -> PlatformImmutableList<T> {
-		return array.platformList
+	public static func __explicit<U>(_ array: [T]) -> NSMutableArray<U> {
+		return (array as! NSMutableArray<T>) as! NSMutableArray<U>
 	}
 	#endif
 
+	//
+	// Operators
+	//
+
 	public static func + <T>(lhs: [T], rhs: [T]) -> [T] {
 		var result = lhs
 		for i in rhs.GetSequence() {

Source/Dictionary.swift

@@ -99,25 +99,61 @@ public struct Dictionary<Key, Value> /*: INSFastEnumeration<T>*/
 	}
 
 	//
-	// Operators
+	// Casts
 	//
 
-	public static func __implicit(_ dictionary: PlatformDictionary<Key,Value>) -> [Key:Value] {
-		return [Key:Value](dictionary)
-	}
+	// Cast from/to platform type
 
-	public static func __explicit(_ dictionary: PlatformDictionary<Key,Value>) -> [Key:Value] {
+	public static func __implicit(_ dictionary: PlatformDictionary<Key,Value>) -> [Key:Value] {
 		return [Key:Value](dictionary)
 	}
 
 	public static func __implicit(_ dictionary: [Key:Value]) -> PlatformDictionary<Key,Value> {
 		return dictionary.platformDictionary
 	}
 
-	public static func __explicit(_ dictionary: [Key:Value]) -> PlatformDictionary<Key,Value> {
-		return dictionary.platformDictionary
+	// Darwin only: cast from/to Cocoa type
+
+	#if DARWIN
+	#if ISLAND
+	public static func __implicit(_ dictionary: NSDictionary<Key,Value>) -> [Key:Value] {
+		return Dictionary<Key,Value>(dictionary)
+	}
+
+	public static func __implicit(_ dictionary: [Key:Value]) -> NSDictionary<Key,Value> {
+		return dictionary.dictionary.ToNSDictionary()
 	}
 
+	public static func __implicit(_ list: [Key:Value]) -> NSMutableDictionary<Key,Value> {
+		return Dictionary.dictionary.ToNSDictionary()
+	}
+	#else
+	public static func __implicit(_ list: [Key:Value]) -> PlatformImmutableDictionary<Key,Value> {
+		return Dictionary.platformFictionary
+	}
+	#endif
+	#endif
+
+	// Cocoa only: cast from/to different generic Cocoa type
+
+	#if TOFFEE || DARWIN
+	public static func __explicit<Key2,Value2>(_ dictionary: NSDictionary<Key2,Value2>) -> [Key:Value] {
+		return (dictionary as! NSDictionary<Key,Value>) as! [Key:Value]
+	}
+
+	public static func __explicit<Key2,Value2>(_ dictionary: [Key:Value]) -> NSDictionary<Key2,Value2> {
+		return (dictionary as! NSDictionary<Key,Value>) as! NSDictionary<Key2,Value2>
+	}
+
+	public static func __explicit<Key2,Value2>(_ dictionary: [Key:Value]) -> NSMutableDictionary<Key2,Value2> {
+		return (dictionary as! NSMutableDictionary<Key,Value>) as! NSMutableDictionary<Key2,Value2>
+	}
+	#endif
+
+	//
+	// Operators
+	//
+
 	public static func + <T>(lhs: [Key:Value], rhs: [Key:Value]) -> [Key:Value] {
 		var result = lhs
 		for k in rhs.keys {
@@ -324,7 +360,7 @@ public struct Dictionary<Key, Value> /*: INSFastEnumeration<T>*/
 		#endif
 	}
 
-	public var keys: ISequence<Key> { // we deliberatey return a sequence, not an array, for efficiency and flexibility.
+	public var keys: ISequence<Key> { // we deliberatey return a sequence, not an dictionary, for efficiency and flexibility.
 		#if JAVA
 		return dictionary.keySet()
 		#elseif CLR || ISLAND
@@ -334,7 +370,7 @@ public struct Dictionary<Key, Value> /*: INSFastEnumeration<T>*/
 		#endif
 	}
 
-	public var values: ISequence<Value> { // we deliberatey return a sequence, not an array, for efficiency and flexibility.
+	public var values: ISequence<Value> { // we deliberatey return a sequence, not an dictionary, for efficiency and flexibility.
 		#if JAVA
 		return dictionary.values()
 		#elseif CLR || ISLAND