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

Get rid of descriptors, resolved classifiers, + some cleanup

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-23 10:59:07 +03:00
parent 8035be07e2
commit 284b21b2a6
72 changed files with 126 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/descriptors/ConeDescriptors.kt
-33
View File
@@ -1,33 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.descriptors
import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.name.ClassId
interface ConeDescriptor
interface ConeClassifierDescriptor : ConeDescriptor
interface ConeClassifierDescriptorWithTypeParameters : ConeClassifierDescriptor {
val typeParameters: List<ConeTypeParameterDescriptor>
val classId: ClassId
}
interface ConeTypeParameterDescriptor : ConeClassifierDescriptor {
val symbol: ConeTypeParameterSymbol
}
interface ConeTypeAliasDescriptor : ConeClassifierDescriptorWithTypeParameters {
val expandedType: ConeKotlinType
}
interface ConeClassDescriptor : ConeClassifierDescriptorWithTypeParameters {
val superTypes: List<ConeKotlinType>
val nestedClassifiers: List<ConeClassifierDescriptor>
}
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class ConeKotlinErrorType(val reason: String) : ConeKotlinType() {
}
}
class ConeClassErrorType(val reason: String): ConeClassLikeType() {
class ConeClassErrorType(val reason: String) : ConeClassLikeType() {
override val symbol: ConeClassLikeSymbol
get() = error("!")
override val typeArguments: List<ConeKotlinTypeProjection>