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

Rename 'ins' -> 'Ins' in BuiltinsPackageFragment and related classes

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-14 20:40:30 +03:00
parent 777ef32d65
commit 4f77b02a58
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.backend.common.CodegenUtil;
import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment;
import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment;
import org.jetbrains.kotlin.codegen.*;
import org.jetbrains.kotlin.codegen.context.*;
import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicArrayConstructorsKt;
@@ -272,7 +272,7 @@ public class InlineCodegen extends CallGenerator {
if (functionDescriptor instanceof FictitiousArrayConstructor) return true;
String name = functionDescriptor.getName().asString();
return (name.equals("arrayOf") || name.equals("emptyArray")) &&
functionDescriptor.getContainingDeclaration() instanceof BuiltinsPackageFragment;
functionDescriptor.getContainingDeclaration() instanceof BuiltInsPackageFragment;
}
private InlineResult inlineCall(SMAPAndMethodNode nodeAndSmap) {
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+2 -2
View File
@@ -22,7 +22,7 @@ import kotlin.Pair;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment;
import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.builtins.PrimitiveType;
import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor;
@@ -279,7 +279,7 @@ public class KotlinTypeMapper {
: "Package member expected, got " + descriptor + " in " + containingDeclaration;
PackageFragmentDescriptor packageFragmentDescriptor = (PackageFragmentDescriptor) containingDeclaration;
if (packageFragmentDescriptor instanceof BuiltinsPackageFragment) {
if (packageFragmentDescriptor instanceof BuiltInsPackageFragment) {
return new ContainingClassesInfo(FAKE_CLASS_ID_FOR_BUILTINS, FAKE_CLASS_ID_FOR_BUILTINS);
}
compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
+4 -4
View File
@@ -67,11 +67,11 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
}
}
private inner class BuiltinsSourcesModule : ModuleInfo {
private inner class BuiltInsSourcesModule : ModuleInfo {
override val name = Name.special("<module for resolving builtin source files>")
override fun dependencies() = listOf(this)
override fun dependencyOnBuiltins(): ModuleInfo.DependencyOnBuiltins =
if (dependOnOldBuiltIns) ModuleInfo.DependenciesOnBuiltins.LAST else ModuleInfo.DependenciesOnBuiltins.NONE
override fun dependencyOnBuiltIns(): ModuleInfo.DependencyOnBuiltIns =
if (dependOnOldBuiltIns) ModuleInfo.DependenciesOnBuiltIns.LAST else ModuleInfo.DependenciesOnBuiltIns.NONE
}
private fun serialize(disposable: Disposable, destDir: File, srcDirs: List<File>, extraClassPath: List<File>) {
@@ -85,7 +85,7 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
val files = environment.getSourceFiles()
val builtInModule = BuiltinsSourcesModule()
val builtInModule = BuiltInsSourcesModule()
val resolver = JvmAnalyzerFacade.setupResolverForProject(
"builtIns source",
ProjectContext(environment.project), listOf(builtInModule),
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt
+1 -1
View File
@@ -61,7 +61,7 @@ private val DEFAULT_IMPORTS_FOR_JVM: List<ImportPath> = ArrayList<ImportPath>().
}
val builtIns = JvmPlatform.builtIns
for (builtinPackageFragment in builtIns.builtinsPackageFragments) {
for (builtinPackageFragment in builtIns.builtInsPackageFragments) {
addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
}
}
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+4 -4
View File
@@ -115,16 +115,16 @@ interface ModuleInfo {
val name: Name
fun dependencies(): List<ModuleInfo>
fun modulesWhoseInternalsAreVisible(): Collection<ModuleInfo> = listOf()
fun dependencyOnBuiltins(): DependencyOnBuiltins = DependenciesOnBuiltins.LAST
fun dependencyOnBuiltIns(): DependencyOnBuiltIns = DependenciesOnBuiltIns.LAST
val capabilities: Map<ModuleDescriptor.Capability<*>, Any?>
get() = emptyMap()
//TODO: (module refactoring) provide dependency on builtins after runtime in IDEA
interface DependencyOnBuiltins {
interface DependencyOnBuiltIns {
fun adjustDependencies(builtinsModule: ModuleDescriptorImpl, dependencies: MutableList<ModuleDescriptorImpl>)
}
enum class DependenciesOnBuiltins : DependencyOnBuiltins {
enum class DependenciesOnBuiltIns : DependencyOnBuiltIns {
NONE {
override fun adjustDependencies(builtinsModule: ModuleDescriptorImpl, dependencies: MutableList<ModuleDescriptorImpl>) {
@@ -174,7 +174,7 @@ abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
}
val builtinsModule = targetPlatform.builtIns.builtInsModule
module.dependencyOnBuiltins().adjustDependencies(builtinsModule, dependenciesDescriptors)
module.dependencyOnBuiltIns().adjustDependencies(builtinsModule, dependenciesDescriptors)
return dependenciesDescriptors
}
compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt
+5 -5
View File
@@ -45,12 +45,12 @@ fun createResolveSessionForFiles(
return resolverForProject.resolverForModule(testModule).componentProvider.get<ResolveSession>()
}
private class TestModule(val dependsOnBuiltins: Boolean) : ModuleInfo {
private class TestModule(val dependsOnBuiltIns: Boolean) : ModuleInfo {
override val name: Name = Name.special("<Test module for lazy resolve>")
override fun dependencies() = listOf(this)
override fun dependencyOnBuiltins() =
if (dependsOnBuiltins)
ModuleInfo.DependenciesOnBuiltins.LAST
override fun dependencyOnBuiltIns() =
if (dependsOnBuiltIns)
ModuleInfo.DependenciesOnBuiltIns.LAST
else
ModuleInfo.DependenciesOnBuiltins.NONE
ModuleInfo.DependenciesOnBuiltIns.NONE
}
compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java
+3 -3
View File
@@ -24,7 +24,7 @@ import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment;
import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
@@ -68,9 +68,9 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment {
builtIns = module.getBuiltIns();
builtinsImportingScope = ScopeUtilsKt.chainImportingScopes(
// builtIns.builtinsPackageFragments.map { it.memberScope.memberScopeAsImportingScope() }
CollectionsKt.map(builtIns.getBuiltinsPackageFragments(), new Function1<BuiltinsPackageFragment, ImportingScope>() {
CollectionsKt.map(builtIns.getBuiltInsPackageFragments(), new Function1<BuiltInsPackageFragment, ImportingScope>() {
@Override
public ImportingScope invoke(BuiltinsPackageFragment packageFragment) {
public ImportingScope invoke(BuiltInsPackageFragment packageFragment) {
return ScopeUtilsKt.memberScopeAsImportingScope(packageFragment.getMemberScope());
}
}), null);
core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt → core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
import org.jetbrains.kotlin.storage.StorageManager
import java.io.InputStream
class BuiltinsPackageFragment(
class BuiltInsPackageFragment(
fqName: FqName,
storageManager: StorageManager,
module: ModuleDescriptor,
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+17 -17
View File
@@ -61,17 +61,17 @@ public abstract class KotlinBuiltIns {
);
protected final ModuleDescriptorImpl builtInsModule;
private final BuiltinsPackageFragment builtinsPackageFragment;
private final BuiltinsPackageFragment collectionsPackageFragment;
private final BuiltinsPackageFragment rangesPackageFragment;
private final BuiltinsPackageFragment annotationPackageFragment;
private final BuiltInsPackageFragment builtInsPackageFragment;
private final BuiltInsPackageFragment collectionsPackageFragment;
private final BuiltInsPackageFragment rangesPackageFragment;
private final BuiltInsPackageFragment annotationPackageFragment;
private final Set<BuiltinsPackageFragment> builtinsPackageFragments;
private final Set<BuiltInsPackageFragment> builtInsPackageFragments;
private final Map<PrimitiveType, KotlinType> primitiveTypeToArrayKotlinType;
private final Map<KotlinType, KotlinType> primitiveKotlinTypeToKotlinArrayType;
private final Map<KotlinType, KotlinType> kotlinArrayTypeToPrimitiveKotlinType;
private final Map<FqName, BuiltinsPackageFragment> packageNameToPackageFragment;
private final Map<FqName, BuiltInsPackageFragment> packageNameToPackageFragment;
public static final FqNames FQ_NAMES = new FqNames();
@@ -96,14 +96,14 @@ public abstract class KotlinBuiltIns {
builtInsModule.initialize(packageFragmentProvider);
builtInsModule.setDependencies(builtInsModule);
packageNameToPackageFragment = new LinkedHashMap<FqName, BuiltinsPackageFragment>();
packageNameToPackageFragment = new LinkedHashMap<FqName, BuiltInsPackageFragment>();
builtinsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, BUILT_INS_PACKAGE_FQ_NAME);
builtInsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, BUILT_INS_PACKAGE_FQ_NAME);
collectionsPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, COLLECTIONS_PACKAGE_FQ_NAME);
rangesPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, RANGES_PACKAGE_FQ_NAME);
annotationPackageFragment = createPackage(packageFragmentProvider, packageNameToPackageFragment, ANNOTATION_PACKAGE_FQ_NAME);
builtinsPackageFragments = new LinkedHashSet<BuiltinsPackageFragment>(packageNameToPackageFragment.values());
builtInsPackageFragments = new LinkedHashSet<BuiltInsPackageFragment>(packageNameToPackageFragment.values());
primitiveTypeToArrayKotlinType = new EnumMap<PrimitiveType, KotlinType>(PrimitiveType.class);
primitiveKotlinTypeToKotlinArrayType = new HashMap<KotlinType, KotlinType>();
@@ -129,12 +129,12 @@ public abstract class KotlinBuiltIns {
@NotNull
private static BuiltinsPackageFragment createPackage(
private static BuiltInsPackageFragment createPackage(
@NotNull PackageFragmentProvider fragmentProvider,
@NotNull Map<FqName, BuiltinsPackageFragment> packageNameToPackageFragment,
@NotNull Map<FqName, BuiltInsPackageFragment> packageNameToPackageFragment,
@NotNull FqName packageFqName
) {
BuiltinsPackageFragment packageFragment = (BuiltinsPackageFragment) single(fragmentProvider.getPackageFragments(packageFqName));
BuiltInsPackageFragment packageFragment = (BuiltInsPackageFragment) single(fragmentProvider.getPackageFragments(packageFqName));
packageNameToPackageFragment.put(packageFqName, packageFragment);
return packageFragment;
}
@@ -246,13 +246,13 @@ public abstract class KotlinBuiltIns {
}
@NotNull
public Set<BuiltinsPackageFragment> getBuiltinsPackageFragments() {
return builtinsPackageFragments;
public Set<BuiltInsPackageFragment> getBuiltInsPackageFragments() {
return builtInsPackageFragments;
}
@NotNull
public PackageFragmentDescriptor getBuiltInsPackageFragment() {
return builtinsPackageFragment;
return builtInsPackageFragment;
}
public boolean isBuiltInPackageFragment(@Nullable PackageFragmentDescriptor packageFragment) {
@@ -261,7 +261,7 @@ public abstract class KotlinBuiltIns {
@NotNull
public MemberScope getBuiltInsPackageScope() {
return builtinsPackageFragment.getMemberScope();
return builtInsPackageFragment.getMemberScope();
}
@NotNull
@@ -290,7 +290,7 @@ public abstract class KotlinBuiltIns {
public ClassDescriptor getBuiltInClassByFqNameNullable(@NotNull FqName fqName) {
if (!fqName.isRoot()) {
FqName parent = fqName.parent();
BuiltinsPackageFragment packageFragment = packageNameToPackageFragment.get(parent);
BuiltInsPackageFragment packageFragment = packageNameToPackageFragment.get(parent);
if (packageFragment != null) {
return getBuiltInClassByNameNullable(fqName.shortName(), packageFragment);
}
core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt
+1 -1
View File
@@ -34,7 +34,7 @@ fun createBuiltInPackageFragmentProvider(
loadResource: (String) -> InputStream?
): PackageFragmentProvider {
val packageFragments = packageFqNames.map { fqName ->
BuiltinsPackageFragment(fqName, storageManager, module, loadResource)
BuiltInsPackageFragment(fqName, storageManager, module, loadResource)
}
val provider = PackageFragmentProviderImpl(packageFragments)
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class AllClassesCompletion(private val parameters: CompletionParameters,
//TODO: this is a temporary solution until we have built-ins in indices
// we need only nested classes because top-level built-ins are all added through default imports
for (builtinPackage in resolutionFacade.moduleDescriptor.builtIns.builtinsPackageFragments) {
for (builtinPackage in resolutionFacade.moduleDescriptor.builtIns.builtInsPackageFragments) {
collectClassesFromScope(builtinPackage.getMemberScope()) {
if (it.containingDeclaration is ClassDescriptor) {
classDescriptorCollector(it)