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

Clarifying renames

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-13 13:29:44 +04:00
parent b76bdd09ff
commit 39f96b80fd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+4 -4
View File
@@ -189,7 +189,7 @@ public class OverrideResolver {
extractAndBindOverridesForMember(fromCurrent, notOverridden, current, sink); extractAndBindOverridesForMember(fromCurrent, notOverridden, current, sink);
} }
bindFakeOverrides(current, notOverridden, sink); createAndBindFakeOverrides(current, notOverridden, sink);
} }
private static void extractAndBindOverridesForMember( private static void extractAndBindOverridesForMember(
@@ -222,7 +222,7 @@ public class OverrideResolver {
} }
} }
private static void bindFakeOverrides( private static void createAndBindFakeOverrides(
@NotNull ClassDescriptor current, @NotNull ClassDescriptor current,
@NotNull List<CallableMemberDescriptor> notOverridden, @NotNull List<CallableMemberDescriptor> notOverridden,
@NotNull DescriptorSink sink @NotNull DescriptorSink sink
@@ -231,11 +231,11 @@ public class OverrideResolver {
while (!fromSuperQueue.isEmpty()) { while (!fromSuperQueue.isEmpty()) {
CallableMemberDescriptor notOverriddenFromSuper = fromSuperQueue.remove(); CallableMemberDescriptor notOverriddenFromSuper = fromSuperQueue.remove();
Collection<CallableMemberDescriptor> overridables = extractMembersOverridableBy(notOverriddenFromSuper, fromSuperQueue, sink); Collection<CallableMemberDescriptor> overridables = extractMembersOverridableBy(notOverriddenFromSuper, fromSuperQueue, sink);
bindFakeOverride(notOverriddenFromSuper, overridables, current, sink); createAndBindFakeOverride(notOverriddenFromSuper, overridables, current, sink);
} }
} }
private static void bindFakeOverride( private static void createAndBindFakeOverride(
@NotNull CallableMemberDescriptor notOverriddenFromSuper, @NotNull CallableMemberDescriptor notOverriddenFromSuper,
@NotNull Collection<CallableMemberDescriptor> overridables, @NotNull Collection<CallableMemberDescriptor> overridables,
@NotNull ClassDescriptor current, @NotNull ClassDescriptor current,