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

Update names to match the generic meaning of the code

Browse Source
This commit is contained in:
Andrey Breslav
2012-05-31 14:28:27 +04:00
parent 7dab62ec97
commit 5471738dfa
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+17 -15
View File
@@ -93,7 +93,7 @@ public class OverrideResolver {
} }
} }
public void generateOverridesInAClass(@NotNull final MutableClassDescriptor classDescriptor, private void generateOverridesInAClass(@NotNull final MutableClassDescriptor classDescriptor,
@NotNull Set<ClassifierDescriptor> processed, @NotNull Set<ClassifierDescriptor> processed,
@NotNull Set<MutableClassDescriptor> ourClasses) { @NotNull Set<MutableClassDescriptor> ourClasses) {
if (!processed.add(classDescriptor)) { if (!processed.add(classDescriptor)) {
@@ -116,22 +116,24 @@ public class OverrideResolver {
} }
private void doGenerateOverridesInAClass(final MutableClassDescriptor classDescriptor) { private void doGenerateOverridesInAClass(final MutableClassDescriptor classDescriptor) {
List<CallableMemberDescriptor> functionsFromSupertypes = getCallableMembersFromSupertypes(classDescriptor); List<CallableMemberDescriptor> membersFromSupertypes = getCallableMembersFromSupertypes(classDescriptor);
MultiMap<Name, CallableMemberDescriptor> functionsFromSupertypesByName = groupDescriptorsByName(functionsFromSupertypes); MultiMap<Name, CallableMemberDescriptor> membersFromSupertypesByName = groupDescriptorsByName(membersFromSupertypes);
MultiMap<Name, CallableMemberDescriptor> functionsFromCurrentByName = groupDescriptorsByName(classDescriptor.getDeclaredCallableMembers()); MultiMap<Name, CallableMemberDescriptor> membersFromCurrentByName = groupDescriptorsByName(classDescriptor.getDeclaredCallableMembers());
Set<Name> functionNames = new LinkedHashSet<Name>(); Set<Name> memberNames = new LinkedHashSet<Name>();
functionNames.addAll(functionsFromSupertypesByName.keySet()); memberNames.addAll(membersFromSupertypesByName.keySet());
functionNames.addAll(functionsFromCurrentByName.keySet()); memberNames.addAll(membersFromCurrentByName.keySet());
for (Name functionName : functionNames) { for (Name memberName : memberNames) {
Collection<CallableMemberDescriptor> fromSupertypes = functionsFromSupertypesByName.get(functionName); Collection<CallableMemberDescriptor> fromSupertypes = membersFromSupertypesByName.get(memberName);
Collection<CallableMemberDescriptor> fromCurrent = functionsFromCurrentByName.get(functionName); Collection<CallableMemberDescriptor> fromCurrent = membersFromCurrentByName.get(memberName);
generateOverridesInFunctionGroup(functionName,
fromSupertypes, generateOverridesInFunctionGroup(
fromCurrent, memberName,
fromSupertypes,
fromCurrent,
classDescriptor, classDescriptor,
new DescriptorSink() { new DescriptorSink() {
@Override @Override
@@ -149,9 +151,9 @@ public class OverrideResolver {
@Override @Override
public void conflict(@NotNull CallableMemberDescriptor fromSuper, @NotNull CallableMemberDescriptor fromCurrent) { public void conflict(@NotNull CallableMemberDescriptor fromSuper, @NotNull CallableMemberDescriptor fromCurrent) {
JetDeclaration jetProperty = (JetDeclaration) BindingContextUtils JetDeclaration declaration = (JetDeclaration) BindingContextUtils
.descriptorToDeclaration(trace.getBindingContext(), fromCurrent); .descriptorToDeclaration(trace.getBindingContext(), fromCurrent);
trace.report(Errors.CONFLICTING_OVERLOADS.on(jetProperty, fromCurrent, fromCurrent.getContainingDeclaration().getName().getName())); trace.report(Errors.CONFLICTING_OVERLOADS.on(declaration, fromCurrent, fromCurrent.getContainingDeclaration().getName().getName()));
} }
}); });
} }