Introduced package view and fragment classes.

This commit is contained in:
Evgeny Gerashchenko
2013-10-09 20:39:00 +04:00
parent 62c542341a
commit 2a0d81a6fe
13 changed files with 192 additions and 0 deletions
@@ -65,6 +65,11 @@ public class ExpectedLoadErrorsUtil {
return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());
}
@Override
public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) {
return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());
}
@Override
public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) {
return visitDeclarationRecursively(descriptor, descriptor.getDefaultType().getMemberScope());
@@ -183,6 +183,11 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());
}
@Override
public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) {
return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());
}
@Override
public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) {
// skip java.util.Collection, etc.
@@ -182,6 +182,22 @@ public class DescriptorValidator {
return true;
}
@Override
public Boolean visitPackageFragmentDescriptor(
PackageFragmentDescriptor descriptor, DiagnosticCollector collector
) {
validateScope(descriptor.getMemberScope(), collector);
return true;
}
@Override
public Boolean visitPackageViewDescriptor(
PackageViewDescriptor descriptor, DiagnosticCollector collector
) {
validateScope(descriptor.getMemberScope(), collector);
return true;
}
@Override
public Boolean visitVariableDescriptor(
VariableDescriptor descriptor, DiagnosticCollector collector
@@ -368,6 +384,22 @@ public class DescriptorValidator {
return null;
}
@Override
public Void visitPackageFragmentDescriptor(
PackageFragmentDescriptor descriptor, JetScope scope
) {
return null;
}
@Override
public Void visitPackageViewDescriptor(
PackageViewDescriptor descriptor, JetScope scope
) {
// TODO
//assertFound(scope, descriptor, scope.getPackage(descriptor.getName()));
return null;
}
@Override
public Void visitVariableDescriptor(
VariableDescriptor descriptor, JetScope scope
@@ -65,6 +65,18 @@ public class RecursiveDescriptorProcessor {
&& visitChildren(descriptor.getValueParameters(), data);
}
@Override
public Boolean visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data) {
return applyWorker(descriptor, data)
&& visitChildren(descriptor.getMemberScope().getAllDescriptors(), data);
}
@Override
public Boolean visitPackageViewDescriptor(PackageViewDescriptor descriptor, D data) {
return applyWorker(descriptor, data)
&& visitChildren(descriptor.getMemberScope().getAllDescriptors(), data);
}
@Override
public Boolean visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data) {
return applyWorker(descriptor, data)
@@ -97,6 +97,20 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment
return true;
}
@Override
public Boolean visitPackageFragmentDescriptor(
PackageFragmentDescriptor descriptor, Void data
) {
add(descriptor);
return true;
}
@Override
public Boolean visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) {
add(descriptor);
return true;
}
@Override
public Boolean visitVariableDescriptor(VariableDescriptor descriptor, Void data) {
add(descriptor);