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

Drop ExecutionResult class implementations and make it regular class

Browse Source 
There was 2 implementations that I managed to combine
This commit is contained in:
Ivan Kylchik
2020-06-17 15:23:40 +03:00
parent c386cbeb54
commit 9377d274a8
1 changed files with 32 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/Label.kt
+32 -56
View File
@@ -26,10 +26,33 @@ enum class ReturnLabel {
NEXT, RETURN, BREAK_LOOP, BREAK_WHEN, CONTINUE, EXCEPTION NEXT, RETURN, BREAK_LOOP, BREAK_WHEN, CONTINUE, EXCEPTION
} }
interface ExecutionResult { open class ExecutionResult(val returnLabel: ReturnLabel, private val owner: IrElement? = null) {
val returnLabel: ReturnLabel suspend fun getNextLabel(irElement: IrElement, interpret: suspend IrElement.() -> ExecutionResult): ExecutionResult {
return when (returnLabel) {
ReturnLabel.RETURN -> when (irElement) {
is IrCall, is IrReturnableBlock, is IrFunctionImpl, is IrLazyFunction -> if (owner == irElement) Next else this
else -> this
}
ReturnLabel.BREAK_WHEN -> when (irElement) {
is IrWhen -> Next
else -> this
}
ReturnLabel.BREAK_LOOP -> when (irElement) {
is IrWhileLoop -> if (owner == irElement) Next else this
else -> this
}
ReturnLabel.CONTINUE -> when (irElement) {
is IrWhileLoop -> if (owner == irElement) irElement.interpret() else this
else -> this
}
ReturnLabel.EXCEPTION -> Exception
ReturnLabel.NEXT -> Next
}
}
suspend fun getNextLabel(irElement: IrElement, interpret: suspend IrElement.() -> ExecutionResult): ExecutionResult fun addOwnerInfo(owner: IrElement): ExecutionResult {
return ExecutionResult(returnLabel, owner)
}
} }
inline fun ExecutionResult.check(toCheckLabel: ReturnLabel = ReturnLabel.NEXT, returnBlock: (ExecutionResult) -> Unit): ExecutionResult { inline fun ExecutionResult.check(toCheckLabel: ReturnLabel = ReturnLabel.NEXT, returnBlock: (ExecutionResult) -> Unit): ExecutionResult {
@@ -55,56 +78,9 @@ internal fun ExecutionResult.implicitCastIfNeeded(expectedType: IrType, actualTy
return this return this
} }
open class ExecutionResultWithoutInfoAboutOwner(override val returnLabel: ReturnLabel) : ExecutionResult { object Next : ExecutionResult(ReturnLabel.NEXT)
override suspend fun getNextLabel(irElement: IrElement, interpret: suspend IrElement.() -> ExecutionResult): ExecutionResult { object Return : ExecutionResult(ReturnLabel.RETURN)
return when (returnLabel) { object BreakLoop : ExecutionResult(ReturnLabel.BREAK_LOOP)
ReturnLabel.RETURN -> this object BreakWhen : ExecutionResult(ReturnLabel.BREAK_WHEN)
ReturnLabel.BREAK_WHEN -> when (irElement) { object Continue : ExecutionResult(ReturnLabel.CONTINUE)
is IrWhen -> Next object Exception : ExecutionResult(ReturnLabel.EXCEPTION)
else -> this
}
ReturnLabel.BREAK_LOOP -> this
ReturnLabel.CONTINUE -> this
ReturnLabel.EXCEPTION -> this
ReturnLabel.NEXT -> this
}
}
fun addOwnerInfo(owner: IrElement): ExecutionResultWithInfoAboutOwner {
return ExecutionResultWithInfoAboutOwner(returnLabel, owner)
}
}
class ExecutionResultWithInfoAboutOwner(
override val returnLabel: ReturnLabel, private val owner: IrElement
) : ExecutionResultWithoutInfoAboutOwner(returnLabel) {
override suspend fun getNextLabel(irElement: IrElement, interpret: suspend IrElement.() -> ExecutionResult): ExecutionResult {
return when (returnLabel) {
ReturnLabel.RETURN -> when (irElement) {
is IrCall, is IrReturnableBlock, is IrFunctionImpl, is IrLazyFunction -> if (owner == irElement) Next else this
else -> this
}
ReturnLabel.BREAK_WHEN -> when (irElement) {
is IrWhen -> Next
else -> this
}
ReturnLabel.BREAK_LOOP -> when (irElement) {
is IrWhileLoop -> if (owner == irElement) Next else this
else -> this
}
ReturnLabel.CONTINUE -> when (irElement) {
is IrWhileLoop -> if (owner == irElement) irElement.interpret() else this
else -> this
}
ReturnLabel.EXCEPTION -> Exception
ReturnLabel.NEXT -> Next
}
}
}
object Next : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.NEXT)
object Return : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.RETURN)
object BreakLoop : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.BREAK_LOOP)
object BreakWhen : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.BREAK_WHEN)
object Continue : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.CONTINUE)
object Exception : ExecutionResultWithoutInfoAboutOwner(ReturnLabel.EXCEPTION)