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

translator: minor fix

Browse Source
This commit is contained in:
e5l
2016-08-19 15:56:36 +03:00
parent f19378e145
commit d98df3c748
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt
+3 -8
View File
@@ -395,7 +395,7 @@ abstract class BlockCodegen(val state: TranslationState, val variableManager: Va
private fun evaluateCallExpression(expr: KtCallExpression, scopeDepth: Int, classScope: StructCodegen? = null, caller: LLVMVariable? = null): LLVMSingleValue? { private fun evaluateCallExpression(expr: KtCallExpression, scopeDepth: Int, classScope: StructCodegen? = null, caller: LLVMVariable? = null): LLVMSingleValue? {
val names = parseArgList(expr, scopeDepth) val names = parseArgList(expr, scopeDepth)
val name = expr.firstChild.firstChild.text var name = expr.firstChild.firstChild.text
val external = state.externalFunctions.containsKey(name) val external = state.externalFunctions.containsKey(name)
val function = "$name${if (names.size > 0 && !external) "_${names.joinToString(separator = "_", transform = { it.type!!.mangle() })}" else ""}" val function = "$name${if (names.size > 0 && !external) "_${names.joinToString(separator = "_", transform = { it.type!!.mangle() })}" else ""}"
@@ -441,13 +441,8 @@ abstract class BlockCodegen(val state: TranslationState, val variableManager: Va
return evaluateConstructorCallExpression(LLVMVariable(nestedConstructor.fullName, nestedConstructor.type, scope = LLVMVariableScope()), args) return evaluateConstructorCallExpression(LLVMVariable(nestedConstructor.fullName, nestedConstructor.type, scope = LLVMVariableScope()), args)
} }
val containingClass = resolveContainingClass(expr) val containingClass = resolveContainingClass(expr) ?: return null
name = "${containingClass.fullName}.$function"
if (containingClass == null) {
return null
}
val name = "${containingClass.fullName}.$function"
val method = containingClass.methods[name]!! val method = containingClass.methods[name]!!
val args = mutableListOf<LLVMSingleValue>() val args = mutableListOf<LLVMSingleValue>()
val leftName = (expr.context as? KtDotQualifiedExpression)?.receiverExpression?.text val leftName = (expr.context as? KtDotQualifiedExpression)?.receiverExpression?.text