diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java index 23770651790..fa6c0c2c373 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java @@ -224,6 +224,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { 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) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java index 33f26a05474..3025f70f041 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java +++ b/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.emptyList(), context()); @@ -81,19 +81,10 @@ public final class ArrayForTranslator extends ForTranslator { @NotNull private JsBlock translate() { List 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)); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeLiteralForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeLiteralForTranslator.java index 585c98e9807..1952f489b49 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeLiteralForTranslator.java +++ b/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 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); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java deleted file mode 100644 index 9a5e0eab723..00000000000 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java +++ /dev/null @@ -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 { - -} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java index 6890b71816f..8a130b98c71 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java +++ b/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 functionIntrinsics = - new HashMap(); + private final Map functionIntrinsics = + new HashMap(); @NotNull private final Map equalsIntrinsics = @@ -64,7 +64,7 @@ public final class Intrinsics { new HashMap(); @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()); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArrayGetIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArrayGetIntrinsic.java index ea0d565247d..c786cc6fc09 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArrayGetIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArraySetIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArraySetIntrinsic.java index 03f41d57c7c..773d6547dbf 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/ArraySetIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/BuiltInPropertyIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/BuiltInPropertyIntrinsic.java index 69d4aa0f006..10445c1921c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/BuiltInPropertyIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/CallStandardMethodIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/CallStandardMethodIntrinsic.java index 05d70508625..d073fadf5a4 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/array/CallStandardMethodIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveBinaryOperationIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveBinaryOperationIntrinsic.java index 5d6039319e9..2da91dff5a1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveBinaryOperationIntrinsic.java +++ b/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) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveRangeToIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveRangeToIntrinsic.java index 3920ade7a2a..4bb5777266d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveRangeToIntrinsic.java +++ b/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() { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveUnaryOperationIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveUnaryOperationIntrinsic.java index 817461472a3..8766549e5b7 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/primitive/PrimitiveUnaryOperationIntrinsic.java +++ b/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) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/string/CharAtIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/string/CharAtIntrinsic.java index 902cbf6f0dc..2cc4d9c2134 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/string/CharAtIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/tuple/TupleAccessIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/tuple/TupleAccessIntrinsic.java index 0dd7aa92dcb..4e8aa2d2ff0 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/tuple/TupleAccessIntrinsic.java +++ b/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; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java index 85e3a978cbd..b987b7bddbe 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java +++ b/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.translateRightExpression; +import static org.jetbrains.k2js.translate.utils.TranslationUtils.*; /** @@ -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); - JsExpression right = translateRightExpression(context(), expression); - return intrinsic.apply(left, Arrays.asList(right), context()); + return applyIntrinsicToBinaryExpression(context(), intrinsic, expression); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java index 3ce5449c216..8b346d023b1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java +++ b/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); - JsExpression right = translateRightExpression(context(), expression); - return intrinsic.apply(left, Arrays.asList(right), context()); + return applyIntrinsicToBinaryExpression(context(), intrinsic, expression); } + } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java index cd6e096c1cf..34c052cbe8e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java +++ b/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() { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java index 636d0e6b9ff..0e02c4b1114 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java +++ b/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) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java index a1b115b1916..522306b1ad0 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java +++ b/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); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java index 899a8365ae3..d0ed7e14d9d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/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); + } }