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

Minor. Code clean

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-05-25 14:10:50 +02:00
parent 340920fe38
commit ad57ca7d2c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/syntheticAccessorUtil.kt
+3 -3
View File
@@ -28,10 +28,10 @@ enum class FieldAccessorKind(val suffix: String) {
} }
private fun CallableMemberDescriptor.getJvmName() = private fun CallableMemberDescriptor.getJvmName() =
DescriptorUtils.getJvmName(this) ?: name.asString() DescriptorUtils.getJvmName(this) ?: name.asString()
fun getAccessorNameSuffix( fun getAccessorNameSuffix(
descriptor: CallableMemberDescriptor, superCallDescriptor: ClassDescriptor?, accessorKind: FieldAccessorKind descriptor: CallableMemberDescriptor, superCallDescriptor: ClassDescriptor?, accessorKind: FieldAccessorKind
): String { ): String {
val suffix = when (descriptor) { val suffix = when (descriptor) {
is ConstructorDescriptor -> is ConstructorDescriptor ->
@@ -41,7 +41,7 @@ fun getAccessorNameSuffix(
is PropertyDescriptor -> is PropertyDescriptor ->
descriptor.getJvmName() + "$" + accessorKind.suffix descriptor.getJvmName() + "$" + accessorKind.suffix
else -> else ->
throw UnsupportedOperationException("Do not know how to create accessor for descriptor " + descriptor) throw UnsupportedOperationException("Do not know how to create accessor for descriptor $descriptor")
} }
if (accessorKind == FieldAccessorKind.JVM_DEFAULT_COMPATIBILITY) return suffix + "$" + FieldAccessorKind.JVM_DEFAULT_COMPATIBILITY.suffix if (accessorKind == FieldAccessorKind.JVM_DEFAULT_COMPATIBILITY) return suffix + "$" + FieldAccessorKind.JVM_DEFAULT_COMPATIBILITY.suffix
return if (superCallDescriptor == null) suffix else "$suffix\$s${superCallDescriptor.name.asString().hashCode()}" return if (superCallDescriptor == null) suffix else "$suffix\$s${superCallDescriptor.name.asString().hashCode()}"