Revert Common FieldRef and ArrayAccess

UnitTestBot · Jun 14, 2024 · eb988d9 · eb988d9
1 parent 42b6dd8
commit eb988d9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonValue.kt b/jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonValue.kt
@@ -21,3 +21,13 @@ interface CommonValue : CommonExpr
 interface CommonThis : CommonValue
 
 interface CommonArgument : CommonValue
+
+interface CommonFieldRef : CommonValue {
+    val instance: CommonValue? // null for static fields
+    // val classField: CommonField
+}
+
+interface CommonArrayAccess : CommonValue {
+    val array: CommonValue
+    val index: CommonValue
+}
diff --git a/jacodb-api-jvm/src/main/kotlin/org/jacodb/api/jvm/cfg/JcInst.kt b/jacodb-api-jvm/src/main/kotlin/org/jacodb/api/jvm/cfg/JcInst.kt
@@ -17,10 +17,12 @@
 package org.jacodb.api.jvm.cfg
 
 import org.jacodb.api.common.cfg.CommonArgument
+import org.jacodb.api.common.cfg.CommonArrayAccess
 import org.jacodb.api.common.cfg.CommonAssignInst
 import org.jacodb.api.common.cfg.CommonCallExpr
 import org.jacodb.api.common.cfg.CommonCallInst
 import org.jacodb.api.common.cfg.CommonExpr
+import org.jacodb.api.common.cfg.CommonFieldRef
 import org.jacodb.api.common.cfg.CommonGotoInst
 import org.jacodb.api.common.cfg.CommonIfInst
 import org.jacodb.api.common.cfg.CommonInst
@@ -848,9 +850,9 @@ data class JcArgument(
 interface JcRef : JcValue
 
 data class JcFieldRef(
-    val instance: JcValue?,
+    override val instance: JcValue?,
     val field: JcTypedField,
-) : JcRef {
+) : JcRef, CommonFieldRef {
 
     override val type: JcType
         get() = this.field.type
@@ -866,10 +868,10 @@ data class JcFieldRef(
 }
 
 data class JcArrayAccess(
-    val array: JcValue,
-    val index: JcValue,
+    override val array: JcValue,
+    override val index: JcValue,
     override val type: JcType,
-) : JcRef {
+) : JcRef, CommonArrayAccess {
 
     override val operands: List<JcValue>
         get() = listOf(array, index)

diff --git a/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/api/PandaValue.kt b/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/api/PandaValue.kt
@@ -17,6 +17,8 @@
 package org.jacodb.panda.dynamic.api
 
 import org.jacodb.api.common.cfg.CommonArgument
+import org.jacodb.api.common.cfg.CommonArrayAccess
+import org.jacodb.api.common.cfg.CommonFieldRef
 import org.jacodb.api.common.cfg.CommonThis
 import org.jacodb.api.common.cfg.CommonValue
 
@@ -190,10 +192,10 @@ data class PandaMethodConstant(
 interface PandaComplexValue : PandaValue
 
 data class PandaFieldRef(
-    val instance: PandaValue?, // null for static fields
+    override val instance: PandaValue?, // null for static fields
     val classField: PandaField,
     override val type: PandaType,
-) : PandaComplexValue {
+) : PandaComplexValue, CommonFieldRef {
     override val operands: List<PandaValue>
         get() = listOfNotNull(instance)
 
@@ -207,10 +209,10 @@ data class PandaFieldRef(
 }
 
 data class PandaArrayAccess(
-    val array: PandaValue,
-    val index: PandaValue,
+    override val array: PandaValue,
+    override val index: PandaValue,
     override val type: PandaType,
-) : PandaComplexValue {
+) : PandaComplexValue, CommonArrayAccess {
     override val operands: List<PandaValue>
         get() = listOf(array, index)
 

diff --git a/jacodb-panda-static/src/main/kotlin/org/jacodb/panda/staticvm/cfg/PandaExpr.kt b/jacodb-panda-static/src/main/kotlin/org/jacodb/panda/staticvm/cfg/PandaExpr.kt
@@ -17,8 +17,10 @@
 package org.jacodb.panda.staticvm.cfg
 
 import org.jacodb.api.common.cfg.CommonArgument
+import org.jacodb.api.common.cfg.CommonArrayAccess
 import org.jacodb.api.common.cfg.CommonCallExpr
 import org.jacodb.api.common.cfg.CommonExpr
+import org.jacodb.api.common.cfg.CommonFieldRef
 import org.jacodb.api.common.cfg.CommonInstanceCallExpr
 import org.jacodb.api.common.cfg.CommonThis
 import org.jacodb.api.common.cfg.CommonValue
@@ -72,9 +74,9 @@ class PandaThis(
 }
 
 class PandaFieldRef(
-    val instance: PandaValue?,
+    override val instance: PandaValue?,
     val field: PandaField,
-) : PandaValue {
+) : PandaValue, CommonFieldRef {
 
     override val type: PandaType
         get() = this.field.type
@@ -86,10 +88,10 @@ class PandaFieldRef(
 }
 
 class PandaArrayAccess(
-    val array: PandaValue,
-    val index: PandaValue,
+    override val array: PandaValue,
+    override val index: PandaValue,
     override val type: PandaType,
-) : PandaValue {
+) : PandaValue, CommonArrayAccess {
     override val operands: List<PandaValue>
         get() = listOf(array, index)