Update for Swift 4.1

Reflection.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name         = "Reflection"
-  s.version      = "0.15.0"
+  s.version      = "0.16.0"
   s.summary      = "Advanced Swift Reflection"
   s.description  = <<-DESC
                     Reflection enables advanced runtime features like dynamic construction of types and manipulating instance properties.
                    DESC
   s.homepage     = "https://github.com/Zewo/Reflection"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Brad Hilton" => "[email protected]" }
-  s.source       = { :git => "https://github.com/Zewo/Reflection.git", :tag => "0.15.0" }
+  s.source       = { :git => "https://github.com/Zewo/Reflection.git", :tag => "0.16.0" }
 
   s.ios.deployment_target = "8.0"
   s.tvos.deployment_target = "9.0"

Sources/Reflection/Construct.swift

@@ -19,7 +19,7 @@ public func construct(_ type: Any.Type, constructor: (Property.Description) thro
 private func constructValueType<T>(_ constructor: (Property.Description) throws -> Any) throws -> T {
     guard Metadata(type: T.self)?.kind == .struct else { throw ReflectionError.notStruct(type: T.self) }
     let pointer = UnsafeMutablePointer<T>.allocate(capacity: 1)
-    defer { pointer.deallocate(capacity: 1) }
+    defer { pointer.deallocate() }
     var values: [Any] = []
     try constructType(storage: UnsafeMutableRawPointer(pointer), values: &values, properties: properties(T.self), constructor: constructor)
     return pointer.move()

Sources/Reflection/Metadata+Class.swift

@@ -3,8 +3,12 @@ extension Metadata {
 
         static let kind: Kind? = .class
         var pointer: UnsafePointer<_Metadata._Class>
+
+        var nominalTypeDescriptor: NominalTypeDescriptor {
+            return pointer.withMemoryRebound(to: NominalTypeDescriptor.self, capacity: 15, { $0[nominalTypeDescriptorLocation] })
+        }
 
-        var nominalTypeDescriptorOffsetLocation: Int {
+        var nominalTypeDescriptorLocation: Int {
             return is64BitPlatform ? 8 : 11
         }
 

Sources/Reflection/Metadata+Struct.swift

@@ -2,16 +2,16 @@ extension Metadata {
     struct Struct : NominalType {
         static let kind: Kind? = .struct
         var pointer: UnsafePointer<_Metadata._Struct>
-        var nominalTypeDescriptorOffsetLocation: Int {
-            return 1
+        var nominalTypeDescriptor: NominalTypeDescriptor {
+            return pointer.pointee.nominalTypeDescriptor
         }
     }
 }
 
 extension _Metadata {
     struct _Struct {
         var kind: Int
-        var nominalTypeDescriptorOffset: Int
+        var nominalTypeDescriptor: NominalTypeDescriptor
         var parent: Metadata?
     }
 }

Sources/Reflection/NominalType.swift

@@ -1,13 +1,8 @@
 protocol NominalType : MetadataType {
-    var nominalTypeDescriptorOffsetLocation: Int { get }
+    var nominalTypeDescriptor: NominalTypeDescriptor { get }
 }
 
 extension NominalType {
-    var nominalTypeDescriptor: NominalTypeDescriptor {
-        let pointer = UnsafePointer<Int>(self.pointer)
-        let base = pointer.advanced(by: nominalTypeDescriptorOffsetLocation)
-        return NominalTypeDescriptor(pointer: relativePointer(base: base, offset: base.pointee))
-    }
 
     var fieldTypes: [Any.Type]? {
         guard let function = nominalTypeDescriptor.fieldTypesAccessor else { return nil }

Sources/Reflection/NominalTypeDescriptor.swift

@@ -1,8 +1,11 @@
 struct NominalTypeDescriptor : PointerType {
+    typealias Pointee = _NominalTypeDescriptor
+
     var pointer: UnsafePointer<_NominalTypeDescriptor>
 
     var mangledName: String {
-        return String(cString: relativePointer(base: pointer, offset: pointer.pointee.mangledName) as UnsafePointer<CChar>)
+//        return String(cString: pointer.pointee.mangledName)
+        return String(cString: relativePointer(base: pointer, offset: pointer.pointee.mangledName) as UnsafePointer<UInt8>)
     }
 
     var numberOfFields: Int {

Sources/Reflection/ValueWitnessTable.swift

@@ -29,14 +29,6 @@ struct _ValueWitnessTable {
     let initializeWithCopy: Int
     let assignWithCopy: Int
     let initializeBufferWithTake: Int
-    let initializeWithTake: Int
-    let assignWithTake: Int
-    let allocateBuffer: Int
-    let initializeBufferWithTakeOrBuffer: Int
-    let destroyArray: Int
-    let initializeArrayWithCopy: Int
-    let initializeArrayWithTakeFrontToBack: Int
-    let initializeArrayWithTakeBackToFront: Int
     let size: Int
     let align: Int
     let stride: Int

Tests/ReflectionTests/InternalTests.swift

@@ -3,6 +3,23 @@ import XCTest
 
 public class InternalTests : XCTestCase {
 
+    func testDumbedDownTest() {
+        struct NominalTypeDescriptor {
+            let something: Int32
+            let numberOfProperties: Int32
+        }
+
+        struct StructMetadata {
+            let kind: Int
+            let nominalTypeDescriptor: UnsafePointer<NominalTypeDescriptor>
+        }
+
+        let type: Any.Type = Person.self
+        let numberOfProperties = unsafeBitCast(type, to: UnsafePointer<StructMetadata>.self).pointee.nominalTypeDescriptor.pointee.numberOfProperties
+        print(numberOfProperties)
+    }
+
+
     func testShallowMetadata() {
         func testShallowMetadata<T>(type: T.Type, expectedKind: Metadata.Kind) {
             let shallowMetadata = Metadata(type: type)