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

Minor, rename IrBuiltIns.IrTypeMapper -> BuiltInIrTypePair

Browse Source 
To avoid name clash with the new IrTypeMapper in JVM backend
This commit is contained in:
Alexander Udalov
2019-05-14 18:37:12 +02:00
parent f9a1e582b2
commit 15e0fd93bd
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt
+15 -15
View File
@@ -130,27 +130,27 @@ class IrBuiltIns(
val throwableType = builtIns.throwable.defaultType.toIrType()
val throwableClass = builtIns.throwable.toIrSymbol()
private class IrTypeMapper(val type: IrType) {
private class BuiltInIrTypePair(val type: IrType) {
val nType: IrType = with(type as IrSimpleType) {
IrSimpleTypeImpl(classifier, true, arguments, annotations)
}
}
private val primitiveTypesMapping = mapOf(
builtIns.any to IrTypeMapper(anyType),
builtIns.boolean to IrTypeMapper(booleanType),
builtIns.char to IrTypeMapper(charType),
builtIns.number to IrTypeMapper(numberType),
builtIns.byte to IrTypeMapper(byteType),
builtIns.short to IrTypeMapper(shortType),
builtIns.int to IrTypeMapper(intType),
builtIns.long to IrTypeMapper(longType),
builtIns.float to IrTypeMapper(floatType),
builtIns.double to IrTypeMapper(doubleType),
builtIns.nothing to IrTypeMapper(nothingType),
builtIns.unit to IrTypeMapper(unitType),
builtIns.string to IrTypeMapper(stringType),
builtIns.throwable to IrTypeMapper(throwableType)
builtIns.any to BuiltInIrTypePair(anyType),
builtIns.boolean to BuiltInIrTypePair(booleanType),
builtIns.char to BuiltInIrTypePair(charType),
builtIns.number to BuiltInIrTypePair(numberType),
builtIns.byte to BuiltInIrTypePair(byteType),
builtIns.short to BuiltInIrTypePair(shortType),
builtIns.int to BuiltInIrTypePair(intType),
builtIns.long to BuiltInIrTypePair(longType),
builtIns.float to BuiltInIrTypePair(floatType),
builtIns.double to BuiltInIrTypePair(doubleType),
builtIns.nothing to BuiltInIrTypePair(nothingType),
builtIns.unit to BuiltInIrTypePair(unitType),
builtIns.string to BuiltInIrTypePair(stringType),
builtIns.throwable to BuiltInIrTypePair(throwableType)
)
fun getPrimitiveTypeOrNullByDescriptor(descriptor: ClassifierDescriptor, isNullable: Boolean) =