Fix primitive type bugs around char16 naming.

tristanlabelle · Mar 24, 2024 · a0732f6 · a0732f6
1 parent 8096d60
commit a0732f6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Sources/WindowsMetadata/MidlNameMangling.swift b/Sources/WindowsMetadata/MidlNameMangling.swift
@@ -16,7 +16,7 @@ public enum MidlNameMangling {
                     case .uint64: return "UINT64"
                 }
             case .float(let double): return double ? "double" : "float"
-            case .char: return "WCHAR"
+            case .char16: return "WCHAR"
             case .guid: return "GUID"
             case .string: return "HSTRING"
         }

diff --git a/Sources/WindowsMetadata/WinRTPrimitiveType.swift b/Sources/WindowsMetadata/WinRTPrimitiveType.swift
@@ -5,7 +5,7 @@ public enum WinRTPrimitiveType: Hashable {
     case boolean
     case integer(WinRTIntegerType)
     case float(double: Bool)
-    case char
+    case char16
     case guid
     case string
 }
@@ -16,7 +16,7 @@ extension WinRTPrimitiveType: CustomStringConvertible {
             case .boolean: return "Boolean"
             case .integer(let type): return type.name
             case .float(let double): return double ? "Double" : "Single"
-            case .char: return "Char16"
+            case .char16: return "Char16"
             case .guid: return "Guid"
             case .string: return "String"
         }
@@ -38,10 +38,19 @@ extension WinRTPrimitiveType {
             case "UInt64": self = .integer(.uint64)
             case "Single": self = .float(double: false)
             case "Double": self = .float(double: true)
-            case "Char16": self = .char
+            case "Char16": self = .char16
             case "Guid": self = .guid
             case "String": self = .string
             default: return nil
         }
     }
+
+    public init?(fromSystemNamespaceType name: String) {
+        // System namespace names match WinRT names except for Char16
+        switch name {
+            case "Char": self = .char16
+            case "Char16": return nil
+            default: self.init(fromName: name)
+        }
+    }
 }
diff --git a/Sources/WindowsMetadata/WinRTTypeName+fromType.swift b/Sources/WindowsMetadata/WinRTTypeName+fromType.swift
@@ -3,7 +3,7 @@ import DotNetMetadata
 extension WinRTTypeName {
     public static func from(type: BoundType) throws -> WinRTTypeName {
         if type.definition.namespace == "System" {
-            if let primitiveType = WinRTPrimitiveType(fromName: type.definition.name) {
+            if let primitiveType = WinRTPrimitiveType(fromSystemNamespaceType: type.definition.name) {
                 return .primitive(primitiveType)
             } else if type.definition.name == "Object" {
                 return .object