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

translator: fix string moving

Browse Source
This commit is contained in:
Alexey Stepanov
2016-08-16 17:54:26 +03:00
parent 56659a6c2a
commit 8e079033a1
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/ProjectTranslator.kt
+5 -4
View File
@@ -13,10 +13,11 @@ class ProjectTranslator(val files: List<KtFile>, val state: TranslationState) {
}
fun addDeclarations(file: KtFile) {
val variableManager = VariableManager(state.globalVariableCollection)
for (declaration in file.declarations) {
when (declaration) {
is KtNamedFunction -> {
val function = FunctionCodegen(state, VariableManager(state.globalVariableCollection), declaration, codeBuilder)
val function = FunctionCodegen(state, variableManager, declaration, codeBuilder)
if (function.external) {
state.externalFunctions.put(function.fullName, function)
} else {
@@ -24,15 +25,15 @@ class ProjectTranslator(val files: List<KtFile>, val state: TranslationState) {
}
}
is KtClass -> {
val codegen = ClassCodegen(state, VariableManager(state.globalVariableCollection), declaration, codeBuilder)
val codegen = ClassCodegen(state, variableManager, declaration, codeBuilder)
state.classes.put(declaration.name!!, codegen)
}
is KtProperty -> {
val property = PropertyCodegen(state, VariableManager(state.globalVariableCollection), declaration, codeBuilder)
val property = PropertyCodegen(state, variableManager, declaration, codeBuilder)
state.properties.put(declaration.name!!, property)
}
is KtObjectDeclaration -> {
val property = ObjectCodegen(state, VariableManager(state.globalVariableCollection), declaration, codeBuilder)
val property = ObjectCodegen(state, variableManager, declaration, codeBuilder)
state.objects.put(declaration.name!!, property)
}
}
translator/src/test/kotlin/tests/input/string_print_test_1.txt
+2
View File
@@ -0,0 +1,2 @@
string_print_test_1_inline() == 23
string_print_test_1_variable() == 1
translator/src/test/kotlin/tests/kotlin/string_print_test_1.kt
+11
View File
@@ -0,0 +1,11 @@
fun string_print_test_1_inline(): Int {
println("STRING INLINE PRINT WORKS")
return 23
}
fun string_print_test_1_variable(): Int {
val x = "STRING VARIABLE WORKS"
val y = x
println(y)
return 1
}