Update PythonTree model

tamarinvs19 · tamarinvs19 · commit 1611f3586e75 · 2022-09-19T15:55:52.000+03:00
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/PythonTree.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/PythonTree.kt
@@ -8,7 +8,6 @@ object PythonTree {
         var comparable: Boolean = true
     ) {
         open val children: List<PythonTreeNode> = emptyList()
-        fun maxDepth(): Int = 1 + children.map { it.maxDepth() }.max()
 
         open fun typeEquals(other: Any?): Boolean {
             return if (other is PythonTreeNode)
@@ -94,7 +93,7 @@ object PythonTree {
     class ReduceNode(
         val id: PythonId,
         type: PythonClassId,
-        val constructor: String,
+        val constructor: PythonClassId,
         val args: List<PythonTreeNode>,
         var state: Map<String, PythonTreeNode>,
         var listitems: List<PythonTreeNode>,
@@ -103,12 +102,12 @@ object PythonTree {
         constructor(
             id: PythonId,
             type: PythonClassId,
-            constructor: String,
+            constructor: PythonClassId,
             args: List<PythonTreeNode>,
         ): this(id, type, constructor, args, emptyMap(), emptyList(), emptyMap())
 
         override val children: List<PythonTreeNode>
-            get() = args + state.values + listitems + dictitems.values + dictitems.keys
+            get() = args + state.values + listitems + dictitems.values + dictitems.keys + PythonTreeNode(constructor)
 
         override fun typeEquals(other: Any?): Boolean {
             return if (other is ReduceNode) {
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/code/KlaxonPythonTreeParser.kt b/utbot-python/src/main/kotlin/org/utbot/python/code/KlaxonPythonTreeParser.kt
@@ -69,7 +69,7 @@ class KlaxonPythonTreeParser(
         val initObject = PythonTree.ReduceNode(
             id,
             PythonClassId(value.string("type")!!),
-            value.string("constructor")!!,
+            PythonClassId(value.string("constructor")!!),
             parsePythonList(value.array("args")!!).items,
         )
         memory[id] = initObject

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class KlaxonPythonTreeParser(`
`69`	`69`	`val initObject = PythonTree.ReduceNode(`
`70`	`70`	`id,`
`71`	`71`	`PythonClassId(value.string("type")!!),`
`72`		`- value.string("constructor")!!,`
	`72`	`+ PythonClassId(value.string("constructor")!!),`
`73`	`73`	`parsePythonList(value.array("args")!!).items,`
`74`	`74`	`)`
`75`	`75`	`memory[id] = initObject`