From be9e25a2e569414ae0b08217d8f3a850b3b921f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 1 Jun 2020 16:54:02 +0700 Subject: [PATCH] [Commonizer] Move fqNameWithTypeParameters extension val into CirType --- .../kotlin/descriptors/commonizer/cir/CirType.kt | 16 +++++++--------- .../commonizer/core/CommonizationVisitor.kt | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt index 0ed028d6a8a..116c20ee4fc 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt @@ -12,7 +12,9 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.types.AbbreviatedType import org.jetbrains.kotlin.types.Variance -sealed class CirType +sealed class CirType { + abstract val fqNameWithTypeParameters: String +} /** * All attributes except for [expandedTypeConstructorId] are read from the abbreviation type: [AbbreviatedType.abbreviation]. @@ -33,7 +35,6 @@ abstract class CirSimpleType : CirType() { abstract val isMarkedNullable: Boolean abstract val isDefinitelyNotNullType: Boolean abstract val expandedTypeConstructorId: CirTypeConstructorId - abstract val fqNameWithTypeParameters: String inline val isClassOrTypeAlias: Boolean get() = (kind == CLASS || kind == TYPE_ALIAS) } @@ -53,10 +54,7 @@ data class CirTypeConstructorId(val fqName: FqName, val numberOfTypeParameters: data class CirTypeProjection(val projectionKind: Variance, val isStarProjection: Boolean, val type: CirType) -data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType() - -val CirType.fqNameWithTypeParameters: String - get() = when (this) { - is CirSimpleType -> fqNameWithTypeParameters - is CirFlexibleType -> lowerBound.fqNameWithTypeParameters - } +data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType() { + override val fqNameWithTypeParameters: String + get() = lowerBound.fqNameWithTypeParameters +} diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt index e4180e56f22..5e008dbd6ec 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.core import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType -import org.jetbrains.kotlin.descriptors.commonizer.cir.fqNameWithTypeParameters import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.* import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroupMap