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

Members reordered for better structure

Browse Source
This commit is contained in:
Andrey Breslav
2012-05-31 17:58:43 +04:00
parent c307acc75a
commit ee96cca49a
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
+22 -19
View File
@@ -37,22 +37,23 @@ import java.util.*;
public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDescriptor {
private final ResolveSession resolveSession;
private final ClassMemberDeclarationProvider declarationProvider;
private final Name name;
private final DeclarationDescriptor containingDeclaration;
private final TypeConstructor typeConstructor;
private final ClassMemberDeclarationProvider declarationProvider;
private final LazyClassMemberScope unsubstitutedMemberScope;
private final JetScope unsubstitutedInnerClassesScope;
private ClassReceiver implicitReceiver;
private JetScope scopeForClassHeaderResolution;
private JetScope scopeForMemberDeclarationResolution;
private final Modality modality;
private final Visibility visibility;
private final ClassKind kind;
private ClassReceiver implicitReceiver;
private final LazyClassMemberScope unsubstitutedMemberScope;
private final JetScope unsubstitutedInnerClassesScope;
private JetScope scopeForClassHeaderResolution;
private JetScope scopeForMemberDeclarationResolution;
public LazyClassDescriptor(
@NotNull ResolveSession resolveSession,
@@ -103,17 +104,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
return unsubstitutedInnerClassesScope;
}
public JetScope getScopeForMemberDeclarationResolution() {
if (scopeForMemberDeclarationResolution == null) {
WritableScopeImpl scope = new WritableScopeImpl(getScopeForClassHeaderResolution(), this, RedeclarationHandler.DO_NOTHING)
.setDebugName("Member Declaration Resolution");
scope.changeLockLevel(WritableScope.LockLevel.READING);
scopeForMemberDeclarationResolution = scope;
}
return scopeForMemberDeclarationResolution;
}
@NotNull
public JetScope getScopeForClassHeaderResolution() {
if (scopeForClassHeaderResolution == null) {
@@ -128,6 +118,19 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
return scopeForClassHeaderResolution;
}
public JetScope getScopeForMemberDeclarationResolution() {
if (scopeForMemberDeclarationResolution == null) {
WritableScopeImpl scope = new WritableScopeImpl(getScopeForClassHeaderResolution(), this, RedeclarationHandler.DO_NOTHING)
.setDebugName("Member Declaration Resolution");
// TODO : supertypes etc
scope.changeLockLevel(WritableScope.LockLevel.READING);
scopeForMemberDeclarationResolution = scope;
}
return scopeForMemberDeclarationResolution;
}
@NotNull
@Override
public Set<ConstructorDescriptor> getConstructors() {