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

[Commonizer] CirConversions: Ensure consistent function names

Browse Source 
^KT-48288
This commit is contained in:
sebastian.sellmair
2021-09-16 14:44:14 +02:00
committed by Space
parent 892512cb67
commit 459e01a729
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirConversions.kt
+3 -3
View File
@@ -20,7 +20,7 @@ internal fun CirProvided.TypeAliasType.toCirTypeAliasTypeOrNull(classifiers: Cir
return CirTypeAliasType.createInterned( return CirTypeAliasType.createInterned(
typeAliasId = classifierId, typeAliasId = classifierId,
isMarkedNullable = isMarkedNullable, isMarkedNullable = isMarkedNullable,
arguments = arguments.map { it.toCirTypeProjection(classifiers) ?: return null }, arguments = arguments.map { it.toCirTypeProjectionOrNull(classifiers) ?: return null },
underlyingType = typeAlias.underlyingType.toCirClassOrTypeAliasTypeOrNull(classifiers) ?: return null underlyingType = typeAlias.underlyingType.toCirClassOrTypeAliasTypeOrNull(classifiers) ?: return null
) )
} }
@@ -30,11 +30,11 @@ internal fun CirProvided.ClassType.toCirClassTypeOrNull(classifiers: CirProvided
classId = classifierId, classId = classifierId,
outerType = outerType?.let { it.toCirClassTypeOrNull(classifiers) ?: return null }, outerType = outerType?.let { it.toCirClassTypeOrNull(classifiers) ?: return null },
isMarkedNullable = isMarkedNullable, isMarkedNullable = isMarkedNullable,
arguments = arguments.map { it.toCirTypeProjection(classifiers) ?: return null }, arguments = arguments.map { it.toCirTypeProjectionOrNull(classifiers) ?: return null },
) )
} }
internal fun CirProvided.TypeProjection.toCirTypeProjection(classifiers: CirProvidedClassifiers): CirTypeProjection? { internal fun CirProvided.TypeProjection.toCirTypeProjectionOrNull(classifiers: CirProvidedClassifiers): CirTypeProjection? {
return when (this) { return when (this) {
is CirProvided.StarTypeProjection -> CirStarTypeProjection is CirProvided.StarTypeProjection -> CirStarTypeProjection
is CirProvided.RegularTypeProjection -> this.toCirRegularTypeProjectionOrNull(classifiers) is CirProvided.RegularTypeProjection -> this.toCirRegularTypeProjectionOrNull(classifiers)