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

[Commonizer] Move fqNameWithTypeParameters extension val into CirType

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-06-01 16:54:02 +07:00
parent 719d5da641
commit be9e25a2e5
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
+7 -9
View File
@@ -12,7 +12,9 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.types.AbbreviatedType import org.jetbrains.kotlin.types.AbbreviatedType
import org.jetbrains.kotlin.types.Variance 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]. * 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 isMarkedNullable: Boolean
abstract val isDefinitelyNotNullType: Boolean abstract val isDefinitelyNotNullType: Boolean
abstract val expandedTypeConstructorId: CirTypeConstructorId abstract val expandedTypeConstructorId: CirTypeConstructorId
abstract val fqNameWithTypeParameters: String
inline val isClassOrTypeAlias: Boolean get() = (kind == CLASS || kind == TYPE_ALIAS) 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 CirTypeProjection(val projectionKind: Variance, val isStarProjection: Boolean, val type: CirType)
data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType() data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType() {
override val fqNameWithTypeParameters: String
val CirType.fqNameWithTypeParameters: String get() = lowerBound.fqNameWithTypeParameters
get() = when (this) { }
is CirSimpleType -> fqNameWithTypeParameters
is CirFlexibleType -> lowerBound.fqNameWithTypeParameters
}
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
-1
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.descriptors.commonizer.core package org.jetbrains.kotlin.descriptors.commonizer.core
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType 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.mergedtree.*
import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroupMap import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroupMap