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

kotlin-objective-c cross resolve: rename ObjCExportNamer#getName -> getPropertyName

Browse Source
This commit is contained in:
Max Medvedev
2018-06-22 10:03:55 +03:00
committed by SvyatoslavScherbina
parent bc322396ce
commit d08947ce59
2 changed files with 3 additions and 3 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/objcexport/ObjCExportHeaderGenerator.kt
+2 -2
View File
@@ -500,7 +500,7 @@ abstract class ObjCExportHeaderGenerator(
private fun buildProperties(property: PropertyDescriptor): Set<RenderedStub<ObjCProperty>> = propertyToSignatures.getOrPut(property) {
mapper.getBaseProperties(property)
.asSequence()
.distinctBy { namer.getName(it) }
.distinctBy { namer.getPropertyName(it) }
.map { base -> buildProperty(property, base) }
.map { property -> RenderedStub(property) }
.toSet()
@@ -518,7 +518,7 @@ abstract class ObjCExportHeaderGenerator(
val getterBridge = mapper.bridgeMethod(baseProperty.getter!!)
val type = mapReturnType(getterBridge.returnBridge, property.getter!!)
val name = namer.getName(baseProperty)
val name = namer.getPropertyName(baseProperty)
val attributes = mutableListOf<String>()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
+1 -1
View File
@@ -205,7 +205,7 @@ internal class ObjCExportNamer(val moduleDescriptor: ModuleDescriptor,
}
}
fun getName(property: PropertyDescriptor): String = propertyNames.getOrPut(property) {
fun getPropertyName(property: PropertyDescriptor): String = propertyNames.getOrPut(property) {
assert(mapper.isBaseProperty(property))
assert(mapper.isObjCProperty(property))