Minor fixes (#342)

Author: Lipen

jacodb-ets/src/main/kotlin/org/jacodb/ets/dsl/ToDot.kt

@@ -19,10 +19,10 @@ package org.jacodb.ets.dsl
 import java.util.IdentityHashMap
 
 private fun Node.toDotLabel() = when (this) {
+    is Nop -> "nop"
     is Assign -> "$target := $expr"
     is Return -> "return $expr"
     is If -> "if ($condition)"
-    is Nop -> "nop"
     is Label -> "label $name"
     is Goto -> "goto $targetLabel"
 }
@@ -90,6 +90,7 @@ fun Program.toDot(): String {
             lines += "  $curId -> $nextId"
         }
     }
+
     processForEdges(nodes)
 
     lines += "}"
@@ -111,7 +112,7 @@ fun BlockCfg.toDot(): String {
     // Nodes
     for (block in blocks) {
         val s = block.statements.joinToString("") { it.toDotLabel() + "\\l" }
-        lines += "  ${block.id} [label=\"Block #${block.id}\\n${s}\"]"
+        lines += "  ${block.id} [label=\"[#${block.id}]\\l${s}\"]"
     }
 
     // Edges

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

@@ -736,7 +736,7 @@ data class EtsInstanceCallExpr(
     override val type: EtsType,
 ) : EtsCallExpr, CommonInstanceCallExpr {
     override fun toString(): String {
-        return "virtual ${instance}.${callee.name}(${args.joinToString()})"
+        return "call ${instance}.${callee.name}(${args.joinToString()})"
     }
 
     override fun <R> accept(visitor: EtsExpr.Visitor<R>): R {
@@ -750,7 +750,7 @@ data class EtsStaticCallExpr(
     override val type: EtsType,
 ) : EtsCallExpr {
     override fun toString(): String {
-        return "static ${callee.enclosingClass.name}.${callee.name}(${args.joinToString()})"
+        return "static_call ${callee.enclosingClass.name}.${callee.name}(${args.joinToString()})"
     }
 
     override fun <R> accept(visitor: EtsExpr.Visitor<R>): R {
@@ -765,7 +765,7 @@ data class EtsPtrCallExpr(
     override val type: EtsType,
 ) : EtsCallExpr {
     override fun toString(): String {
-        return "ptr ${ptr}(${args.joinToString()})"
+        return "ptr_call ${ptr}(${args.joinToString()})"
     }
 
     override fun <R> accept(visitor: EtsExpr.Visitor<R>): R {

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

@@ -21,6 +21,7 @@ import org.jacodb.api.common.CommonProject
 class EtsScene(
     val projectFiles: List<EtsFile>,
     val sdkFiles: List<EtsFile> = emptyList(),
+    val projectName: String? = null,
 ) : CommonProject {
     init {
         projectFiles.forEach { it.scene = this }

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

@@ -79,6 +79,31 @@ data class EtsClassSignature(
         }
     }
 
+    private val cachedHashCode: Int = run {
+        var result = name.hashCode()
+        result = 31 * result + file.hashCode()
+        result = 31 * result + (namespace?.hashCode() ?: 0)
+        result
+    }
+
+    override fun hashCode(): Int {
+        return cachedHashCode
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as EtsClassSignature
+
+        if (cachedHashCode != other.cachedHashCode) return false
+        if (name != other.name) return false
+        if (file != other.file) return false
+        if (namespace != other.namespace) return false
+
+        return true
+    }
+
     companion object {
         val UNKNOWN = EtsClassSignature(
             name = UNKNOWN_CLASS_NAME,

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

@@ -98,7 +98,7 @@ interface EtsTerminatingStmt : EtsStmt
 
 data class EtsReturnStmt(
     override val location: EtsStmtLocation,
-    override val returnValue: EtsValue?,
+    override val returnValue: EtsValue?, // TODO: make returnValue EtsLocal
 ) : EtsTerminatingStmt, CommonReturnInst {
     override fun toString(): String {
         return if (returnValue != null) {

jacodb-ets/src/main/kotlin/org/jacodb/ets/utils/BlockCfgToDot.kt

@@ -30,6 +30,7 @@ private fun String.htmlEncode(): String = this
     .replace("&", "&")
     .replace("<", "&lt;")
     .replace(">", "&gt;")
+    .replace("\\\"", "&quot;")
     .replace("\"", "&quot;")
 
 fun EtsBlockCfg.toDot(