From 825cdd384121ab6570a847d853e3a6af7df41f7d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 30 Apr 2020 12:58:47 +0300 Subject: [PATCH] FIR: Move PersistentImplicitReceiverStack to resolve module --- .../kotlin/fir/analysis/checkers/context/CheckerContext.kt | 3 ++- .../kotlin/fir/resolve}/PersistentImplicitReceiverStack.kt | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) rename compiler/fir/{checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context => resolve/src/org/jetbrains/kotlin/fir/resolve}/PersistentImplicitReceiverStack.kt (93%) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt index 50addb1041a..2d7301763c7 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt @@ -10,6 +10,7 @@ import kotlinx.collections.immutable.persistentListOf import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.resolve.ImplicitReceiverStack +import org.jetbrains.kotlin.fir.resolve.PersistentImplicitReceiverStack import org.jetbrains.kotlin.fir.resolve.SessionHolder import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue import org.jetbrains.kotlin.name.Name @@ -61,4 +62,4 @@ class PersistentCheckerContext( sessionHolder ) } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/PersistentImplicitReceiverStack.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt similarity index 93% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/PersistentImplicitReceiverStack.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt index 4619228c946..c6a94e17706 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/PersistentImplicitReceiverStack.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt @@ -3,14 +3,12 @@ * 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.analysis.checkers.context +package org.jetbrains.kotlin.fir.resolve import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.PersistentMap import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentMapOf -import org.jetbrains.kotlin.fir.resolve.ImplicitReceiverStack -import org.jetbrains.kotlin.fir.resolve.PersistentSetMultimap import org.jetbrains.kotlin.fir.resolve.calls.ImplicitDispatchReceiverValue import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -66,4 +64,4 @@ class PersistentImplicitReceiverStack private constructor( override operator fun iterator(): Iterator> { return stack.iterator() } -} \ No newline at end of file +}