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

Remove unnecessary code in PatternTranslator.

Browse Source 
Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0.
This commit is contained in:
Pavel V. Talanov
2012-08-10 14:48:09 +04:00
parent 8939dd1a6e
commit 14a9986ddc
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java
+5 -14
View File
@@ -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