Extract an ABIBindings module (#296)

Package.swift

@@ -26,9 +26,13 @@ let package = Package(
             dependencies: ["COM_ABI", "WindowsRuntime_ABI"],
             path: "Support/Sources/InternalABI",
             exclude: ["CMakeLists.txt"]),
+        .target(
+            name: "ABIBindings",
+            path: "Support/Sources/ABIBindings",
+            exclude: ["CMakeLists.txt"]),
         .target(
             name: "COM",
-            dependencies: ["COM_ABI", "InternalABI"],
+            dependencies: ["ABIBindings", "COM_ABI", "InternalABI"],
             path: "Support/Sources/COM",
             exclude: ["CMakeLists.txt"]),
         .target(

Support/Sources/COM/ABIBinding.swift → Support/Sources/ABIBindings/ABIBinding.swift

@@ -40,13 +40,6 @@ extension ABIBinding {
     }
 }
 
-public protocol IdentityBinding: PODBinding where SwiftValue == ABIValue {}
-
-extension IdentityBinding {
-    public static func toABI(_ value: SwiftValue) -> ABIValue { value }
-    public static func toSwift(_ value: ABIValue) -> SwiftValue { value }
-}
-
 public enum ABIBindingError: Error {
     case unsupported(Any.Type)
 }

Support/Sources/ABIBindings/CMakeLists.txt

@@ -0,0 +1,2 @@
+file(GLOB_RECURSE SOURCES *.swift)
+add_library(ABIBindings STATIC ${SOURCES})

Support/Sources/ABIBindings/ClosedEnumBinding.swift

@@ -0,0 +1,11 @@
+/// Binding for an enumeration whose ABI representation is an integer,
+/// and for which allowed values are limited to a set of defined enumerants.
+public protocol ClosedEnumBinding: RawRepresentable, PODBinding 
+    where ABIValue == RawValue, SwiftValue == Self, RawValue: FixedWidthInteger & Hashable {
+}
+
+extension ClosedEnumBinding {
+    public static var abiDefaultValue: RawValue { RawValue.zero }
+    public static func toSwift(_ value: RawValue) -> Self { Self(rawValue: value)! }
+    public static func toABI(_ value: Self) -> RawValue { value.rawValue }
+}

Support/Sources/ABIBindings/IdentityBinding.swift

@@ -0,0 +1,7 @@
+/// Binds a Swift type to an identical ABI type.
+public protocol IdentityBinding: PODBinding where SwiftValue == ABIValue {}
+
+extension IdentityBinding {
+    public static func toABI(_ value: SwiftValue) -> ABIValue { value }
+    public static func toSwift(_ value: ABIValue) -> SwiftValue { value }
+}

Support/Sources/COM/ProjectedTypes/EnumBinding.swift → Support/Sources/ABIBindings/OpenEnumBinding.swift

@@ -11,15 +11,3 @@ extension OpenEnumBinding {
     public static func toSwift(_ value: RawValue) -> Self { Self(rawValue: value) }
     public static func toABI(_ value: Self) -> RawValue { value.rawValue }
 }
-
-/// Binding for an enumeration whose ABI representation is an integer,
-/// and for which allowed values are limited to a set of defined enumerants.
-public protocol ClosedEnumBinding: RawRepresentable, PODBinding 
-    where ABIValue == RawValue, SwiftValue == Self, RawValue: FixedWidthInteger & Hashable {
-}
-
-extension ClosedEnumBinding {
-    public static var abiDefaultValue: RawValue { RawValue.zero }
-    public static func toSwift(_ value: RawValue) -> Self { Self(rawValue: value)! }
-    public static func toABI(_ value: Self) -> RawValue { value.rawValue }
-}

Support/Sources/CMakeLists.txt

@@ -2,5 +2,6 @@ add_subdirectory(COM_ABI)
 add_subdirectory(WindowsRuntime_ABI)
 add_subdirectory(InternalABI)
 
+add_subdirectory(ABIBindings)
 add_subdirectory(COM)
 add_subdirectory(WindowsRuntime)

Support/Sources/COM/ABIBindings.swift

@@ -0,0 +1 @@
+@_exported import ABIBindings

Support/Sources/COM/CMakeLists.txt

@@ -1,3 +1,4 @@
 file(GLOB_RECURSE SOURCES *.swift)
 add_library(COM STATIC ${SOURCES})
-target_link_libraries(COM PRIVATE COM_ABI SWRT_InternalABI)
+target_link_libraries(COM PUBLIC ABIBindings COM_ABI SWRT_InternalABI)
+target_link_libraries(COM PRIVATE SWRT_InternalABI)

Support/Sources/WindowsRuntime/CMakeLists.txt

@@ -1,3 +1,4 @@
 file(GLOB_RECURSE SOURCES *.swift)
 add_library(WindowsRuntime STATIC ${SOURCES})
-target_link_libraries(WindowsRuntime PRIVATE COM WindowsRuntime_ABI SWRT_InternalABI)
+target_link_libraries(WindowsRuntime PUBLIC COM WindowsRuntime_ABI)
+target_link_libraries(WindowsRuntime PRIVATE SWRT_InternalABI)