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

JS backend: Optimized CallInfo classes structure

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-12-26 22:58:15 +04:00
parent 7a0f359aa0
commit 4e9187779d
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallInfo.kt
+22 -16
View File
@@ -32,15 +32,18 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor
import com.google.dart.compiler.backend.js.ast.JsName import com.google.dart.compiler.backend.js.ast.JsName
open class BaseCallInfo( trait CallInfo {
val context: TranslationContext, val context: TranslationContext
val resolvedCall: ResolvedCall<out CallableDescriptor>, val resolvedCall: ResolvedCall<out CallableDescriptor>
val thisObject: JsExpression?, val thisObject: JsExpression?
val receiverObject: JsExpression?, val receiverObject: JsExpression?
val nullableReceiverForSafeCall: JsExpression? val nullableReceiverForSafeCall: JsExpression?
) {
open val callableDescriptor = resolvedCall.getResultingDescriptor().getOriginal() val callableDescriptor: CallableDescriptor
get() {
return resolvedCall.getResultingDescriptor().getOriginal()
}
fun isExtension(): Boolean = receiverObject != null fun isExtension(): Boolean = receiverObject != null
fun isMemberCall(): Boolean = thisObject != null fun isMemberCall(): Boolean = thisObject != null
@@ -55,11 +58,8 @@ open class BaseCallInfo(
// TODO: toString for debug // TODO: toString for debug
} }
private open class CallInfoWrapper(callInfo: BaseCallInfo) :
BaseCallInfo(callInfo.context, callInfo.resolvedCall, callInfo.thisObject, callInfo.receiverObject, callInfo.nullableReceiverForSafeCall)
// if setTo == null, it is get access // if setTo == null, it is get access
class VariableAccessInfo(callInfo: BaseCallInfo, private val setTo: JsExpression? = null): CallInfoWrapper(callInfo) { class VariableAccessInfo(callInfo: CallInfo, private val setTo: JsExpression? = null): CallInfo by callInfo {
val variableDescriptor = super.callableDescriptor as VariableDescriptor val variableDescriptor = super.callableDescriptor as VariableDescriptor
val variableName : JsName val variableName : JsName
get() { get() {
@@ -76,7 +76,7 @@ class VariableAccessInfo(callInfo: BaseCallInfo, private val setTo: JsExpression
} }
} }
class FunctionCallInfo(callInfo: BaseCallInfo, val argumentsInfo: CallArgumentTranslator.ArgumentsInfo) : CallInfoWrapper(callInfo) { class FunctionCallInfo(callInfo: CallInfo, val argumentsInfo: CallArgumentTranslator.ArgumentsInfo) : CallInfo by callInfo {
val functionName : JsName val functionName : JsName
get() { // getter, because for several descriptors name is undefined. Example: {(a) -> a+1}(3) get() { // getter, because for several descriptors name is undefined. Example: {(a) -> a+1}(3)
return context.getNameForDescriptor(callableDescriptor) return context.getNameForDescriptor(callableDescriptor)
@@ -92,7 +92,7 @@ private fun TranslationContext.getThisObject(receiverValue: ReceiverValue): JsEx
return getThisObject(getDeclarationDescriptorForReceiver(receiverValue)) return getThisObject(getDeclarationDescriptorForReceiver(receiverValue))
} }
private fun TranslationContext.mainGetCallInfo(resolvedCall: ResolvedCall<out CallableDescriptor>, receiver1: JsExpression?, receiver2: JsExpression?): BaseCallInfo { private fun TranslationContext.mainGetCallInfo(resolvedCall: ResolvedCall<out CallableDescriptor>, receiver1: JsExpression?, receiver2: JsExpression?): CallInfo {
val receiverKind = resolvedCall.getExplicitReceiverKind() val receiverKind = resolvedCall.getExplicitReceiverKind()
fun getNotNullReceiver1(): JsExpression { fun getNotNullReceiver1(): JsExpression {
assert(receiver1 != null, "ResolvedCall say, that receiver(1) must be not null") assert(receiver1 != null, "ResolvedCall say, that receiver(1) must be not null")
@@ -135,14 +135,20 @@ private fun TranslationContext.mainGetCallInfo(resolvedCall: ResolvedCall<out Ca
else -> getNotNullReceiver1() else -> getNotNullReceiver1()
} }
} }
return BaseCallInfo(this, resolvedCall, getThisObject(), getReceiverObject(), getNullableReceiverForSafeCall()) return object : CallInfo {
override val context: TranslationContext = this@mainGetCallInfo
override val resolvedCall: ResolvedCall<out CallableDescriptor> = resolvedCall
override val thisObject: JsExpression? = getThisObject()
override val receiverObject: JsExpression? = getReceiverObject()
override val nullableReceiverForSafeCall: JsExpression? = getNullableReceiverForSafeCall()
};
} }
fun ResolvedCall<out CallableDescriptor>.expectedReceivers(): Boolean { fun ResolvedCall<out CallableDescriptor>.expectedReceivers(): Boolean {
return this.getExplicitReceiverKind() != NO_EXPLICIT_RECEIVER return this.getExplicitReceiverKind() != NO_EXPLICIT_RECEIVER
} }
fun TranslationContext.getCallInfo(resolvedCall: ResolvedCall<out CallableDescriptor>, receiver: JsExpression?): BaseCallInfo { fun TranslationContext.getCallInfo(resolvedCall: ResolvedCall<out CallableDescriptor>, receiver: JsExpression?): CallInfo {
return mainGetCallInfo(resolvedCall, receiver, null) return mainGetCallInfo(resolvedCall, receiver, null)
} }
js/js.translator/src/org/jetbrains/k2js/translate/reference/ClearCallTranslator.kt
+3 -3
View File
@@ -69,7 +69,7 @@ private fun TranslationContext.buildCall(resolvedCall: ResolvedCall<out Function
} }
trait CallCase<I : BaseCallInfo> { trait CallCase<I : CallInfo> {
val callInfo: I val callInfo: I
protected fun unsupported(message: String = "") : Exception { protected fun unsupported(message: String = "") : Exception {
@@ -139,7 +139,7 @@ open class VariableAccessCase(override val callInfo: VariableAccessInfo) : CallC
} }
} }
class CallCaseDispatcher<C : CallCase<I>, I : BaseCallInfo> { class CallCaseDispatcher<C : CallCase<I>, I : CallInfo> {
private val cases: MutableList<(I) -> JsExpression?> = ArrayList() private val cases: MutableList<(I) -> JsExpression?> = ArrayList()
fun addCase(canBeApplyCase: (I) -> JsExpression?) { fun addCase(canBeApplyCase: (I) -> JsExpression?) {
@@ -165,7 +165,7 @@ class CallCaseDispatcher<C : CallCase<I>, I : BaseCallInfo> {
} }
} }
trait DelegateIntrinsic<I : BaseCallInfo> : CallCase<I> { trait DelegateIntrinsic<I : CallInfo> : CallCase<I> {
fun I.canBeApply(): Boolean = true fun I.canBeApply(): Boolean = true
fun I.getReceiver(): JsExpression? { fun I.getReceiver(): JsExpression? {
return when (resolvedCall.getExplicitReceiverKind()) { return when (resolvedCall.getExplicitReceiverKind()) {
js/js.translator/src/org/jetbrains/k2js/translate/reference/FunctionCallCases.kt
+1 -1
View File
@@ -146,7 +146,7 @@ class ExpressionAsFunctionDescriptorIntrinsic(callInfo: FunctionCallInfo) : Func
if (callableDescriptor !is ExpressionAsFunctionDescriptor) { if (callableDescriptor !is ExpressionAsFunctionDescriptor) {
throw IllegalStateException("callableDescriptor must be ExpressionAsFunctionDescriptor $callInfo") throw IllegalStateException("callableDescriptor must be ExpressionAsFunctionDescriptor $callInfo")
} }
val funRef = Translation.translateAsExpression(callableDescriptor.getExpression()!!, context) val funRef = Translation.translateAsExpression((callableDescriptor as ExpressionAsFunctionDescriptor).getExpression()!!, context)
return JsInvocation(funRef, argumentsInfo.getTranslateArguments()) return JsInvocation(funRef, argumentsInfo.getTranslateArguments())
} }