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

translator: fix var and function naming

Browse Source
This commit is contained in:
e5l
2016-07-11 16:18:29 +03:00
parent 4caf323d9d
commit c170a24cc9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/FunctionCodegen.kt
+2 -3
View File
@@ -7,7 +7,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespaceAndComments import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespaceAndComments
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.kotlinnative.translator.debug.printFunction
import org.kotlinnative.translator.llvm.* import org.kotlinnative.translator.llvm.*
import org.kotlinnative.translator.llvm.types.LLVMIntType import org.kotlinnative.translator.llvm.types.LLVMIntType
import org.kotlinnative.translator.llvm.types.parseLLVMType import org.kotlinnative.translator.llvm.types.parseLLVMType
@@ -73,7 +72,7 @@ class FunctionCodegen(val state: TranslationState, val function: KtNamedFunction
.getNextSiblingIgnoringWhitespaceAndComments() .getNextSiblingIgnoringWhitespaceAndComments()
?.firstChild) ?.firstChild)
return LLVMCall(descriptor.returnType, function.text, descriptor.argTypes.mapIndexed { i: Int, type: String -> LLVMVariable(names[i], parseLLVMType(type)) }) return LLVMCall(descriptor.returnType, "@${function.text}", descriptor.argTypes.mapIndexed { i: Int, type: String -> LLVMVariable(names[i], parseLLVMType(type)) })
} }
private fun parseArgList(argumentList: PsiElement?): List<String> { private fun parseArgList(argumentList: PsiElement?): List<String> {
@@ -127,7 +126,7 @@ class FunctionCodegen(val state: TranslationState, val function: KtNamedFunction
val eq = identifier?.getNextSiblingIgnoringWhitespaceAndComments() ?: return null val eq = identifier?.getNextSiblingIgnoringWhitespaceAndComments() ?: return null
val assignExpression = evaluateExpression(eq?.getNextSiblingIgnoringWhitespaceAndComments()) ?: return null val assignExpression = evaluateExpression(eq?.getNextSiblingIgnoringWhitespaceAndComments()) ?: return null
codeBuilder.addAssignment(LLVMVariable(identifier!!.text), assignExpression) codeBuilder.addAssignment(LLVMVariable("%${identifier!!.text}"), assignExpression)
return null return null
} }
translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt
+1 -1
View File
@@ -49,7 +49,7 @@ class LLVMBuilder {
} }
fun addAssignment(llvmVariable: LLVMVariable, rhs: LLVMNode) { fun addAssignment(llvmVariable: LLVMVariable, rhs: LLVMNode) {
llvmCode.appendln("%$llvmVariable = $rhs") llvmCode.appendln("$llvmVariable = $rhs")
} }
override fun toString(): String { override fun toString(): String {