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

translator: reorginize code, fix double expression, add assigment llvm

Browse Source
This commit is contained in:
Alexey Stepanov
2016-07-11 15:50:30 +03:00
parent 55c3401f56
commit 0586473bb6
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt
+9 -5
View File
@@ -29,17 +29,21 @@ class LLVMBuilder {
fun addPrimitiveBinaryOperation(operation: IElementType, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMVariable { fun addPrimitiveBinaryOperation(operation: IElementType, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMVariable {
val newVar = getNewVariable(::LLVMIntType) val newVar = getNewVariable(::LLVMIntType)
val llvmOperator = when (operation) { val llvmExpression = when (operation) {
KtTokens.PLUS -> firstOp.type?.operatorPlus(newVar, firstOp, secondOp)?.generateExpression(this) KtTokens.PLUS -> firstOp.type!!.operatorPlus(newVar, firstOp, secondOp)
KtTokens.MINUS -> firstOp.type?.operatorMinus(newVar, firstOp, secondOp)?.generateExpression(this) KtTokens.MINUS -> firstOp.type!!.operatorMinus(newVar, firstOp, secondOp)
KtTokens.MUL -> firstOp.type?.operatorTimes(newVar, firstOp, secondOp)?.generateExpression(this) KtTokens.MUL -> firstOp.type!!.operatorTimes(newVar, firstOp, secondOp)
else -> throw UnsupportedOperationException("Unkbown binary operator") else -> throw UnsupportedOperationException("Unkbown binary operator")
} }
llvmCode.appendln("$newVar = $llvmOperator $firstOp, $secondOp") addAssignment(newVar, llvmExpression)
return newVar return newVar
} }
fun addAssignment(llvmVariable: LLVMNode, assignExpression: LLVMNode) {
llvmCode.appendln("$llvmVariable = $assignExpression")
}
fun clean() { fun clean() {
llvmCode = StringBuilder() llvmCode = StringBuilder()
translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMExpression.kt
+4 -6
View File
@@ -1,12 +1,10 @@
package org.kotlinnative.translator.llvm package org.kotlinnative.translator.llvm
import org.kotlinnative.translator.llvm.types.LLVMType import org.kotlinnative.translator.llvm.types.LLVMType
import kotlin.reflect.KFunction0
class LLVMExpression(val variableType: KFunction0<LLVMType>, val llvmCode: String) : LLVMNode() { class LLVMExpression(val variableType: LLVMType, val llvmCode: String) : LLVMNode() {
fun generateExpression(builder: LLVMBuilder): LLVMVariable {
val newVar = builder.getNewVariable(variableType); override fun toString(): String {
builder.addLLVMCode("$newVar = $llvmCode"); return llvmCode
return newVar
} }
} }
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMDoubleType.kt
+3 -3
View File
@@ -8,17 +8,17 @@ class LLVMDoubleType() : LLVMType() {
override fun operatorMinus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorMinus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "fsub double i32 $firstOp, $secondOp") return LLVMExpression(LLVMDoubleType(), "fsub double i32 $firstOp, $secondOp")
} }
override fun operatorTimes(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorTimes(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "fmul double i32 $firstOp, $secondOp") return LLVMExpression(LLVMDoubleType(), "fmul double i32 $firstOp, $secondOp")
} }
override fun operatorPlus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorPlus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "fadd double $firstOp, $secondOp") return LLVMExpression(LLVMDoubleType(), "fadd double $firstOp, $secondOp")
} }
} }
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMIntType.kt
+3 -3
View File
@@ -8,17 +8,17 @@ class LLVMIntType() : LLVMType() {
override fun operatorMinus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorMinus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "sub nsw i32 $firstOp, $secondOp") return LLVMExpression(LLVMIntType(), "sub nsw i32 $firstOp, $secondOp")
} }
override fun operatorTimes(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorTimes(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "mul nsw i32 $firstOp, $secondOp") return LLVMExpression(LLVMIntType(), "mul nsw i32 $firstOp, $secondOp")
} }
override fun operatorPlus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression { override fun operatorPlus(result: LLVMVariable, firstOp: LLVMVariable, secondOp: LLVMVariable): LLVMExpression {
//TODO switch by types: int + double = int //TODO switch by types: int + double = int
return LLVMExpression(::LLVMIntType, "add nsw i32 $firstOp, $secondOp") return LLVMExpression(LLVMIntType(), "add nsw i32 $firstOp, $secondOp")
} }
} }