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

Revert "smarter WritableScopeImpl.getAllDescriptors"

Browse Source 
This reverts commit 4d229144cf.
This commit is contained in:
Stepan Koltsov
2012-06-18 20:50:18 +04:00
parent ea0c68929a
commit e5481d5956
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
+4 -32
View File
@@ -124,49 +124,21 @@ public class WritableScopeImpl extends WritableScopeWithImports {
super.clearImports();
}
@NotNull
private Collection<DeclarationDescriptor> getInheritedDescriptors(@NotNull DescriptorPredicate predicate) {
Collection<DeclarationDescriptor> r = Lists.newArrayList();
r.addAll(getWorkerScope().getAllDescriptors(predicate));
for (JetScope imported : getImports()) {
r.addAll(imported.getAllDescriptors(predicate));
}
return r;
}
@NotNull
private static <A> Collection<A> concat(@NotNull Collection<A> c1, @NotNull Collection<A> c2) {
if (c1.isEmpty()) {
return c2;
}
else if (c2.isEmpty()) {
return c1;
}
else {
Collection<A> r = Lists.newArrayListWithCapacity(c1.size() + c2.size());
r.addAll(c1);
r.addAll(c2);
return r;
}
}
@NotNull
@Override
public Collection<DeclarationDescriptor> getAllDescriptors(@NotNull DescriptorPredicate predicate) {
checkMayRead();
if (!allDescriptorsDone) {
if (!predicate.includeAll()) {
// super-optimized version
return concat(allDescriptors, getInheritedDescriptors(predicate));
}
allDescriptorsDone = true;
// make sure no descriptors added to allDescriptors collection
changeLockLevel(LockLevel.READING);
allDescriptors.addAll(getInheritedDescriptors(DescriptorPredicate.all()));
allDescriptors.addAll(getWorkerScope().getAllDescriptors(DescriptorPredicate.all()));
for (JetScope imported : getImports()) {
allDescriptors.addAll(imported.getAllDescriptors(DescriptorPredicate.all()));
}
}
return DescriptorPredicateUtils.filter(allDescriptors, predicate);
}