Fix translation for ObjCProtocol.

touchlab · Nov 13, 2023 · d2f0448 · d2f0448
1 parent 7cf51ea
commit d2f0448
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/descriptor/ExtraDescriptorBuiltins.kt b/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/descriptor/ExtraDescriptorBuiltins.kt
@@ -14,6 +14,10 @@ class ExtraDescriptorBuiltins(
 
     private val Darwin = getModule("<org.jetbrains.kotlin.native.platform.darwin>")
 
+    private val stdlib = getModule("<stdlib>")
+
+    val Protocol: ClassDescriptor = getClass("kotlinx.cinterop.ObjCProtocol", stdlib)
+
     val NSObject: ClassDescriptor = getClass("platform.darwin.NSObject", Darwin)
 
     val NSCopying: ClassDescriptor = getClass("platform.Foundation.NSCopyingProtocol", Foundation)

diff --git a/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/builtin/OirBuiltins.kt b/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/builtin/OirBuiltins.kt
@@ -15,6 +15,11 @@ class OirBuiltins(
 
     private val Foundation: OirModule.External = oirProvider.getExternalModule("Foundation")
 
+    val Protocol: OirClass = oirProvider.getExternalClass(extraDescriptorBuiltins.Protocol, Foundation).apply {
+        name = "Protocol"
+        kind = OirClass.Kind.Class
+    }
+
     val NSObject: OirClass = oirProvider.getExternalClass(extraDescriptorBuiltins.NSObject, Foundation)
 
     val NSError: OirClass = oirProvider.getExternalClass(extraDescriptorBuiltins.NSError).apply {

diff --git a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirClass.kt b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirClass.kt
@@ -5,9 +5,9 @@ import co.touchlab.skie.oir.type.OirType
 import co.touchlab.skie.sir.element.SirClass
 
 class OirClass(
-    override val name: String,
+    override var name: String,
     override val parent: OirTopLevelDeclarationParent,
-    val kind: Kind,
+    var kind: Kind,
 ) : OirTypeDeclaration, OirCallableDeclarationParent {
 
     lateinit var originalSirClass: SirClass

diff --git a/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/type/SpecialReferenceOirType.kt b/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/type/SpecialReferenceOirType.kt
@@ -8,8 +8,6 @@ sealed class SpecialReferenceOirType(private val name: String) : NonNullReferenc
 
     object Class : SpecialReferenceOirType("Class")
 
-    object Protocol : SpecialReferenceOirType("Protocol")
-
     override fun render(attrsAndName: String, needsNonnullAttribute: Boolean): String =
         name.withAttrsAndName(attrsAndName.plusNonnullAttributeIfNeeded(needsNonnullAttribute))
 }
diff --git a/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/type/translation/OirTypeTranslator.kt b/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/type/translation/OirTypeTranslator.kt
@@ -150,7 +150,7 @@ class OirTypeTranslator(
         // TODO: more precise types can be used.
 
         if (descriptor.isObjCMetaClass()) return SpecialReferenceOirType.Class
-        if (descriptor.isObjCProtocolClass()) return SpecialReferenceOirType.Protocol
+        if (descriptor.isObjCProtocolClass()) return oirBuiltins.Protocol.defaultType
 
         if (descriptor.isExternalObjCClass() || descriptor.isObjCForwardDeclaration()) {
             return oirProvider.getExternalClass(descriptor).defaultType

diff --git a/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/type/SpecialSirType.kt b/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/type/SpecialSirType.kt
@@ -1,9 +1,7 @@
 package co.touchlab.skie.sir.type
 
 import co.touchlab.skie.sir.element.SirTypeParameter
-import co.touchlab.skie.util.swift.qualifiedLocalTypeName
 import io.outfoxx.swiftpoet.AnyTypeName
-import io.outfoxx.swiftpoet.DeclaredTypeName
 import io.outfoxx.swiftpoet.SelfTypeName
 import io.outfoxx.swiftpoet.TypeName
 
@@ -35,6 +33,4 @@ sealed class SpecialSirType<SELF : SirType>(
     object Self : SpecialSirType<Self>(SelfTypeName.INSTANCE)
 
     object Any : SpecialSirType<Any>(AnyTypeName.INSTANCE)
-
-    object Protocol : SpecialSirType<Protocol>(DeclaredTypeName.qualifiedLocalTypeName("Protocol"))
 }
diff --git a/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/type/translation/SirTypeTranslator.kt b/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/type/translation/SirTypeTranslator.kt
@@ -116,7 +116,6 @@ class SirTypeTranslator(
             SpecialReferenceOirType.Class -> sirBuiltins.Swift.AnyClass.defaultType
             SpecialReferenceOirType.Id -> SpecialSirType.Any
             SpecialReferenceOirType.InstanceType -> SpecialSirType.Self
-            SpecialReferenceOirType.Protocol -> SpecialSirType.Protocol
         }
 
     private fun mapType(oirType: TypeParameterUsageOirType): SirType =