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

[Commonizer] Drop CirPackageFactory

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-05 00:33:22 +03:00
parent bfe0623837
commit b30ebe2842
5 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt
+9
View File
@@ -7,4 +7,13 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir
interface CirPackage : CirDeclaration {
val packageName: CirPackageName
companion object {
@Suppress("NOTHING_TO_INLINE")
inline fun create(packageName: CirPackageName): CirPackage = CirPackageImpl(packageName)
}
}
data class CirPackageImpl(
override val packageName: CirPackageName
) : CirPackage
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPackageFactory.kt
-14
View File
@@ -1,14 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName
import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPackageImpl
object CirPackageFactory {
fun create(packageName: CirPackageName): CirPackage = CirPackageImpl(packageName)
}
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPackageImpl.kt
-13
View File
@@ -1,13 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName
data class CirPackageImpl(
override val packageName: CirPackageName
) : CirPackage
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt
+1 -2
View File
@@ -7,12 +7,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName
import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirPackageFactory
class PackageCommonizer : AbstractStandardCommonizer<CirPackage, CirPackage>() {
private lateinit var packageName: CirPackageName
override fun commonizationResult() = CirPackageFactory.create(packageName = packageName)
override fun commonizationResult() = CirPackage.create(packageName = packageName)
override fun initialize(first: CirPackage) {
packageName = first.packageName
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+1 -1
View File
@@ -166,7 +166,7 @@ class CirTreeMerger(
val packageNode: CirPackageNode = moduleNode.packages.getOrPut(packageName) {
buildPackageNode(storageManager, leafTargetsSize)
}
packageNode.targetDeclarations[context.targetIndex] = CirPackageFactory.create(packageName)
packageNode.targetDeclarations[context.targetIndex] = CirPackage.create(packageName)
val classesToProcess = ClassesToProcess()
fragments.forEach { fragment ->