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

New J2K: fix ExceptionInInitializerError in JKJavaPrimitiveTypeImpl

Browse Source
This commit is contained in:
Ilya Kirillov
2019-07-09 16:12:55 +03:00
parent f0dd21790a
commit b18350e9c8
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
+1 -1
View File
@@ -111,7 +111,7 @@ class ImplicitInitializerConversion(private val context: NewJ2kConverterContext)
private fun createPrimitiveTypeInitializer(primitiveType: JKJavaPrimitiveType): JKLiteralExpression = private fun createPrimitiveTypeInitializer(primitiveType: JKJavaPrimitiveType): JKLiteralExpression =
when (primitiveType) { when (primitiveType) {
is JKJavaPrimitiveTypeImpl.BOOLEAN -> JKJavaPrimitiveTypeImpl.BOOLEAN ->
JKBooleanLiteral(false) JKBooleanLiteral(false)
else -> else ->
JKJavaLiteralExpressionImpl("0", JKLiteralExpression.LiteralType.INT) JKJavaLiteralExpressionImpl("0", JKLiteralExpression.LiteralType.INT)
nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/j.kt
+13 -11
View File
@@ -261,20 +261,22 @@ class JKJavaNewArrayImpl(initializer: List<JKExpression>, type: JKTypeElement) :
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaNewArray(this, data) override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaNewArray(this, data)
} }
sealed class JKJavaPrimitiveTypeImpl(override val jvmPrimitiveType: JvmPrimitiveType) : JKJavaPrimitiveType { class JKJavaPrimitiveTypeImpl(override val jvmPrimitiveType: JvmPrimitiveType) : JKJavaPrimitiveType {
object BOOLEAN : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.BOOLEAN)
object CHAR : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.CHAR)
object BYTE : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.BYTE)
object SHORT : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.SHORT)
object INT : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.INT)
object FLOAT : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.FLOAT)
object LONG : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.LONG)
object DOUBLE : JKJavaPrimitiveTypeImpl(JvmPrimitiveType.DOUBLE)
companion object { companion object {
val BOOLEAN = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.BOOLEAN)
val CHAR = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.CHAR)
val BYTE = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.BYTE)
val SHORT = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.SHORT)
val INT = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.INT)
val FLOAT = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.FLOAT)
val LONG = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.LONG)
val DOUBLE = JKJavaPrimitiveTypeImpl(JvmPrimitiveType.DOUBLE)
val KEYWORD_TO_INSTANCE = listOf( val KEYWORD_TO_INSTANCE = listOf(
BOOLEAN, CHAR, BYTE, SHORT, INT, FLOAT, LONG, DOUBLE BOOLEAN, CHAR, BYTE, SHORT, INT, FLOAT, LONG, DOUBLE
).associate { it.jvmPrimitiveType.javaKeywordName to it } + ("void" to JKJavaVoidType) ).associate {
it.jvmPrimitiveType.javaKeywordName to it
} + ("void" to JKJavaVoidType)
} }
} }