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

JS: reduce number of functions to create callable references

Browse Source
This commit is contained in:
Alexey Andreev
2017-01-17 13:15:35 +03:00
parent dcb8b7b92c
commit c100826629
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java
+1 -3
View File
@@ -192,9 +192,7 @@ public final class Namer {
@NotNull
public static final String FUNCTION_CALLABLE_REF = "getCallableRef";
@NotNull
public static final String PROPERTY_CALLABLE_REF_ZERO_ARG = "getCallableRefZeroArg";
@NotNull
public static final String PROPERTY_CALLABLE_REF_ONE_ARG = "getCallableRefOneArg";
public static final String PROPERTY_CALLABLE_REF = "getPropertyCallableRef";
@NotNull
private final JsExpression callGetProperty;
@NotNull
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt
+5 -8
View File
@@ -17,10 +17,7 @@
package org.jetbrains.kotlin.js.translate.reference
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind
import org.jetbrains.kotlin.js.backend.ast.metadata.isCallableReference
@@ -207,14 +204,14 @@ object CallableReferenceTranslator {
getter: JsExpression,
setter: JsExpression?
): JsExpression {
var argCount = if (descriptor.dispatchReceiverParameter != null || descriptor.extensionReceiverParameter != null) 1 else 0
var argCount = if (descriptor.containingDeclaration is ClassDescriptor || descriptor.extensionReceiverParameter != null) 1 else 0
if (receiver != null) {
argCount--
}
val nameLiteral = context.program().getStringLiteral(name)
val invokeName = if (argCount == 0) Namer.PROPERTY_CALLABLE_REF_ZERO_ARG else Namer.PROPERTY_CALLABLE_REF_ONE_ARG
val invokeFun = JsNameRef(invokeName, Namer.kotlinObject())
val invocation = JsInvocation(invokeFun, nameLiteral, getter)
val argCountLiteral = context.program().getNumberLiteral(argCount)
val invokeFun = JsNameRef(Namer.PROPERTY_CALLABLE_REF, Namer.kotlinObject())
val invocation = JsInvocation(invokeFun, nameLiteral, argCountLiteral, getter)
if (setter != null) {
invocation.arguments += setter
}