From 557aaf363a5e46454d122e5c1dfb5d88cafd78b6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 26 Nov 2013 18:08:39 +0400 Subject: [PATCH] Renamed method and got rid of some usages. --- .../src/org/jetbrains/jet/codegen/FunctionTypesUtil.java | 8 +++----- .../src/org/jetbrains/jet/codegen/RangeCodegenUtil.java | 2 +- .../serialization/BuiltinsDeserializationTest.java | 2 +- .../org/jetbrains/jet/resolve/ExpectedResolveData.java | 4 ++-- .../jet/types/JetDefaultModalityModifiersTest.java | 2 +- .../tests/org/jetbrains/jet/types/JetOverloadTest.java | 2 +- .../tests/org/jetbrains/jet/types/JetOverridingTest.java | 2 +- .../org/jetbrains/jet/types/TypeSubstitutorTest.java | 2 +- .../tests/org/jetbrains/jet/types/TypeUnifierTest.java | 2 +- .../jet/lang/resolve/java/resolver/JavaClassResolver.java | 2 +- .../org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java | 5 ++--- .../jet/generators/evaluate/GenerateOperationsMap.kt | 2 +- 12 files changed, 16 insertions(+), 19 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionTypesUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionTypesUtil.java index c0720ed5511..bf54c65d519 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionTypesUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionTypesUtil.java @@ -23,7 +23,6 @@ import org.jetbrains.asm4.Type; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetTypeImpl; import org.jetbrains.jet.lang.types.TypeProjection; @@ -140,11 +139,10 @@ public class FunctionTypesUtil { @NotNull private static ClassDescriptor createFunctionImplDescriptor(@NotNull Name name, @NotNull ClassDescriptor functionInterface) { - JetScope builtInsScope = KotlinBuiltIns.getInstance().getBuiltInsScope(); - + PackageFragmentDescriptor builtinsFragment = KotlinBuiltIns.getInstance().getBuiltInsPackageFragment(); MutableClassDescriptor functionImpl = new MutableClassDescriptor( - KotlinBuiltIns.getInstance().getBuiltInsPackageFragment(), - builtInsScope, + builtinsFragment, + builtinsFragment.getMemberScope(), ClassKind.CLASS, false, name diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java index 22f3c5be009..402e89bbecb 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java @@ -105,7 +105,7 @@ public class RangeCodegenUtil { ) { ClassifierDescriptor declarationDescriptor = rangeOrProgression.getConstructor().getDeclarationDescriptor(); assert declarationDescriptor != null; - if (declarationDescriptor != KotlinBuiltIns.getInstance().getBuiltInsScope().getClassifier(declarationDescriptor.getName())) { + if (declarationDescriptor != KotlinBuiltIns.getInstance().getBuiltInsPackageScope().getClassifier(declarationDescriptor.getName())) { // Must be a standard library class return null; } diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java index 7042e36826a..ecb4b3c55a4 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java @@ -51,7 +51,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { } public void testBuiltIns() throws Exception { - Collection allDescriptors = KotlinBuiltIns.getInstance().getBuiltInsScope().getAllDescriptors(); + Collection allDescriptors = KotlinBuiltIns.getInstance().getBuiltInsPackageScope().getAllDescriptors(); PackageFragmentDescriptor actualPackage = getDeserializedDescriptorsAsPackage(allDescriptors); RecursiveDescriptorComparator.Configuration configuration = RecursiveDescriptorComparator.RECURSIVE.withRenderer( diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 3992c73cba0..952a0b0bd04 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -254,7 +254,7 @@ public abstract class ExpectedResolveData { JetType actualType = bindingContext.get(BindingContext.TYPE, typeReference); assertNotNull("Type " + name + " not resolved for reference " + name, actualType); - ClassifierDescriptor expectedClass = builtIns.getBuiltInsScope().getClassifier(Name.identifier(name.substring(STANDARD_PREFIX.length()))); + ClassifierDescriptor expectedClass = builtIns.getBuiltInClassByName(Name.identifier(name.substring(STANDARD_PREFIX.length()))); assertNotNull("Expected class not found: " + name); assertSame("Type resolution mismatch: ", expectedClass.getTypeConstructor(), actualType.getConstructor()); continue; @@ -311,7 +311,7 @@ public abstract class ExpectedResolveData { TypeConstructor expectedTypeConstructor; if (typeName.startsWith(STANDARD_PREFIX)) { String name = typeName.substring(STANDARD_PREFIX.length()); - ClassifierDescriptor expectedClass = builtIns.getBuiltInsScope().getClassifier(Name.identifier(name)); + ClassifierDescriptor expectedClass = builtIns.getBuiltInClassByName(Name.identifier(name)); assertNotNull("Expected class not found: " + typeName, expectedClass); expectedTypeConstructor = expectedClass.getTypeConstructor(); diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 55ac65da5c0..e82bd1c36ca 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -69,7 +69,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { InjectorForTests injector = new InjectorForTests(getProject(), root); KotlinBuiltIns builtIns = injector.getKotlinBuiltIns(); descriptorResolver = injector.getDescriptorResolver(); - scope = createScope(builtIns.getBuiltInsScope()); + scope = createScope(builtIns.getBuiltInsPackageScope()); } public void tearDown() throws Exception { diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index c871ca50a4a..b89f38ec5fb 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -182,7 +182,7 @@ public class JetOverloadTest extends JetLiteFixture { private FunctionDescriptor makeFunction(String funDecl) { JetNamedFunction function = JetPsiFactory.createFunction(getProject(), funDecl); - return descriptorResolver.resolveFunctionDescriptor(root, builtIns.getBuiltInsScope(), function, + return descriptorResolver.resolveFunctionDescriptor(root, builtIns.getBuiltInsPackageScope(), function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } } diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index 18f6a258901..3eaa85b0dd4 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -172,7 +172,7 @@ public class JetOverridingTest extends JetLiteFixture { private FunctionDescriptor makeFunction(String funDecl) { JetNamedFunction function = JetPsiFactory.createFunction(getProject(), funDecl); - return descriptorResolver.resolveFunctionDescriptor(root, builtIns.getBuiltInsScope(), function, + return descriptorResolver.resolveFunctionDescriptor(root, builtIns.getBuiltInsPackageScope(), function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } } diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index 75a65bc5575..07555db0d62 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -96,7 +96,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { topLevelDeclarations, typeParameters, contextClass.getDefaultType().getMemberScope(), - KotlinBuiltIns.getInstance().getBuiltInsScope()); + KotlinBuiltIns.getInstance().getBuiltInsPackageScope()); } private void doTest(@Nullable String expectedTypeStr, String initialTypeStr, Pair... substitutionStrs) { diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index 48f2353bd99..2b1340b97b0 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -198,7 +198,7 @@ public class TypeUnifierTest extends JetLiteFixture { } private TypeProjection makeType(String typeStr) { - return makeTypeProjection(builtIns.getBuiltInsScope(), typeStr); + return makeTypeProjection(builtIns.getBuiltInsPackageScope(), typeStr); } private TypeProjection makeTypeProjection(JetScope scope, String typeStr) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 68b69470922..7395ea06772 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -174,7 +174,7 @@ public final class JavaClassResolver { List segments = qualifiedName.pathSegments(); if (segments.size() < 2) return null; - JetScope scope = KotlinBuiltIns.getInstance().getBuiltInsScope(); + JetScope scope = KotlinBuiltIns.getInstance().getBuiltInsPackageScope(); for (int i = 1, size = segments.size(); i < size; i++) { ClassifierDescriptor classifier = scope.getClassifier(segments.get(i)); if (classifier == null) return null; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 57754e10227..3fb5faabcd2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -227,9 +227,8 @@ public class KotlinBuiltIns { return builtInsModule.getPackageFragmentProvider().getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME).get(0); } - @Deprecated @NotNull - public JetScope getBuiltInsScope() { // TODO 1 scope? + public JetScope getBuiltInsPackageScope() { return getBuiltInsPackageFragment().getMemberScope(); } @@ -241,7 +240,7 @@ public class KotlinBuiltIns { @NotNull public ClassDescriptor getBuiltInClassByName(@NotNull Name simpleName) { - ClassifierDescriptor classifier = getBuiltInsScope().getClassifier(simpleName); + ClassifierDescriptor classifier = getBuiltInsPackageFragment().getMemberScope().getClassifier(simpleName); assert classifier instanceof ClassDescriptor : "Must be a class descriptor " + simpleName + ", but was " + classifier; return (ClassDescriptor) classifier; } diff --git a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt index 0e63b33fb71..3e9dc4210e7 100644 --- a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt @@ -51,7 +51,7 @@ fun generate(): String { val builtIns = KotlinBuiltIns.getInstance() [suppress("UNCHECKED_CAST")] - val allPrimitiveTypes = builtIns.getBuiltInsPackage().getMemberScope().getAllDescriptors() + val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getAllDescriptors() .filter { it is ClassDescriptor && builtIns.isPrimitiveType(it.getDefaultType()) } as List for (descriptor in allPrimitiveTypes + builtIns.getString()) {