azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some hardcoded names from ObjCExport code generator

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2019-10-10 16:00:16 +03:00
committed by SvyatoslavScherbina
parent f578ce88f5
commit a40604b640
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
+5 -8
View File
@@ -24,10 +24,7 @@ import org.jetbrains.kotlin.descriptors.konan.CurrentKlibModuleOrigin
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.constructedClass import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.util.isInterface
import org.jetbrains.kotlin.ir.util.isReal
import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -230,10 +227,10 @@ internal class ObjCExportCodeGenerator(
internal fun emitRtti() { internal fun emitRtti() {
NSNumberKind.values().mapNotNull { it.mappedKotlinClassId }.forEach { NSNumberKind.values().mapNotNull { it.mappedKotlinClassId }.forEach {
dataGenerator.exportClass("Kotlin${it.shortClassName}") dataGenerator.exportClass(namer.numberBoxName(it).binaryName)
} }
dataGenerator.exportClass("KotlinMutableSet") dataGenerator.exportClass(namer.mutableSetName.binaryName)
dataGenerator.exportClass("KotlinMutableDictionary") dataGenerator.exportClass(namer.mutableMapName.binaryName)
emitSpecialClassesConvertions() emitSpecialClassesConvertions()
@@ -520,7 +517,7 @@ private fun ObjCExportCodeGenerator.emitBoxConverter(
val value = kotlinToObjC(kotlinValue, objCValueType) val value = kotlinToObjC(kotlinValue, objCValueType)
val nsNumberSubclass = genGetLinkedClass("Kotlin${boxClass.name}") val nsNumberSubclass = genGetLinkedClass(namer.numberBoxName(boxClass.classId!!).binaryName)
ret(genSendMessage(int8TypePtr, nsNumberSubclass, nsNumberFactorySelector, value)) ret(genSendMessage(int8TypePtr, nsNumberSubclass, nsNumberFactorySelector, value))
} }