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

[FIR] Get rid of FirDeserializationComponents

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-14 16:19:41 +03:00
parent d4cc98fab1
commit 8deab3559e
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+3 -10
View File
@@ -42,8 +42,7 @@ class FirDeserializationContext(
val annotationDeserializer: AbstractAnnotationDeserializer, val annotationDeserializer: AbstractAnnotationDeserializer,
val constDeserializer: FirConstDeserializer, val constDeserializer: FirConstDeserializer,
val containerSource: DeserializedContainerSource?, val containerSource: DeserializedContainerSource?,
outerTypeParameters: List<FirTypeParameterSymbol>, outerTypeParameters: List<FirTypeParameterSymbol>
val components: FirDeserializationComponents
) { ) {
val allTypeParameters: List<FirTypeParameterSymbol> = val allTypeParameters: List<FirTypeParameterSymbol> =
typeDeserializer.ownTypeParameters + outerTypeParameters typeDeserializer.ownTypeParameters + outerTypeParameters
@@ -62,7 +61,7 @@ class FirDeserializationContext(
session, nameResolver, typeTable, typeParameterProtos, typeDeserializer session, nameResolver, typeTable, typeParameterProtos, typeDeserializer
), ),
annotationDeserializer, constDeserializer, containerSource, annotationDeserializer, constDeserializer, containerSource,
if (capturesTypeParameters) allTypeParameters else emptyList(), components if (capturesTypeParameters) allTypeParameters else emptyList()
) )
val memberDeserializer: FirMemberDeserializer = FirMemberDeserializer(this) val memberDeserializer: FirMemberDeserializer = FirMemberDeserializer(this)
@@ -138,18 +137,12 @@ class FirDeserializationContext(
annotationDeserializer, annotationDeserializer,
constDeserializer, constDeserializer,
containerSource, containerSource,
emptyList(), emptyList()
FirDeserializationComponents()
) )
} }
} }
} }
// TODO: Move something here
class FirDeserializationComponents {
}
class FirMemberDeserializer(private val c: FirDeserializationContext) { class FirMemberDeserializer(private val c: FirDeserializationContext) {
private val contractDeserializer = FirContractDeserializer(c) private val contractDeserializer = FirContractDeserializer(c)