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

Introduce DeserializationConfiguration

Browse Source 
Will be used soon to deliver the language/API-version-related behavior to the
deserialization
This commit is contained in:
Alexander Udalov
2016-10-11 11:48:30 +03:00
parent 25b9542c06
commit 88af36001c
17 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+15 -7
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.serialization.DescriptorSerializer
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.StringTableImpl
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import java.io.ByteArrayInputStream
@@ -56,18 +57,25 @@ object KotlinJavascriptSerializationUtil {
stream.toByteArray()
}
@JvmStatic fun readModule(metadata: ByteArray, storageManager: StorageManager,
kotlinModule: ModuleDescriptor): JsModuleDescriptor<PackageFragmentProvider?> {
@JvmStatic
fun readModule(
metadata: ByteArray, storageManager: StorageManager, kotlinModule: ModuleDescriptor, configuration: DeserializationConfiguration
): JsModuleDescriptor<PackageFragmentProvider?> {
val jsModule = metadata.readAsContentMap(kotlinModule.name.asString())
return jsModule.copy(createPackageFragmentProvider(kotlinModule, jsModule.data, storageManager))
return jsModule.copy(createPackageFragmentProvider(kotlinModule, jsModule.data, storageManager, configuration))
}
@JvmStatic private fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, contentMap: Map<String, ByteArray>,
storageManager: StorageManager): PackageFragmentProvider? {
val packageFqNames = getPackages(contentMap).map { FqName(it) }.toSet()
@JvmStatic
private fun createPackageFragmentProvider(
moduleDescriptor: ModuleDescriptor,
contentMap: Map<String, ByteArray>,
storageManager: StorageManager,
configuration: DeserializationConfiguration
): PackageFragmentProvider? {
val packageFqNames = getPackages(contentMap).map(::FqName).toSet()
if (packageFqNames.isEmpty()) return null
return createKotlinJavascriptPackageFragmentProvider(storageManager, moduleDescriptor, packageFqNames) {
return createKotlinJavascriptPackageFragmentProvider(storageManager, moduleDescriptor, packageFqNames, configuration) {
path ->
if (!contentMap.containsKey(path)) {
when {
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt
+2
View File
@@ -29,6 +29,7 @@ fun createKotlinJavascriptPackageFragmentProvider(
storageManager: StorageManager,
module: ModuleDescriptor,
packageFqNames: Set<FqName>,
configuration: DeserializationConfiguration,
loadResource: (String) -> InputStream?
): PackageFragmentProvider {
val packageFragments = packageFqNames.map { fqName ->
@@ -41,6 +42,7 @@ fun createKotlinJavascriptPackageFragmentProvider(
val components = DeserializationComponents(
storageManager,
module,
configuration,
DeserializedClassDataFinder(provider),
AnnotationAndConstantLoaderImpl(module, notFoundClasses, JsSerializerProtocol),
provider,