From ac76e305eb08efd892c0f05e18b40c8b5e693182 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 11 Jul 2016 15:54:57 +0300 Subject: [PATCH] translator: quick fix for kfunction --- .../kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt b/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt index 5b2d46c0d5d..52bb3b0f8df 100644 --- a/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt +++ b/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt @@ -4,15 +4,14 @@ import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.lexer.KtTokens import org.kotlinnative.translator.llvm.types.LLVMIntType import org.kotlinnative.translator.llvm.types.LLVMType -import kotlin.reflect.KFunction0 class LLVMBuilder { private var llvmCode: StringBuilder = StringBuilder() private var variableCount = 0 - fun getNewVariable(type: KFunction0?): LLVMVariable { + fun getNewVariable(type: LLVMType?): LLVMVariable { variableCount++ - return LLVMVariable("%var$variableCount", type?.invoke()) + return LLVMVariable("%var$variableCount", type) } fun addLLVMCode(code: String) { @@ -28,7 +27,7 @@ class LLVMBuilder { } fun addPrimitiveBinaryOperation(operation: IElementType, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMVariable { - val newVar = getNewVariable(::LLVMIntType) + val newVar = getNewVariable(LLVMIntType()) val llvmExpression = when (operation) { KtTokens.PLUS -> firstOp.type!!.operatorPlus(newVar, firstOp, secondOp) KtTokens.MINUS -> firstOp.type!!.operatorMinus(newVar, firstOp, secondOp)