Refactoring intrinsics.

js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java

@@ -224,6 +224,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
         return translateAsExpression(expression, context);
     }
 
+    //NOTE: since JsWhile and JsDoWhile do not have an ancestor, cannot avoid duplication here
     @Override
     @NotNull
     public JsNode visitWhileExpression(@NotNull JetWhileExpression expression, @NotNull TranslationContext context) {

js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.k2js.translate.context.TemporaryVariable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 import java.util.Collections;
@@ -70,7 +70,7 @@ public final class ArrayForTranslator extends ForTranslator {
     private ArrayForTranslator(@NotNull JetForExpression forExpression, @NotNull TranslationContext context) {
         super(forExpression, context);
         loopRange = context.declareTemporary(Translation.translateAsExpression(getLoopRange(expression), context));
-        FunctionIntrinsic lengthPropertyIntrinsic = context().intrinsics().getLengthPropertyIntrinsic();
+        Intrinsic lengthPropertyIntrinsic = context().intrinsics().getLengthPropertyIntrinsic();
         JsExpression length = lengthPropertyIntrinsic.apply(loopRange.reference(),
                                                             Collections.<JsExpression>emptyList(),
                                                             context());
@@ -81,19 +81,10 @@ public final class ArrayForTranslator extends ForTranslator {
     @NotNull
     private JsBlock translate() {
         List<JsStatement> blockStatements = temporariesInitialization(loopRange, end);
-        blockStatements.add(generateForExpression());
+        blockStatements.add(generateForExpression(getInitExpression(), getCondition(), getIncrExpression(), getBody()));
         return newBlock(blockStatements);
     }
 
-    @NotNull
-    private JsFor generateForExpression() {
-        JsFor result = new JsFor();
-        result.setInitVars(initExpression());
-        result.setCondition(getCondition());
-        result.setIncrExpr(getIncrExpression());
-        result.setBody(getBody());
-        return result;
-    }
 
     @NotNull
     private JsStatement getBody() {
@@ -104,7 +95,7 @@ public final class ArrayForTranslator extends ForTranslator {
     }
 
     @NotNull
-    private JsVars initExpression() {
+    private JsVars getInitExpression() {
         return newVar(index.name(), program().getNumberLiteral(0));
     }
 

js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeLiteralForTranslator.java

@@ -80,20 +80,13 @@ public final class RangeLiteralForTranslator extends ForTranslator {
     @NotNull
     private JsBlock translate() {
         List<JsStatement> blockStatements = temporariesInitialization(rangeEnd);
-        blockStatements.add(generateForExpression());
+        blockStatements.add(generateForExpression(initExpression(),
+                                                  getCondition(),
+                                                  getIncrExpression(),
+                                                  translateOriginalBodyExpression()));
         return newBlock(blockStatements);
     }
 
-    @NotNull
-    private JsFor generateForExpression() {
-        JsFor result = new JsFor();
-        result.setInitVars(initExpression());
-        result.setCondition(getCondition());
-        result.setIncrExpr(getIncrExpression());
-        result.setBody(translateOriginalBodyExpression());
-        return result;
-    }
-
     @NotNull
     private JsVars initExpression() {
         return newVar(parameterName, rangeStart);

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java

@@ -1,24 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.k2js.translate.intrinsic;
-
-/**
- * @author Pavel Talanov
- */
-public interface FunctionIntrinsic extends Intrinsic {
-
-}

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java

@@ -52,8 +52,8 @@ import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getPropertyByNa
 public final class Intrinsics {
 
     @NotNull
-    private final Map<FunctionDescriptor, FunctionIntrinsic> functionIntrinsics =
+    private final Map<FunctionDescriptor, Intrinsic> functionIntrinsics =
-            new HashMap<FunctionDescriptor, FunctionIntrinsic>();
+            new HashMap<FunctionDescriptor, Intrinsic>();
 
     @NotNull
     private final Map<FunctionDescriptor, EqualsIntrinsic> equalsIntrinsics =
@@ -64,7 +64,7 @@ public final class Intrinsics {
             new HashMap<FunctionDescriptor, CompareToIntrinsic>();
 
     @NotNull
-    private final FunctionIntrinsic lengthPropertyIntrinsic = new BuiltInPropertyIntrinsic("length");
+    private final Intrinsic lengthPropertyIntrinsic = new BuiltInPropertyIntrinsic("length");
 
     public static Intrinsics standardLibraryIntrinsics(@NotNull JetStandardLibrary library) {
         return new Intrinsics(library);
@@ -82,7 +82,7 @@ public final class Intrinsics {
     }
 
     @NotNull
-    public FunctionIntrinsic getLengthPropertyIntrinsic() {
+    public Intrinsic getLengthPropertyIntrinsic() {
         return lengthPropertyIntrinsic;
     }
 
@@ -183,7 +183,7 @@ public final class Intrinsics {
     }
 
     @NotNull
-    public FunctionIntrinsic getFunctionIntrinsic(@NotNull FunctionDescriptor descriptor) {
+    public Intrinsic getFunctionIntrinsic(@NotNull FunctionDescriptor descriptor) {
         return functionIntrinsics.get(descriptor.getOriginal());
     }
 

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArrayGetIntrinsic.java

@@ -21,14 +21,14 @@ import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public enum ArrayGetIntrinsic implements FunctionIntrinsic {
+public enum ArrayGetIntrinsic implements Intrinsic {
 
     INSTANCE;
 

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArraySetIntrinsic.java

@@ -22,14 +22,14 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public enum ArraySetIntrinsic implements FunctionIntrinsic {
+public enum ArraySetIntrinsic implements Intrinsic {
 
     INSTANCE;
 

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/BuiltInPropertyIntrinsic.java

@@ -6,7 +6,7 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
 /**
  * @author Pavel Talanov
  */
-public final class BuiltInPropertyIntrinsic implements FunctionIntrinsic {
+public final class BuiltInPropertyIntrinsic implements Intrinsic {
 
     @NotNull
     private final String propertyName;

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/CallStandardMethodIntrinsic.java

@@ -23,7 +23,7 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.newInvocation;
 /**
  * @author Pavel Talanov
  */
-public final class CallStandardMethodIntrinsic implements FunctionIntrinsic {
+public final class CallStandardMethodIntrinsic implements Intrinsic {
 
     @NotNull
     private final String methodName;

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveBinaryOperationIntrinsic.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 
 import java.util.List;
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * @author Pavel Talanov
  */
-public final class PrimitiveBinaryOperationIntrinsic implements FunctionIntrinsic {
+public final class PrimitiveBinaryOperationIntrinsic implements Intrinsic {
 
     @NotNull
     public static PrimitiveBinaryOperationIntrinsic newInstance(@NotNull JetToken token) {

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveRangeToIntrinsic.java

@@ -24,7 +24,7 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.*;
 /**
  * @author Pavel Talanov
  */
-public final class PrimitiveRangeToIntrinsic implements FunctionIntrinsic {
+public final class PrimitiveRangeToIntrinsic implements Intrinsic {
 
     @NotNull
     public static PrimitiveRangeToIntrinsic newInstance() {

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveUnaryOperationIntrinsic.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 
 import java.util.List;
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * @author Pavel Talanov
  */
-public final class PrimitiveUnaryOperationIntrinsic implements FunctionIntrinsic {
+public final class PrimitiveUnaryOperationIntrinsic implements Intrinsic {
 
     @NotNull
     public static PrimitiveUnaryOperationIntrinsic newInstance(@NotNull JetToken token) {

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/string/CharAtIntrinsic.java

@@ -22,7 +22,7 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
 /**
  * @author Pavel Talanov
  */
-public enum CharAtIntrinsic implements FunctionIntrinsic {
+public enum CharAtIntrinsic implements Intrinsic {
 
     INSTANCE;
 

js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/tuple/TupleAccessIntrinsic.java

@@ -21,14 +21,14 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public final class TupleAccessIntrinsic implements FunctionIntrinsic {
+public final class TupleAccessIntrinsic implements Intrinsic {
 
     private final int elementIndex;
 

js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java

@@ -33,8 +33,6 @@ import org.jetbrains.k2js.translate.intrinsic.EqualsIntrinsic;
 import org.jetbrains.k2js.translate.reference.CallBuilder;
 import org.jetbrains.k2js.translate.reference.CallType;
 
-import java.util.Arrays;
-
 import static org.jetbrains.k2js.translate.operation.AssignmentTranslator.isAssignmentOperator;
 import static org.jetbrains.k2js.translate.operation.CompareToTranslator.isCompareToCall;
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression;
@@ -42,8 +40,7 @@ import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCall;
 import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isEquals;
 import static org.jetbrains.k2js.translate.utils.JsAstUtils.not;
 import static org.jetbrains.k2js.translate.utils.PsiUtils.*;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateLeftExpression;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.*;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRightExpression;
 
 
 /**
@@ -105,9 +102,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator {
         assert operationDescriptor != null : "Equals operation must resolve to descriptor.";
         EqualsIntrinsic intrinsic = context().intrinsics().getEqualsIntrinsic(operationDescriptor);
         intrinsic.setNegated(expression.getOperationToken().equals(JetTokens.EXCLEQ));
-        JsExpression left = translateLeftExpression(context(), expression);
+        return applyIntrinsicToBinaryExpression(context(), intrinsic, expression);
-        JsExpression right = translateRightExpression(context(), expression);
-        return intrinsic.apply(left, Arrays.asList(right), context());
     }
 
     @NotNull

js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java

@@ -29,12 +29,11 @@ import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.intrinsic.CompareToIntrinsic;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
-import java.util.Arrays;
-
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression;
 import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isCompareTo;
 import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.*;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.applyIntrinsicToBinaryExpression;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOperation;
 
 /**
  * @author Pavel Talanov
@@ -93,8 +92,7 @@ public final class CompareToTranslator extends AbstractTranslator {
     private JsExpression intrinsicCompareTo() {
         CompareToIntrinsic intrinsic = context().intrinsics().getCompareToIntrinsic(descriptor);
         intrinsic.setComparisonToken((JetToken) expression.getOperationToken());
-        JsExpression left = translateLeftExpression(context(), expression);
+        return applyIntrinsicToBinaryExpression(context(), intrinsic, expression);
-        JsExpression right = translateRightExpression(context(), expression);
-        return intrinsic.apply(left, Arrays.asList(right), context());
     }
+
 }

js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java

@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
@@ -121,10 +121,10 @@ public final class CallTranslator extends AbstractTranslator {
     @NotNull
     private JsExpression intrinsicInvocation() {
         assert descriptor instanceof FunctionDescriptor;
-        FunctionIntrinsic functionIntrinsic =
+        Intrinsic intrinsic =
                 context().intrinsics().getFunctionIntrinsic((FunctionDescriptor) descriptor);
         JsExpression receiverExpression = resolveThisObject(/*do not get qualifier*/false);
-        return functionIntrinsic.apply(receiverExpression, arguments, context());
+        return intrinsic.apply(receiverExpression, arguments, context());
     }
 
     private boolean isConstructor() {

js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java

@@ -205,6 +205,7 @@ public final class BindingUtils {
     }
 
 
+    //TODO: refactor duplication
     //TODO: check where we use there, suspicious
     public static boolean isOwnedByNamespace(@NotNull DeclarationDescriptor descriptor) {
         if (descriptor instanceof ConstructorDescriptor) {

js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java

@@ -169,6 +169,19 @@ public final class JsAstUtils {
         return equals(new JsPrefixOperation(JsUnaryOperator.TYPEOF, expression), string);
     }
 
+    @NotNull
+    public static JsFor generateForExpression(@NotNull JsVars initExpression,
+                                              @NotNull JsExpression condition,
+                                              @NotNull JsExpression incrExpression,
+                                              @NotNull JsStatement body) {
+        JsFor result = new JsFor();
+        result.setInitVars(initExpression);
+        result.setCondition(condition);
+        result.setIncrExpr(incrExpression);
+        result.setBody(body);
+        return result;
+    }
+
     public interface Mutator {
         JsNode mutate(JsNode node);
     }

js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java

@@ -24,8 +24,10 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.k2js.translate.context.TemporaryVariable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
@@ -227,4 +229,12 @@ public final class TranslationUtils {
         context.aliaser().removeAliasForThis(descriptor);
     }
 
+    @NotNull
+    public static JsExpression applyIntrinsicToBinaryExpression(@NotNull TranslationContext context,
+                                                                @NotNull Intrinsic intrinsic,
+                                                                @NotNull JetBinaryExpression binaryExpression) {
+        JsExpression left = translateLeftExpression(context, binaryExpression);
+        JsExpression right = translateRightExpression(context, binaryExpression);
+        return intrinsic.apply(left, Arrays.asList(right), context);
+    }
 }