From 14a9986ddc8a3265ed356a8a39a01bed01741adc Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 10 Aug 2012 14:48:09 +0400 Subject: [PATCH] Remove unnecessary code in PatternTranslator. Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0. --- .../expression/PatternTranslator.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java index a45d61156e2..4ee2d4d5627 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java @@ -16,7 +16,10 @@ package org.jetbrains.k2js.translate.expression; -import com.google.dart.compiler.backend.js.ast.*; +import com.google.dart.compiler.backend.js.ast.JsExpression; +import com.google.dart.compiler.backend.js.ast.JsInvocation; +import com.google.dart.compiler.backend.js.ast.JsName; +import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; @@ -131,19 +134,7 @@ public final class PatternTranslator extends AbstractTranslator { @NotNull private JsExpression translateExpressionPattern(@NotNull JsExpression expressionToMatch, JetExpressionPattern pattern) { JsExpression expressionToMatchAgainst = translateExpressionForExpressionPattern(pattern); - JsBinaryOperation eq = equality(expressionToMatch, expressionToMatchAgainst); - // Uncaught TypeError: Cannot convert object to primitive value - if (context().isEcma5()) { - if (expressionToMatchAgainst instanceof JsNumberLiteral || - expressionToMatchAgainst instanceof JsStringLiteral || - expressionToMatchAgainst instanceof JsLiteral.JsBooleanLiteral) { - JsNameRef valueOf = new JsNameRef("valueOf"); - valueOf.setQualifier(expressionToMatch); - return and(valueOf, eq); - } - } - - return eq; + return equality(expressionToMatch, expressionToMatchAgainst); } @NotNull