From 6d5b505d11a797491f4d60b8ecc42e6c181daf16 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 30 Aug 2016 15:44:32 +0300 Subject: [PATCH] translator: refactoring pointers and load classes --- .../org/kotlinnative/translator/BlockCodegen.kt | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt index 8d48e671172..c7c79aab846 100644 --- a/translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt +++ b/translator/src/main/kotlin/org/kotlinnative/translator/BlockCodegen.kt @@ -504,18 +504,7 @@ abstract class BlockCodegen(val state: TranslationState, val variableManager: Va private fun resolveContainingClass(expr: KtElement): StructCodegen? { val name = expr.getResolvedCallWithAssert(state.bindingContext).dispatchReceiver?.type?.constructor?.declarationDescriptor?.fqNameSafe?.asString() ?: return null - - 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 + return resolveCodegenByName(name) } private fun evaluateFunctionCallExpression(function: LLVMVariable, names: List): LLVMSingleValue? {