Refine api

Author: Lipen

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

@@ -18,7 +18,6 @@ import org.usvm.UBv32Sort
 import org.usvm.UConcreteHeapRef
 import org.usvm.UContext
 import org.usvm.UExpr
-import org.usvm.UHeapRef
 import org.usvm.USort
 import org.usvm.collection.field.UFieldLValue
 import org.usvm.isTrue
@@ -103,7 +102,7 @@ class TsContext(
         return ref
     }
 
-    fun UHeapRef.extractSingleValueFromFakeObjectOrNull(scope: TsStepScope): UExpr<out USort>? {
+    fun UExpr<out USort>.extractSingleValueFromFakeObjectOrNull(scope: TsStepScope): UExpr<out USort>? {
         if (!isFakeObject()) return null
 
         val type = scope.calcOnState {

usvm-ts/src/main/kotlin/org/usvm/machine/operator/TsBinaryOperator.kt

@@ -56,8 +56,8 @@ sealed interface TsBinaryOperator {
         rhs: UExpr<out USort>,
         scope: TsStepScope,
     ): UExpr<out USort> {
-        val lhsValue = if (lhs.isFakeObject()) lhs.extractSingleValueFromFakeObjectOrNull(scope) ?: lhs else lhs
-        val rhsValue = if (rhs.isFakeObject()) rhs.extractSingleValueFromFakeObjectOrNull(scope) ?: rhs else rhs
+        val lhsValue = lhs.extractSingleValueFromFakeObjectOrNull(scope) ?: lhs
+        val rhsValue = rhs.extractSingleValueFromFakeObjectOrNull(scope) ?: rhs
 
         if (lhsValue.isFakeObject() || rhsValue.isFakeObject()) {
             return resolveFakeObject(lhsValue, rhsValue, scope)