Introduce DeserializationConfiguration
Will be used soon to deliver the language/API-version-related behavior to the deserialization
This commit is contained in:
+5
-6
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.storage.StorageManager
|
||||
class DeserializationComponentsForJava(
|
||||
storageManager: StorageManager,
|
||||
moduleDescriptor: ModuleDescriptor,
|
||||
configuration: DeserializationConfiguration,
|
||||
classDataFinder: JavaClassDataFinder,
|
||||
annotationAndConstantLoader: BinaryClassAnnotationAndConstantLoaderImpl,
|
||||
packageFragmentProvider: LazyJavaPackageFragmentProvider,
|
||||
@@ -41,13 +42,11 @@ class DeserializationComponentsForJava(
|
||||
// currently built-ins may be not an instance of JvmBuiltIns only in case of built-ins serialization
|
||||
val jvmBuiltIns = moduleDescriptor.builtIns as? JvmBuiltIns
|
||||
components = DeserializationComponents(
|
||||
storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider,
|
||||
LocalClassifierTypeSettings.Default,
|
||||
errorReporter, lookupTracker, JavaFlexibleTypeDeserializer, ClassDescriptorFactory.EMPTY,
|
||||
notFoundClasses,
|
||||
storageManager, moduleDescriptor, configuration, classDataFinder, annotationAndConstantLoader, packageFragmentProvider,
|
||||
LocalClassifierTypeSettings.Default, errorReporter, lookupTracker, JavaFlexibleTypeDeserializer,
|
||||
ClassDescriptorFactory.EMPTY, notFoundClasses,
|
||||
additionalClassPartsProvider = jvmBuiltIns?.settings ?: AdditionalClassPartsProvider.None,
|
||||
platformDependentDeclarationFilter =
|
||||
jvmBuiltIns?.settings ?: PlatformDependentDeclarationFilter.NoPlatformDependent
|
||||
platformDependentDeclarationFilter = jvmBuiltIns?.settings ?: PlatformDependentDeclarationFilter.NoPlatformDependent
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+4
-2
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.platform.JvmBuiltIns
|
||||
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
|
||||
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
|
||||
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
|
||||
import org.jetbrains.kotlin.serialization.deserialization.NotFoundClasses
|
||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||
|
||||
@@ -72,8 +73,9 @@ class RuntimeModuleData private constructor(val deserialization: Deserialization
|
||||
module, notFoundClasses, storageManager, reflectKotlinClassFinder
|
||||
)
|
||||
val deserializationComponentsForJava = DeserializationComponentsForJava(
|
||||
storageManager, module, javaClassDataFinder, binaryClassAnnotationAndConstantLoader,
|
||||
lazyJavaPackageFragmentProvider, notFoundClasses, RuntimeErrorReporter, LookupTracker.DO_NOTHING
|
||||
storageManager, module, DeserializationConfiguration.Default, javaClassDataFinder,
|
||||
binaryClassAnnotationAndConstantLoader, lazyJavaPackageFragmentProvider, notFoundClasses,
|
||||
RuntimeErrorReporter, LookupTracker.DO_NOTHING
|
||||
)
|
||||
|
||||
singleModuleClassResolver.resolver = javaDescriptorResolver
|
||||
|
||||
@@ -44,6 +44,7 @@ fun createBuiltInPackageFragmentProvider(
|
||||
val components = DeserializationComponents(
|
||||
storageManager,
|
||||
module,
|
||||
DeserializationConfiguration.Default,
|
||||
DeserializedClassDataFinder(provider),
|
||||
AnnotationAndConstantLoaderImpl(module, notFoundClasses, BuiltInSerializerProtocol),
|
||||
provider,
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
/*
|
||||
* 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.serialization.deserialization
|
||||
|
||||
interface DeserializationConfiguration {
|
||||
object Default : DeserializationConfiguration
|
||||
}
|
||||
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.storage.StorageManager
|
||||
class DeserializationComponents(
|
||||
val storageManager: StorageManager,
|
||||
val moduleDescriptor: ModuleDescriptor,
|
||||
val configuration: DeserializationConfiguration,
|
||||
val classDataFinder: ClassDataFinder,
|
||||
val annotationAndConstantLoader: AnnotationAndConstantLoader<AnnotationDescriptor, ConstantValue<*>, AnnotationWithTarget>,
|
||||
val packageFragmentProvider: PackageFragmentProvider,
|
||||
|
||||
Reference in New Issue
Block a user