Intrinsic -> FunctionIntrinsic

Introduce FunctionIntrinsicFactory (unused atm)

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

@@ -26,14 +26,14 @@ 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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType;
 import static org.jetbrains.k2js.translate.utils.JsAstUtils.*;
+import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getClassDescriptorForType;
 import static org.jetbrains.k2js.translate.utils.PsiUtils.getLoopRange;
 import static org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization;
 
@@ -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));
-        Intrinsic lengthPropertyIntrinsic = context().intrinsics().getLengthPropertyIntrinsic();
+        FunctionIntrinsic lengthPropertyIntrinsic = context().intrinsics().getLengthPropertyIntrinsic();
         JsExpression length = lengthPropertyIntrinsic.apply(loopRange.reference(),
                                                             Collections.<JsExpression>emptyList(),
                                                             context());

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

@@ -31,7 +31,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
 /**
  * @author Pavel Talanov
  */
-public final class BuiltInFunctionIntrinsic implements Intrinsic {
+public final class BuiltInFunctionIntrinsic implements FunctionIntrinsic {
 
     @NotNull
     private final String functionName;

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

@@ -15,7 +15,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
  * @author Pavel Talanov
  */
 //TODO: find should be usages
-public final class BuiltInPropertyIntrinsic implements Intrinsic {
+public final class BuiltInPropertyIntrinsic implements FunctionIntrinsic {
 
     @NotNull
     private final String propertyName;

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

@@ -33,7 +33,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.newInvocation;
 /**
  * @author Pavel Talanov
  */
-public final class CallStandardMethodIntrinsic implements Intrinsic {
+public final class CallStandardMethodIntrinsic implements FunctionIntrinsic {
 
     @NotNull
     private final String methodName;

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

@@ -23,7 +23,7 @@ import org.jetbrains.jet.lexer.JetToken;
 /**
  * @author Pavel Talanov
  */
-public abstract class CompareToIntrinsic implements Intrinsic {
+public abstract class CompareToIntrinsic implements FunctionIntrinsic {
 
     private JetToken comparisonToken = null;
 

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

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Pavel Talanov
  */
-public abstract class EqualsIntrinsic implements Intrinsic {
+public abstract class EqualsIntrinsic implements FunctionIntrinsic {
 
     @NotNull
     private Boolean isNegated = false;

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

@@ -26,9 +26,9 @@ import java.util.List;
 /**
  * @author Pavel Talanov
  *         <p/>
- *         Base class for all intrinsics.
+ *         Base for intrinsics that substitute standard function calls like Int#plus, Float#minus ... etc
  */
-public interface Intrinsic {
+public interface FunctionIntrinsic {
 
     @NotNull
     JsExpression apply(@Nullable JsExpression receiver, @NotNull List<JsExpression> arguments,

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-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;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+
+/**
+ * @author Pavel Talanov
+ */
+public abstract class FunctionIntrinsicFactory {
+
+    public abstract boolean isApplicable(@NotNull FunctionDescriptor descriptor);
+
+    @NotNull
+    public abstract FunctionIntrinsic createIntrinsic(@NotNull FunctionDescriptor descriptor);
+}

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

@@ -50,13 +50,13 @@ import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getPropertyBy
 /**
  * @author Pavel Talanov
  *         <p/>
- *         Provides mechanism to substitute method calls /w native constucts directly.
+ *         Provides mechanism to substitute method calls /w native constructs directly.
  */
 public final class Intrinsics {
 
     @NotNull
-    private final Map<FunctionDescriptor, Intrinsic> functionIntrinsics =
+    private final Map<FunctionDescriptor, FunctionIntrinsic> functionIntrinsics =
-            new HashMap<FunctionDescriptor, Intrinsic>();
+            new HashMap<FunctionDescriptor, FunctionIntrinsic>();
 
     @NotNull
     private final Map<FunctionDescriptor, EqualsIntrinsic> equalsIntrinsics =
@@ -67,7 +67,7 @@ public final class Intrinsics {
             new HashMap<FunctionDescriptor, CompareToIntrinsic>();
 
     @NotNull
-    private final Intrinsic lengthPropertyIntrinsic = new BuiltInPropertyIntrinsic("length");
+    private final FunctionIntrinsic lengthPropertyIntrinsic = new BuiltInPropertyIntrinsic("length");
 
     public static Intrinsics standardLibraryIntrinsics(@NotNull JetStandardLibrary library) {
         return new Intrinsics(library);
@@ -106,7 +106,7 @@ public final class Intrinsics {
     }
 
     @NotNull
-    public Intrinsic getLengthPropertyIntrinsic() {
+    public FunctionIntrinsic getLengthPropertyIntrinsic() {
         return lengthPropertyIntrinsic;
     }
 
@@ -212,8 +212,8 @@ public final class Intrinsics {
 
     //NOTE: that if we want to add other intrinsics we have to modify this method
     @NotNull
-    public Intrinsic getIntrinsic(@NotNull FunctionDescriptor descriptor) {
+    public FunctionIntrinsic getIntrinsic(@NotNull FunctionDescriptor descriptor) {
-        Intrinsic intrinsic = functionIntrinsics.get(descriptor.getOriginal());
+        FunctionIntrinsic intrinsic = functionIntrinsics.get(descriptor.getOriginal());
         if (intrinsic == null) {
             intrinsic = equalsIntrinsics.get(descriptor.getOriginal());
         }

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

@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * @author Pavel Talanov
  */
-public enum ReturnReceiverIntrinsic implements Intrinsic {
+public enum ReturnReceiverIntrinsic implements FunctionIntrinsic {
 
     INSTANCE;
 

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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public enum ArrayGetIntrinsic implements Intrinsic {
+public enum ArrayGetIntrinsic implements FunctionIntrinsic {
 
     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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public enum ArraySetIntrinsic implements Intrinsic {
+public enum ArraySetIntrinsic implements FunctionIntrinsic {
 
     INSTANCE;
 

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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 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 Intrinsic {
+public final class PrimitiveBinaryOperationIntrinsic implements FunctionIntrinsic {
 
     @NotNull
     public static PrimitiveBinaryOperationIntrinsic newInstance(@NotNull JetToken token) {

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

@@ -21,7 +21,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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.List;
 
@@ -30,7 +30,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.*;
 /**
  * @author Pavel Talanov
  */
-public final class PrimitiveRangeToIntrinsic implements Intrinsic {
+public final class PrimitiveRangeToIntrinsic implements FunctionIntrinsic {
 
     @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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 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 Intrinsic {
+public final class PrimitiveUnaryOperationIntrinsic implements FunctionIntrinsic {
 
     @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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
 /**
  * @author Pavel Talanov
  */
-public enum CharAtIntrinsic implements Intrinsic {
+public enum CharAtIntrinsic implements FunctionIntrinsic {
 
     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.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.List;
 
 /**
  * @author Pavel Talanov
  */
-public final class TupleAccessIntrinsic implements Intrinsic {
+public final class TupleAccessIntrinsic implements FunctionIntrinsic {
 
     private final int elementIndex;
 

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

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.VariableAsFunctionResolvedCall;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
 import org.jetbrains.k2js.translate.utils.ErrorReportingUtils;
 
@@ -126,7 +126,7 @@ public final class CallTranslator extends AbstractTranslator {
     private JsExpression intrinsicInvocation() {
         assert descriptor instanceof FunctionDescriptor;
         try {
-            Intrinsic intrinsic = context().intrinsics().getIntrinsic((FunctionDescriptor) descriptor);
+            FunctionIntrinsic intrinsic = context().intrinsics().getIntrinsic((FunctionDescriptor) descriptor);
             return intrinsic.apply(callParameters.getThisOrReceiverOrNull(), arguments, context());
         }
         catch (RuntimeException e) {

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

@@ -26,7 +26,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.Translation;
-import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -234,7 +234,7 @@ public final class TranslationUtils {
 
     @NotNull
     public static JsExpression applyIntrinsicToBinaryExpression(@NotNull TranslationContext context,
-            @NotNull Intrinsic intrinsic,
+            @NotNull FunctionIntrinsic intrinsic,
             @NotNull JetBinaryExpression binaryExpression) {
         JsExpression left = translateLeftExpression(context, binaryExpression);
         JsExpression right = translateRightExpression(context, binaryExpression);