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

PackagePartProvider refactoring

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-01 15:09:10 +03:00
parent 5ca8f7409a
commit 672d25e7e0
33 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationCompone
import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver
import org.jetbrains.kotlin.storage.LockBasedStorageManager
public class RuntimeModuleData private constructor(public val deserialization: DeserializationComponents, val packageFacadeProvider: RuntimePackageFacadeProvider) {
public class RuntimeModuleData private constructor(public val deserialization: DeserializationComponents, val packageFacadeProvider: RuntimePackagePartProvider) {
public val module: ModuleDescriptor get() = deserialization.moduleDescriptor
public val localClassResolver: LocalClassResolver get() = deserialization.localClassResolver
@@ -51,7 +51,7 @@ public class RuntimeModuleData private constructor(public val deserialization: D
val reflectKotlinClassFinder = ReflectKotlinClassFinder(classLoader)
val deserializedDescriptorResolver = DeserializedDescriptorResolver(RuntimeErrorReporter)
val singleModuleClassResolver = SingleModuleClassResolver()
val runtimePackageFacadeProvider = RuntimePackageFacadeProvider(classLoader)
val runtimePackageFacadeProvider = RuntimePackagePartProvider(classLoader)
val globalJavaResolverContext = JavaResolverComponents(
storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver,
ExternalAnnotationResolver.EMPTY, ExternalSignatureResolver.DO_NOTHING, RuntimeErrorReporter, JavaResolverCache.EMPTY,
core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackageFacadeProvider.kt → core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackagePartProvider.kt
+3 -3
View File
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.load.kotlin.reflect
import org.jetbrains.kotlin.descriptors.PackageFacadeProvider
import org.jetbrains.kotlin.descriptors.PackagePartProvider
import org.jetbrains.kotlin.load.kotlin.ModuleMapping
import java.io.InputStream
import java.util.concurrent.ConcurrentHashMap
class RuntimePackageFacadeProvider(val classLoader : ClassLoader) : PackageFacadeProvider {
class RuntimePackagePartProvider(val classLoader : ClassLoader) : PackagePartProvider {
val module2Mapping = ConcurrentHashMap<String, Lazy<ModuleMapping>>()
@@ -42,7 +42,7 @@ class RuntimePackageFacadeProvider(val classLoader : ClassLoader) : PackageFacad
}
override fun findPackageFacades(packageInternalName: String): List<String> {
override fun findPackageParts(packageInternalName: String): List<String> {
return module2Mapping.values().map { it.value.findPackageParts(packageInternalName) }.filterNotNull().flatMap { it.parts }.distinct()
}
}