JS backend: fix TranslationUtils.isCacheNeeded

This commit is contained in:
Michael Nedzelsky
2014-09-02 17:31:32 +04:00
parent 5967b6637f
commit 0e41411c75
3 changed files with 43 additions and 1 deletions
@@ -112,4 +112,8 @@ public class EvaluationOrderTest extends AbstractExpressionTest {
public void testOrOrWithBreakContinueReturn() throws Exception {
checkFooBoxIsOk();
}
public void testWhenJsLiteralWithSideEffect() throws Exception {
checkFooBoxIsOk();
}
}
@@ -397,7 +397,7 @@ public final class TranslationUtils {
}
public static boolean isCacheNeeded(@NotNull JsExpression expression) {
return !(expression instanceof JsLiteral) &&
return !(expression instanceof JsLiteral.JsValueLiteral) &&
(!(expression instanceof JsNameRef) || ((JsNameRef) expression).getQualifier() != null);
}
@@ -0,0 +1,38 @@
package foo
var global: String = ""
fun bar(s: String): Int {
global += s
return 1
}
fun testWhen() {
global = ""
when(array(bar("A"),2,3)) {
array(1) -> println("1")
array(2) -> println("2")
else -> println("else")
}
assertEquals("A", global)
}
fun testIntrinsic() {
global = ""
val x = array(bar("A")) == try { array(bar("B")) } finally {}
assertEquals("AB", global)
}
fun testElvis() {
global = ""
var x = array(bar("A")) ?: 10
assertEquals("A", global)
}
fun box(): String {
testWhen()
testIntrinsic()
testElvis()
return "OK"
}