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

JS backend: Fix super property access call

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-12-20 23:04:04 +04:00
parent 392da838ca
commit 4527c56f6d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/reference/VarialbeCallCases.kt
+12 -1
View File
@@ -115,11 +115,22 @@ class DelegatePropertyAccessIntrinsic(callInfo: VariableAccessInfo) : VariableAc
} }
} }
class SuperPropertyAccessCase(callInfo: VariableAccessInfo) : VariableAccessCase(callInfo) {
override fun VariableAccessInfo.thisObject(): JsExpression {
val variableName = context.program().getStringLiteral(this.variableName.getIdent())
return if (isGetAccess())
JsInvocation(context.namer().getCallGetProperty(), JsLiteral.THIS, thisObject!!, variableName)
else
JsInvocation(context.namer().getCallSetProperty(), JsLiteral.THIS, thisObject!!, variableName, getSetToExpression())
}
}
fun createVariableAccessCases(): CallCaseDispatcher<VariableAccessCase, VariableAccessInfo> { fun createVariableAccessCases(): CallCaseDispatcher<VariableAccessCase, VariableAccessInfo> {
val caseDispatcher = CallCaseDispatcher<VariableAccessCase, VariableAccessInfo>() val caseDispatcher = CallCaseDispatcher<VariableAccessCase, VariableAccessInfo>()
caseDispatcher.addCase { DelegatePropertyAccessIntrinsic(it).intrinsic() } caseDispatcher.addCase { DelegatePropertyAccessIntrinsic(it).intrinsic() }
caseDispatcher.addCase(::ValueParameterAccessCase) { it.variableDescriptor is ValueParameterDescriptor} caseDispatcher.addCase(::SuperPropertyAccessCase) { it.isSuperInvocation() }
//caseDispatcher.addCase(::ValueParameterAccessCase) { it.variableDescriptor is ValueParameterDescriptor}
caseDispatcher.addCase(::NativeVariableAccessCase) { it.isNative() } caseDispatcher.addCase(::NativeVariableAccessCase) { it.isNative() }
caseDispatcher.addCase(::DefaultVariableAccessCase) { true } // TODO: fix this caseDispatcher.addCase(::DefaultVariableAccessCase) { true } // TODO: fix this
return caseDispatcher return caseDispatcher