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

toString() on nullables fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-03 12:15:16 +04:00
parent 619df3a53e
commit 9fb09e62af
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
+1 -1
View File
@@ -554,7 +554,7 @@ private fun createStringConstant(value: CompileTimeConstant<*>?): StringValue? {
is CharValue, is CharValue,
is DoubleValue, is FloatValue, is DoubleValue, is FloatValue,
is BooleanValue, is BooleanValue,
is NullValue -> StringValue(value.getValue().toString(), value.canBeUsedInAnnotations(), value.usesVariableAsConstant()) is NullValue -> StringValue("${value.getValue()}", value.canBeUsedInAnnotations(), value.usesVariableAsConstant())
else -> null else -> null
} }
} }
compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip
if (compileTimeConstant is StringValue) { if (compileTimeConstant is StringValue) {
"\\\"${compileTimeConstant.getValue()}\\\"" "\\\"${compileTimeConstant.getValue()}\\\""
} else { } else {
compileTimeConstant.toString() "$compileTimeConstant"
} }
} }
} }