From 1dbd342938070870cdc7adb0815c1863d4afaac6 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sat, 13 Jun 2015 01:49:29 +0300 Subject: [PATCH] Minor --- .../descriptors/impl/MutableClassDescriptor.java | 10 +++------- .../src/org/jetbrains/kotlin/resolve/BodyResolver.java | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 00673c76716..785f195b879 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -51,7 +51,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class // This scope contains type parameters but does not contain inner classes private final WritableScope scopeForSupertypeResolution; private JetScope scopeForInitializers; //contains members + primary constructor value parameters + map for backing fields - private JetScope scopeForMemberLookup; + private final JetScope scopeForMemberLookup; private final JetScope staticScope = new StaticScopeForKotlinClass(this); public MutableClassDescriptor( @@ -70,8 +70,8 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class RedeclarationHandler redeclarationHandler = RedeclarationHandler.DO_NOTHING; - setScopeForMemberLookup(new WritableScopeImpl(JetScope.Empty.INSTANCE$, this, redeclarationHandler, "MemberLookup", null, this) - .changeLockLevel(WritableScope.LockLevel.BOTH)); + this.scopeForMemberLookup = new WritableScopeImpl(JetScope.Empty.INSTANCE$, this, redeclarationHandler, "MemberLookup", null, this) + .changeLockLevel(WritableScope.LockLevel.BOTH); this.scopeForSupertypeResolution = new WritableScopeImpl(outerScope, this, redeclarationHandler, "SupertypeResolution") .changeLockLevel(WritableScope.LockLevel.BOTH); this.mutableScopeForMemberResolution = new MutableScopeForMemberResolution(); @@ -254,10 +254,6 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class .changeLockLevel(WritableScope.LockLevel.BOTH); } - public void setScopeForMemberLookup(@NotNull JetScope scopeForMemberLookup) { - this.scopeForMemberLookup = scopeForMemberLookup; - } - @Override @NotNull public JetScope getScopeForMemberLookup() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index b949e974688..9b7736ceb38 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -508,7 +508,7 @@ public class BodyResolver { if (unsubstitutedPrimaryConstructor != null) { ForceResolveUtil.forceResolveAllContents(unsubstitutedPrimaryConstructor.getAnnotations()); - WritableScope parameterScope = getPrimaryConstructorParametersScope(classDescriptor.getScopeForClassHeaderResolution(), + JetScope parameterScope = getPrimaryConstructorParametersScope(classDescriptor.getScopeForClassHeaderResolution(), unsubstitutedPrimaryConstructor); valueParameterResolver.resolveValueParameters(klass.getPrimaryConstructorParameters(), unsubstitutedPrimaryConstructor.getValueParameters(), @@ -517,7 +517,7 @@ public class BodyResolver { } } - private static WritableScope getPrimaryConstructorParametersScope( + private static JetScope getPrimaryConstructorParametersScope( JetScope originalScope, ConstructorDescriptor unsubstitutedPrimaryConstructor ) {