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

translator: refactoring pointers and load classes

Browse Source
This commit is contained in:
Alexey Stepanov
2016-08-30 15:44:32 +03:00
parent fcc3b68ad8
commit 6d5b505d11
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt
+1 -12
View File
@@ -504,18 +504,7 @@ abstract class BlockCodegen(val state: TranslationState, val variableManager: Va
private fun resolveContainingClass(expr: KtElement): StructCodegen? { private fun resolveContainingClass(expr: KtElement): StructCodegen? {
val name = expr.getResolvedCallWithAssert(state.bindingContext).dispatchReceiver?.type?.constructor?.declarationDescriptor?.fqNameSafe?.asString() ?: return null val name = expr.getResolvedCallWithAssert(state.bindingContext).dispatchReceiver?.type?.constructor?.declarationDescriptor?.fqNameSafe?.asString() ?: return null
return resolveCodegenByName(name)
var currentResolvedClassName = ""
var codegen: StructCodegen? = null
for (classPart in name.split(".")) {
currentResolvedClassName += (if (currentResolvedClassName.length > 0) "." else "") + classPart
codegen = (codegen?.nestedClasses ?: state.classes)[currentResolvedClassName]
?: (if ((codegen as? ClassCodegen)?.companionObjectCodegen?.structName == currentResolvedClassName) (codegen as? ClassCodegen)?.companionObjectCodegen else null)
?: state.objects[currentResolvedClassName]
?: codegen
}
return codegen
} }
private fun evaluateFunctionCallExpression(function: LLVMVariable, names: List<LLVMSingleValue>): LLVMSingleValue? { private fun evaluateFunctionCallExpression(function: LLVMVariable, names: List<LLVMSingleValue>): LLVMSingleValue? {