Update set functionality

Author: bradhilton

Sources/Reflection/Any+Extensions.swift

@@ -18,12 +18,19 @@ extension AnyExtensions {
         return try Reflection.construct(self, dictionary: dictionary)
     }
 
-    static func value(from pointer: UnsafeRawPointer) -> Any {
-        return pointer.assumingMemoryBound(to: self).pointee
+    static func isValueTypeOrSubtype(_ value: Any) -> Bool {
+        return value is Self
     }
 
-    func write(to pointer: UnsafeMutableRawPointer) {
-        pointer.assumingMemoryBound(to: type(of: self)).initialize(to: self)
+    static func value(from storage: UnsafeRawPointer) -> Any {
+        return storage.assumingMemoryBound(to: self).pointee
+    }
+    
+    static func write(_ value: Any, to storage: UnsafeMutableRawPointer) throws {
+        guard let this = value as? Self else {
+            throw ReflectionError.valueIsNotType(value: value, type: self)
+        }
+        storage.assumingMemoryBound(to: self).initialize(to: this)
     }
 
 }

Sources/Reflection/AnyExistentialContainer.swift

@@ -26,9 +26,8 @@ private func constructType(storage: UnsafeMutableRawPointer, values: inout [Any]
     for property in properties {
         do {
             let value = try constructor(property)
-            guard Reflection.value(value, is: property.type) else { throw ReflectionError.valueIsNotType(value: value, type: property.type) }
             values.append(value)
-            extensions(of: value).write(to: storage.advanced(by: property.offset))
+            try property.write(value, to: storage)
         } catch {
             errors.append(error)
         }

Sources/Reflection/Construct.swift

@@ -1,18 +1,6 @@
 /// Tests if `value` is `type` or a subclass of `type`
 public func value(_ value: Any, is type: Any.Type) -> Bool {
-    if type(of: value) == type {
-        return true
-    }
-    guard var subclass = Metadata.Class(type: type(of: value)), let superclass = Metadata.Class(type: type) else {
-        return false
-    }
-    while let parentClass = subclass.superclass {
-        if parentClass == superclass {
-            return true
-        }
-        subclass = parentClass
-    }
-    return false
+    return extensions(of: type).isValueTypeOrSubtype(value)
 }
 
 /// Tests equality of any two existential types

Sources/Reflection/Identity.swift

@@ -21,6 +21,9 @@ public struct Property {
         public let key: String
         public let type: Any.Type
         let offset: Int
+        func write(_ value: Any, to storage: UnsafeMutableRawPointer) throws {
+            return try extensions(of: type).write(value, to: storage.advanced(by: offset))
+        }
     }
 }
 

Sources/Reflection/Properties.swift

@@ -1,7 +1,6 @@
 /// Set value for key of an instance
 public func set(_ value: Any, key: String, for instance: inout Any) throws {
-    let property = try Reflection.property(type: type(of: instance), key: key)
-    try setValue(value, forKey: key, property: property, storage: mutableStorage(instance: &instance))
+    try property(type: type(of: instance), key: key).write(value, to: mutableStorage(instance: &instance))
 }
 
 /// Set value for key of an instance
@@ -12,16 +11,10 @@ public func set(_ value: Any, key: String, for instance: AnyObject) throws {
 
 /// Set value for key of an instance
 public func set<T>(_ value: Any, key: String, for instance: inout T) throws {
-    let property = try Reflection.property(type: T.self, key: key)
-    try setValue(value, forKey: key, property: property, storage: mutableStorage(instance: &instance))
+    try property(type: T.self, key: key).write(value, to: mutableStorage(instance: &instance))
 }
 
 private func property(type: Any.Type, key: String) throws -> Property.Description {
     guard let property = try properties(type).first(where: { $0.key == key }) else { throw ReflectionError.instanceHasNoKey(type: type, key: key) }
     return property
 }
-
-private func setValue(_ value: Any, forKey key: String, property: Property.Description, storage: UnsafeMutableRawPointer) throws {
-    guard Reflection.value(value, is: property.type) else { throw ReflectionError.valueIsNotType(value: value, type: property.type) }
-    extensions(of: value).write(to: storage.advanced(by: property.offset))
-}

Sources/Reflection/Set.swift

@@ -72,7 +72,7 @@ public class PublicTests : XCTestCase {
         }
         let flags: Flags = try construct(dictionary: [
             "x": false,
-            "y": nil as Optional<Bool>,
+            "y": Optional<Bool>.none as Any,
             "z": (true, false)
         ] as [String : Any])
         XCTAssert(!flags.x)
@@ -91,7 +91,7 @@ public class PublicTests : XCTestCase {
         let object: Object = try construct(dictionary: [
            "flag": true,
            "pair": (UInt8(1), UInt8(2)),
-           "float": Optional(Float(89.0)),
+           "float": Optional<Float>(89.0) as Any,
            "integer": 123,
            "string": "Hello, world"
         ] as [String : Any])