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

Don't use fields for non-strict interop enum constants

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2018-08-28 13:51:55 +03:00
committed by SvyatoslavScherbina
parent 2b8612632e
commit 71405c34fa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt
+6 -6
View File
@@ -518,15 +518,15 @@ class StubGenerator(
it.name !in macroConstantsByName it.name !in macroConstantsByName
} }
val typeName: String val kotlinType: KotlinType
val baseKotlinType = mirror(e.baseType).argType.render(kotlinFile) val baseKotlinType = mirror(e.baseType).argType
if (e.isAnonymous) { if (e.isAnonymous) {
if (constants.isNotEmpty()) { if (constants.isNotEmpty()) {
out("// ${e.spelling}:") out("// ${e.spelling}:")
} }
typeName = baseKotlinType kotlinType = baseKotlinType
} else { } else {
val typeMirror = mirror(EnumType(e)) val typeMirror = mirror(EnumType(e))
if (typeMirror !is TypeMirror.ByValue) { if (typeMirror !is TypeMirror.ByValue) {
@@ -538,18 +538,18 @@ class StubGenerator(
val varTypeClassifier = typeMirror.pointedType.classifier val varTypeClassifier = typeMirror.pointedType.classifier
val valueTypeClassifier = typeMirror.valueType.classifier val valueTypeClassifier = typeMirror.valueType.classifier
out("typealias ${kotlinFile.declare(varTypeClassifier)} = $varTypeName") out("typealias ${kotlinFile.declare(varTypeClassifier)} = $varTypeName")
out("typealias ${kotlinFile.declare(valueTypeClassifier)} = $baseKotlinType") out("typealias ${kotlinFile.declare(valueTypeClassifier)} = ${baseKotlinType.render(kotlinFile)}")
if (constants.isNotEmpty()) { if (constants.isNotEmpty()) {
out("") out("")
} }
typeName = typeMirror.valueType.render(kotlinFile) kotlinType = typeMirror.valueType
} }
for (constant in constants) { for (constant in constants) {
val literal = integerLiteral(e.baseType, constant.value) ?: continue val literal = integerLiteral(e.baseType, constant.value) ?: continue
out("val ${constant.name.asSimpleName()}: $typeName = $literal") out(topLevelValWithGetter(constant.name, kotlinType, literal))
} }
} }