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

Fix build after subtle change of Enum.name from function to property

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-14 22:00:48 +03:00
parent 57205f5721
commit bd5f068454
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java
+2 -2
View File
@@ -44,7 +44,7 @@ public enum JvmPrimitiveType {
for (JvmPrimitiveType type : values()) { for (JvmPrimitiveType type : values()) {
WRAPPERS_CLASS_NAMES.add(type.getWrapperFqName()); WRAPPERS_CLASS_NAMES.add(type.getWrapperFqName());
TYPE_BY_NAME.put(type.getName(), type); TYPE_BY_NAME.put(type.getJavaKeywordName(), type);
TYPE_BY_PRIMITIVE_TYPE.put(type.getPrimitiveType(), type); TYPE_BY_PRIMITIVE_TYPE.put(type.getPrimitiveType(), type);
} }
} }
@@ -85,7 +85,7 @@ public enum JvmPrimitiveType {
} }
@NotNull @NotNull
public String getName() { public String getJavaKeywordName() {
return name; return name;
} }
j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+1 -1
View File
@@ -174,7 +174,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
override fun visitClassObjectAccessExpression(expression: PsiClassObjectAccessExpression) { override fun visitClassObjectAccessExpression(expression: PsiClassObjectAccessExpression) {
val operand = expression.getOperand() val operand = expression.getOperand()
val typeName = operand.getType().getCanonicalText() val typeName = operand.getType().getCanonicalText()
val primitiveType = JvmPrimitiveType.values().firstOrNull { it.getName() == typeName } val primitiveType = JvmPrimitiveType.values().firstOrNull { it.getJavaKeywordName() == typeName }
val wrapperTypeName = if (primitiveType != null) { val wrapperTypeName = if (primitiveType != null) {
primitiveType.getWrapperFqName() primitiveType.getWrapperFqName()
} }
j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.j2k.ast.*
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.getName() } private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.getJavaKeywordName() }
class TypeVisitor( class TypeVisitor(
private val converter: Converter, private val converter: Converter,