From 6c12aa8605d0f1d643bc4ba55540f929f75f5a34 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 5 Jun 2012 22:56:25 +0400 Subject: [PATCH] rename CodegenContext.contextType to contextDescriptor to match getter name --- .../jetbrains/jet/codegen/CodegenContext.java | 14 ++++---- .../jet/codegen/CodegenContexts.java | 34 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java index 9291653df7f..db600d059de 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java @@ -38,7 +38,7 @@ import java.util.LinkedHashMap; public abstract class CodegenContext { @NotNull - private final DeclarationDescriptor contextType; + private final DeclarationDescriptor contextDescriptor; private final OwnerKind contextKind; @Nullable @@ -54,8 +54,8 @@ public abstract class CodegenContext { protected Type outerWasUsed ; - public CodegenContext(@NotNull DeclarationDescriptor contextType, OwnerKind contextKind, @Nullable CodegenContext parentContext, @Nullable ObjectOrClosureCodegen closureCodegen) { - this.contextType = contextType; + public CodegenContext(@NotNull DeclarationDescriptor contextDescriptor, OwnerKind contextKind, @Nullable CodegenContext parentContext, @Nullable ObjectOrClosureCodegen closureCodegen) { + this.contextDescriptor = contextDescriptor; this.contextKind = contextKind; this.parentContext = parentContext; closure = closureCodegen; @@ -90,11 +90,11 @@ public abstract class CodegenContext { } public DeclarationDescriptor getContextDescriptor() { - return contextType; + return contextDescriptor; } public String getNamespaceClassName() { - DeclarationDescriptor descriptor = contextType; + DeclarationDescriptor descriptor = contextDescriptor; while(!(descriptor instanceof NamespaceDescriptor)) { descriptor = descriptor.getContainingDeclaration(); } @@ -206,7 +206,7 @@ public abstract class CodegenContext { if (accessor != null) { return accessor; } if(descriptor instanceof SimpleFunctionDescriptor) { - SimpleFunctionDescriptorImpl myAccessor = new SimpleFunctionDescriptorImpl(contextType, + SimpleFunctionDescriptorImpl myAccessor = new SimpleFunctionDescriptorImpl(contextDescriptor, Collections.emptyList(), Name.identifier(descriptor.getName() + "$bridge$" + accessors.size()), CallableMemberDescriptor.Kind.DECLARATION); @@ -223,7 +223,7 @@ public abstract class CodegenContext { } else if(descriptor instanceof PropertyDescriptor) { PropertyDescriptor pd = (PropertyDescriptor) descriptor; - PropertyDescriptor myAccessor = new PropertyDescriptor(contextType, + PropertyDescriptor myAccessor = new PropertyDescriptor(contextDescriptor, Collections.emptyList(), pd.getModality(), pd.getVisibility(), diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java index 3df52652215..d56d4932d61 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java @@ -99,9 +99,9 @@ public class CodegenContexts { public abstract static class ReceiverContext extends CodegenContext { final CallableDescriptor receiverDescriptor; - public ReceiverContext(CallableDescriptor contextType, OwnerKind contextKind, CodegenContext parentContext, @Nullable ObjectOrClosureCodegen closureCodegen) { - super(contextType, contextKind, parentContext, closureCodegen); - receiverDescriptor = contextType.getReceiverParameter().exists() ? contextType : null; + public ReceiverContext(CallableDescriptor contextDescriptor, OwnerKind contextKind, CodegenContext parentContext, @Nullable ObjectOrClosureCodegen closureCodegen) { + super(contextDescriptor, contextKind, parentContext, closureCodegen); + receiverDescriptor = contextDescriptor.getReceiverParameter().exists() ? contextDescriptor : null; } @Override @@ -144,8 +144,8 @@ public class CodegenContexts { } public static class ConstructorContext extends MethodContext { - public ConstructorContext(ConstructorDescriptor contextType, OwnerKind kind, CodegenContext parent, JetTypeMapper typeMapper) { - super(contextType, kind, parent); + public ConstructorContext(ConstructorDescriptor contextDescriptor, OwnerKind kind, CodegenContext parent, JetTypeMapper typeMapper) { + super(contextDescriptor, kind, parent); final Type type = enclosingClassType(typeMapper); outerExpression = type != null @@ -166,11 +166,11 @@ public class CodegenContexts { public static class ScriptContext extends CodegenContext { public ScriptContext( - @NotNull DeclarationDescriptor contextType, + @NotNull DeclarationDescriptor contextDescriptor, @NotNull OwnerKind contextKind, @Nullable CodegenContext parentContext, @Nullable ObjectOrClosureCodegen closureCodegen) { - super(contextType, contextKind, parentContext, closureCodegen); + super(contextDescriptor, contextKind, parentContext, closureCodegen); } @Override @@ -185,12 +185,12 @@ public class CodegenContexts { } public static class ClassContext extends CodegenContext { - public ClassContext(ClassDescriptor contextType, OwnerKind contextKind, CodegenContext parentContext, JetTypeMapper typeMapper) { - super(contextType, contextKind, parentContext, null); + public ClassContext(ClassDescriptor contextDescriptor, OwnerKind contextKind, CodegenContext parentContext, JetTypeMapper typeMapper) { + super(contextDescriptor, contextKind, parentContext, null); final Type type = enclosingClassType(typeMapper); outerExpression = type != null - ? StackValue.field(type, typeMapper.getClassFQName(contextType), "this$0", false) + ? StackValue.field(type, typeMapper.getClassFQName(contextDescriptor), "this$0", false) : null; } @@ -206,11 +206,11 @@ public class CodegenContexts { } public static class AnonymousClassContext extends CodegenContext { - public AnonymousClassContext(ClassDescriptor contextType, OwnerKind contextKind, CodegenContext parentContext, @NotNull ObjectOrClosureCodegen closure, JetTypeMapper typeMapper) { - super(contextType, contextKind, parentContext, closure); + public AnonymousClassContext(ClassDescriptor contextDescriptor, OwnerKind contextKind, CodegenContext parentContext, @NotNull ObjectOrClosureCodegen closure, JetTypeMapper typeMapper) { + super(contextDescriptor, contextKind, parentContext, closure); final Type type = enclosingClassType(typeMapper); - Type owner = closure.state.getInjector().getJetTypeMapper().mapType(contextType.getDefaultType(), MapTypeMode.IMPL); + Type owner = closure.state.getInjector().getJetTypeMapper().mapType(contextDescriptor.getDefaultType(), MapTypeMode.IMPL); outerExpression = type != null ? StackValue.field(type, JvmClassName.byType(owner), "this$0", false) : null; @@ -235,8 +235,8 @@ public class CodegenContexts { public static class ClosureContext extends ReceiverContext { private ClassDescriptor classDescriptor; - public ClosureContext(FunctionDescriptor contextType, ClassDescriptor classDescriptor, CodegenContext parentContext, @NotNull ObjectOrClosureCodegen closureCodegen, JvmClassName internalClassName, JetTypeMapper typeMapper) { - super(contextType, OwnerKind.IMPLEMENTATION, parentContext, closureCodegen); + public ClosureContext(FunctionDescriptor contextDescriptor, ClassDescriptor classDescriptor, CodegenContext parentContext, @NotNull ObjectOrClosureCodegen closureCodegen, JvmClassName internalClassName, JetTypeMapper typeMapper) { + super(contextDescriptor, OwnerKind.IMPLEMENTATION, parentContext, closureCodegen); this.classDescriptor = classDescriptor; final Type type = enclosingClassType(typeMapper); @@ -267,8 +267,8 @@ public class CodegenContexts { } public static class NamespaceContext extends CodegenContext { - public NamespaceContext(NamespaceDescriptor contextType, CodegenContext parent) { - super(contextType, OwnerKind.NAMESPACE, parent, null); + public NamespaceContext(NamespaceDescriptor contextDescriptor, CodegenContext parent) { + super(contextDescriptor, OwnerKind.NAMESPACE, parent, null); } @Override