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

Scopes reverted to nested structure

Browse Source 
I was wrong about not redirecting getClassifier() to parent
This commit is contained in:
Andrey Breslav
2012-06-09 15:51:05 +04:00
parent 8358afbcd1
commit 86b08d89cf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
+2 -4
View File
@@ -112,8 +112,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
public JetScope getScopeForClassHeaderResolution() { public JetScope getScopeForClassHeaderResolution() {
if (scopeForClassHeaderResolution == null) { if (scopeForClassHeaderResolution == null) {
WritableScopeImpl scope = new WritableScopeImpl( WritableScopeImpl scope = new WritableScopeImpl(
JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Class Header Resolution"); resolveSession.getResolutionScope(declarationProvider.getOwnerClassOrObject()), this, RedeclarationHandler.DO_NOTHING, "Class Header Resolution");
scope.importScope(resolveSession.getResolutionScope(declarationProvider.getOwnerClassOrObject()));
for (TypeParameterDescriptor typeParameterDescriptor : getTypeConstructor().getParameters()) { for (TypeParameterDescriptor typeParameterDescriptor : getTypeConstructor().getParameters()) {
scope.addClassifierDescriptor(typeParameterDescriptor); scope.addClassifierDescriptor(typeParameterDescriptor);
} }
@@ -126,8 +125,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
public JetScope getScopeForMemberDeclarationResolution() { public JetScope getScopeForMemberDeclarationResolution() {
if (scopeForMemberDeclarationResolution == null) { if (scopeForMemberDeclarationResolution == null) {
WritableScopeImpl scope = new WritableScopeImpl( WritableScopeImpl scope = new WritableScopeImpl(
JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Member Declaration Resolution"); getScopeForClassHeaderResolution(), this, RedeclarationHandler.DO_NOTHING, "Member Declaration Resolution");
scope.importScope(getScopeForClassHeaderResolution());
scope.importScope(getScopeForMemberLookup()); scope.importScope(getScopeForMemberLookup());
// TODO : supertypes etc // TODO : supertypes etc