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

[Commonizer] Rename CirTypeSubstitutor implementations

Browse Source 
^KT-48287
^KT-48286
This commit is contained in:
sebastian.sellmair
2021-08-17 17:28:16 +02:00
committed by Space
parent 8aceff3641
commit e2816ffabb
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
+4 -4
View File
@@ -14,8 +14,8 @@ import org.jetbrains.kotlin.commonizer.mergedtree.CirKnownClassifiers
import org.jetbrains.kotlin.commonizer.mergedtree.CirNode.Companion.indexOfCommon import org.jetbrains.kotlin.commonizer.mergedtree.CirNode.Companion.indexOfCommon
import org.jetbrains.kotlin.commonizer.mergedtree.CirRootNode import org.jetbrains.kotlin.commonizer.mergedtree.CirRootNode
import org.jetbrains.kotlin.commonizer.metadata.CirTreeSerializer import org.jetbrains.kotlin.commonizer.metadata.CirTreeSerializer
import org.jetbrains.kotlin.commonizer.transformer.CirAliasTypeSubstitutor import org.jetbrains.kotlin.commonizer.transformer.AliasedTypeSubstitutor
import org.jetbrains.kotlin.commonizer.transformer.CirUnderscoredTypeAliasSubstitutor import org.jetbrains.kotlin.commonizer.transformer.UnderscoredTypeAliasTypeSubstitutor
import org.jetbrains.kotlin.commonizer.transformer.InlineTypeAliasCirNodeTransformer import org.jetbrains.kotlin.commonizer.transformer.InlineTypeAliasCirNodeTransformer
import org.jetbrains.kotlin.commonizer.transformer.TypeSubstitutionCirNodeTransformer import org.jetbrains.kotlin.commonizer.transformer.TypeSubstitutionCirNodeTransformer
import org.jetbrains.kotlin.commonizer.tree.CirTreeRoot import org.jetbrains.kotlin.commonizer.tree.CirTreeRoot
@@ -67,12 +67,12 @@ internal fun commonizeTarget(
TypeSubstitutionCirNodeTransformer( TypeSubstitutionCirNodeTransformer(
parameters.storageManager, classifiers, parameters.storageManager, classifiers,
CirAliasTypeSubstitutor(classifiers.commonDependencies, classifiers.classifierIndices) AliasedTypeSubstitutor(classifiers.commonDependencies, classifiers.classifierIndices)
).invoke(mergedTree) ).invoke(mergedTree)
TypeSubstitutionCirNodeTransformer( TypeSubstitutionCirNodeTransformer(
parameters.storageManager, classifiers, parameters.storageManager, classifiers,
CirUnderscoredTypeAliasSubstitutor(classifiers.classifierIndices) UnderscoredTypeAliasTypeSubstitutor(classifiers.classifierIndices)
).invoke(mergedTree) ).invoke(mergedTree)
mergedTree.accept(CommonizationVisitor(classifiers, mergedTree), Unit) mergedTree.accept(CommonizationVisitor(classifiers, mergedTree), Unit)
native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirAliasTypeSubstitutor.kt → native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/AliasedTypeSubstitutor.kt
+1 -1
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.commonizer.mergedtree.CirProvidedClassifiers
import org.jetbrains.kotlin.commonizer.mergedtree.CirTypeSubstitutor import org.jetbrains.kotlin.commonizer.mergedtree.CirTypeSubstitutor
import org.jetbrains.kotlin.commonizer.tree.CirTreeTypeAlias import org.jetbrains.kotlin.commonizer.tree.CirTreeTypeAlias
internal class CirAliasTypeSubstitutor( internal class AliasedTypeSubstitutor(
private val commonDependencies: CirProvidedClassifiers, private val commonDependencies: CirProvidedClassifiers,
private val classifierIndices: TargetDependent<CirClassifierIndex> private val classifierIndices: TargetDependent<CirClassifierIndex>
) : CirTypeSubstitutor { ) : CirTypeSubstitutor {
native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutor.kt → native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/UnderscoredTypeAliasTypeSubstitutor.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.commonizer.mergedtree.findTypeAlias
* `platform/posix/mode_t -> platform/posix/__mode_t -> kotlin/UInt` * `platform/posix/mode_t -> platform/posix/__mode_t -> kotlin/UInt`
* exists which is preferable * exists which is preferable
*/ */
internal class CirUnderscoredTypeAliasSubstitutor( internal class UnderscoredTypeAliasTypeSubstitutor(
private val classifierIndices: TargetDependent<CirClassifierIndex> private val classifierIndices: TargetDependent<CirClassifierIndex>
) : CirTypeSubstitutor { ) : CirTypeSubstitutor {
native/commonizer/tests/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutorTest.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.commonizer.transformer
import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
import org.jetbrains.kotlin.commonizer.assertCommonized import org.jetbrains.kotlin.commonizer.assertCommonized
class CirUnderscoredTypeAliasSubstitutorTest : AbstractInlineSourcesCommonizationTest() { class UnderscoredTypeAliasTypeSubstitutorTest : AbstractInlineSourcesCommonizationTest() {
fun `test inlined underscored typealias - single platform`() { fun `test inlined underscored typealias - single platform`() {
val result = commonize { val result = commonize {