From 15d189f6b442a3c8d1f18ff513c504d318921423 Mon Sep 17 00:00:00 2001
From: Michael Gronover <mgronover@itemis.com>
Date: Mon, 23 Sep 2024 14:19:09 +0200
Subject: [PATCH 1/2] add callback function when trace node is add/inserted
 into the tree

---
 .../com/mbeddr/mpsutil/interpreter/rt.mps     | 194 +++++++++---------
 1 file changed, 94 insertions(+), 100 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index c797d157563..5a615638175 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -332,6 +332,14 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
+        <child id="1235746996653" name="function" index="2SgG2M" />
+        <child id="1235747002942" name="parameter" index="2SgHGx" />
+      </concept>
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
+      </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -15240,7 +15248,17 @@
       <node concept="3Tm6S6" id="3vcWfImelUU" role="1B3o_S" />
       <node concept="10P_77" id="3vcWfImepg7" role="1tU5fm" />
     </node>
-    <node concept="2tJIrI" id="4HGbj9ThDuz" role="jymVt" />
+    <node concept="Wx3nA" id="DCSeLnKqHT" role="jymVt">
+      <property role="TrG5h" value="childAddedCallBackFunction" />
+      <node concept="3Tm6S6" id="DCSeLnKhw5" role="1B3o_S" />
+      <node concept="1ajhzC" id="DCSeLnKoD0" role="1tU5fm">
+        <node concept="3cqZAl" id="DCSeLnKphj" role="1ajl9A" />
+        <node concept="3uibUv" id="DCSeLnKpLA" role="1ajw0F">
+          <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
+        </node>
+      </node>
+      <node concept="10Nm6u" id="DCSeLnN7ID" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="6DRSV4e4sC7" role="jymVt" />
     <node concept="312cEg" id="4HGbj9ThJt0" role="jymVt">
       <property role="34CwA1" value="false" />
@@ -15266,6 +15284,50 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7cNsFS_gVYU" role="jymVt" />
+    <node concept="2YIFZL" id="DCSeLnKHSR" role="jymVt">
+      <property role="TrG5h" value="SetCallBackWhenChildAdded" />
+      <node concept="3clFbS" id="DCSeLnKHSU" role="3clF47">
+        <node concept="3clFbF" id="DCSeLnKPtO" role="3cqZAp">
+          <node concept="37vLTI" id="DCSeLnKQ4K" role="3clFbG">
+            <node concept="37vLTw" id="DCSeLnKR6e" role="37vLTx">
+              <ref role="3cqZAo" node="DCSeLnKNUi" resolve="creationCallBackFunction" />
+            </node>
+            <node concept="37vLTw" id="DCSeLnKPtN" role="37vLTJ">
+              <ref role="3cqZAo" node="DCSeLnKqHT" resolve="creationCallBackFunction" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="DCSeLnK_WC" role="1B3o_S" />
+      <node concept="3cqZAl" id="DCSeLnKHrk" role="3clF45" />
+      <node concept="37vLTG" id="DCSeLnKNUi" role="3clF46">
+        <property role="TrG5h" value="childAddedCallBack" />
+        <node concept="1ajhzC" id="DCSeLnKNUg" role="1tU5fm">
+          <node concept="3cqZAl" id="DCSeLnKUXP" role="1ajl9A" />
+          <node concept="3uibUv" id="DCSeLnKTrm" role="1ajw0F">
+            <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2YIFZL" id="DCSeLnLmcu" role="jymVt">
+      <property role="TrG5h" value="GetCallBackWhenChildAdded" />
+      <node concept="3clFbS" id="DCSeLnLmcv" role="3clF47">
+        <node concept="3clFbF" id="DCSeLnLmcw" role="3cqZAp">
+          <node concept="37vLTw" id="DCSeLnLmcz" role="3clFbG">
+            <ref role="3cqZAo" node="DCSeLnKqHT" resolve="creationCallBackFunction" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="DCSeLnLmc$" role="1B3o_S" />
+      <node concept="1ajhzC" id="DCSeLnLxXK" role="3clF45">
+        <node concept="3cqZAl" id="DCSeLnLyEB" role="1ajl9A" />
+        <node concept="3uibUv" id="DCSeLnLzrv" role="1ajw0F">
+          <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="DCSeLnKv1P" role="jymVt" />
     <node concept="3clFbW" id="7cNsFS_gVK7" role="jymVt">
       <node concept="3cqZAl" id="7cNsFS_gVK9" role="3clF45" />
       <node concept="3Tm1VV" id="7cNsFS_gVKa" role="1B3o_S" />
@@ -15891,7 +15953,12 @@
             <node concept="3uibUv" id="3KLmtT4G_t3" role="1tU5fm">
               <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
             </node>
-            <node concept="Xjq3P" id="3KLmtT4G_t5" role="33vP2m" />
+            <node concept="2OqwBi" id="DCSeLnN_ON" role="33vP2m">
+              <node concept="Xjq3P" id="3KLmtT4G_t5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="DCSeLnND48" role="2OqNvi">
+                <ref role="2Oxat5" node="YcTL0giMk" resolve="parent" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="2$JKZl" id="3KLmtT4G_tE" role="3cqZAp">
@@ -15981,6 +16048,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="DCSeLnL0CI" role="3cqZAp">
+          <node concept="3clFbS" id="DCSeLnL0CK" role="3clFbx">
+            <node concept="3clFbF" id="DCSeLnLcMB" role="3cqZAp">
+              <node concept="2Sg_IR" id="DCSeLnLfp4" role="3clFbG">
+                <node concept="37vLTw" id="DCSeLnLVvq" role="2SgG2M">
+                  <ref role="3cqZAo" node="DCSeLnKqHT" resolve="childAddedCallBackFunction" />
+                </node>
+                <node concept="37vLTw" id="DCSeLnMYja" role="2SgHGx">
+                  <ref role="3cqZAo" node="1FJItavey2y" resolve="t" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="DCSeLnL766" role="3clFbw">
+            <node concept="10Nm6u" id="DCSeLnL9JH" role="3uHU7w" />
+            <node concept="37vLTw" id="DCSeLnLVvF" role="3uHU7B">
+              <ref role="3cqZAo" node="DCSeLnKqHT" resolve="creationCallBackFunction" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5syY_AMb$0d" role="3cqZAp">
           <node concept="Xjq3P" id="5syY_AMb$0b" role="3clFbG" />
         </node>
@@ -16047,104 +16134,11 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3KLmtT4GhEV" role="3cqZAp">
-          <node concept="3cpWsn" id="3KLmtT4GhEW" role="3cpWs9">
-            <property role="TrG5h" value="next" />
-            <node concept="3uibUv" id="3KLmtT4Ggx6" role="1tU5fm">
-              <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
-            </node>
-            <node concept="2OqwBi" id="3KLmtT4GsBt" role="33vP2m">
-              <node concept="Xjq3P" id="3KLmtT4GhEX" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3KLmtT4GsRs" role="2OqNvi">
-                <ref role="2Oxat5" node="YcTL0giMk" resolve="parent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2$JKZl" id="3KLmtT4GmSl" role="3cqZAp">
-          <node concept="3clFbS" id="3KLmtT4GmSo" role="2LFqv$">
-            <node concept="3SKdUt" id="1I$ftHWUcP9" role="3cqZAp">
-              <node concept="1PaTwC" id="1I$ftHWUcPa" role="1aUNEU">
-                <node concept="3oM_SD" id="1I$ftHWUcPc" role="1PaTwD">
-                  <property role="3oM_SC" value="prevent" />
-                </node>
-                <node concept="3oM_SD" id="1I$ftHWUhCk" role="1PaTwD">
-                  <property role="3oM_SC" value="creating" />
-                </node>
-                <node concept="3oM_SD" id="1I$ftHWUhCv" role="1PaTwD">
-                  <property role="3oM_SC" value="cycles" />
-                </node>
-                <node concept="3oM_SD" id="1I$ftHWUhCN" role="1PaTwD">
-                  <property role="3oM_SC" value="in" />
-                </node>
-                <node concept="3oM_SD" id="1I$ftHWUhD0" role="1PaTwD">
-                  <property role="3oM_SC" value="computation" />
-                </node>
-                <node concept="3oM_SD" id="1I$ftHWUhDu" role="1PaTwD">
-                  <property role="3oM_SC" value="trace" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="3KLmtT4Gw_R" role="3cqZAp">
-              <node concept="3clFbS" id="3KLmtT4Gw_T" role="3clFbx">
-                <node concept="3cpWs6" id="1I$ftHWTYnK" role="3cqZAp">
-                  <node concept="Xjq3P" id="1I$ftHWTYnL" role="3cqZAk" />
-                </node>
-              </node>
-              <node concept="3clFbC" id="3KLmtT4Gx8z" role="3clFbw">
-                <node concept="37vLTw" id="3KLmtT4GxoL" role="3uHU7w">
-                  <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
-                </node>
-                <node concept="37vLTw" id="3KLmtT4GwK8" role="3uHU7B">
-                  <ref role="3cqZAo" node="3KLmtT4GhEW" resolve="next" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="3KLmtT4Gufe" role="3cqZAp">
-              <node concept="37vLTI" id="3KLmtT4Gu$V" role="3clFbG">
-                <node concept="2OqwBi" id="3KLmtT4Gv4N" role="37vLTx">
-                  <node concept="37vLTw" id="3KLmtT4GuJ0" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3KLmtT4GhEW" resolve="next" />
-                  </node>
-                  <node concept="2OwXpG" id="3KLmtT4GvjU" role="2OqNvi">
-                    <ref role="2Oxat5" node="YcTL0giMk" resolve="parent" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="3KLmtT4Gufd" role="37vLTJ">
-                  <ref role="3cqZAo" node="3KLmtT4GhEW" resolve="next" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="3KLmtT4Gslq" role="2$JKZa">
-            <node concept="10Nm6u" id="3KLmtT4Gu51" role="3uHU7w" />
-            <node concept="37vLTw" id="3KLmtT4GrVj" role="3uHU7B">
-              <ref role="3cqZAo" node="3KLmtT4GhEW" resolve="next" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5syY_ALIam3" role="3cqZAp">
-          <node concept="37vLTI" id="5syY_ALIam4" role="3clFbG">
-            <node concept="Xjq3P" id="5syY_ALIam5" role="37vLTx" />
-            <node concept="2OqwBi" id="5syY_ALIam6" role="37vLTJ">
-              <node concept="37vLTw" id="5syY_ALIam7" role="2Oq$k0">
-                <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
-              </node>
-              <node concept="2OwXpG" id="5syY_ALIam8" role="2OqNvi">
-                <ref role="2Oxat5" node="YcTL0giMk" resolve="parent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5syY_ALIam9" role="3cqZAp">
-          <node concept="2OqwBi" id="5syY_ALIama" role="3clFbG">
-            <node concept="37vLTw" id="5syY_ALIamb" role="2Oq$k0">
-              <ref role="3cqZAo" node="1FJItaveypK" resolve="children" />
-            </node>
-            <node concept="TSZUe" id="5syY_ALIamc" role="2OqNvi">
-              <node concept="37vLTw" id="5syY_ALIamd" role="25WWJ7">
-                <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
-              </node>
+        <node concept="3clFbF" id="DCSeLnMcDR" role="3cqZAp">
+          <node concept="1rXfSq" id="DCSeLnMcDP" role="3clFbG">
+            <ref role="37wK5l" node="1FJItavexS7" resolve="addChild" />
+            <node concept="37vLTw" id="DCSeLnMh9o" role="37wK5m">
+              <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
             </node>
           </node>
         </node>

From 5cd7ace086bf45543563c58a90ff8c44c78d3d68 Mon Sep 17 00:00:00 2001
From: Michael Gronover <mgronover@itemis.com>
Date: Mon, 23 Sep 2024 15:47:37 +0200
Subject: [PATCH 2/2] Interpreter: adds callback function when trace node is
 add/inserted into the tree (#2527)

---
 CHANGELOG.md                                          |  6 ++++++
 .../models/com/mbeddr/mpsutil/interpreter/rt.mps      | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ac9fc78f13..6484171d4e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 * Breaking change: debugger and spawner were not maintained and were removed.
 
+## com.mbeddr.mpsutil.interpreter
+
+### Feature
+
+- Added user defineable call back function when trace node is added to the trace tree
+
 ## com.mbeddr.mpsutil.margincell
 
 ### Fixed
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index 5a615638175..acab2a16392 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -15285,7 +15285,7 @@
     </node>
     <node concept="2tJIrI" id="7cNsFS_gVYU" role="jymVt" />
     <node concept="2YIFZL" id="DCSeLnKHSR" role="jymVt">
-      <property role="TrG5h" value="SetCallBackWhenChildAdded" />
+      <property role="TrG5h" value="setCallBackWhenChildAdded" />
       <node concept="3clFbS" id="DCSeLnKHSU" role="3clF47">
         <node concept="3clFbF" id="DCSeLnKPtO" role="3cqZAp">
           <node concept="37vLTI" id="DCSeLnKQ4K" role="3clFbG">
@@ -15311,7 +15311,7 @@
       </node>
     </node>
     <node concept="2YIFZL" id="DCSeLnLmcu" role="jymVt">
-      <property role="TrG5h" value="GetCallBackWhenChildAdded" />
+      <property role="TrG5h" value="getCallBackWhenChildAdded" />
       <node concept="3clFbS" id="DCSeLnLmcv" role="3clF47">
         <node concept="3clFbF" id="DCSeLnLmcw" role="3cqZAp">
           <node concept="37vLTw" id="DCSeLnLmcz" role="3clFbG">
@@ -15953,12 +15953,7 @@
             <node concept="3uibUv" id="3KLmtT4G_t3" role="1tU5fm">
               <ref role="3uigEE" node="7cNsFS_gTK8" resolve="ComputationTrace" />
             </node>
-            <node concept="2OqwBi" id="DCSeLnN_ON" role="33vP2m">
-              <node concept="Xjq3P" id="3KLmtT4G_t5" role="2Oq$k0" />
-              <node concept="2OwXpG" id="DCSeLnND48" role="2OqNvi">
-                <ref role="2Oxat5" node="YcTL0giMk" resolve="parent" />
-              </node>
-            </node>
+            <node concept="Xjq3P" id="3KLmtT4G_t5" role="33vP2m" />
           </node>
         </node>
         <node concept="2$JKZl" id="3KLmtT4G_tE" role="3cqZAp">