Rebase fixes

Author: CaelmBleidd

usvm-ts/src/main/kotlin/org/usvm/api/checkers/UnreachableCodeDetector.kt

@@ -1,13 +1,15 @@
 package org.usvm.api.checkers
 
-import org.jacodb.ets.base.EtsIfStmt
-import org.jacodb.ets.base.EtsStmt
+import org.jacodb.ets.model.EtsIfStmt
 import org.jacodb.ets.model.EtsMethod
+import org.jacodb.ets.model.EtsStmt
 import org.usvm.machine.TsInterpreterObserver
 import org.usvm.machine.expr.TsSimpleValueResolver
 import org.usvm.machine.interpreter.TsStepScope
 import org.usvm.machine.state.TsState
 import org.usvm.statistics.UMachineObserver
+import kotlin.collections.filter
+import kotlin.collections.isNotEmpty
 
 data class UncoveredIfSuccessors(val ifStmt: EtsIfStmt, val successors: Set<EtsStmt>)
 

usvm-ts/src/main/kotlin/org/usvm/machine/TsInterpreterObserver.kt

@@ -1,12 +1,10 @@
 package org.usvm.machine
 
-import org.jacodb.ets.base.EtsAssignStmt
-import org.jacodb.ets.base.EtsCallExpr
-import org.jacodb.ets.base.EtsGotoStmt
-import org.jacodb.ets.base.EtsIfStmt
-import org.jacodb.ets.base.EtsReturnStmt
-import org.jacodb.ets.base.EtsSwitchStmt
-import org.jacodb.ets.base.EtsThrowStmt
+import org.jacodb.ets.model.EtsAssignStmt
+import org.jacodb.ets.model.EtsCallExpr
+import org.jacodb.ets.model.EtsIfStmt
+import org.jacodb.ets.model.EtsReturnStmt
+import org.jacodb.ets.model.EtsThrowStmt
 import org.usvm.UBoolExpr
 import org.usvm.machine.expr.TsSimpleValueResolver
 import org.usvm.machine.interpreter.TsStepScope
@@ -66,20 +64,4 @@ interface TsInterpreterObserver : UInterpreterObserver {
     ) {
         // default empty implementation
     }
-
-    fun onGotoStatement(
-        simpleValueResolver: TsSimpleValueResolver,
-        stmt: EtsGotoStmt,
-        scope: TsStepScope,
-    ) {
-        // default empty implementation
-    }
-
-    fun onSwitchStatement(
-        simpleValueResolver: TsSimpleValueResolver,
-        stmt: EtsSwitchStmt,
-        scope: TsStepScope,
-    ) {
-        // default empty implementation
-    }
 }

usvm-ts/src/test/kotlin/org/usvm/samples/checkers/UnreachableCodeDetector.kt

@@ -1,7 +1,7 @@
 package org.usvm.samples.checkers
 
-import org.jacodb.ets.base.EtsAssignStmt
-import org.jacodb.ets.base.EtsIfStmt
+import org.jacodb.ets.model.EtsAssignStmt
+import org.jacodb.ets.model.EtsIfStmt
 import org.jacodb.ets.model.EtsScene
 import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test

usvm-ts/src/test/resources/samples/checkers/UnreachableCode.ts

@@ -23,4 +23,4 @@ class UnreachableCode {
 
         return
     }
-}
+}