From a1d752c7ae6e39112a1fc2865d991ff3001c1b54 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 22 May 2014 22:04:14 +0400 Subject: [PATCH] Minor, fix parameter type in MemberCodegen --- .../org/jetbrains/jet/codegen/ClassBodyCodegen.java | 2 +- .../src/org/jetbrains/jet/codegen/MemberCodegen.java | 5 +---- .../src/org/jetbrains/jet/codegen/PackageCodegen.java | 11 +++++------ .../org/jetbrains/jet/codegen/PackagePartCodegen.java | 7 +++++-- .../src/org/jetbrains/jet/codegen/ScriptCodegen.java | 5 ++--- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java index 6c9ad7c0c6c..0dd04d4b637 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java @@ -93,7 +93,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { protected void generateDeclaration(PropertyCodegen propertyCodegen, JetDeclaration declaration) { if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) { - genFunctionOrProperty((JetTypeParameterListOwner) declaration, v); + genFunctionOrProperty(declaration, v); } else if (declaration instanceof JetClassOrObject) { if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(state.getBindingContext(), (JetEnumEntry) declaration)) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index 5ab832562fe..97b907fe7d4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -106,10 +106,7 @@ public abstract class MemberCodegen generateCallableMemberTasks) { - boolean generateSrcClass = false; + boolean generatePackagePart = false; Type packagePartType = getPackagePartType(getPackageClassFqName(packageFragment.getFqName()), file.getVirtualFile()); PackageContext packagePartContext = CodegenContext.STATIC.intoPackagePart(packageFragment, packagePartType); for (JetDeclaration declaration : file.getDeclarations()) { if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) { - generateSrcClass = true; + generatePackagePart = true; } else if (declaration instanceof JetClassOrObject) { JetClassOrObject classOrObject = (JetClassOrObject) declaration; @@ -283,7 +283,7 @@ public class PackageCodegen { } } - if (!generateSrcClass) return null; + if (!generatePackagePart) return null; ClassBuilder builder = state.getFactory().forPackagePart(packagePartType, file); @@ -303,7 +303,7 @@ public class PackageCodegen { new Runnable() { @Override public void run() { - memberCodegen.genFunctionOrProperty((JetTypeParameterListOwner) declaration, v.getClassBuilder()); + memberCodegen.genFunctionOrProperty(declaration, v.getClassBuilder()); } } ); @@ -313,7 +313,6 @@ public class PackageCodegen { return builder; } - //TODO: FIX: Default method generated at facade without delegation private MemberCodegen getMemberCodegen(@NotNull FieldOwnerContext packageFacade) { return new MemberCodegen(state, null, packageFacade, null, null) { @Override diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java index 07af313cf92..56432142a52 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java @@ -21,7 +21,10 @@ import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.context.FieldOwnerContext; import org.jetbrains.jet.codegen.state.GenerationState; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.jet.lang.psi.JetProperty; import org.jetbrains.org.objectweb.asm.Type; import static org.jetbrains.jet.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; @@ -58,7 +61,7 @@ public class PackagePartCodegen extends MemberCodegen { protected void generateBody() { for (JetDeclaration declaration : element.getDeclarations()) { if (declaration instanceof JetNamedFunction || declaration instanceof JetProperty) { - genFunctionOrProperty((JetTypeParameterListOwner) declaration, v); + genFunctionOrProperty(declaration, v); } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java index 2fe20ed1a92..318920563d0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java @@ -21,15 +21,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.context.MethodContext; import org.jetbrains.jet.codegen.context.ScriptContext; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetScript; -import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -208,7 +207,7 @@ public class ScriptCodegen extends MemberCodegen { private void genMembers(@NotNull ClassBuilder classBuilder) { for (JetDeclaration declaration : scriptDeclaration.getDeclarations()) { - genFunctionOrProperty((JetTypeParameterListOwner) declaration, classBuilder); + genFunctionOrProperty(declaration, classBuilder); } } }