~ More js -> web in serializer.web
diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
index 9889e29..e9528d9 100644
--- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
+++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt
@@ -70,7 +70,7 @@
val irBuiltIns = psi2IrContext.irBuiltIns
val feContext = psi2IrContext.run {
- WebIrLinker.JsFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns)
+ WebIrLinker.WebFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns)
}
val stubGenerator = DeclarationStubGeneratorImpl(
psi2IrContext.moduleDescriptor,
diff --git a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/klib.kt b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/klib.kt
index 6ebb14e..8c78f2b 100644
--- a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/klib.kt
+++ b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/klib.kt
@@ -316,7 +316,7 @@
): IrModuleInfo {
val irBuiltIns = psi2IrContext.irBuiltIns
val feContext = psi2IrContext.run {
- WebIrLinker.JsFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns)
+ WebIrLinker.WebFePluginContext(moduleDescriptor, symbolTable, typeTranslator, irBuiltIns)
}
val partialLinkageEnabled = configuration[WebConfigurationKeys.PARTIAL_LINKAGE] ?: false
@@ -626,7 +626,7 @@
val signatureClashChecks = configuration[CommonConfigurationKeys.PRODUCE_KLIB_SIGNATURES_CLASH_CHECKS] ?: false
val serializedIr =
- JsIrModuleSerializer(
+ WebIrModuleSerializer(
messageLogger,
moduleFragment.irBuiltins,
expectDescriptorToSymbol,
diff --git a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsDeclarationTable.kt b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsDeclarationTable.kt
index e519466..92a9971 100644
--- a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsDeclarationTable.kt
+++ b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsDeclarationTable.kt
@@ -14,7 +14,7 @@
import org.jetbrains.kotlin.ir.util.IdSignature
import org.jetbrains.kotlin.ir.util.render
-class JsUniqIdClashTracker() : IdSignatureClashTracker {
+class WebUniqIdClashTracker() : IdSignatureClashTracker {
private val committedIdSignatures = mutableMapOf<IdSignature, IrDeclaration>()
override fun commit(declaration: IrDeclaration, signature: IdSignature) {
@@ -34,7 +34,7 @@
}
}
-class JsGlobalDeclarationTable(builtIns: IrBuiltIns, tracker: IdSignatureClashTracker = JsUniqIdClashTracker()) :
+class WebGlobalDeclarationTable(builtIns: IrBuiltIns, tracker: IdSignatureClashTracker = WebUniqIdClashTracker()) :
GlobalDeclarationTable(WebManglerIr, tracker) {
init {
loadKnownBuiltins(builtIns)
diff --git a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrLinker.kt b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrLinker.kt
index 552893d..6e70e36 100644
--- a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrLinker.kt
+++ b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrLinker.kt
@@ -62,19 +62,19 @@
require(klib != null) { "Expecting kotlin library" }
val libraryAbiVersion = klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT
return when (val lazyIrGenerator = stubGenerator) {
- null -> JsModuleDeserializer(moduleDescriptor, klib, strategyResolver, libraryAbiVersion, klib.libContainsErrorCode)
- else -> JsLazyIrModuleDeserializer(moduleDescriptor, libraryAbiVersion, builtIns, lazyIrGenerator)
+ null -> WebModuleDeserializer(moduleDescriptor, klib, strategyResolver, libraryAbiVersion, klib.libContainsErrorCode)
+ else -> WebLazyIrModuleDeserializer(moduleDescriptor, libraryAbiVersion, builtIns, lazyIrGenerator)
}
}
- private inner class JsModuleDeserializer(moduleDescriptor: ModuleDescriptor, klib: IrLibrary, strategyResolver: (String) -> DeserializationStrategy, libraryAbiVersion: KotlinAbiVersion, allowErrorCode: Boolean) :
+ private inner class WebModuleDeserializer(moduleDescriptor: ModuleDescriptor, klib: IrLibrary, strategyResolver: (String) -> DeserializationStrategy, libraryAbiVersion: KotlinAbiVersion, allowErrorCode: Boolean) :
BasicIrModuleDeserializer(this, moduleDescriptor, klib, strategyResolver, libraryAbiVersion, allowErrorCode)
override fun createCurrentModuleDeserializer(moduleFragment: IrModuleFragment, dependencies: Collection<IrModuleDeserializer>): IrModuleDeserializer {
val currentModuleDeserializer = super.createCurrentModuleDeserializer(moduleFragment, dependencies)
icData?.let {
return CurrentModuleWithICDeserializer(currentModuleDeserializer, symbolTable, builtIns, it.icData) { lib ->
- JsModuleDeserializer(currentModuleDeserializer.moduleDescriptor, lib, currentModuleDeserializer.strategyResolver, KotlinAbiVersion.CURRENT, it.containsErrorCode)
+ WebModuleDeserializer(currentModuleDeserializer.moduleDescriptor, lib, currentModuleDeserializer.strategyResolver, KotlinAbiVersion.CURRENT, it.containsErrorCode)
}
}
return currentModuleDeserializer
@@ -90,7 +90,7 @@
return deserializersForModules[moduleDescriptor.name.asString()] ?: error("Deserializer for $moduleDescriptor not found")
}
- class JsFePluginContext(
+ class WebFePluginContext(
override val moduleDescriptor: ModuleDescriptor,
override val symbolTable: ReferenceSymbolTable,
override val typeTranslator: TypeTranslator,
diff --git a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsIrModuleSerializer.kt b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrModuleSerializer.kt
similarity index 90%
rename from compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsIrModuleSerializer.kt
rename to compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrModuleSerializer.kt
index 1f8ebc6..198301e 100644
--- a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsIrModuleSerializer.kt
+++ b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebIrModuleSerializer.kt
@@ -16,7 +16,7 @@
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.util.IrMessageLogger
-class JsIrModuleSerializer(
+class WebIrModuleSerializer(
messageLogger: IrMessageLogger,
irBuiltIns: IrBuiltIns,
private val expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
@@ -28,9 +28,9 @@
shouldCheckSignaturesOnUniqueness: Boolean = true
) : IrModuleSerializer<WebIrFileSerializer>(messageLogger, compatibilityMode, normalizeAbsolutePaths, sourceBaseDirs) {
- private val globalDeclarationTable = JsGlobalDeclarationTable(
+ private val globalDeclarationTable = WebGlobalDeclarationTable(
irBuiltIns,
- if (shouldCheckSignaturesOnUniqueness) JsUniqIdClashTracker() else IdSignatureClashTracker.DEFAULT_TRACKER
+ if (shouldCheckSignaturesOnUniqueness) WebUniqIdClashTracker() else IdSignatureClashTracker.DEFAULT_TRACKER
)
override fun createSerializerForFile(file: IrFile): WebIrFileSerializer =
diff --git a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsLazyIrModuleDeserializer.kt b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebLazyIrModuleDeserializer.kt
similarity index 99%
rename from compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsLazyIrModuleDeserializer.kt
rename to compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebLazyIrModuleDeserializer.kt
index 96dfd45..e1d6590 100644
--- a/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/JsLazyIrModuleDeserializer.kt
+++ b/compiler/ir/serialization.web/src/org/jetbrains/kotlin/ir/backend/web/lower/serialization/ir/WebLazyIrModuleDeserializer.kt
@@ -22,7 +22,7 @@
import org.jetbrains.kotlin.library.KotlinAbiVersion
-class JsLazyIrModuleDeserializer(
+class WebLazyIrModuleDeserializer(
moduleDescriptor: ModuleDescriptor,
libraryAbiVersion: KotlinAbiVersion,
private val builtIns: IrBuiltIns,
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt
index f3fc8bc..4c25445 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt
@@ -28,7 +28,7 @@
import org.jetbrains.kotlin.ir.backend.web.KotlinFileSerializedData
import org.jetbrains.kotlin.ir.backend.web.webResolveLibraries
import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebIrLinker
-import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.JsIrModuleSerializer
+import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebIrModuleSerializer
import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebManglerDesc
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
@@ -137,7 +137,7 @@
protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap<DeclarationDescriptor, IrSymbol>, skipExpect: Boolean): String {
val ktFiles = myFiles.psiFiles
- val serializedIr = JsIrModuleSerializer(
+ val serializedIr = WebIrModuleSerializer(
IrMessageLogger.None,
irModuleFragment.irBuiltins,
expectActualSymbols,
diff --git a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
index 40d0eea..61c036f 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
@@ -33,7 +33,7 @@
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.backend.js.*
import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebIrLinker
-import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.JsIrModuleSerializer
+import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebIrModuleSerializer
import org.jetbrains.kotlin.ir.backend.web.lower.serialization.ir.WebManglerDesc
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformer
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.TranslationMode
@@ -528,7 +528,7 @@
private fun doSerializeIrModule(module: IrModuleFragment): SerializedIrModule {
- val serializedIr = JsIrModuleSerializer(
+ val serializedIr = WebIrModuleSerializer(
IrMessageLogger.None,
module.irBuiltins,
mutableMapOf(),
