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

Outer's superclass' method is now inaccessible from nested

Browse Source 
Also the diagnostic error message reported the wrong nested class name: it
should be the nested class in the hierarchy which is static, not the class of
the scope where we're checking the accessibility
This commit is contained in:
Alexander Udalov
2013-01-22 16:41:29 +04:00
parent f84d00eec9
commit a0a22b7be6
6 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+12 -20
View File
@@ -1358,28 +1358,20 @@ public class DescriptorResolver {
@NotNull PsiElement reportErrorsOn,
@NotNull ClassDescriptor target
) {
ClassDescriptor thisClass = getContainingClass(scope);
if (thisClass == null) return true;
if (!isAncestor(target, thisClass, true)) return true;
if (!hasOuterClassInstance(thisClass, target)) {
trace.report(INACCESSIBLE_OUTER_CLASS_EXPRESSION.on(reportErrorsOn, thisClass));
return false;
}
return true;
}
private static boolean hasOuterClassInstance(@NotNull ClassDescriptor thisClass, @NotNull ClassDescriptor outerClass) {
DeclarationDescriptor descriptor = thisClass;
while (true) {
assert descriptor != null : "outerClass must be an ancestor of thisClass: " + thisClass + " " + outerClass;
if (descriptor instanceof ClassDescriptor && isSubclass((ClassDescriptor) descriptor, outerClass)) {
return true;
}
if (isStaticNestedClass(descriptor)) {
return false;
DeclarationDescriptor descriptor = getContainingClass(scope);
while (descriptor != null) {
if (descriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
if (isSubclass(classDescriptor, target)) {
return true;
}
if (isStaticNestedClass(classDescriptor)) {
trace.report(INACCESSIBLE_OUTER_CLASS_EXPRESSION.on(reportErrorsOn, classDescriptor));
return false;
}
}
descriptor = descriptor.getContainingDeclaration();
}
return true;
}
}