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

FIR: make KFunctionX derived from KFunction

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-04-16 16:21:01 +03:00
parent 4bb6410ce3
commit 96d8b0bea3
25 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
+1
View File
@@ -48,6 +48,7 @@ object StandardClassIds {
val KMutableProperty1 = "KMutableProperty1".reflectId()
val KProperty2 = "KProperty2".reflectId()
val KMutableProperty2 = "KMutableProperty2".reflectId()
val KFunction = "KFunction".reflectId()
val Comparable = "Comparable".baseId()
val Number = "Number".baseId()
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt
+12 -4
View File
@@ -227,20 +227,28 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
}
superTypeRefs += when (kind) {
FunctionClassDescriptor.Kind.Function ->
FunctionClassDescriptor.Kind.Function -> listOf(
buildResolvedTypeRef {
type = ConeClassLikeLookupTagImpl(StandardClassIds.Function)
.constructClassType(arrayOf(typeArguments.last().type), isNullable = false)
}
)
FunctionClassDescriptor.Kind.SuspendFunction ->
FunctionClassDescriptor.Kind.SuspendFunction -> listOf(
session.builtinTypes.anyType
)
FunctionClassDescriptor.Kind.KFunction ->
FunctionClassDescriptor.Kind.KFunction -> listOf(
buildResolvedTypeRef {
type = ConeClassLikeLookupTagImpl(StandardClassIds.KFunction)
.constructClassType(arrayOf(typeArguments.last().type), isNullable = false)
},
createSuperType(FunctionClassDescriptor.Kind.Function)
)
FunctionClassDescriptor.Kind.KSuspendFunction ->
FunctionClassDescriptor.Kind.KSuspendFunction -> listOf(
createSuperType(FunctionClassDescriptor.Kind.SuspendFunction)
)
}
addDeclaration(
buildSimpleFunction {