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

Rename: OverridingUtil#filterOverrides -> filterOutOverridden to be more precise

Browse Source
This commit is contained in:
Pavel Talanov
2013-10-12 20:46:20 +04:00
committed by Pavel V. Talanov
parent 700d26917b
commit 82feef23c3
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -1833,7 +1833,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
OverridingUtil.getOverriddenDeclarations(callableMemberDescriptor);
Collection<CallableMemberDescriptor> filteredOverriddenDeclarations =
OverridingUtil.filterOverrides(Sets.newLinkedHashSet(overriddenDeclarations));
OverridingUtil.filterOutOverridden(Sets.newLinkedHashSet(overriddenDeclarations));
int count = 0;
CallableMemberDescriptor candidate = null;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
+1 -1
View File
@@ -355,6 +355,6 @@ public class BindingContextUtils {
throw new AssertionError("Unexpected callable kind " + kind);
}
}
return OverridingUtil.filterOverrides(result);
return OverridingUtil.filterOutOverridden(result);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+5 -3
View File
@@ -288,7 +288,8 @@ public class OverrideResolver {
Map<CallableMemberDescriptor, Set<CallableMemberDescriptor>> overriddenDeclarationsByDirectParent = collectOverriddenDeclarations(directOverridden);
List<CallableMemberDescriptor> allOverriddenDeclarations = ContainerUtil.flatten(overriddenDeclarationsByDirectParent.values());
Set<CallableMemberDescriptor> allFilteredOverriddenDeclarations = OverridingUtil.filterOverrides(Sets.newLinkedHashSet(allOverriddenDeclarations));
Set<CallableMemberDescriptor> allFilteredOverriddenDeclarations = OverridingUtil.filterOutOverridden(
Sets.newLinkedHashSet(allOverriddenDeclarations));
Set<CallableMemberDescriptor> relevantDirectlyOverridden =
getRelevantDirectlyOverridden(overriddenDeclarationsByDirectParent, allFilteredOverriddenDeclarations);
@@ -394,7 +395,8 @@ public class OverrideResolver {
Map<CallableMemberDescriptor, Set<CallableMemberDescriptor>> overriddenDeclarationsByDirectParent = Maps.newLinkedHashMap();
for (CallableMemberDescriptor descriptor : directOverriddenDescriptors) {
Collection<CallableMemberDescriptor> overriddenDeclarations = OverridingUtil.getOverriddenDeclarations(descriptor);
Set<CallableMemberDescriptor> filteredOverrides = OverridingUtil.filterOverrides(Sets.newLinkedHashSet(overriddenDeclarations));
Set<CallableMemberDescriptor> filteredOverrides = OverridingUtil.filterOutOverridden(
Sets.newLinkedHashSet(overriddenDeclarations));
Set<CallableMemberDescriptor> overridden = Sets.newLinkedHashSet();
for (CallableMemberDescriptor memberDescriptor : filteredOverrides) {
overridden.add(memberDescriptor);
@@ -416,7 +418,7 @@ public class OverrideResolver {
}
// Only those actually inherited
Set<CallableMemberDescriptor> filteredMembers = OverridingUtil.filterOverrides(inheritedFunctions);
Set<CallableMemberDescriptor> filteredMembers = OverridingUtil.filterOutOverridden(inheritedFunctions);
// Group members with "the same" signature
Multimap<CallableMemberDescriptor, CallableMemberDescriptor> factoredMembers = CommonSuppliers.newLinkedHashSetHashSetMultimap();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java
+2 -2
View File
@@ -142,7 +142,7 @@ public class ResolutionResultsHandler {
assert false : "Should not be reachable, cause every status must belong to some level";
Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(failedCandidates, MAP_TO_CANDIDATE);
Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOutOverridden(failedCandidates, MAP_TO_CANDIDATE);
if (noOverrides.size() != 1) {
tracing.noneApplicable(trace, noOverrides);
tracing.recordAmbiguity(trace, noOverrides);
@@ -203,7 +203,7 @@ public class ResolutionResultsHandler {
}
}
Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT);
Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOutOverridden(candidates, MAP_TO_RESULT);
if (noOverrides.size() == 1) {
return OverloadResolutionResultsImpl.success(noOverrides.iterator().next());
}