Add EtsScene

.github/workflows/build-and-test.yml

@@ -64,7 +64,7 @@ jobs:
           DEST_DIR="arkanalyzer"
           MAX_RETRIES=10
           RETRY_DELAY=3  # Delay between retries in seconds  
-          BRANCH="neo/2024-08-07"
+          BRANCH="neo/2024-08-16"
 
           for ((i=1; i<=MAX_RETRIES; i++)); do
               git clone --depth=1 --branch $BRANCH $REPO_URL $DEST_DIR && break

.gitignore

@@ -3,3 +3,4 @@
 build/
 idea-community
 *.db
+/generated/

jacodb-ets/.gitignore

@@ -0,0 +1,4 @@
+/src/test/resources/samples/etsir
+/src/test/resources/projects
+
+*.abc

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt

@@ -114,11 +114,14 @@
 import org.jacodb.ets.model.EtsFieldSignature
 import org.jacodb.ets.model.EtsFieldSubSignature
 import org.jacodb.ets.model.EtsFile
+import org.jacodb.ets.model.EtsFileSignature
 import org.jacodb.ets.model.EtsMethod
 import org.jacodb.ets.model.EtsMethodImpl
 import org.jacodb.ets.model.EtsMethodParameter
 import org.jacodb.ets.model.EtsMethodSignature
 import org.jacodb.ets.model.EtsMethodSubSignature
+import org.jacodb.ets.model.EtsNamespace
+import org.jacodb.ets.model.EtsNamespaceSignature
 
 class EtsMethodBuilder(
     signature: EtsMethodSignature,
@@ -187,8 +190,13 @@
 
             is AssignStmtDto -> {
                 val lhv = convertToEtsEntity(stmt.left) as EtsValue // safe cast
+                check(lhv is EtsLocal || lhv is EtsFieldRef || lhv is EtsArrayAccess) {
+                    "LHV of AssignStmt should be EtsLocal, EtsFieldRef, or EtsArrayAccess, but got $lhv"
+                }
                 val rhv = convertToEtsEntity(stmt.right).let {
-                    if (it is EtsCastExpr || it is EtsNewExpr) {
+                    if (lhv is EtsLocal) {
+                        it
+                    } else if (it is EtsCastExpr || it is EtsNewExpr) {
                         it
                     } else {
                         ensureOneAddress(it)
@@ -516,7 +524,7 @@
         val cfg = CfgDto(blocks = listOf(zeroBlock))
         val body = BodyDto(locals = emptyList(), cfg = cfg)
         val signature = MethodSignatureDto(
-            enclosingClass = classSignatureDto,
+            declaringClass = classSignatureDto,
             name = "constructor",
             parameters = emptyList(),
             returnType = ClassTypeDto(classSignatureDto),
@@ -529,16 +537,12 @@
         )
     }
 
-    val signature = EtsClassSignature(
-        name = classDto.signature.name,
-        namespace = null, // TODO
-        file = null, // TODO
-    )
+    val signature = convertToEtsClassSignature(classDto.signature)
     val superClassSignature = classDto.superClassName?.takeIf { it != "" }?.let { name ->
         EtsClassSignature(
             name = name,
-            namespace = null, // TODO
             file = null, // TODO
+            namespace = null, // TODO
         )
     }
 
@@ -658,17 +662,32 @@
     }
 }
 
+fun convertToEtsFileSignature(file: FileSignatureDto): EtsFileSignature {
+    return EtsFileSignature(
+        projectName = file.projectName,
+        fileName = file.fileName,
+    )
+}
+
+fun convertToEtsNamespaceSignature(namespace: NamespaceSignatureDto): EtsNamespaceSignature {
+    return EtsNamespaceSignature(
+        name = namespace.name,
+        file = namespace.declaringFile?.let { convertToEtsFileSignature(it) },
+        namespace = namespace.declaringNamespace?.let { convertToEtsNamespaceSignature(it) },
+    )
+}
+
 fun convertToEtsClassSignature(clazz: ClassSignatureDto): EtsClassSignature {
     return EtsClassSignature(
         name = clazz.name,
-        namespace = null, // TODO
-        file = null, // TODO
+        file = clazz.declaringFile?.let { convertToEtsFileSignature(it) },
+        namespace = clazz.declaringNamespace?.let { convertToEtsNamespaceSignature(it) },
     )
 }
 
 fun convertToEtsFieldSignature(field: FieldSignatureDto): EtsFieldSignature {
     return EtsFieldSignature(
-        enclosingClass = convertToEtsClassSignature(field.enclosingClass),
+        enclosingClass = convertToEtsClassSignature(field.declaringClass),
         sub = EtsFieldSubSignature(
             name = field.name,
             type = convertToEtsType(field.type),
@@ -678,7 +697,7 @@
 
 fun convertToEtsMethodSignature(method: MethodSignatureDto): EtsMethodSignature {
     return EtsMethodSignature(
-        enclosingClass = convertToEtsClassSignature(method.enclosingClass),
+        enclosingClass = convertToEtsClassSignature(method.declaringClass),
         sub = EtsMethodSubSignature(
             name = method.name,
             parameters = method.parameters.mapIndexed { index, param ->
@@ -715,7 +734,7 @@
 fun convertToEtsField(field: FieldDto): EtsField {
     return EtsFieldImpl(
         signature = EtsFieldSignature(
-            enclosingClass = convertToEtsClassSignature(field.signature.enclosingClass),
+            enclosingClass = convertToEtsClassSignature(field.signature.declaringClass),
             sub = EtsFieldSubSignature(
                 name = field.signature.name,
                 type = convertToEtsType(field.signature.type),
@@ -730,13 +749,24 @@
     )
 }
 
+fun convertToEtsNamespace(namespace: NamespaceDto): EtsNamespace {
+    val signature = convertToEtsNamespaceSignature(namespace.signature)
+    val classes = namespace.classes.map { convertToEtsClass(it) }
+    val namespaces = namespace.namespaces.map { convertToEtsNamespace(it) }
+    return EtsNamespace(
+        signature = signature,
+        classes = classes,
+        namespaces = namespaces,
+    )
+}
+
 fun convertToEtsFile(file: EtsFileDto): EtsFile {
-    val classesFromNamespaces = file.namespaces.flatMap { it.classes }
-    val allClasses = file.classes + classesFromNamespaces
-    val convertedClasses = allClasses.map { convertToEtsClass(it) }
+    val signature = convertToEtsFileSignature(file.signature)
+    val classes = file.classes.map { convertToEtsClass(it) }
+    val namespaces = file.namespaces.map { convertToEtsNamespace(it) }
     return EtsFile(
-        name = file.name,
-        path = file.absoluteFilePath,
-        classes = convertedClasses,
+        signature = signature,
+        classes = classes,
+        namespaces = namespaces,
     )
 }

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Graph.kt

@@ -27,6 +27,6 @@ data class CfgDto(
 data class BasicBlockDto(
     val id: Int,
     val successors: List<Int>,
-    val predecessors: List<Int>,
+    val predecessors: List<Int>? = null,
     val stmts: List<StmtDto>,
 )

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Model.kt

@@ -26,10 +26,7 @@
 
 @Serializable
 data class EtsFileDto(
-    val name: String,
-    val absoluteFilePath: String? = null,
-    val projectDir: String? = null,
-    val projectName: String? = null,
+    val signature: FileSignatureDto,
     val namespaces: List<NamespaceDto>,
     val classes: List<ClassDto>,
     val importInfos: List<ImportInfoDto>,
@@ -49,9 +46,9 @@
 
 @Serializable
 data class NamespaceDto(
-    val name: String,
-    val namespaces: List<NamespaceDto> = emptyList(),
+    val signature: NamespaceSignatureDto,
     val classes: List<ClassDto> = emptyList(),
+    val namespaces: List<NamespaceDto> = emptyList(),
 )
 
 @Serializable

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Signatures.kt

@@ -18,18 +18,53 @@
 
 import kotlinx.serialization.Serializable
 
+@Serializable
+data class FileSignatureDto(
+    val projectName: String,
+    val fileName: String,
+) {
+    override fun toString(): String {
+        return "@$projectName/$fileName"
+    }
+}
+
+@Serializable
+data class NamespaceSignatureDto(
+    val name: String,
+    val declaringFile: FileSignatureDto? = null,
+    val declaringNamespace: NamespaceSignatureDto? = null,
+) {
+    override fun toString(): String {
+        return if (declaringNamespace != null) {
+            "$declaringNamespace::$name"
+        } else if (declaringFile != null) {
+            "$name in $declaringFile"
+        } else {
+            name
+        }
+    }
+}
+
 @Serializable
 data class ClassSignatureDto(
     val name: String,
+    val declaringFile: FileSignatureDto? = null,
+    val declaringNamespace: NamespaceSignatureDto? = null,
 ) {
     override fun toString(): String {
-        return name
+        return if (declaringNamespace != null) {
+            "$declaringNamespace::$name"
+        } else if (declaringFile != null) {
+            "$name in $declaringFile"
+        } else {
+            name
+        }
     }
 }
 
 @Serializable
 data class FieldSignatureDto(
-    val enclosingClass: ClassSignatureDto,
+    val declaringClass: ClassSignatureDto,
     val name: String,
     val type: TypeDto,
 ) {
@@ -40,13 +75,14 @@
 
 @Serializable
 data class MethodSignatureDto(
-    val enclosingClass: ClassSignatureDto,
+    val declaringClass: ClassSignatureDto,
     val name: String,
     val parameters: List<MethodParameterDto>,
     val returnType: TypeDto,
 ) {
     override fun toString(): String {
-        return "$name(${parameters.joinToString { it.toString() }}): $returnType"
+        val params = parameters.joinToString()
+        return "$name($params): $returnType"
     }
 }
 

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Values.kt

@@ -429,6 +429,6 @@
     override val field: FieldSignatureDto,
 ) : FieldRefDto {
     override fun toString(): String {
-        return "${field.enclosingClass.name}.${field.name}"
+        return "${field.declaringClass.name}.${field.name}"
     }
 }

jacodb-ets/src/main/kotlin/org/jacodb/ets/graph/EtsApplicationGraph.kt

@@ -18,16 +18,16 @@ package org.jacodb.ets.graph
 
 import org.jacodb.api.common.analysis.ApplicationGraph
 import org.jacodb.ets.base.EtsStmt
-import org.jacodb.ets.model.EtsFile
 import org.jacodb.ets.model.EtsMethod
+import org.jacodb.ets.model.EtsScene
 import org.jacodb.ets.utils.callExpr
 
 interface EtsApplicationGraph : ApplicationGraph<EtsMethod, EtsStmt> {
-    val cp: EtsFile
+    val cp: EtsScene
 }
 
 class EtsApplicationGraphImpl(
-    override val cp: EtsFile,
+    override val cp: EtsScene,
 ) : EtsApplicationGraph {
 
     override fun predecessors(node: EtsStmt): Sequence<EtsStmt> {
@@ -45,9 +45,10 @@ class EtsApplicationGraphImpl(
     override fun callees(node: EtsStmt): Sequence<EtsMethod> {
         val expr = node.callExpr ?: return emptySequence()
         val callee = expr.method
-        return cp.classes.asSequence()
+        return cp.classes
+            .asSequence()
             .flatMap { it.methods }
-            .filter { it.name == callee.name }
+            .filter { it.signature == callee }
     }
 
     override fun callers(method: EtsMethod): Sequence<EtsStmt> {

jacodb-ets/src/main/kotlin/org/jacodb/ets/model/EtsFile.kt

@@ -16,19 +16,17 @@
 
 package org.jacodb.ets.model
 
-import org.jacodb.api.common.CommonProject
-
 class EtsFile(
-    val name: String,
-    val path: String? = null,
+    val signature: EtsFileSignature,
     val classes: List<EtsClass>,
-) : CommonProject {
-
-    fun getMethodBySignature(signature: EtsMethodSignature): EtsMethod? {
-        return classes.asSequence().flatMap { it.methods }.firstOrNull { it.signature == signature }
-    }
+    val namespaces: List<EtsNamespace>,
+) {
+    val name: String
+        get() = signature.fileName
+    val projectName: String
+        get() = signature.projectName
 
-    fun getClassBySignature(signature: EtsClassSignature): EtsClass? {
-        return classes.firstOrNull { it.signature == signature }
+    override fun toString(): String {
+        return name
     }
 }

jacodb-ets/src/main/kotlin/org/jacodb/ets/model/EtsNamespace.kt

@@ -0,0 +1,23 @@
+/*
+ *  Copyright 2022 UnitTestBot contributors (utbot.org)
+ * <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.jacodb.ets.model
+
+class EtsNamespace(
+    val signature: EtsNamespaceSignature,
+    val classes: List<EtsClass>,
+    val namespaces: List<EtsNamespace>,
+)

jacodb-ets/src/main/kotlin/org/jacodb/ets/model/EtsScene.kt

@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2022 UnitTestBot contributors (utbot.org)
+ * <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.jacodb.ets.model
+
+import org.jacodb.api.common.CommonProject
+
+class EtsScene (
+    val files: List<EtsFile>,
+): CommonProject {
+    val classes: List<EtsClass>
+        get() = files.flatMap { it.classes }
+}