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

Reordered methods

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-14 17:24:21 +03:00
parent 2b215681c9
commit b625298cd4
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/Importer.java
+31 -32
View File
@@ -63,6 +63,37 @@ public interface Importer {
importDeclarationAlias(descriptor, aliasName); importDeclarationAlias(descriptor, aliasName);
} }
protected void importDeclarationAlias(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) {
if (descriptor instanceof ClassifierDescriptor) {
fileScope.importClassifierAlias(aliasName, (ClassifierDescriptor) descriptor);
}
else if (descriptor instanceof PackageViewDescriptor) {
fileScope.importPackageAlias(aliasName, (PackageViewDescriptor) descriptor);
}
else if (descriptor instanceof FunctionDescriptor) {
fileScope.importFunctionAlias(aliasName, (FunctionDescriptor) descriptor);
}
else if (descriptor instanceof VariableDescriptor) {
fileScope.importVariableAlias(aliasName, (VariableDescriptor) descriptor);
}
}
protected void importAllUnderDeclaration(@NotNull DeclarationDescriptor descriptor, @NotNull PlatformToKotlinClassMap platformToKotlinClassMap) {
if (descriptor instanceof PackageViewDescriptor) {
NoSubpackagesInPackageScope scope = new NoSubpackagesInPackageScope((PackageViewDescriptor) descriptor);
fileScope.importScope(createFilteringScope(scope, (PackageViewDescriptor) descriptor, platformToKotlinClassMap));
}
else if (descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() != ClassKind.OBJECT) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
fileScope.importScope(classDescriptor.getStaticScope());
fileScope.importScope(classDescriptor.getUnsubstitutedInnerClassesScope());
ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
if (classObjectDescriptor != null) {
fileScope.importScope(classObjectDescriptor.getUnsubstitutedInnerClassesScope());
}
}
}
@NotNull @NotNull
private static JetScope createFilteringScope( private static JetScope createFilteringScope(
@NotNull JetScope scope, @NotNull JetScope scope,
@@ -83,38 +114,6 @@ public interface Importer {
} }
}); });
} }
protected void importAllUnderDeclaration(@NotNull DeclarationDescriptor descriptor, @NotNull PlatformToKotlinClassMap platformToKotlinClassMap) {
if (descriptor instanceof PackageViewDescriptor) {
NoSubpackagesInPackageScope scope = new NoSubpackagesInPackageScope((PackageViewDescriptor) descriptor);
fileScope.importScope(createFilteringScope(scope, (PackageViewDescriptor) descriptor, platformToKotlinClassMap));
}
else if (descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() != ClassKind.OBJECT) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
fileScope.importScope(classDescriptor.getStaticScope());
fileScope.importScope(classDescriptor.getUnsubstitutedInnerClassesScope());
ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
if (classObjectDescriptor != null) {
fileScope.importScope(classObjectDescriptor.getUnsubstitutedInnerClassesScope());
}
}
}
protected void importDeclarationAlias(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) {
if (descriptor instanceof ClassifierDescriptor) {
fileScope.importClassifierAlias(aliasName, (ClassifierDescriptor) descriptor);
}
else if (descriptor instanceof PackageViewDescriptor) {
fileScope.importPackageAlias(aliasName, (PackageViewDescriptor) descriptor);
}
else if (descriptor instanceof FunctionDescriptor) {
fileScope.importFunctionAlias(aliasName, (FunctionDescriptor) descriptor);
}
else if (descriptor instanceof VariableDescriptor) {
fileScope.importVariableAlias(aliasName, (VariableDescriptor) descriptor);
}
}
} }
class DelayedImporter extends StandardImporter { class DelayedImporter extends StandardImporter {