From 181824b8633b7e5dfbb7bd2d3bc01549cc31c0f5 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Sat, 2 Apr 2022 14:43:25 +0200
Subject: [PATCH 01/10] improved value inspector

---
 .../org.iets3.opensource/.mps/vcs.xml         |  10 +-
 .../models/behavior.mps                       | 214 ++---
 .../models/editor.mps                         | 703 +++++++---------
 .../models/intentions.mps                     |   4 +-
 .../models/structure.mps                      |  62 +-
 .../models/runtime.mps                        |  15 +-
 .../models/plugin.mps                         | 761 +++++++++---------
 7 files changed, 809 insertions(+), 960 deletions(-)

diff --git a/code/languages/org.iets3.opensource/.mps/vcs.xml b/code/languages/org.iets3.opensource/.mps/vcs.xml
index cbf847c1b6..18b2599de3 100644
--- a/code/languages/org.iets3.opensource/.mps/vcs.xml
+++ b/code/languages/org.iets3.opensource/.mps/vcs.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GithubSharedProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="master" />
-        <option value="maintenance\/.*" />
-      </list>
-    </option>
-  </component>
   <component name="IssueNavigationConfiguration">
     <option name="links">
       <list>
@@ -19,6 +11,6 @@
     </option>
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+    <mapping directory="$iets3.github.opensource.home$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index 572f5dc569..d48f4f353a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -24902,7 +24902,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="2ufoZQIKHLk">
-    <ref role="13h7C2" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
+    <ref role="13h7C2" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
     <node concept="13hLZK" id="2ufoZQIKHLl" role="13h7CW">
       <node concept="3clFbS" id="2ufoZQIKHLm" role="2VODD2" />
     </node>
@@ -26605,6 +26605,112 @@
       <node concept="3clFbS" id="6xvNSEj6BMC" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="5r47dOg5pCc">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+    <node concept="13i0hz" id="5r47dOg5pCn" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="type" />
+      <node concept="3Tm1VV" id="5r47dOg5pCo" role="1B3o_S" />
+      <node concept="3Tqbb2" id="5r47dOg5pT$" role="3clF45">
+        <ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
+      </node>
+      <node concept="3clFbS" id="5r47dOg5pCq" role="3clF47" />
+    </node>
+    <node concept="13hLZK" id="5r47dOg5pCd" role="13h7CW">
+      <node concept="3clFbS" id="5r47dOg5pCe" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="25rRV02ygTq">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:25rRV02ooIM" resolve="NCopiesOp" />
+    <node concept="13hLZK" id="25rRV02ygTr" role="13h7CW">
+      <node concept="3clFbS" id="25rRV02ygTs" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="25rRV02ygVl" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" node="6kR0qIbI2yi" resolve="renderReadable" />
+      <node concept="3Tm1VV" id="25rRV02ygVm" role="1B3o_S" />
+      <node concept="3clFbS" id="25rRV02ygVp" role="3clF47">
+        <node concept="3cpWs6" id="7SygLIkQvL7" role="3cqZAp">
+          <node concept="3cpWs3" id="7SygLIkTd2k" role="3cqZAk">
+            <node concept="Xl_RD" id="7SygLIkTdn1" role="3uHU7w">
+              <property role="Xl_RC" value=")" />
+            </node>
+            <node concept="3cpWs3" id="7SygLIkT6C1" role="3uHU7B">
+              <node concept="3cpWs3" id="7SygLIkT6fw" role="3uHU7B">
+                <node concept="2OqwBi" id="7SygLIkT5xF" role="3uHU7B">
+                  <node concept="2OqwBi" id="7SygLIkT4X3" role="2Oq$k0">
+                    <node concept="13iPFW" id="7SygLIkT4Ng" role="2Oq$k0" />
+                    <node concept="2yIwOk" id="7SygLIkT5fu" role="2OqNvi" />
+                  </node>
+                  <node concept="3n3YKJ" id="7SygLIkT5WO" role="2OqNvi" />
+                </node>
+                <node concept="Xl_RD" id="7SygLIkT6fJ" role="3uHU7w">
+                  <property role="Xl_RC" value="(" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="7SygLIkT7$Q" role="3uHU7w">
+                <node concept="2OqwBi" id="7SygLIkT6Wl" role="2Oq$k0">
+                  <node concept="13iPFW" id="7SygLIkT6H_" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="25rRV02yiIz" role="2OqNvi">
+                    <ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="7SygLIkT80i" role="2OqNvi">
+                  <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="25rRV02ygVq" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="ijyib_dOXX" role="13h7CS">
+      <property role="TrG5h" value="expression" />
+      <node concept="3Tm1VV" id="ijyib_dOXY" role="1B3o_S" />
+      <node concept="3Tqbb2" id="ijyib_dOXZ" role="3clF45">
+        <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
+      </node>
+      <node concept="3clFbS" id="ijyib_dOY0" role="3clF47">
+        <node concept="3clFbF" id="ijyib_dOY1" role="3cqZAp">
+          <node concept="2OqwBi" id="ijyib_dOY2" role="3clFbG">
+            <node concept="1PxgMI" id="ijyib_dOY3" role="2Oq$k0">
+              <node concept="chp4Y" id="ijyib_dOY4" role="3oSUPX">
+                <ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
+              </node>
+              <node concept="2OqwBi" id="ijyib_dOY5" role="1m5AlR">
+                <node concept="13iPFW" id="ijyib_dOY6" role="2Oq$k0" />
+                <node concept="1mfA1w" id="ijyib_dOY7" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="ijyib_dOY8" role="2OqNvi">
+              <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="5r47dOfJ8Us">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+    <node concept="13i0hz" id="5r47dOfJ8UL" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getMembers" />
+      <node concept="3Tm1VV" id="5r47dOfJ8UM" role="1B3o_S" />
+      <node concept="2I9FWS" id="5r47dOfJ9kG" role="3clF45">
+        <ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+      </node>
+      <node concept="3clFbS" id="5r47dOfJ8UO" role="3clF47" />
+    </node>
+    <node concept="13hLZK" id="5r47dOfJ8Ut" role="13h7CW">
+      <node concept="3clFbS" id="5r47dOfJ8Uu" role="2VODD2" />
+    </node>
+  </node>
   <node concept="13h7C7" id="6ngDzsNlH7U">
     <property role="3GE5qa" value="numeric.number.limit" />
     <ref role="13h7C2" to="hm2y:1RwPUjzgk0y" resolve="AbstractMinMaxExpression" />
@@ -26685,40 +26791,6 @@
       <node concept="17QB3L" id="6ngDzsNlH8k" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="5r47dOg5pCc">
-    <property role="3GE5qa" value="tuples" />
-    <ref role="13h7C2" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
-    <node concept="13i0hz" id="5r47dOg5pCn" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="type" />
-      <node concept="3Tm1VV" id="5r47dOg5pCo" role="1B3o_S" />
-      <node concept="3Tqbb2" id="5r47dOg5pT$" role="3clF45">
-        <ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
-      </node>
-      <node concept="3clFbS" id="5r47dOg5pCq" role="3clF47" />
-    </node>
-    <node concept="13hLZK" id="5r47dOg5pCd" role="13h7CW">
-      <node concept="3clFbS" id="5r47dOg5pCe" role="2VODD2" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="5r47dOfJ8Us">
-    <property role="3GE5qa" value="tuples" />
-    <ref role="13h7C2" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
-    <node concept="13i0hz" id="5r47dOfJ8UL" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getMembers" />
-      <node concept="3Tm1VV" id="5r47dOfJ8UM" role="1B3o_S" />
-      <node concept="2I9FWS" id="5r47dOfJ9kG" role="3clF45">
-        <ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
-      </node>
-      <node concept="3clFbS" id="5r47dOfJ8UO" role="3clF47" />
-    </node>
-    <node concept="13hLZK" id="5r47dOfJ8Ut" role="13h7CW">
-      <node concept="3clFbS" id="5r47dOfJ8Uu" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="6GiZkUz7qWV">
     <property role="3GE5qa" value="tuples" />
     <ref role="13h7C2" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
@@ -27819,77 +27891,5 @@
     </node>
     <node concept="3Tm1VV" id="2nydsCfyYD1" role="1B3o_S" />
   </node>
-  <node concept="13h7C7" id="25rRV02ygTq">
-    <property role="3GE5qa" value="tuples" />
-    <ref role="13h7C2" to="hm2y:25rRV02ooIM" resolve="NCopiesOp" />
-    <node concept="13hLZK" id="25rRV02ygTr" role="13h7CW">
-      <node concept="3clFbS" id="25rRV02ygTs" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="25rRV02ygVl" role="13h7CS">
-      <property role="TrG5h" value="renderReadable" />
-      <ref role="13i0hy" node="6kR0qIbI2yi" resolve="renderReadable" />
-      <node concept="3Tm1VV" id="25rRV02ygVm" role="1B3o_S" />
-      <node concept="3clFbS" id="25rRV02ygVp" role="3clF47">
-        <node concept="3cpWs6" id="7SygLIkQvL7" role="3cqZAp">
-          <node concept="3cpWs3" id="7SygLIkTd2k" role="3cqZAk">
-            <node concept="Xl_RD" id="7SygLIkTdn1" role="3uHU7w">
-              <property role="Xl_RC" value=")" />
-            </node>
-            <node concept="3cpWs3" id="7SygLIkT6C1" role="3uHU7B">
-              <node concept="3cpWs3" id="7SygLIkT6fw" role="3uHU7B">
-                <node concept="2OqwBi" id="7SygLIkT5xF" role="3uHU7B">
-                  <node concept="2OqwBi" id="7SygLIkT4X3" role="2Oq$k0">
-                    <node concept="13iPFW" id="7SygLIkT4Ng" role="2Oq$k0" />
-                    <node concept="2yIwOk" id="7SygLIkT5fu" role="2OqNvi" />
-                  </node>
-                  <node concept="3n3YKJ" id="7SygLIkT5WO" role="2OqNvi" />
-                </node>
-                <node concept="Xl_RD" id="7SygLIkT6fJ" role="3uHU7w">
-                  <property role="Xl_RC" value="(" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="7SygLIkT7$Q" role="3uHU7w">
-                <node concept="2OqwBi" id="7SygLIkT6Wl" role="2Oq$k0">
-                  <node concept="13iPFW" id="7SygLIkT6H_" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="25rRV02yiIz" role="2OqNvi">
-                    <ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="7SygLIkT80i" role="2OqNvi">
-                  <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="25rRV02ygVq" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="ijyib_dOXX" role="13h7CS">
-      <property role="TrG5h" value="expression" />
-      <node concept="3Tm1VV" id="ijyib_dOXY" role="1B3o_S" />
-      <node concept="3Tqbb2" id="ijyib_dOXZ" role="3clF45">
-        <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
-      </node>
-      <node concept="3clFbS" id="ijyib_dOY0" role="3clF47">
-        <node concept="3clFbF" id="ijyib_dOY1" role="3cqZAp">
-          <node concept="2OqwBi" id="ijyib_dOY2" role="3clFbG">
-            <node concept="1PxgMI" id="ijyib_dOY3" role="2Oq$k0">
-              <node concept="chp4Y" id="ijyib_dOY4" role="3oSUPX">
-                <ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
-              </node>
-              <node concept="2OqwBi" id="ijyib_dOY5" role="1m5AlR">
-                <node concept="13iPFW" id="ijyib_dOY6" role="2Oq$k0" />
-                <node concept="1mfA1w" id="ijyib_dOY7" role="2OqNvi" />
-              </node>
-            </node>
-            <node concept="3TrEf2" id="ijyib_dOY8" role="2OqNvi">
-              <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index f6209eb83e..78be55ea79 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:8405f486-53b5-4fe6-af3e-7f68358bd631(org.iets3.core.expr.base.editor)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -12,9 +11,9 @@
     <use id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor" version="0" />
     <use id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell" version="0" />
     <use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
+    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -39,12 +38,14 @@
     <import index="9eyi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.lang.editor.menus.transformation(MPS.Editor/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="6lvu" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellMenu(MPS.Editor/)" />
-    <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="q4oi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellActions(MPS.Editor/)" />
     <import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" />
     <import index="fulz" ref="r:6f792c44-2a5d-40e8-9f05-33f7d4ae26ec(jetbrains.mps.editor.runtime.completion)" />
-    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
+    <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="u59o" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.menus.transformation(MPS.Editor/)" />
+    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
+    <import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
+    <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
     <import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -179,6 +180,7 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
+      <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
@@ -209,9 +211,6 @@
       <concept id="8998492695583129971" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_DescriptionText" flags="ng" index="16NL0t">
         <child id="8998492695583129972" name="query" index="16NL0q" />
       </concept>
-      <concept id="1235999440492" name="jetbrains.mps.lang.editor.structure.HorizontalAlign" flags="ln" index="37jFXN">
-        <property id="1235999920262" name="align" index="37lx6p" />
-      </concept>
       <concept id="1220974635399" name="jetbrains.mps.lang.editor.structure.QueryFunction_FontStyle" flags="in" index="17KAyr" />
       <concept id="2115302367868116903" name="jetbrains.mps.lang.editor.structure.GeneratedSubstituteMenuAttribute" flags="ng" index="382kZG" />
       <concept id="3360401466585705291" name="jetbrains.mps.lang.editor.structure.CellModel_ContextAssistant" flags="ng" index="18a60v" />
@@ -397,6 +396,10 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -461,7 +464,6 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
-      <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
@@ -598,6 +600,8 @@
       <concept id="4682418030828844314" name="de.itemis.mps.editor.celllayout.structure.HorzontalLineWidthStyle" flags="lg" index="2T_bXT" />
       <concept id="4682418030828725523" name="de.itemis.mps.editor.celllayout.structure.HorizontalLineCell" flags="ng" index="2T_mXK" />
       <concept id="9000758320091481718" name="de.itemis.mps.editor.celllayout.structure.GridLayoutFlattenStyle" flags="lg" index="1QQdxR" />
+      <concept id="2728748097294736650" name="de.itemis.mps.editor.celllayout.structure.BorderColorStyle" flags="lg" index="3T6ez_" />
+      <concept id="2728748097294695721" name="de.itemis.mps.editor.celllayout.structure.BorderSizeStyle" flags="lg" index="3T6Sz6" />
       <concept id="2728748097294192922" name="de.itemis.mps.editor.celllayout.structure.IntegerStyle" flags="lg" index="3To2jP">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </concept>
@@ -5091,7 +5095,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2ufoZQIKHBI">
-    <ref role="1XX52x" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
+    <ref role="1XX52x" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
     <node concept="1QoScp" id="6a3SqxOtZyV" role="2wV5jI">
       <property role="1QpmdY" value="true" />
       <node concept="pkWqt" id="6a3SqxOtZyY" role="3e4ffs">
@@ -5108,189 +5112,93 @@
       </node>
       <node concept="3EZMnI" id="6a3SqxOuf2M" role="1QoS34">
         <node concept="2iRkQZ" id="6a3SqxOuf2N" role="2iSdaV" />
-        <node concept="3EZMnI" id="2ufoZQIKHBK" role="3EZMnx">
-          <node concept="3F0ifn" id="2ufoZQIKHBX" role="3EZMnx">
-            <property role="3F0ifm" value="[" />
-            <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-            <node concept="11LMrY" id="2ufoZQIKHCa" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="Veino" id="2ufoZQILzrE" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5A/lightGray" />
-              <node concept="1iSF2X" id="2ufoZQILASp" role="VblUZ">
-                <property role="1iTho6" value="EEEEEE" />
-              </node>
-            </node>
-            <node concept="VechU" id="2ufoZQILAK5" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5_/gray" />
-            </node>
-          </node>
-          <node concept="1HlG4h" id="2ufoZQIKHCl" role="3EZMnx">
-            <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-            <node concept="Veino" id="2ufoZQILzvS" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5A/lightGray" />
-              <node concept="1iSF2X" id="2ufoZQILASu" role="VblUZ">
-                <property role="1iTho6" value="EEEEEE" />
-              </node>
-            </node>
-            <node concept="VechU" id="2ufoZQILA3Y" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5_/gray" />
-            </node>
-            <node concept="1HfYo3" id="2ufoZQIKHCn" role="1HlULh">
-              <node concept="3TQlhw" id="2ufoZQIKHCp" role="1Hhtcw">
-                <node concept="3clFbS" id="2ufoZQIKHCr" role="2VODD2">
-                  <node concept="3cpWs8" id="2ufoZQIKOAk" role="3cqZAp">
-                    <node concept="3cpWsn" id="2ufoZQIKOAl" role="3cpWs9">
-                      <property role="TrG5h" value="values" />
-                      <node concept="_YKpA" id="2ufoZQIKOAc" role="1tU5fm">
-                        <node concept="3uibUv" id="2ufoZQIKOAf" role="_ZDj9">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="2ufoZQIKOAm" role="33vP2m">
-                        <node concept="pncrf" id="2ufoZQIKOAn" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="2ufoZQIKOAo" role="2OqNvi">
-                          <ref role="37wK5l" to="pbu6:2ufoZQIKMt6" resolve="getValues" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="2ufoZQIKOW6" role="3cqZAp">
-                    <node concept="3clFbS" id="2ufoZQIKOW8" role="3clFbx">
-                      <node concept="3cpWs6" id="2ufoZQIKRgZ" role="3cqZAp">
-                        <node concept="Xl_RD" id="2ufoZQIKRWF" role="3cqZAk">
-                          <property role="Xl_RC" value="" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbC" id="2ufoZQIKQmf" role="3clFbw">
-                      <node concept="10Nm6u" id="2ufoZQIKQVn" role="3uHU7w" />
-                      <node concept="37vLTw" id="2ufoZQIKPhK" role="3uHU7B">
-                        <ref role="3cqZAo" node="2ufoZQIKOAl" resolve="values" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs8" id="2ufoZQIL0$u" role="3cqZAp">
-                    <node concept="3cpWsn" id="2ufoZQIL0$v" role="3cpWs9">
-                      <property role="TrG5h" value="s" />
-                      <node concept="17QB3L" id="2ufoZQIL0$t" role="1tU5fm" />
-                      <node concept="3cpWs3" id="2ufoZQIL0$w" role="33vP2m">
-                        <node concept="Xl_RD" id="2ufoZQIL0$x" role="3uHU7w">
-                          <property role="Xl_RC" value="" />
-                        </node>
-                        <node concept="37vLTw" id="2ufoZQIL0$y" role="3uHU7B">
-                          <ref role="3cqZAo" node="2ufoZQIKOAl" resolve="values" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="2ufoZQIL1wq" role="3cqZAp">
-                    <node concept="3clFbS" id="2ufoZQIL1ws" role="3clFbx">
-                      <node concept="3clFbF" id="2ufoZQIL5OU" role="3cqZAp">
-                        <node concept="37vLTI" id="2ufoZQIL6ry" role="3clFbG">
-                          <node concept="2OqwBi" id="2ufoZQIL7o9" role="37vLTx">
-                            <node concept="37vLTw" id="2ufoZQIL6Lo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
-                            </node>
-                            <node concept="liA8E" id="2ufoZQIL8Oa" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
-                              <node concept="3cmrfG" id="2ufoZQIL8Og" role="37wK5m">
-                                <property role="3cmrfH" value="1" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="2ufoZQIL5OS" role="37vLTJ">
-                            <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
+        <node concept="3EZMnI" id="3ToB$MLMJAs" role="3EZMnx">
+          <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
+          <node concept="2iRfu4" id="3ToB$MLMJAt" role="2iSdaV" />
+          <node concept="gc7cB" id="3ToB$MLMJAu" role="3EZMnx">
+            <node concept="3VJUX4" id="3ToB$MLMJAv" role="3YsKMw">
+              <node concept="3clFbS" id="3ToB$MLMJAw" role="2VODD2">
+                <node concept="3cpWs8" id="3ToB$MLMJAx" role="3cqZAp">
+                  <node concept="3cpWsn" id="3ToB$MLMJAy" role="3cpWs9">
+                    <property role="TrG5h" value="s" />
+                    <node concept="17QB3L" id="3ToB$MLMJAz" role="1tU5fm" />
+                    <node concept="2OqwBi" id="3ToB$MLMJA$" role="33vP2m">
+                      <node concept="2OqwBi" id="3ToB$MLMJA_" role="2Oq$k0">
+                        <node concept="2OqwBi" id="3ToB$MLMJAA" role="2Oq$k0">
+                          <node concept="pncrf" id="3ToB$MLMJAB" role="2Oq$k0" />
+                          <node concept="2qgKlT" id="3ToB$MLMJAC" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:2ufoZQIKMt6" resolve="getValues" />
                           </node>
                         </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="2ufoZQIL2CJ" role="3clFbw">
-                      <node concept="37vLTw" id="2ufoZQIL1Yy" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
-                      </node>
-                      <node concept="liA8E" id="2ufoZQIL3oz" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
-                        <node concept="Xl_RD" id="2ufoZQIL4nC" role="37wK5m">
-                          <property role="Xl_RC" value="[" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="2ufoZQILapB" role="3cqZAp">
-                    <node concept="3clFbS" id="2ufoZQILapD" role="3clFbx">
-                      <node concept="3clFbF" id="2ufoZQILfbi" role="3cqZAp">
-                        <node concept="37vLTI" id="2ufoZQILhvr" role="3clFbG">
-                          <node concept="2OqwBi" id="2ufoZQILi_G" role="37vLTx">
-                            <node concept="37vLTw" id="2ufoZQILhU6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
-                            </node>
-                            <node concept="liA8E" id="2ufoZQILjqL" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                              <node concept="3cmrfG" id="2ufoZQILkwp" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
-                              </node>
-                              <node concept="3cpWsd" id="2ufoZQILs7H" role="37wK5m">
-                                <node concept="3cmrfG" id="2ufoZQILs7N" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
-                                </node>
-                                <node concept="2OqwBi" id="2ufoZQILoB6" role="3uHU7B">
-                                  <node concept="37vLTw" id="2ufoZQILnPY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
+                        <node concept="3$u5V9" id="3ToB$MLMJAD" role="2OqNvi">
+                          <node concept="1bVj0M" id="3ToB$MLMJAE" role="23t8la">
+                            <node concept="3clFbS" id="3ToB$MLMJAF" role="1bW5cS">
+                              <node concept="3clFbF" id="3ToB$MLMJAG" role="3cqZAp">
+                                <node concept="2OqwBi" id="3ToB$MLMJAH" role="3clFbG">
+                                  <node concept="37vLTw" id="3ToB$MLMJAI" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3ToB$MLMJAK" resolve="it" />
                                   </node>
-                                  <node concept="liA8E" id="2ufoZQILr1e" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                  <node concept="liA8E" id="3ToB$MLMJAJ" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="37vLTw" id="2ufoZQILfbg" role="37vLTJ">
-                            <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
+                            <node concept="Rh6nW" id="3ToB$MLMJAK" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="3ToB$MLMJAL" role="1tU5fm" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="2OqwBi" id="2ufoZQILbFP" role="3clFbw">
-                      <node concept="37vLTw" id="2ufoZQILaWM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
-                      </node>
-                      <node concept="liA8E" id="2ufoZQILcwv" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
-                        <node concept="Xl_RD" id="2ufoZQILd$y" role="37wK5m">
-                          <property role="Xl_RC" value="]" />
+                      <node concept="3uJxvA" id="3ToB$MLMJAM" role="2OqNvi">
+                        <node concept="Xl_RD" id="3ToB$MLMJAN" role="3uJOhx">
+                          <property role="Xl_RC" value="\n" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="2ufoZQIKNCB" role="3cqZAp">
-                    <node concept="37vLTw" id="2ufoZQIL0$z" role="3clFbG">
-                      <ref role="3cqZAo" node="2ufoZQIL0$v" resolve="s" />
+                </node>
+                <node concept="3cpWs6" id="3ToB$MLMJAO" role="3cqZAp">
+                  <node concept="2OqwBi" id="3ToB$MLMJAP" role="3cqZAk">
+                    <node concept="2ShNRf" id="3ToB$MLMJAQ" role="2Oq$k0">
+                      <node concept="1pGfFk" id="3ToB$MLMJAR" role="2ShVmc">
+                        <ref role="37wK5l" to="oq0c:2ufoZQJzoWr" resolve="MultiLineEditorCell" />
+                        <node concept="pncrf" id="3ToB$MLMJAS" role="37wK5m" />
+                        <node concept="37vLTw" id="3ToB$MLMJAT" role="37wK5m">
+                          <ref role="3cqZAo" node="3ToB$MLMJAy" resolve="s" />
+                        </node>
+                        <node concept="2YIFZM" id="3ToB$MLMJAU" role="37wK5m">
+                          <ref role="37wK5l" to="lzb2:~JBColor.foreground()" resolve="foreground" />
+                          <ref role="1Pybhc" to="lzb2:~JBColor" resolve="JBColor" />
+                        </node>
+                        <node concept="10Nm6u" id="3ToB$MLMJAV" role="37wK5m" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3ToB$MLMJAW" role="2OqNvi">
+                      <ref role="37wK5l" to="oq0c:4nY0kF8hJxc" resolve="createCellProvider" />
+                      <node concept="1Q80Hx" id="3ToB$MLMJAX" role="37wK5m" />
+                      <node concept="pncrf" id="3ToB$MLMJAY" role="37wK5m" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="3F0ifn" id="2ufoZQIKHC5" role="3EZMnx">
-            <property role="3F0ifm" value="]" />
-            <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-            <node concept="11L4FC" id="2ufoZQIKHCc" role="3F10Kt">
+            <node concept="VPXOz" id="3ToB$MLMJAZ" role="3F10Kt">
               <property role="VOm3f" value="true" />
             </node>
-            <node concept="Veino" id="2ufoZQIL$7S" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5A/lightGray" />
-              <node concept="1iSF2X" id="2ufoZQILASw" role="VblUZ">
-                <property role="1iTho6" value="EEEEEE" />
-              </node>
+            <node concept="3T6ez_" id="3ToB$MLMJB0" role="3F10Kt">
+              <property role="Vb096" value="fLwANPu/blue" />
             </node>
-            <node concept="VechU" id="2ufoZQILAOh" role="3F10Kt">
-              <property role="Vb096" value="fLJRk5_/gray" />
+            <node concept="3T6Sz6" id="3ToB$MLMJB1" role="3F10Kt">
+              <property role="1lJzqX" value="2" />
+            </node>
+            <node concept="Veino" id="3ToB$MLMJB2" role="3F10Kt">
+              <property role="Vb096" value="hGRnIZc/lightBlue" />
+              <node concept="1iSF2X" id="3ToB$MLMJB3" role="VblUZ">
+                <property role="1iTho6" value="b6f1fa" />
+              </node>
             </node>
-          </node>
-          <node concept="2iRfu4" id="2ufoZQIKHBN" role="2iSdaV" />
-          <node concept="37jFXN" id="6a3SqxOGwpi" role="3F10Kt">
-            <property role="37lx6p" value="hZ7kQ4a/CENTER" />
           </node>
         </node>
         <node concept="2T_mXK" id="6a3SqxOuxVD" role="3EZMnx">
@@ -5309,186 +5217,125 @@
       </node>
       <node concept="3EZMnI" id="6a3SqxOu7vo" role="1QoVPY">
         <node concept="2SsqMj" id="6a3SqxOu7vp" role="3EZMnx" />
-        <node concept="3F0ifn" id="6a3SqxOu7vq" role="3EZMnx">
-          <property role="3F0ifm" value="[" />
-          <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-          <node concept="11LMrY" id="6a3SqxOu7vr" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="Veino" id="6a3SqxOu7vs" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5A/lightGray" />
-            <node concept="1iSF2X" id="6a3SqxOu7vt" role="VblUZ">
-              <property role="1iTho6" value="EEEEEE" />
-            </node>
-          </node>
-          <node concept="VechU" id="6a3SqxOu7vu" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5_/gray" />
-          </node>
-        </node>
-        <node concept="1HlG4h" id="6a3SqxOu7vv" role="3EZMnx">
+        <node concept="2iRfu4" id="6a3SqxOu7ww" role="2iSdaV" />
+        <node concept="3EZMnI" id="3ToB$MLsrug" role="3EZMnx">
           <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-          <node concept="Veino" id="6a3SqxOu7vw" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5A/lightGray" />
-            <node concept="1iSF2X" id="6a3SqxOu7vx" role="VblUZ">
-              <property role="1iTho6" value="EEEEEE" />
-            </node>
-          </node>
-          <node concept="VechU" id="6a3SqxOu7vy" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5_/gray" />
-          </node>
-          <node concept="1HfYo3" id="6a3SqxOu7vz" role="1HlULh">
-            <node concept="3TQlhw" id="6a3SqxOu7v$" role="1Hhtcw">
-              <node concept="3clFbS" id="6a3SqxOu7v_" role="2VODD2">
-                <node concept="3cpWs8" id="6a3SqxOu7vA" role="3cqZAp">
-                  <node concept="3cpWsn" id="6a3SqxOu7vB" role="3cpWs9">
-                    <property role="TrG5h" value="values" />
-                    <node concept="_YKpA" id="6a3SqxOu7vC" role="1tU5fm">
-                      <node concept="3uibUv" id="6a3SqxOu7vD" role="_ZDj9">
-                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="6a3SqxOu7vE" role="33vP2m">
-                      <node concept="pncrf" id="6a3SqxOu7vF" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="6a3SqxOu7vG" role="2OqNvi">
-                        <ref role="37wK5l" to="pbu6:2ufoZQIKMt6" resolve="getValues" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6a3SqxOu7vH" role="3cqZAp">
-                  <node concept="3clFbS" id="6a3SqxOu7vI" role="3clFbx">
-                    <node concept="3cpWs6" id="6a3SqxOu7vJ" role="3cqZAp">
-                      <node concept="Xl_RD" id="6a3SqxOu7vK" role="3cqZAk">
-                        <property role="Xl_RC" value="" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbC" id="6a3SqxOu7vL" role="3clFbw">
-                    <node concept="10Nm6u" id="6a3SqxOu7vM" role="3uHU7w" />
-                    <node concept="37vLTw" id="6a3SqxOu7vN" role="3uHU7B">
-                      <ref role="3cqZAo" node="6a3SqxOu7vB" resolve="values" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="6a3SqxOu7vO" role="3cqZAp">
-                  <node concept="3cpWsn" id="6a3SqxOu7vP" role="3cpWs9">
+          <node concept="2iRfu4" id="3ToB$MLsruh" role="2iSdaV" />
+          <node concept="gc7cB" id="3boFcNpzAqg" role="3EZMnx">
+            <node concept="3VJUX4" id="3boFcNpzAqh" role="3YsKMw">
+              <node concept="3clFbS" id="3boFcNpzAqi" role="2VODD2">
+                <node concept="3cpWs8" id="3ToB$MLnhRy" role="3cqZAp">
+                  <node concept="3cpWsn" id="3ToB$MLnhRz" role="3cpWs9">
                     <property role="TrG5h" value="s" />
-                    <node concept="17QB3L" id="6a3SqxOu7vQ" role="1tU5fm" />
-                    <node concept="3cpWs3" id="6a3SqxOu7vR" role="33vP2m">
-                      <node concept="Xl_RD" id="6a3SqxOu7vS" role="3uHU7w">
-                        <property role="Xl_RC" value="" />
-                      </node>
-                      <node concept="37vLTw" id="6a3SqxOu7vT" role="3uHU7B">
-                        <ref role="3cqZAo" node="6a3SqxOu7vB" resolve="values" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6a3SqxOu7vU" role="3cqZAp">
-                  <node concept="3clFbS" id="6a3SqxOu7vV" role="3clFbx">
-                    <node concept="3clFbF" id="6a3SqxOu7vW" role="3cqZAp">
-                      <node concept="37vLTI" id="6a3SqxOu7vX" role="3clFbG">
-                        <node concept="2OqwBi" id="6a3SqxOu7vY" role="37vLTx">
-                          <node concept="37vLTw" id="6a3SqxOu7vZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
-                          </node>
-                          <node concept="liA8E" id="6a3SqxOu7w0" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
-                            <node concept="3cmrfG" id="6a3SqxOu7w1" role="37wK5m">
-                              <property role="3cmrfH" value="1" />
-                            </node>
+                    <node concept="17QB3L" id="3ToB$MLnhQQ" role="1tU5fm" />
+                    <node concept="2OqwBi" id="3ToB$MLnhR$" role="33vP2m">
+                      <node concept="2OqwBi" id="3ToB$MLni_x" role="2Oq$k0">
+                        <node concept="2OqwBi" id="3ToB$MLnhR_" role="2Oq$k0">
+                          <node concept="pncrf" id="3ToB$MLnhRA" role="2Oq$k0" />
+                          <node concept="2qgKlT" id="3ToB$MLnhRB" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:2ufoZQIKMt6" resolve="getValues" />
                           </node>
                         </node>
-                        <node concept="37vLTw" id="6a3SqxOu7w2" role="37vLTJ">
-                          <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6a3SqxOu7w3" role="3clFbw">
-                    <node concept="37vLTw" id="6a3SqxOu7w4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
-                    </node>
-                    <node concept="liA8E" id="6a3SqxOu7w5" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
-                      <node concept="Xl_RD" id="6a3SqxOu7w6" role="37wK5m">
-                        <property role="Xl_RC" value="[" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6a3SqxOu7w7" role="3cqZAp">
-                  <node concept="3clFbS" id="6a3SqxOu7w8" role="3clFbx">
-                    <node concept="3clFbF" id="6a3SqxOu7w9" role="3cqZAp">
-                      <node concept="37vLTI" id="6a3SqxOu7wa" role="3clFbG">
-                        <node concept="2OqwBi" id="6a3SqxOu7wb" role="37vLTx">
-                          <node concept="37vLTw" id="6a3SqxOu7wc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
-                          </node>
-                          <node concept="liA8E" id="6a3SqxOu7wd" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                            <node concept="3cmrfG" id="6a3SqxOu7we" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="3cpWsd" id="6a3SqxOu7wf" role="37wK5m">
-                              <node concept="3cmrfG" id="6a3SqxOu7wg" role="3uHU7w">
-                                <property role="3cmrfH" value="1" />
-                              </node>
-                              <node concept="2OqwBi" id="6a3SqxOu7wh" role="3uHU7B">
-                                <node concept="37vLTw" id="6a3SqxOu7wi" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
+                        <node concept="3$u5V9" id="3ToB$MLnjj_" role="2OqNvi">
+                          <node concept="1bVj0M" id="3ToB$MLnjjB" role="23t8la">
+                            <node concept="3clFbS" id="3ToB$MLnjjC" role="1bW5cS">
+                              <node concept="3clFbJ" id="3ToB$MLOTTB" role="3cqZAp">
+                                <node concept="3clFbS" id="3ToB$MLOTTD" role="3clFbx">
+                                  <node concept="3cpWs6" id="3ToB$MLOUEg" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3ToB$MLOVBx" role="3cqZAk">
+                                      <node concept="1eOMI4" id="3ToB$MLOV9F" role="2Oq$k0">
+                                        <node concept="10QFUN" id="3ToB$MLOV9E" role="1eOMHV">
+                                          <node concept="37vLTw" id="3ToB$MLOV9D" role="10QFUP">
+                                            <ref role="3cqZAo" node="3ToB$MLnjjD" resolve="it" />
+                                          </node>
+                                          <node concept="3uibUv" id="3ToB$MLOV9C" role="10QFUM">
+                                            <ref role="3uigEE" to="xfg9:3ToB$MLORO4" resolve="ICustomStringForValueInspector" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="3ToB$MLOVTZ" role="2OqNvi">
+                                        <ref role="37wK5l" to="xfg9:3ToB$MLORPt" resolve="valueInspectorString" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2ZW3vV" id="3ToB$MLOUjC" role="3clFbw">
+                                  <node concept="3uibUv" id="3ToB$MLOUpU" role="2ZW6by">
+                                    <ref role="3uigEE" to="xfg9:3ToB$MLORO4" resolve="ICustomStringForValueInspector" />
+                                  </node>
+                                  <node concept="37vLTw" id="3ToB$MLOTZg" role="2ZW6bz">
+                                    <ref role="3cqZAo" node="3ToB$MLnjjD" resolve="it" />
+                                  </node>
                                 </node>
-                                <node concept="liA8E" id="6a3SqxOu7wj" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                              </node>
+                              <node concept="3clFbF" id="3ToB$MLnjjN" role="3cqZAp">
+                                <node concept="2OqwBi" id="3ToB$MLnjsx" role="3clFbG">
+                                  <node concept="37vLTw" id="3ToB$MLnjjM" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3ToB$MLnjjD" resolve="it" />
+                                  </node>
+                                  <node concept="liA8E" id="3ToB$MLnjAv" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="Rh6nW" id="3ToB$MLnjjD" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="3ToB$MLnjjE" role="1tU5fm" />
+                            </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="6a3SqxOu7wk" role="37vLTJ">
-                          <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
+                      </node>
+                      <node concept="3uJxvA" id="3ToB$MLnhRC" role="2OqNvi">
+                        <node concept="Xl_RD" id="3ToB$MLnhRD" role="3uJOhx">
+                          <property role="Xl_RC" value="\n" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="6a3SqxOu7wl" role="3clFbw">
-                    <node concept="37vLTw" id="6a3SqxOu7wm" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
-                    </node>
-                    <node concept="liA8E" id="6a3SqxOu7wn" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
-                      <node concept="Xl_RD" id="6a3SqxOu7wo" role="37wK5m">
-                        <property role="Xl_RC" value="]" />
+                </node>
+                <node concept="3cpWs6" id="3boFcNpzAqo" role="3cqZAp">
+                  <node concept="2OqwBi" id="3boFcNpzAqp" role="3cqZAk">
+                    <node concept="2ShNRf" id="3boFcNpzAqq" role="2Oq$k0">
+                      <node concept="1pGfFk" id="3boFcNpzAqr" role="2ShVmc">
+                        <ref role="37wK5l" to="oq0c:2ufoZQJzoWr" resolve="MultiLineEditorCell" />
+                        <node concept="pncrf" id="3boFcNpzAqs" role="37wK5m" />
+                        <node concept="37vLTw" id="3boFcNpzAqt" role="37wK5m">
+                          <ref role="3cqZAo" node="3ToB$MLnhRz" resolve="s" />
+                        </node>
+                        <node concept="2YIFZM" id="47M_EquwGyx" role="37wK5m">
+                          <ref role="37wK5l" to="lzb2:~JBColor.foreground()" resolve="foreground" />
+                          <ref role="1Pybhc" to="lzb2:~JBColor" resolve="JBColor" />
+                        </node>
+                        <node concept="10Nm6u" id="3boFcNpzAqv" role="37wK5m" />
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="6a3SqxOu7wp" role="3cqZAp">
-                  <node concept="37vLTw" id="6a3SqxOu7wq" role="3clFbG">
-                    <ref role="3cqZAo" node="6a3SqxOu7vP" resolve="s" />
+                    <node concept="liA8E" id="3boFcNpzAqw" role="2OqNvi">
+                      <ref role="37wK5l" to="oq0c:4nY0kF8hJxc" resolve="createCellProvider" />
+                      <node concept="1Q80Hx" id="3boFcNpzAqx" role="37wK5m" />
+                      <node concept="pncrf" id="3boFcNpzAqy" role="37wK5m" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3F0ifn" id="6a3SqxOu7wr" role="3EZMnx">
-          <property role="3F0ifm" value="]" />
-          <ref role="1ERwB7" node="2ufoZQIP11$" resolve="deleteValueInspector" />
-          <node concept="11L4FC" id="6a3SqxOu7ws" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="Veino" id="6a3SqxOu7wt" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5A/lightGray" />
-            <node concept="1iSF2X" id="6a3SqxOu7wu" role="VblUZ">
-              <property role="1iTho6" value="EEEEEE" />
+            <node concept="VPXOz" id="3ToB$MLsqy3" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="3T6ez_" id="3ToB$MLsqBq" role="3F10Kt">
+              <property role="Vb096" value="fLwANPu/blue" />
+            </node>
+            <node concept="3T6Sz6" id="3ToB$MLsqWV" role="3F10Kt">
+              <property role="1lJzqX" value="2" />
+            </node>
+            <node concept="Veino" id="3ToB$MLsqcB" role="3F10Kt">
+              <property role="Vb096" value="hGRnIZc/lightBlue" />
+              <node concept="1iSF2X" id="3ToB$MLvKi7" role="VblUZ">
+                <property role="1iTho6" value="b6f1fa" />
+              </node>
             </node>
-          </node>
-          <node concept="VechU" id="6a3SqxOu7wv" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
-        <node concept="2iRfu4" id="6a3SqxOu7ww" role="2iSdaV" />
       </node>
     </node>
     <node concept="3EZMnI" id="6a3SqxOwJ1y" role="6VMZX">
@@ -5531,7 +5378,7 @@
   </node>
   <node concept="1h_SRR" id="2ufoZQIP11$">
     <property role="TrG5h" value="deleteValueInspector" />
-    <ref role="1h_SK9" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
+    <ref role="1h_SK9" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
     <node concept="1hA7zw" id="2ufoZQIP1DC" role="1h_SK8">
       <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
       <node concept="1hAIg9" id="2ufoZQIP1DD" role="1hA7z_">
@@ -7032,18 +6879,6 @@
       <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
     </node>
   </node>
-  <node concept="PKFIW" id="12bsjhgd0dR">
-    <property role="TrG5h" value="OpAlias" />
-    <ref role="1XX52x" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
-    <node concept="PMmxH" id="12bsjhgd0dT" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <node concept="OXEIz" id="12bsjhgd0dW" role="P5bDN">
-        <node concept="UkePV" id="12bsjhgd0dZ" role="OY2wv">
-          <ref role="Ul1FP" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="jqB9UdvFo_">
     <property role="TrG5h" value="PriorisationHelper" />
     <node concept="2tJIrI" id="jqB9UdvFSX" role="jymVt" />
@@ -7446,95 +7281,6 @@
       </node>
     </node>
   </node>
-  <node concept="22mcaB" id="6GiZkUz7qWL">
-    <property role="3GE5qa" value="tuples" />
-    <ref role="aqKnT" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
-    <node concept="22hDWj" id="6GiZkUz7qWM" role="22hAXT" />
-  </node>
-  <node concept="24kQdi" id="1c6hIxyRTnQ">
-    <property role="3GE5qa" value="tuples" />
-    <ref role="1XX52x" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
-    <node concept="3EZMnI" id="1c6hIxySmQ7" role="2wV5jI">
-      <node concept="l2Vlx" id="1c6hIxySmQ8" role="2iSdaV" />
-      <node concept="3F0ifn" id="1c6hIxySmQ9" role="3EZMnx">
-        <property role="3F0ifm" value="inline tuple type" />
-      </node>
-      <node concept="3F0ifn" id="1c6hIxySmQa" role="3EZMnx">
-        <property role="3F0ifm" value="decl" />
-      </node>
-      <node concept="1iCGBv" id="1c6hIxySmQb" role="3EZMnx">
-        <ref role="1NtTu8" to="hm2y:5r47dOfJ9kT" resolve="decl" />
-        <node concept="1sVBvm" id="1c6hIxySmQe" role="1sWHZn">
-          <node concept="1HlG4h" id="5gz1ElMSFrN" role="2wV5jI">
-            <node concept="1HfYo3" id="5gz1ElMSFrP" role="1HlULh">
-              <node concept="3TQlhw" id="5gz1ElMSFrR" role="1Hhtcw">
-                <node concept="3clFbS" id="5gz1ElMSFrT" role="2VODD2">
-                  <node concept="3clFbF" id="5gz1ElMSFzM" role="3cqZAp">
-                    <node concept="2OqwBi" id="5gz1ElMVBr1" role="3clFbG">
-                      <node concept="2OqwBi" id="5gz1ElMVwsX" role="2Oq$k0">
-                        <node concept="2OqwBi" id="5gz1ElMSFK6" role="2Oq$k0">
-                          <node concept="pncrf" id="5gz1ElMSFzL" role="2Oq$k0" />
-                          <node concept="2qgKlT" id="5gz1ElMVuHB" role="2OqNvi">
-                            <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
-                          </node>
-                        </node>
-                        <node concept="3$u5V9" id="5gz1ElMVA8a" role="2OqNvi">
-                          <node concept="1bVj0M" id="5gz1ElMVA8c" role="23t8la">
-                            <node concept="3clFbS" id="5gz1ElMVA8d" role="1bW5cS">
-                              <node concept="3clFbF" id="5gz1ElMVAdO" role="3cqZAp">
-                                <node concept="2OqwBi" id="5gz1ElMVAvp" role="3clFbG">
-                                  <node concept="37vLTw" id="5gz1ElMVAdN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5gz1ElMVA8e" resolve="it" />
-                                  </node>
-                                  <node concept="3TrcHB" id="5gz1ElMVAWE" role="2OqNvi">
-                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Rh6nW" id="5gz1ElMVA8e" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5gz1ElMVA8f" role="1tU5fm" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3uJxvA" id="5gz1ElMVCGl" role="2OqNvi">
-                        <node concept="Xl_RD" id="5gz1ElMVDTe" role="3uJOhx">
-                          <property role="Xl_RC" value="_" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1c6hIxySmQh" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <node concept="11L4FC" id="1c6hIxySmQi" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3mYdg7" id="1c6hIxySmQj" role="3F10Kt">
-          <property role="1413C4" value="body-paren" />
-        </node>
-        <node concept="11LMrY" id="1c6hIxySmQk" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1c6hIxySmQl" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <node concept="11L4FC" id="1c6hIxySmQm" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3mYdg7" id="1c6hIxySmQn" role="3F10Kt">
-          <property role="1413C4" value="body-paren" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="Ss0aue3Qrs">
     <property role="TrG5h" value="SingleEntrySelector" />
     <node concept="2YIFZL" id="Ss0aue3QB0" role="jymVt">
@@ -7688,6 +7434,11 @@
     </node>
     <node concept="3Tm1VV" id="Ss0aue3Qrt" role="1B3o_S" />
   </node>
+  <node concept="22mcaB" id="6GiZkUz7qWL">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="aqKnT" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
+    <node concept="22hDWj" id="6GiZkUz7qWM" role="22hAXT" />
+  </node>
   <node concept="24kQdi" id="25rRV02o$Gx">
     <property role="3GE5qa" value="tuples" />
     <ref role="1XX52x" to="hm2y:25rRV02ooIM" resolve="NCopiesOp" />
@@ -7716,5 +7467,101 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="1c6hIxyRTnQ">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="1XX52x" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
+    <node concept="3EZMnI" id="1c6hIxySmQ7" role="2wV5jI">
+      <node concept="l2Vlx" id="1c6hIxySmQ8" role="2iSdaV" />
+      <node concept="3F0ifn" id="1c6hIxySmQ9" role="3EZMnx">
+        <property role="3F0ifm" value="inline tuple type" />
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQa" role="3EZMnx">
+        <property role="3F0ifm" value="decl" />
+      </node>
+      <node concept="1iCGBv" id="1c6hIxySmQb" role="3EZMnx">
+        <ref role="1NtTu8" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+        <node concept="1sVBvm" id="1c6hIxySmQe" role="1sWHZn">
+          <node concept="1HlG4h" id="5gz1ElMSFrN" role="2wV5jI">
+            <node concept="1HfYo3" id="5gz1ElMSFrP" role="1HlULh">
+              <node concept="3TQlhw" id="5gz1ElMSFrR" role="1Hhtcw">
+                <node concept="3clFbS" id="5gz1ElMSFrT" role="2VODD2">
+                  <node concept="3clFbF" id="5gz1ElMSFzM" role="3cqZAp">
+                    <node concept="2OqwBi" id="5gz1ElMVBr1" role="3clFbG">
+                      <node concept="2OqwBi" id="5gz1ElMVwsX" role="2Oq$k0">
+                        <node concept="2OqwBi" id="5gz1ElMSFK6" role="2Oq$k0">
+                          <node concept="pncrf" id="5gz1ElMSFzL" role="2Oq$k0" />
+                          <node concept="2qgKlT" id="5gz1ElMVuHB" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                          </node>
+                        </node>
+                        <node concept="3$u5V9" id="5gz1ElMVA8a" role="2OqNvi">
+                          <node concept="1bVj0M" id="5gz1ElMVA8c" role="23t8la">
+                            <node concept="3clFbS" id="5gz1ElMVA8d" role="1bW5cS">
+                              <node concept="3clFbF" id="5gz1ElMVAdO" role="3cqZAp">
+                                <node concept="2OqwBi" id="5gz1ElMVAvp" role="3clFbG">
+                                  <node concept="37vLTw" id="5gz1ElMVAdN" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5gz1ElMVA8e" resolve="it" />
+                                  </node>
+                                  <node concept="3TrcHB" id="5gz1ElMVAWE" role="2OqNvi">
+                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="5gz1ElMVA8e" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="5gz1ElMVA8f" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3uJxvA" id="5gz1ElMVCGl" role="2OqNvi">
+                        <node concept="Xl_RD" id="5gz1ElMVDTe" role="3uJOhx">
+                          <property role="Xl_RC" value="_" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQh" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <node concept="11L4FC" id="1c6hIxySmQi" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3mYdg7" id="1c6hIxySmQj" role="3F10Kt">
+          <property role="1413C4" value="body-paren" />
+        </node>
+        <node concept="11LMrY" id="1c6hIxySmQk" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQl" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <node concept="11L4FC" id="1c6hIxySmQm" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3mYdg7" id="1c6hIxySmQn" role="3F10Kt">
+          <property role="1413C4" value="body-paren" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="PKFIW" id="12bsjhgd0dR">
+    <property role="TrG5h" value="OpAlias" />
+    <ref role="1XX52x" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
+    <node concept="PMmxH" id="12bsjhgd0dT" role="2wV5jI">
+      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      <node concept="OXEIz" id="12bsjhgd0dW" role="P5bDN">
+        <node concept="UkePV" id="12bsjhgd0dZ" role="OY2wv">
+          <ref role="Ul1FP" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
index 1610a53c16..a89c7de888 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
@@ -2516,7 +2516,7 @@
   </node>
   <node concept="2S6QgY" id="2ufoZQIOVi8">
     <property role="TrG5h" value="attachValueInspector" />
-    <ref role="2ZfgGC" to="hm2y:6sdnDbSla17" resolve="Expression" />
+    <ref role="2ZfgGC" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="2S6ZIM" id="2ufoZQIOVi9" role="2ZfVej">
       <node concept="3clFbS" id="2ufoZQIOVia" role="2VODD2">
         <node concept="3clFbF" id="2ufoZQIOYep" role="3cqZAp">
@@ -2539,7 +2539,7 @@
               </node>
             </node>
             <node concept="zfrQC" id="2ufoZQIP0LY" role="2OqNvi">
-              <ref role="1A9B2P" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
+              <ref role="1A9B2P" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index 6b3dbbcdf4..f2e51d727d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -1722,7 +1722,7 @@
   </node>
   <node concept="1TIwiD" id="2ufoZQIKHqp">
     <property role="EcuMT" value="2850607030358693529" />
-    <property role="TrG5h" value="SimpleExpressionValueInspector" />
+    <property role="TrG5h" value="SimpleValueInspector" />
     <property role="R4oN_" value="an inspector for simple expression values" />
     <ref role="1TJDcQ" to="3673:2ufoZQIGI7m" resolve="ValueInspector" />
     <node concept="1TJgyi" id="6a3SqxOqxli" role="1TKVEl">
@@ -2171,15 +2171,6 @@
     <property role="EcuMT" value="7520958096812440715" />
     <property role="TrG5h" value="IComplexTypeSupportsEquals" />
   </node>
-  <node concept="PlHQZ" id="6wzrxL38hak">
-    <property role="EcuMT" value="7503962471793758868" />
-    <property role="TrG5h" value="IPreferredProposalContext" />
-  </node>
-  <node concept="PlHQZ" id="5r47dOfJ8Ur">
-    <property role="TrG5h" value="ITupleDeclaration" />
-    <property role="3GE5qa" value="tuples" />
-    <property role="EcuMT" value="6252153918474456730" />
-  </node>
   <node concept="PlHQZ" id="5r47dOfJ8UC">
     <property role="TrG5h" value="ITupleMemberDeclaration" />
     <property role="3GE5qa" value="tuples" />
@@ -2188,18 +2179,28 @@
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
   </node>
-  <node concept="1TIwiD" id="5r47dOfJ9kS">
-    <property role="EcuMT" value="6252153918474458424" />
+  <node concept="1TIwiD" id="25rRV02ooIM">
+    <property role="EcuMT" value="2403760773179476914" />
     <property role="3GE5qa" value="tuples" />
-    <property role="TrG5h" value="InlineTupleType" />
-    <ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
-    <node concept="1TJgyj" id="5r47dOfJ9kT" role="1TKVEi">
-      <property role="IQ2ns" value="6252153918474458425" />
-      <property role="20kJfa" value="decl" />
+    <property role="TrG5h" value="NCopiesOp" />
+    <property role="34LRSv" value="nTimes" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="25rRV02osES" role="1TKVEi">
+      <property role="IQ2ns" value="2403760773179493048" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="times" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+      <ref role="20lvS9" node="6sdnDbSla17" resolve="Expression" />
+    </node>
+    <node concept="PrWs8" id="25rRV02oy5O" role="PzmwI">
+      <ref role="PrY4T" node="25rRV02oe$f" resolve="ITupleOp" />
     </node>
   </node>
+  <node concept="PlHQZ" id="5r47dOfJ8Ur">
+    <property role="TrG5h" value="ITupleDeclaration" />
+    <property role="3GE5qa" value="tuples" />
+    <property role="EcuMT" value="6252153918474456730" />
+  </node>
   <node concept="1TIwiD" id="6GiZkUz7qWO">
     <property role="EcuMT" value="7715507625824988980" />
     <property role="3GE5qa" value="tuples" />
@@ -2226,21 +2227,20 @@
       <ref role="PrY4T" node="7NJy08a3O9a" resolve="IDotTarget" />
     </node>
   </node>
-  <node concept="1TIwiD" id="25rRV02ooIM">
-    <property role="EcuMT" value="2403760773179476914" />
+  <node concept="PlHQZ" id="6wzrxL38hak">
+    <property role="EcuMT" value="7503962471793758868" />
+    <property role="TrG5h" value="IPreferredProposalContext" />
+  </node>
+  <node concept="1TIwiD" id="5r47dOfJ9kS">
+    <property role="EcuMT" value="6252153918474458424" />
     <property role="3GE5qa" value="tuples" />
-    <property role="TrG5h" value="NCopiesOp" />
-    <property role="34LRSv" value="nTimes" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="25rRV02osES" role="1TKVEi">
-      <property role="IQ2ns" value="2403760773179493048" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="times" />
+    <property role="TrG5h" value="InlineTupleType" />
+    <ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
+    <node concept="1TJgyj" id="5r47dOfJ9kT" role="1TKVEi">
+      <property role="IQ2ns" value="6252153918474458425" />
+      <property role="20kJfa" value="decl" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="6sdnDbSla17" resolve="Expression" />
-    </node>
-    <node concept="PrWs8" id="25rRV02oy5O" role="PzmwI">
-      <ref role="PrY4T" node="25rRV02oe$f" resolve="ITupleOp" />
+      <ref role="20lvS9" node="5r47dOfJ8Ur" resolve="ITupleDeclaration" />
     </node>
   </node>
 </model>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
index 305c3c6ea8..d5aa3deed4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
@@ -196,6 +196,7 @@
         <child id="1144231399730" name="condition" index="1Dwp0S" />
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
@@ -1626,6 +1627,7 @@
       <node concept="3Tm1VV" id="3NUSEp5yd90" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6fmG8CYTYFr" role="jymVt" />
+    <node concept="3Tm1VV" id="6fmG8CYTWg2" role="1B3o_S" />
     <node concept="2YIFZL" id="2TlZyI4PJU1" role="jymVt">
       <property role="TrG5h" value="reset" />
       <node concept="3clFbS" id="2TlZyI4PJU4" role="3clF47">
@@ -1668,7 +1670,6 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="6fmG8CYTWg2" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3nVyItrYWd7">
     <property role="3GE5qa" value="nix" />
@@ -3409,5 +3410,17 @@
     <node concept="2tJIrI" id="26cjRACVUI9" role="jymVt" />
     <node concept="3Tm1VV" id="26cjRACVUN4" role="1B3o_S" />
   </node>
+  <node concept="3HP615" id="3ToB$MLORO4">
+    <property role="TrG5h" value="ICustomStringForValueInspector" />
+    <node concept="2tJIrI" id="3ToB$MLORP6" role="jymVt" />
+    <node concept="3clFb_" id="3ToB$MLORPt" role="jymVt">
+      <property role="TrG5h" value="valueInspectorString" />
+      <node concept="17QB3L" id="3ToB$MLORR7" role="3clF45" />
+      <node concept="3Tm1VV" id="3ToB$MLORPw" role="1B3o_S" />
+      <node concept="3clFbS" id="3ToB$MLORPx" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="3ToB$MLORPe" role="jymVt" />
+    <node concept="3Tm1VV" id="3ToB$MLORO5" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index dde98e6e5a..32caef82ad 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:e3e5593b-dfcd-4a2e-b10f-f1ed4a43f093(org.iets3.core.expr.plugin.plugin)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
@@ -1228,7 +1227,7 @@
   </node>
   <node concept="sE7Ow" id="2ufoZQISyNm">
     <property role="TrG5h" value="deleteValuesInspectors" />
-    <property role="2uzpH1" value="Clear Inspectors" />
+    <property role="2uzpH1" value="Remove all Inspectors" />
     <property role="3GE5qa" value="inspect" />
     <node concept="tnohg" id="2ufoZQISyNn" role="tncku">
       <node concept="3clFbS" id="2ufoZQISyNo" role="2VODD2">
@@ -1354,7 +1353,7 @@
               </node>
             </node>
             <node concept="zfrQC" id="2ufoZQISl8a" role="2OqNvi">
-              <ref role="1A9B2P" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
+              <ref role="1A9B2P" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
             </node>
           </node>
         </node>
@@ -1367,9 +1366,7 @@
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="2ufoZQISkkX" role="1B3o_S" />
       <node concept="1oajcY" id="2ufoZQISkkY" role="1oa70y" />
-      <node concept="3Tqbb2" id="2ufoZQIRP6b" role="1tU5fm">
-        <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
-      </node>
+      <node concept="3Tqbb2" id="2ufoZQIRP6b" role="1tU5fm" />
     </node>
     <node concept="2ScWuX" id="2ufoZQISlhf" role="tmbBb">
       <node concept="3clFbS" id="2ufoZQISlhg" role="2VODD2">
@@ -2455,245 +2452,97 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="5rUl2R7JDDM">
+  <node concept="312cEu" id="5rUl2R7NKQt">
     <property role="3GE5qa" value="testExecution" />
-    <property role="TrG5h" value="GeneratorWorkspace" />
-    <node concept="3clFbW" id="5rUl2R7JDDN" role="jymVt">
-      <node concept="3cqZAl" id="5rUl2R7JDDO" role="3clF45" />
-      <node concept="3Tm1VV" id="5rUl2R7JDDP" role="1B3o_S" />
-      <node concept="3clFbS" id="5rUl2R7JDDQ" role="3clF47">
-        <node concept="XkiVB" id="5rUl2R7JDDR" role="3cqZAp">
+    <property role="TrG5h" value="NoPreferenceWorkspace" />
+    <node concept="3clFbW" id="5rUl2R7NKQu" role="jymVt">
+      <node concept="3cqZAl" id="5rUl2R7NKQv" role="3clF45" />
+      <node concept="3Tm1VV" id="5rUl2R7NKQw" role="1B3o_S" />
+      <node concept="3clFbS" id="5rUl2R7NKQx" role="3clF47">
+        <node concept="XkiVB" id="5rUl2R7NKQy" role="3cqZAp">
           <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String)" resolve="ToggleAction" />
-          <node concept="Xl_RD" id="5rUl2R7JDDS" role="37wK5m">
-            <property role="Xl_RC" value="KernelF Tests: Generator (workspace)" />
+          <node concept="Xl_RD" id="5rUl2R7NKQz" role="37wK5m">
+            <property role="Xl_RC" value="KernelF Tests: No preference (workspace overrides above settings)" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="5rUl2R7JDDT" role="1B3o_S" />
-    <node concept="3uibUv" id="5rUl2R7JDDU" role="1zkMxy">
+    <node concept="3Tm1VV" id="5rUl2R7NKQ$" role="1B3o_S" />
+    <node concept="3uibUv" id="5rUl2R7NKQ_" role="1zkMxy">
       <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
     </node>
-    <node concept="3clFb_" id="5rUl2R7JDDV" role="jymVt">
+    <node concept="3clFb_" id="5rUl2R7NKQA" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="isSelected" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="5rUl2R7JDDW" role="1B3o_S" />
-      <node concept="10P_77" id="5rUl2R7JDDX" role="3clF45" />
-      <node concept="37vLTG" id="5rUl2R7JDDY" role="3clF46">
+      <node concept="3Tm1VV" id="5rUl2R7NKQB" role="1B3o_S" />
+      <node concept="10P_77" id="5rUl2R7NKQC" role="3clF45" />
+      <node concept="37vLTG" id="5rUl2R7NKQD" role="3clF46">
         <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="5rUl2R7JDDZ" role="1tU5fm">
+        <node concept="3uibUv" id="5rUl2R7NKQE" role="1tU5fm">
           <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
         </node>
       </node>
-      <node concept="3clFbS" id="5rUl2R7JDE0" role="3clF47">
-        <node concept="3cpWs8" id="5rUl2R7KnQD" role="3cqZAp">
-          <node concept="3cpWsn" id="5rUl2R7KnQE" role="3cpWs9">
+      <node concept="3clFbS" id="5rUl2R7NKQF" role="3clF47">
+        <node concept="3cpWs8" id="5rUl2R7NKQG" role="3cqZAp">
+          <node concept="3cpWsn" id="5rUl2R7NKQH" role="3cpWs9">
             <property role="TrG5h" value="mode" />
-            <node concept="3uibUv" id="5rUl2R7KGhX" role="1tU5fm">
+            <node concept="3uibUv" id="5rUl2R7NKQI" role="1tU5fm">
               <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
             </node>
-            <node concept="2YIFZM" id="5rUl2R7KrpJ" role="33vP2m">
-              <ref role="37wK5l" node="5rUl2R7Ka3V" resolve="getExecutionMode" />
+            <node concept="2YIFZM" id="5rUl2R7NKQJ" role="33vP2m">
               <ref role="1Pybhc" node="5rUl2R7JYML" resolve="TestExecutionWorkspaceSetting" />
+              <ref role="37wK5l" node="5rUl2R7Ka3V" resolve="getExecutionMode" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5rUl2R7KtJ4" role="3cqZAp">
-          <node concept="17R0WA" id="5rUl2R7KwIK" role="3clFbG">
-            <node concept="Rm8GO" id="5rUl2R7KGB2" role="3uHU7w">
-              <ref role="Rm8GQ" node="5rUl2R7KE3p" resolve="GENERATOR" />
+        <node concept="3clFbF" id="5rUl2R7NKQN" role="3cqZAp">
+          <node concept="17R0WA" id="5rUl2R7NKQO" role="3clFbG">
+            <node concept="Rm8GO" id="5rUl2R7NMki" role="3uHU7w">
+              <ref role="Rm8GQ" node="5rUl2R7KE90" resolve="NO_PREFERENCE" />
               <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
             </node>
-            <node concept="37vLTw" id="5rUl2R7KtJ2" role="3uHU7B">
-              <ref role="3cqZAo" node="5rUl2R7KnQE" resolve="mode" />
+            <node concept="37vLTw" id="5rUl2R7NKQQ" role="3uHU7B">
+              <ref role="3cqZAo" node="5rUl2R7NKQH" resolve="mode" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5rUl2R7JDEK" role="2AJF6D">
+      <node concept="2AHcQZ" id="5rUl2R7NKQR" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="3clFb_" id="5rUl2R7JDEL" role="jymVt">
+    <node concept="3clFb_" id="5rUl2R7NKQS" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="setSelected" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="5rUl2R7JDEM" role="1B3o_S" />
-      <node concept="3cqZAl" id="5rUl2R7JDEN" role="3clF45" />
-      <node concept="37vLTG" id="5rUl2R7JDEO" role="3clF46">
+      <node concept="3Tm1VV" id="5rUl2R7NKQT" role="1B3o_S" />
+      <node concept="3cqZAl" id="5rUl2R7NKQU" role="3clF45" />
+      <node concept="37vLTG" id="5rUl2R7NKQV" role="3clF46">
         <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="5rUl2R7JDEP" role="1tU5fm">
+        <node concept="3uibUv" id="5rUl2R7NKQW" role="1tU5fm">
           <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
         </node>
       </node>
-      <node concept="37vLTG" id="5rUl2R7JDEQ" role="3clF46">
+      <node concept="37vLTG" id="5rUl2R7NKQX" role="3clF46">
         <property role="TrG5h" value="b" />
-        <node concept="10P_77" id="5rUl2R7JDER" role="1tU5fm" />
+        <node concept="10P_77" id="5rUl2R7NKQY" role="1tU5fm" />
       </node>
-      <node concept="3clFbS" id="5rUl2R7JDES" role="3clF47">
-        <node concept="3clFbF" id="5rUl2R7KHfz" role="3cqZAp">
-          <node concept="2YIFZM" id="5rUl2R7KCfH" role="3clFbG">
-            <ref role="37wK5l" node="5rUl2R7KxIX" resolve="setExecutionMode" />
+      <node concept="3clFbS" id="5rUl2R7NKQZ" role="3clF47">
+        <node concept="3clFbF" id="5rUl2R7NKR0" role="3cqZAp">
+          <node concept="2YIFZM" id="5rUl2R7NMZH" role="3clFbG">
+            <ref role="37wK5l" node="5rUl2R7K_Rs" resolve="clearExecutionMode" />
             <ref role="1Pybhc" node="5rUl2R7JYML" resolve="TestExecutionWorkspaceSetting" />
-            <node concept="Rm8GO" id="5rUl2R7KHbk" role="37wK5m">
-              <ref role="Rm8GQ" node="5rUl2R7KE3p" resolve="GENERATOR" />
-              <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
-            </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5rUl2R7JDFv" role="2AJF6D">
+      <node concept="2AHcQZ" id="5rUl2R7NKR6" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="5rUl2R7JYML">
-    <property role="3GE5qa" value="testExecution" />
-    <property role="TrG5h" value="TestExecutionWorkspaceSetting" />
-    <node concept="Wx3nA" id="5rUl2R7KcOJ" role="jymVt">
-      <property role="TrG5h" value="KEY" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="5rUl2R7Kctg" role="1B3o_S" />
-      <node concept="17QB3L" id="5rUl2R7KcLR" role="1tU5fm" />
-      <node concept="Xl_RD" id="5rUl2R7KcYW" role="33vP2m">
-        <property role="Xl_RC" value="org.iets3.core.expr.testExecution" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5rUl2R7KcM3" role="jymVt" />
-    <node concept="2tJIrI" id="5rUl2R7K8MW" role="jymVt" />
-    <node concept="2YIFZL" id="5rUl2R7Ka3V" role="jymVt">
-      <property role="TrG5h" value="getExecutionMode" />
-      <node concept="3clFbS" id="5rUl2R7Ka3Y" role="3clF47">
-        <node concept="3cpWs8" id="5rUl2R7KeqZ" role="3cqZAp">
-          <node concept="3cpWsn" id="5rUl2R7Ker0" role="3cpWs9">
-            <property role="TrG5h" value="value" />
-            <node concept="17QB3L" id="5rUl2R7KiPQ" role="1tU5fm" />
-            <node concept="2OqwBi" id="5rUl2R7Ker1" role="33vP2m">
-              <node concept="2YIFZM" id="5rUl2R7Ker2" role="2Oq$k0">
-                <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
-                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
-              </node>
-              <node concept="liA8E" id="5rUl2R7Ker4" role="2OqNvi">
-                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getValue(java.lang.String)" resolve="getValue" />
-                <node concept="37vLTw" id="5rUl2R7Ker5" role="37wK5m">
-                  <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="5rUl2R7Kf2D" role="3cqZAp">
-          <node concept="3clFbS" id="5rUl2R7Kf2F" role="3clFbx">
-            <node concept="3cpWs6" id="5rUl2R7Kg8j" role="3cqZAp">
-              <node concept="Rm8GO" id="5rUl2R7KF0m" role="3cqZAk">
-                <ref role="Rm8GQ" node="5rUl2R7KE90" resolve="NO_PREFERENCE" />
-                <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="5rUl2R7KfG5" role="3clFbw">
-            <node concept="10Nm6u" id="5rUl2R7KfX3" role="3uHU7w" />
-            <node concept="37vLTw" id="5rUl2R7Kfhp" role="3uHU7B">
-              <ref role="3cqZAo" node="5rUl2R7Ker0" resolve="value" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="5rUl2R7KgDa" role="3cqZAp" />
-        <node concept="3clFbF" id="5rUl2R7Khco" role="3cqZAp">
-          <node concept="unr1b" id="5rUl2R7KhRh" role="3clFbG">
-            <ref role="un$jP" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
-            <node concept="37vLTw" id="5rUl2R7KixT" role="unwt0">
-              <ref role="3cqZAo" node="5rUl2R7Ker0" resolve="value" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5rUl2R7K9oN" role="1B3o_S" />
-      <node concept="3uibUv" id="5rUl2R7KEEl" role="3clF45">
-        <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5rUl2R7KxkE" role="jymVt" />
-    <node concept="2YIFZL" id="5rUl2R7KxIX" role="jymVt">
-      <property role="TrG5h" value="setExecutionMode" />
-      <node concept="37vLTG" id="5rUl2R7KyQy" role="3clF46">
-        <property role="TrG5h" value="mode" />
-        <node concept="3uibUv" id="5rUl2R7KFws" role="1tU5fm">
-          <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5rUl2R7KxJ0" role="3clF47">
-        <node concept="3clFbF" id="5rUl2R7K$Xy" role="3cqZAp">
-          <node concept="2OqwBi" id="5rUl2R7Ky40" role="3clFbG">
-            <node concept="2YIFZM" id="5rUl2R7Ky41" role="2Oq$k0">
-              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
-              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
-            </node>
-            <node concept="liA8E" id="5rUl2R7Ky43" role="2OqNvi">
-              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,java.lang.String)" resolve="setValue" />
-              <node concept="37vLTw" id="5rUl2R7K$XA" role="37wK5m">
-                <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
-              </node>
-              <node concept="2OqwBi" id="5rUl2R7K$49" role="37wK5m">
-                <node concept="37vLTw" id="5rUl2R7KzuD" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5rUl2R7KyQy" resolve="mode" />
-                </node>
-                <node concept="liA8E" id="5rUl2R7K$KH" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5rUl2R7Kxva" role="1B3o_S" />
-      <node concept="3cqZAl" id="5rUl2R7KxIF" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="5rUl2R7K_nM" role="jymVt" />
-    <node concept="2YIFZL" id="5rUl2R7K_Rs" role="jymVt">
-      <property role="TrG5h" value="clearExecutionMode" />
-      <node concept="3clFbS" id="5rUl2R7K_Rv" role="3clF47">
-        <node concept="3clFbF" id="5rUl2R7KA0l" role="3cqZAp">
-          <node concept="2OqwBi" id="5rUl2R7KA0m" role="3clFbG">
-            <node concept="2YIFZM" id="5rUl2R7KA0n" role="2Oq$k0">
-              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
-              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
-            </node>
-            <node concept="liA8E" id="5rUl2R7KA0p" role="2OqNvi">
-              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,java.lang.String)" resolve="setValue" />
-              <node concept="37vLTw" id="5rUl2R7KA0v" role="37wK5m">
-                <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
-              </node>
-              <node concept="10Nm6u" id="5rUl2R7KArb" role="37wK5m" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5rUl2R7K__4" role="1B3o_S" />
-      <node concept="3cqZAl" id="5rUl2R7K_R6" role="3clF45" />
-    </node>
-    <node concept="3Tm1VV" id="5rUl2R7JYMM" role="1B3o_S" />
-  </node>
-  <node concept="Qs71p" id="5rUl2R7KDH5">
-    <property role="3GE5qa" value="testExecution" />
-    <property role="TrG5h" value="ExecutionModePreference" />
-    <node concept="QsSxf" id="5rUl2R7KDTl" role="Qtgdg">
-      <property role="TrG5h" value="INTERPRETER" />
-      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-    </node>
-    <node concept="QsSxf" id="5rUl2R7KE3p" role="Qtgdg">
-      <property role="TrG5h" value="GENERATOR" />
-      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-    </node>
-    <node concept="QsSxf" id="5rUl2R7KE90" role="Qtgdg">
-      <property role="TrG5h" value="NO_PREFERENCE" />
-      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-    </node>
-    <node concept="3Tm1VV" id="5rUl2R7KDH6" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="5rUl2R7KIet">
     <property role="3GE5qa" value="testExecution" />
     <property role="TrG5h" value="InterpreterWorkspace" />
@@ -2789,97 +2638,386 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="5rUl2R7NKQt">
+  <node concept="Qs71p" id="5rUl2R7KDH5">
     <property role="3GE5qa" value="testExecution" />
-    <property role="TrG5h" value="NoPreferenceWorkspace" />
-    <node concept="3clFbW" id="5rUl2R7NKQu" role="jymVt">
-      <node concept="3cqZAl" id="5rUl2R7NKQv" role="3clF45" />
-      <node concept="3Tm1VV" id="5rUl2R7NKQw" role="1B3o_S" />
-      <node concept="3clFbS" id="5rUl2R7NKQx" role="3clF47">
-        <node concept="XkiVB" id="5rUl2R7NKQy" role="3cqZAp">
-          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String)" resolve="ToggleAction" />
-          <node concept="Xl_RD" id="5rUl2R7NKQz" role="37wK5m">
-            <property role="Xl_RC" value="KernelF Tests: No preference (workspace overrides above settings)" />
-          </node>
-        </node>
-      </node>
+    <property role="TrG5h" value="ExecutionModePreference" />
+    <node concept="QsSxf" id="5rUl2R7KDTl" role="Qtgdg">
+      <property role="TrG5h" value="INTERPRETER" />
+      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
     </node>
-    <node concept="3Tm1VV" id="5rUl2R7NKQ$" role="1B3o_S" />
-    <node concept="3uibUv" id="5rUl2R7NKQ_" role="1zkMxy">
-      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    <node concept="QsSxf" id="5rUl2R7KE3p" role="Qtgdg">
+      <property role="TrG5h" value="GENERATOR" />
+      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
     </node>
-    <node concept="3clFb_" id="5rUl2R7NKQA" role="jymVt">
+    <node concept="QsSxf" id="5rUl2R7KE90" role="Qtgdg">
+      <property role="TrG5h" value="NO_PREFERENCE" />
+      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+    </node>
+    <node concept="3Tm1VV" id="5rUl2R7KDH6" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="3ApArNFARAE">
+    <property role="TrG5h" value="AbstractTraceExplorerAction" />
+    <property role="1sVAO0" value="true" />
+    <node concept="312cEg" id="3ApArNFASVW" role="jymVt">
+      <property role="TrG5h" value="ideaProject" />
+      <node concept="3Tmbuc" id="3ApArNFAZl5" role="1B3o_S" />
+      <node concept="3uibUv" id="3ApArNFASVY" role="1tU5fm">
+        <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+      </node>
+    </node>
+    <node concept="312cEg" id="3ApArNFASVZ" role="jymVt">
+      <property role="TrG5h" value="mpsProject" />
+      <node concept="3Tmbuc" id="3ApArNFAZvE" role="1B3o_S" />
+      <node concept="3uibUv" id="3ApArNFASW1" role="1tU5fm">
+        <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3ApArNFAS$I" role="jymVt" />
+    <node concept="2tJIrI" id="3ApArNFBgAL" role="jymVt" />
+    <node concept="3clFbW" id="3ApArNFASzH" role="jymVt">
+      <node concept="3cqZAl" id="3ApArNFASzJ" role="3clF45" />
+      <node concept="3Tm1VV" id="3ApArNFASzK" role="1B3o_S" />
+      <node concept="3clFbS" id="3ApArNFASzL" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFATw0" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFDl1Z" role="jymVt">
+      <property role="TrG5h" value="initialize" />
+      <node concept="37vLTG" id="3ApArNFAS$7" role="3clF46">
+        <property role="TrG5h" value="ideaProject" />
+        <node concept="3uibUv" id="3ApArNFAS$8" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3ApArNFAS$9" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="3ApArNFAS$a" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3ApArNFDl22" role="3clF47">
+        <node concept="3clFbF" id="3ApArNFATjD" role="3cqZAp">
+          <node concept="37vLTI" id="3ApArNFATjE" role="3clFbG">
+            <node concept="37vLTw" id="3ApArNFATjF" role="37vLTx">
+              <ref role="3cqZAo" node="3ApArNFAS$7" resolve="ideaProject" />
+            </node>
+            <node concept="2OqwBi" id="3ApArNFATjG" role="37vLTJ">
+              <node concept="Xjq3P" id="3ApArNFATjH" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3ApArNFATjI" role="2OqNvi">
+                <ref role="2Oxat5" node="3ApArNFASVW" resolve="ideaProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ApArNFATjL" role="3cqZAp">
+          <node concept="37vLTI" id="3ApArNFATjM" role="3clFbG">
+            <node concept="37vLTw" id="3ApArNFATjN" role="37vLTx">
+              <ref role="3cqZAo" node="3ApArNFAS$9" resolve="mpsProject" />
+            </node>
+            <node concept="2OqwBi" id="3ApArNFATjO" role="37vLTJ">
+              <node concept="Xjq3P" id="3ApArNFATjP" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3ApArNFATjQ" role="2OqNvi">
+                <ref role="2Oxat5" node="3ApArNFASVZ" resolve="mpsProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3ApArNFDkuD" role="1B3o_S" />
+      <node concept="3cqZAl" id="3ApArNFDl1Q" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFATFJ" role="jymVt" />
+    <node concept="3Tm1VV" id="3ApArNFARAF" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="5rUl2R7JYML">
+    <property role="3GE5qa" value="testExecution" />
+    <property role="TrG5h" value="TestExecutionWorkspaceSetting" />
+    <node concept="Wx3nA" id="5rUl2R7KcOJ" role="jymVt">
+      <property role="TrG5h" value="KEY" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="5rUl2R7Kctg" role="1B3o_S" />
+      <node concept="17QB3L" id="5rUl2R7KcLR" role="1tU5fm" />
+      <node concept="Xl_RD" id="5rUl2R7KcYW" role="33vP2m">
+        <property role="Xl_RC" value="org.iets3.core.expr.testExecution" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5rUl2R7KcM3" role="jymVt" />
+    <node concept="2tJIrI" id="5rUl2R7K8MW" role="jymVt" />
+    <node concept="2YIFZL" id="5rUl2R7Ka3V" role="jymVt">
+      <property role="TrG5h" value="getExecutionMode" />
+      <node concept="3clFbS" id="5rUl2R7Ka3Y" role="3clF47">
+        <node concept="3cpWs8" id="5rUl2R7KeqZ" role="3cqZAp">
+          <node concept="3cpWsn" id="5rUl2R7Ker0" role="3cpWs9">
+            <property role="TrG5h" value="value" />
+            <node concept="17QB3L" id="5rUl2R7KiPQ" role="1tU5fm" />
+            <node concept="2OqwBi" id="5rUl2R7Ker1" role="33vP2m">
+              <node concept="2YIFZM" id="5rUl2R7Ker2" role="2Oq$k0">
+                <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="5rUl2R7Ker4" role="2OqNvi">
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getValue(java.lang.String)" resolve="getValue" />
+                <node concept="37vLTw" id="5rUl2R7Ker5" role="37wK5m">
+                  <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5rUl2R7Kf2D" role="3cqZAp">
+          <node concept="3clFbS" id="5rUl2R7Kf2F" role="3clFbx">
+            <node concept="3cpWs6" id="5rUl2R7Kg8j" role="3cqZAp">
+              <node concept="Rm8GO" id="5rUl2R7KF0m" role="3cqZAk">
+                <ref role="Rm8GQ" node="5rUl2R7KE90" resolve="NO_PREFERENCE" />
+                <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="5rUl2R7KfG5" role="3clFbw">
+            <node concept="10Nm6u" id="5rUl2R7KfX3" role="3uHU7w" />
+            <node concept="37vLTw" id="5rUl2R7Kfhp" role="3uHU7B">
+              <ref role="3cqZAo" node="5rUl2R7Ker0" resolve="value" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5rUl2R7KgDa" role="3cqZAp" />
+        <node concept="3clFbF" id="5rUl2R7Khco" role="3cqZAp">
+          <node concept="unr1b" id="5rUl2R7KhRh" role="3clFbG">
+            <ref role="un$jP" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
+            <node concept="37vLTw" id="5rUl2R7KixT" role="unwt0">
+              <ref role="3cqZAo" node="5rUl2R7Ker0" resolve="value" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5rUl2R7K9oN" role="1B3o_S" />
+      <node concept="3uibUv" id="5rUl2R7KEEl" role="3clF45">
+        <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5rUl2R7KxkE" role="jymVt" />
+    <node concept="2YIFZL" id="5rUl2R7KxIX" role="jymVt">
+      <property role="TrG5h" value="setExecutionMode" />
+      <node concept="37vLTG" id="5rUl2R7KyQy" role="3clF46">
+        <property role="TrG5h" value="mode" />
+        <node concept="3uibUv" id="5rUl2R7KFws" role="1tU5fm">
+          <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5rUl2R7KxJ0" role="3clF47">
+        <node concept="3clFbF" id="5rUl2R7K$Xy" role="3cqZAp">
+          <node concept="2OqwBi" id="5rUl2R7Ky40" role="3clFbG">
+            <node concept="2YIFZM" id="5rUl2R7Ky41" role="2Oq$k0">
+              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+            </node>
+            <node concept="liA8E" id="5rUl2R7Ky43" role="2OqNvi">
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,java.lang.String)" resolve="setValue" />
+              <node concept="37vLTw" id="5rUl2R7K$XA" role="37wK5m">
+                <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
+              </node>
+              <node concept="2OqwBi" id="5rUl2R7K$49" role="37wK5m">
+                <node concept="37vLTw" id="5rUl2R7KzuD" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5rUl2R7KyQy" resolve="mode" />
+                </node>
+                <node concept="liA8E" id="5rUl2R7K$KH" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5rUl2R7Kxva" role="1B3o_S" />
+      <node concept="3cqZAl" id="5rUl2R7KxIF" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="5rUl2R7K_nM" role="jymVt" />
+    <node concept="2YIFZL" id="5rUl2R7K_Rs" role="jymVt">
+      <property role="TrG5h" value="clearExecutionMode" />
+      <node concept="3clFbS" id="5rUl2R7K_Rv" role="3clF47">
+        <node concept="3clFbF" id="5rUl2R7KA0l" role="3cqZAp">
+          <node concept="2OqwBi" id="5rUl2R7KA0m" role="3clFbG">
+            <node concept="2YIFZM" id="5rUl2R7KA0n" role="2Oq$k0">
+              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+            </node>
+            <node concept="liA8E" id="5rUl2R7KA0p" role="2OqNvi">
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,java.lang.String)" resolve="setValue" />
+              <node concept="37vLTw" id="5rUl2R7KA0v" role="37wK5m">
+                <ref role="3cqZAo" node="5rUl2R7KcOJ" resolve="KEY" />
+              </node>
+              <node concept="10Nm6u" id="5rUl2R7KArb" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5rUl2R7K__4" role="1B3o_S" />
+      <node concept="3cqZAl" id="5rUl2R7K_R6" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="5rUl2R7JYMM" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="5rUl2R7JDDM">
+    <property role="3GE5qa" value="testExecution" />
+    <property role="TrG5h" value="GeneratorWorkspace" />
+    <node concept="3clFbW" id="5rUl2R7JDDN" role="jymVt">
+      <node concept="3cqZAl" id="5rUl2R7JDDO" role="3clF45" />
+      <node concept="3Tm1VV" id="5rUl2R7JDDP" role="1B3o_S" />
+      <node concept="3clFbS" id="5rUl2R7JDDQ" role="3clF47">
+        <node concept="XkiVB" id="5rUl2R7JDDR" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String)" resolve="ToggleAction" />
+          <node concept="Xl_RD" id="5rUl2R7JDDS" role="37wK5m">
+            <property role="Xl_RC" value="KernelF Tests: Generator (workspace)" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="5rUl2R7JDDT" role="1B3o_S" />
+    <node concept="3uibUv" id="5rUl2R7JDDU" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    </node>
+    <node concept="3clFb_" id="5rUl2R7JDDV" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="isSelected" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="5rUl2R7NKQB" role="1B3o_S" />
-      <node concept="10P_77" id="5rUl2R7NKQC" role="3clF45" />
-      <node concept="37vLTG" id="5rUl2R7NKQD" role="3clF46">
+      <node concept="3Tm1VV" id="5rUl2R7JDDW" role="1B3o_S" />
+      <node concept="10P_77" id="5rUl2R7JDDX" role="3clF45" />
+      <node concept="37vLTG" id="5rUl2R7JDDY" role="3clF46">
         <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="5rUl2R7NKQE" role="1tU5fm">
+        <node concept="3uibUv" id="5rUl2R7JDDZ" role="1tU5fm">
           <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
         </node>
       </node>
-      <node concept="3clFbS" id="5rUl2R7NKQF" role="3clF47">
-        <node concept="3cpWs8" id="5rUl2R7NKQG" role="3cqZAp">
-          <node concept="3cpWsn" id="5rUl2R7NKQH" role="3cpWs9">
+      <node concept="3clFbS" id="5rUl2R7JDE0" role="3clF47">
+        <node concept="3cpWs8" id="5rUl2R7KnQD" role="3cqZAp">
+          <node concept="3cpWsn" id="5rUl2R7KnQE" role="3cpWs9">
             <property role="TrG5h" value="mode" />
-            <node concept="3uibUv" id="5rUl2R7NKQI" role="1tU5fm">
+            <node concept="3uibUv" id="5rUl2R7KGhX" role="1tU5fm">
               <ref role="3uigEE" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
             </node>
-            <node concept="2YIFZM" id="5rUl2R7NKQJ" role="33vP2m">
-              <ref role="1Pybhc" node="5rUl2R7JYML" resolve="TestExecutionWorkspaceSetting" />
+            <node concept="2YIFZM" id="5rUl2R7KrpJ" role="33vP2m">
               <ref role="37wK5l" node="5rUl2R7Ka3V" resolve="getExecutionMode" />
+              <ref role="1Pybhc" node="5rUl2R7JYML" resolve="TestExecutionWorkspaceSetting" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5rUl2R7NKQN" role="3cqZAp">
-          <node concept="17R0WA" id="5rUl2R7NKQO" role="3clFbG">
-            <node concept="Rm8GO" id="5rUl2R7NMki" role="3uHU7w">
-              <ref role="Rm8GQ" node="5rUl2R7KE90" resolve="NO_PREFERENCE" />
+        <node concept="3clFbF" id="5rUl2R7KtJ4" role="3cqZAp">
+          <node concept="17R0WA" id="5rUl2R7KwIK" role="3clFbG">
+            <node concept="Rm8GO" id="5rUl2R7KGB2" role="3uHU7w">
+              <ref role="Rm8GQ" node="5rUl2R7KE3p" resolve="GENERATOR" />
               <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
             </node>
-            <node concept="37vLTw" id="5rUl2R7NKQQ" role="3uHU7B">
-              <ref role="3cqZAo" node="5rUl2R7NKQH" resolve="mode" />
+            <node concept="37vLTw" id="5rUl2R7KtJ2" role="3uHU7B">
+              <ref role="3cqZAo" node="5rUl2R7KnQE" resolve="mode" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5rUl2R7NKQR" role="2AJF6D">
+      <node concept="2AHcQZ" id="5rUl2R7JDEK" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="3clFb_" id="5rUl2R7NKQS" role="jymVt">
+    <node concept="3clFb_" id="5rUl2R7JDEL" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="setSelected" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="5rUl2R7NKQT" role="1B3o_S" />
-      <node concept="3cqZAl" id="5rUl2R7NKQU" role="3clF45" />
-      <node concept="37vLTG" id="5rUl2R7NKQV" role="3clF46">
+      <node concept="3Tm1VV" id="5rUl2R7JDEM" role="1B3o_S" />
+      <node concept="3cqZAl" id="5rUl2R7JDEN" role="3clF45" />
+      <node concept="37vLTG" id="5rUl2R7JDEO" role="3clF46">
         <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="5rUl2R7NKQW" role="1tU5fm">
+        <node concept="3uibUv" id="5rUl2R7JDEP" role="1tU5fm">
           <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
         </node>
       </node>
-      <node concept="37vLTG" id="5rUl2R7NKQX" role="3clF46">
+      <node concept="37vLTG" id="5rUl2R7JDEQ" role="3clF46">
         <property role="TrG5h" value="b" />
-        <node concept="10P_77" id="5rUl2R7NKQY" role="1tU5fm" />
+        <node concept="10P_77" id="5rUl2R7JDER" role="1tU5fm" />
       </node>
-      <node concept="3clFbS" id="5rUl2R7NKQZ" role="3clF47">
-        <node concept="3clFbF" id="5rUl2R7NKR0" role="3cqZAp">
-          <node concept="2YIFZM" id="5rUl2R7NMZH" role="3clFbG">
-            <ref role="37wK5l" node="5rUl2R7K_Rs" resolve="clearExecutionMode" />
+      <node concept="3clFbS" id="5rUl2R7JDES" role="3clF47">
+        <node concept="3clFbF" id="5rUl2R7KHfz" role="3cqZAp">
+          <node concept="2YIFZM" id="5rUl2R7KCfH" role="3clFbG">
+            <ref role="37wK5l" node="5rUl2R7KxIX" resolve="setExecutionMode" />
             <ref role="1Pybhc" node="5rUl2R7JYML" resolve="TestExecutionWorkspaceSetting" />
+            <node concept="Rm8GO" id="5rUl2R7KHbk" role="37wK5m">
+              <ref role="Rm8GQ" node="5rUl2R7KE3p" resolve="GENERATOR" />
+              <ref role="1Px2BO" node="5rUl2R7KDH5" resolve="ExecutionModePreference" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5rUl2R7NKR6" role="2AJF6D">
+      <node concept="2AHcQZ" id="5rUl2R7JDFv" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
+  <node concept="3HP615" id="3ApArNFAIPt">
+    <property role="TrG5h" value="ITraceExplorerAction" />
+    <node concept="2tJIrI" id="3ApArNFBW5B" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFAK9d" role="jymVt">
+      <property role="TrG5h" value="getPriority" />
+      <node concept="3clFbS" id="3ApArNFAK9g" role="3clF47" />
+      <node concept="3Tm1VV" id="3ApArNFAK9h" role="1B3o_S" />
+      <node concept="10Oyi0" id="3ApArNFAK90" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFBW52" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFD4pN" role="jymVt">
+      <property role="TrG5h" value="initialize" />
+      <node concept="37vLTG" id="3ApArNFD4AI" role="3clF46">
+        <property role="TrG5h" value="ideaProject" />
+        <node concept="3uibUv" id="3ApArNFD4AJ" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3ApArNFD4AK" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="3ApArNFD4AL" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3ApArNFD4pQ" role="3clF47" />
+      <node concept="3Tm1VV" id="3ApArNFD4pR" role="1B3o_S" />
+      <node concept="3cqZAl" id="3ApArNFD4oV" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFD4P2" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFJXkK" role="jymVt">
+      <property role="TrG5h" value="setNode" />
+      <node concept="3clFbS" id="3ApArNFJXkN" role="3clF47" />
+      <node concept="3Tm1VV" id="3ApArNFJXkO" role="1B3o_S" />
+      <node concept="3cqZAl" id="3ApArNFJXjs" role="3clF45" />
+      <node concept="37vLTG" id="3ApArNFJXTE" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3ApArNFJXTD" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3ApArNFJWTz" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFD4Nv" role="jymVt">
+      <property role="TrG5h" value="isApplicable" />
+      <node concept="3clFbS" id="3ApArNFBSd8" role="3clF47" />
+      <node concept="37vLTG" id="3ApArNFBSdb" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="3ApArNFBSdc" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+      </node>
+      <node concept="10P_77" id="3ApArNFBSd6" role="3clF45" />
+      <node concept="3Tm1VV" id="3ApArNFBSdg" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFD4D1" role="jymVt" />
+    <node concept="3clFb_" id="3ApArNFBZx6" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <node concept="37vLTG" id="3ApArNFC20D" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="3ApArNFC20E" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3ApArNFBZx9" role="3clF47" />
+      <node concept="3Tm1VV" id="3ApArNFBZxa" role="1B3o_S" />
+      <node concept="3cqZAl" id="3ApArNFBZws" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3ApArNFAR3Z" role="jymVt" />
+    <node concept="3Tm1VV" id="3ApArNFAIPu" role="1B3o_S" />
+  </node>
   <node concept="312cEu" id="5rUl2R7OncF">
     <property role="3GE5qa" value="testExecution" />
     <property role="TrG5h" value="TestExecutionSettings" />
@@ -2979,146 +3117,5 @@
     </node>
     <node concept="3Tm1VV" id="5rUl2R7OncG" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="3ApArNFAIPt">
-    <property role="TrG5h" value="ITraceExplorerAction" />
-    <node concept="2tJIrI" id="3ApArNFBW5B" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFAK9d" role="jymVt">
-      <property role="TrG5h" value="getPriority" />
-      <node concept="3clFbS" id="3ApArNFAK9g" role="3clF47" />
-      <node concept="3Tm1VV" id="3ApArNFAK9h" role="1B3o_S" />
-      <node concept="10Oyi0" id="3ApArNFAK90" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFBW52" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFD4pN" role="jymVt">
-      <property role="TrG5h" value="initialize" />
-      <node concept="37vLTG" id="3ApArNFD4AI" role="3clF46">
-        <property role="TrG5h" value="ideaProject" />
-        <node concept="3uibUv" id="3ApArNFD4AJ" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3ApArNFD4AK" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="3ApArNFD4AL" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3ApArNFD4pQ" role="3clF47" />
-      <node concept="3Tm1VV" id="3ApArNFD4pR" role="1B3o_S" />
-      <node concept="3cqZAl" id="3ApArNFD4oV" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFD4P2" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFJXkK" role="jymVt">
-      <property role="TrG5h" value="setNode" />
-      <node concept="3clFbS" id="3ApArNFJXkN" role="3clF47" />
-      <node concept="3Tm1VV" id="3ApArNFJXkO" role="1B3o_S" />
-      <node concept="3cqZAl" id="3ApArNFJXjs" role="3clF45" />
-      <node concept="37vLTG" id="3ApArNFJXTE" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3ApArNFJXTD" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3ApArNFJWTz" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFD4Nv" role="jymVt">
-      <property role="TrG5h" value="isApplicable" />
-      <node concept="3clFbS" id="3ApArNFBSd8" role="3clF47" />
-      <node concept="37vLTG" id="3ApArNFBSdb" role="3clF46">
-        <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="3ApArNFBSdc" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-        </node>
-      </node>
-      <node concept="10P_77" id="3ApArNFBSd6" role="3clF45" />
-      <node concept="3Tm1VV" id="3ApArNFBSdg" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFD4D1" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFBZx6" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <node concept="37vLTG" id="3ApArNFC20D" role="3clF46">
-        <property role="TrG5h" value="event" />
-        <node concept="3uibUv" id="3ApArNFC20E" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3ApArNFBZx9" role="3clF47" />
-      <node concept="3Tm1VV" id="3ApArNFBZxa" role="1B3o_S" />
-      <node concept="3cqZAl" id="3ApArNFBZws" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFAR3Z" role="jymVt" />
-    <node concept="3Tm1VV" id="3ApArNFAIPu" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="3ApArNFARAE">
-    <property role="TrG5h" value="AbstractTraceExplorerAction" />
-    <property role="1sVAO0" value="true" />
-    <node concept="312cEg" id="3ApArNFASVW" role="jymVt">
-      <property role="TrG5h" value="ideaProject" />
-      <node concept="3Tmbuc" id="3ApArNFAZl5" role="1B3o_S" />
-      <node concept="3uibUv" id="3ApArNFASVY" role="1tU5fm">
-        <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-      </node>
-    </node>
-    <node concept="312cEg" id="3ApArNFASVZ" role="jymVt">
-      <property role="TrG5h" value="mpsProject" />
-      <node concept="3Tmbuc" id="3ApArNFAZvE" role="1B3o_S" />
-      <node concept="3uibUv" id="3ApArNFASW1" role="1tU5fm">
-        <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3ApArNFAS$I" role="jymVt" />
-    <node concept="2tJIrI" id="3ApArNFBgAL" role="jymVt" />
-    <node concept="3clFbW" id="3ApArNFASzH" role="jymVt">
-      <node concept="3cqZAl" id="3ApArNFASzJ" role="3clF45" />
-      <node concept="3Tm1VV" id="3ApArNFASzK" role="1B3o_S" />
-      <node concept="3clFbS" id="3ApArNFASzL" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFATw0" role="jymVt" />
-    <node concept="3clFb_" id="3ApArNFDl1Z" role="jymVt">
-      <property role="TrG5h" value="initialize" />
-      <node concept="37vLTG" id="3ApArNFAS$7" role="3clF46">
-        <property role="TrG5h" value="ideaProject" />
-        <node concept="3uibUv" id="3ApArNFAS$8" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3ApArNFAS$9" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="3ApArNFAS$a" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3ApArNFDl22" role="3clF47">
-        <node concept="3clFbF" id="3ApArNFATjD" role="3cqZAp">
-          <node concept="37vLTI" id="3ApArNFATjE" role="3clFbG">
-            <node concept="37vLTw" id="3ApArNFATjF" role="37vLTx">
-              <ref role="3cqZAo" node="3ApArNFAS$7" resolve="ideaProject" />
-            </node>
-            <node concept="2OqwBi" id="3ApArNFATjG" role="37vLTJ">
-              <node concept="Xjq3P" id="3ApArNFATjH" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3ApArNFATjI" role="2OqNvi">
-                <ref role="2Oxat5" node="3ApArNFASVW" resolve="ideaProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3ApArNFATjL" role="3cqZAp">
-          <node concept="37vLTI" id="3ApArNFATjM" role="3clFbG">
-            <node concept="37vLTw" id="3ApArNFATjN" role="37vLTx">
-              <ref role="3cqZAo" node="3ApArNFAS$9" resolve="mpsProject" />
-            </node>
-            <node concept="2OqwBi" id="3ApArNFATjO" role="37vLTJ">
-              <node concept="Xjq3P" id="3ApArNFATjP" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3ApArNFATjQ" role="2OqNvi">
-                <ref role="2Oxat5" node="3ApArNFASVZ" resolve="mpsProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3ApArNFDkuD" role="1B3o_S" />
-      <node concept="3cqZAl" id="3ApArNFDl1Q" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3ApArNFATFJ" role="jymVt" />
-    <node concept="3Tm1VV" id="3ApArNFARAF" role="1B3o_S" />
-  </node>
 </model>
 

From 4dcb43f0854d5796469b2bf7c827ae5310b43bfc Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Sat, 2 Apr 2022 16:16:41 +0200
Subject: [PATCH 02/10] fixed equals and hashcode of nix

---
 .../models/runtime.mps                        | 55 +++++++++++++++----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
index d5aa3deed4..511e769f5a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
@@ -1675,30 +1675,61 @@
     <property role="3GE5qa" value="nix" />
     <property role="TrG5h" value="DefaultNix" />
     <node concept="2tJIrI" id="26cjRABQf4s" role="jymVt" />
-    <node concept="3clFb_" id="26cjRABQf7G" role="jymVt">
+    <node concept="2tJIrI" id="26cjRABQf78" role="jymVt" />
+    <node concept="3clFb_" id="4Xe8FxpNCuQ" role="jymVt">
       <property role="TrG5h" value="equals" />
-      <node concept="10P_77" id="26cjRABQf8i" role="3clF45" />
-      <node concept="3Tm1VV" id="26cjRABQf7J" role="1B3o_S" />
-      <node concept="3clFbS" id="26cjRABQf7K" role="3clF47">
-        <node concept="3cpWs6" id="26cjRABQfdt" role="3cqZAp">
-          <node concept="2ZW3vV" id="26cjRABQfhs" role="3cqZAk">
-            <node concept="3uibUv" id="26cjRABQfks" role="2ZW6by">
+      <node concept="10P_77" id="4Xe8FxpNCLv" role="3clF45" />
+      <node concept="3Tm1VV" id="4Xe8FxpNCuT" role="1B3o_S" />
+      <node concept="3clFbS" id="4Xe8FxpNCuU" role="3clF47">
+        <node concept="3clFbJ" id="4Xe8FxpNCPU" role="3cqZAp">
+          <node concept="3clFbC" id="4Xe8FxpNCVp" role="3clFbw">
+            <node concept="10Nm6u" id="4Xe8FxpND5Y" role="3uHU7w" />
+            <node concept="37vLTw" id="4Xe8FxpNCQx" role="3uHU7B">
+              <ref role="3cqZAo" node="4Xe8FxpNCzE" resolve="other" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="4Xe8FxpNCPW" role="3clFbx">
+            <node concept="3cpWs6" id="4Xe8FxpND1X" role="3cqZAp">
+              <node concept="3clFbT" id="4Xe8FxpNDaG" role="3cqZAk" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4Xe8FxpNDjp" role="3cqZAp">
+          <node concept="2ZW3vV" id="4Xe8FxpNDL7" role="3clFbG">
+            <node concept="3uibUv" id="4Xe8FxpNDQ2" role="2ZW6by">
               <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
             </node>
-            <node concept="37vLTw" id="26cjRABQfdF" role="2ZW6bz">
-              <ref role="3cqZAo" node="26cjRABQf94" resolve="other" />
+            <node concept="37vLTw" id="4Xe8FxpNDuJ" role="2ZW6bz">
+              <ref role="3cqZAo" node="4Xe8FxpNCzE" resolve="other" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="26cjRABQf94" role="3clF46">
+      <node concept="37vLTG" id="4Xe8FxpNCzE" role="3clF46">
         <property role="TrG5h" value="other" />
-        <node concept="3uibUv" id="26cjRABQf93" role="1tU5fm">
+        <node concept="3uibUv" id="4Xe8FxpNCzD" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="26cjRABQf78" role="jymVt" />
+    <node concept="2tJIrI" id="4Xe8FxpNDUg" role="jymVt" />
+    <node concept="3clFb_" id="4Xe8FxpNDZj" role="jymVt">
+      <property role="TrG5h" value="hashCode" />
+      <node concept="10Oyi0" id="4Xe8FxpNEgf" role="3clF45" />
+      <node concept="3Tm1VV" id="4Xe8FxpNDZm" role="1B3o_S" />
+      <node concept="3clFbS" id="4Xe8FxpNDZn" role="3clF47">
+        <node concept="3clFbF" id="4Xe8FxpNEmJ" role="3cqZAp">
+          <node concept="2OqwBi" id="4Xe8FxpNEWR" role="3clFbG">
+            <node concept="Xl_RD" id="4Xe8FxpNEmI" role="2Oq$k0">
+              <property role="Xl_RC" value="nix" />
+            </node>
+            <node concept="liA8E" id="4Xe8FxpNFmH" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.hashCode()" resolve="hashCode" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="26cjRABQf7e" role="jymVt" />
     <node concept="2tJIrI" id="26cjRABQf4x" role="jymVt" />
     <node concept="2tJIrI" id="26cjRABQf4_" role="jymVt" />

From ea2965b0d7a3304d4950e79d9134e31d35a9b659 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Mon, 4 Apr 2022 20:09:40 +0200
Subject: [PATCH 03/10] hopefully fixed a strange error

---
 .../models/intentions.mps                     | 119 +++++++++---------
 1 file changed, 59 insertions(+), 60 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
index 087fd01ff5..1514194513 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
@@ -937,66 +937,6 @@
       <property role="1SWRpm" value="EXPRESSIONS" />
     </node>
   </node>
-  <node concept="2S6QgY" id="2nByCcxXU6U">
-    <property role="3GE5qa" value="function" />
-    <property role="TrG5h" value="InlineAll" />
-    <property role="2ZfUl0" value="true" />
-    <ref role="2ZfgGC" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="2S6ZIM" id="2nByCcxXU6V" role="2ZfVej">
-      <node concept="3clFbS" id="2nByCcxXU6W" role="2VODD2">
-        <node concept="3clFbF" id="2nByCcxXU6X" role="3cqZAp">
-          <node concept="Xl_RD" id="2nByCcxXU6Y" role="3clFbG">
-            <property role="Xl_RC" value="Inline All Calls" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="2nByCcxXU6Z" role="2ZfgGD">
-      <node concept="3clFbS" id="2nByCcxXU70" role="2VODD2">
-        <node concept="3clFbF" id="5I_8B5u9gTD" role="3cqZAp">
-          <node concept="2YIFZM" id="2nByCcy0pRo" role="3clFbG">
-            <ref role="37wK5l" to="pq1l:2nByCcy0njX" resolve="inlineAllCalls" />
-            <ref role="1Pybhc" to="pq1l:2nByCcy0n9q" resolve="CallInliner" />
-            <node concept="2Sf5sV" id="2nByCcy0pYG" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1SWQZ3" id="2nByCcxXU7n" role="lGtFl">
-      <property role="1SWRpm" value="EXPRESSIONS" />
-    </node>
-    <node concept="2SaL7w" id="5I_8B5u9stm" role="2ZfVeh">
-      <node concept="3clFbS" id="5I_8B5u9stn" role="2VODD2">
-        <node concept="3clFbF" id="5I_8B5u9sAt" role="3cqZAp">
-          <node concept="1Wc70l" id="TGQG6jU2HE" role="3clFbG">
-            <node concept="2OqwBi" id="TGQG6jU9VZ" role="3uHU7w">
-              <node concept="2OqwBi" id="TGQG6jU3Ix" role="2Oq$k0">
-                <node concept="2Sf5sV" id="TGQG6jU3uQ" role="2Oq$k0" />
-                <node concept="2Rf3mk" id="TGQG6jU4bL" role="2OqNvi">
-                  <node concept="1xMEDy" id="TGQG6jU4bN" role="1xVPHs">
-                    <node concept="chp4Y" id="TGQG6jU4sA" role="ri$Ld">
-                      <ref role="cht4Q" to="yv47:49WTic8gFfG" resolve="FunctionCall" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3GX2aA" id="TGQG6jUjiC" role="2OqNvi" />
-            </node>
-            <node concept="3fqX7Q" id="5I_8B5u9tpL" role="3uHU7B">
-              <node concept="2OqwBi" id="5I_8B5u9tpN" role="3fr31v">
-                <node concept="2Sf5sV" id="5I_8B5u9tpO" role="2Oq$k0" />
-                <node concept="1mIQ4w" id="5I_8B5u9tpP" role="2OqNvi">
-                  <node concept="chp4Y" id="5I_8B5u9tpQ" role="cj9EA">
-                    <ref role="cht4Q" to="yv47:49WTic8gFfG" resolve="FunctionCall" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="2S6QgY" id="6cw1FA4enca">
     <property role="3GE5qa" value="record.builder" />
     <property role="TrG5h" value="assignDefaultsWhereAvailable" />
@@ -1131,5 +1071,64 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="4Xe8Fxr0BHJ">
+    <property role="3GE5qa" value="function" />
+    <property role="TrG5h" value="inlineAll2" />
+    <ref role="2ZfgGC" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="2S6ZIM" id="4Xe8Fxr0BHK" role="2ZfVej">
+      <node concept="3clFbS" id="4Xe8Fxr0BHL" role="2VODD2">
+        <node concept="3clFbF" id="4Xe8Fxr0BUH" role="3cqZAp">
+          <node concept="Xl_RD" id="4Xe8Fxr0BUJ" role="3clFbG">
+            <property role="Xl_RC" value="Inline All Calls" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="4Xe8Fxr0BHM" role="2ZfgGD">
+      <node concept="3clFbS" id="4Xe8Fxr0BHN" role="2VODD2">
+        <node concept="3clFbF" id="4Xe8Fxr0CMD" role="3cqZAp">
+          <node concept="2YIFZM" id="4Xe8Fxr0D5p" role="3clFbG">
+            <ref role="1Pybhc" to="pq1l:2nByCcy0n9q" resolve="CallInliner" />
+            <ref role="37wK5l" to="pq1l:2nByCcy0njX" resolve="inlineAllCalls" />
+            <node concept="2Sf5sV" id="4Xe8Fxr0D5q" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="4Xe8Fxr0BZy" role="2ZfVeh">
+      <node concept="3clFbS" id="4Xe8Fxr0BZz" role="2VODD2">
+        <node concept="3clFbF" id="4Xe8Fxr0C3x" role="3cqZAp">
+          <node concept="1Wc70l" id="4Xe8Fxr0C3z" role="3clFbG">
+            <node concept="2OqwBi" id="4Xe8Fxr0C3$" role="3uHU7w">
+              <node concept="2OqwBi" id="4Xe8Fxr0C3_" role="2Oq$k0">
+                <node concept="2Sf5sV" id="4Xe8Fxr0C3A" role="2Oq$k0" />
+                <node concept="2Rf3mk" id="4Xe8Fxr0C3B" role="2OqNvi">
+                  <node concept="1xMEDy" id="4Xe8Fxr0C3C" role="1xVPHs">
+                    <node concept="chp4Y" id="4Xe8Fxr0C3D" role="ri$Ld">
+                      <ref role="cht4Q" to="yv47:49WTic8gFfG" resolve="FunctionCall" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3GX2aA" id="4Xe8Fxr0C3E" role="2OqNvi" />
+            </node>
+            <node concept="3fqX7Q" id="4Xe8Fxr0C3F" role="3uHU7B">
+              <node concept="2OqwBi" id="4Xe8Fxr0C3G" role="3fr31v">
+                <node concept="2Sf5sV" id="4Xe8Fxr0C3H" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="4Xe8Fxr0C3I" role="2OqNvi">
+                  <node concept="chp4Y" id="4Xe8Fxr0C3J" role="cj9EA">
+                    <ref role="cht4Q" to="yv47:49WTic8gFfG" resolve="FunctionCall" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1SWQZ3" id="4Xe8Fxr0D64" role="lGtFl">
+      <property role="1SWRpm" value="EXPRESSIONS" />
+    </node>
+  </node>
 </model>
 

From e0008a72dae106ddd846ee1cecc87d8c44637022 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Sun, 24 Apr 2022 18:42:08 +0200
Subject: [PATCH 04/10] Running runManually from a root now also works if that
 root has an annotation (refresh didn't work previously)

---
 .../models/org/iets3/core/plugin/plugin.mps                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
index 550ce91224..73b4183d54 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
@@ -6,9 +6,9 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="1f1b4a81-113d-4b88-9b67-2bae3e4f8128" name="com.mbeddr.mpsutil.projectview" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>

From 214e785563db68a762fac5b94d8e5cdd81ab7721 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Wed, 22 Mar 2023 13:12:56 +0100
Subject: [PATCH 05/10] improved renderReadable of DataDeltaLiteral

---
 .../models/behavior.mps                       | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index 3c18a8c54a..62e1e177d3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -188,6 +188,9 @@
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -1700,5 +1703,47 @@
       <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="5xLzI609Ewd">
+    <property role="3GE5qa" value="delta" />
+    <ref role="13h7C2" to="mi3w:7aRvJQE2nOx" resolve="DateDeltaLiteral" />
+    <node concept="13i0hz" id="5xLzI609Ewo" role="13h7CS">
+      <property role="TrG5h" value="getPresentation" />
+      <ref role="13i0hy" to="pbu6:7cNsFS_e265" resolve="getPresentation" />
+      <node concept="3clFbS" id="5xLzI609Ewr" role="3clF47">
+        <node concept="3clFbF" id="5xLzI609Ex5" role="3cqZAp">
+          <node concept="3cpWs3" id="5xLzI609G9r" role="3clFbG">
+            <node concept="2OqwBi" id="5xLzI609H0K" role="3uHU7w">
+              <node concept="2OqwBi" id="5xLzI609Gmv" role="2Oq$k0">
+                <node concept="13iPFW" id="5xLzI609G9J" role="2Oq$k0" />
+                <node concept="2yIwOk" id="5xLzI609GK9" role="2OqNvi" />
+              </node>
+              <node concept="3n3YKJ" id="5xLzI609H_y" role="2OqNvi" />
+            </node>
+            <node concept="3cpWs3" id="5xLzI609FSR" role="3uHU7B">
+              <node concept="2OqwBi" id="5xLzI609Fgt" role="3uHU7B">
+                <node concept="2OqwBi" id="5xLzI609EH9" role="2Oq$k0">
+                  <node concept="13iPFW" id="5xLzI609Ex4" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5xLzI609F6k" role="2OqNvi">
+                    <ref role="3Tt5mk" to="mi3w:7aRvJQE2nOA" resolve="value" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="5xLzI609FAT" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="5xLzI609FSU" role="3uHU7w">
+                <property role="Xl_RC" value=" " />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="5xLzI609EwS" role="3clF45" />
+      <node concept="3Tm1VV" id="5xLzI609EwT" role="1B3o_S" />
+    </node>
+    <node concept="13hLZK" id="5xLzI609Ewe" role="13h7CW">
+      <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
+    </node>
+  </node>
 </model>
 

From 860b45d7aacc4f1bd4dbfee25cceae76031c05e2 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Fri, 24 Mar 2023 15:45:33 +0100
Subject: [PATCH 06/10] improved renderReadable of DataDeltaLiteral; this time
 really.

---
 .../models/behavior.mps                       | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index 62e1e177d3..06399d4ce3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -1683,6 +1683,48 @@
       <node concept="17QB3L" id="3HiHZeyrUvY" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="5xLzI609Ewd">
+    <property role="3GE5qa" value="delta" />
+    <ref role="13h7C2" to="mi3w:7aRvJQE2nOx" resolve="DateDeltaLiteral" />
+    <node concept="13hLZK" id="5xLzI609Ewe" role="13h7CW">
+      <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2ky_aiZ9ala" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+      <node concept="3clFbS" id="2ky_aiZ9ald" role="3clF47">
+        <node concept="3clFbF" id="2ky_aiZ9aIq" role="3cqZAp">
+          <node concept="3cpWs3" id="2ky_aiZ9aIs" role="3clFbG">
+            <node concept="2OqwBi" id="2ky_aiZ9aIt" role="3uHU7w">
+              <node concept="2OqwBi" id="2ky_aiZ9aIu" role="2Oq$k0">
+                <node concept="13iPFW" id="2ky_aiZ9aIv" role="2Oq$k0" />
+                <node concept="2yIwOk" id="2ky_aiZ9aIw" role="2OqNvi" />
+              </node>
+              <node concept="3n3YKJ" id="2ky_aiZ9aIx" role="2OqNvi" />
+            </node>
+            <node concept="3cpWs3" id="2ky_aiZ9aIy" role="3uHU7B">
+              <node concept="2OqwBi" id="2ky_aiZ9aIz" role="3uHU7B">
+                <node concept="2OqwBi" id="2ky_aiZ9aI$" role="2Oq$k0">
+                  <node concept="13iPFW" id="2ky_aiZ9aI_" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2ky_aiZ9aIA" role="2OqNvi">
+                    <ref role="3Tt5mk" to="mi3w:7aRvJQE2nOA" resolve="value" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="2ky_aiZ9aIB" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="2ky_aiZ9aIC" role="3uHU7w">
+                <property role="Xl_RC" value=" " />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="2ky_aiZ9axX" role="3clF45" />
+      <node concept="3Tm1VV" id="2ky_aiZ9axY" role="1B3o_S" />
+    </node>
+  </node>
   <node concept="13h7C7" id="7k6A8WfqVL8">
     <property role="3GE5qa" value="time" />
     <ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
@@ -1703,47 +1745,5 @@
       <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="5xLzI609Ewd">
-    <property role="3GE5qa" value="delta" />
-    <ref role="13h7C2" to="mi3w:7aRvJQE2nOx" resolve="DateDeltaLiteral" />
-    <node concept="13i0hz" id="5xLzI609Ewo" role="13h7CS">
-      <property role="TrG5h" value="getPresentation" />
-      <ref role="13i0hy" to="pbu6:7cNsFS_e265" resolve="getPresentation" />
-      <node concept="3clFbS" id="5xLzI609Ewr" role="3clF47">
-        <node concept="3clFbF" id="5xLzI609Ex5" role="3cqZAp">
-          <node concept="3cpWs3" id="5xLzI609G9r" role="3clFbG">
-            <node concept="2OqwBi" id="5xLzI609H0K" role="3uHU7w">
-              <node concept="2OqwBi" id="5xLzI609Gmv" role="2Oq$k0">
-                <node concept="13iPFW" id="5xLzI609G9J" role="2Oq$k0" />
-                <node concept="2yIwOk" id="5xLzI609GK9" role="2OqNvi" />
-              </node>
-              <node concept="3n3YKJ" id="5xLzI609H_y" role="2OqNvi" />
-            </node>
-            <node concept="3cpWs3" id="5xLzI609FSR" role="3uHU7B">
-              <node concept="2OqwBi" id="5xLzI609Fgt" role="3uHU7B">
-                <node concept="2OqwBi" id="5xLzI609EH9" role="2Oq$k0">
-                  <node concept="13iPFW" id="5xLzI609Ex4" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="5xLzI609F6k" role="2OqNvi">
-                    <ref role="3Tt5mk" to="mi3w:7aRvJQE2nOA" resolve="value" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="5xLzI609FAT" role="2OqNvi">
-                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="5xLzI609FSU" role="3uHU7w">
-                <property role="Xl_RC" value=" " />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="5xLzI609EwS" role="3clF45" />
-      <node concept="3Tm1VV" id="5xLzI609EwT" role="1B3o_S" />
-    </node>
-    <node concept="13hLZK" id="5xLzI609Ewe" role="13h7CW">
-      <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
-    </node>
-  </node>
 </model>
 

From 8000b368a40c551b0c35e859de5c30131108c24d Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Tue, 28 Mar 2023 20:36:14 +0200
Subject: [PATCH 07/10] improved renderReadable of TimeDeltaLiteral; this time
 really.

---
 .../models/behavior.mps                       | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index 06399d4ce3..db7ec5340d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -1686,9 +1686,6 @@
   <node concept="13h7C7" id="5xLzI609Ewd">
     <property role="3GE5qa" value="delta" />
     <ref role="13h7C2" to="mi3w:7aRvJQE2nOx" resolve="DateDeltaLiteral" />
-    <node concept="13hLZK" id="5xLzI609Ewe" role="13h7CW">
-      <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
-    </node>
     <node concept="13i0hz" id="2ky_aiZ9ala" role="13h7CS">
       <property role="TrG5h" value="renderReadable" />
       <ref role="13i0hy" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -1722,7 +1719,10 @@
         </node>
       </node>
       <node concept="17QB3L" id="2ky_aiZ9axX" role="3clF45" />
-      <node concept="3Tm1VV" id="2ky_aiZ9axY" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3WWbNXAVBqR" role="1B3o_S" />
+    </node>
+    <node concept="13hLZK" id="5xLzI609Ewe" role="13h7CW">
+      <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
     </node>
   </node>
   <node concept="13h7C7" id="7k6A8WfqVL8">
@@ -1745,5 +1745,47 @@
       <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="3WWbNXAVC6q">
+    <property role="3GE5qa" value="time.delta" />
+    <ref role="13h7C2" to="mi3w:3HiHZeyhTnY" resolve="TimeDeltaLiteral" />
+    <node concept="13i0hz" id="3WWbNXAVC6_" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+      <node concept="3clFbS" id="3WWbNXAVC6A" role="3clF47">
+        <node concept="3clFbF" id="3WWbNXAVC6B" role="3cqZAp">
+          <node concept="3cpWs3" id="3WWbNXAVC6C" role="3clFbG">
+            <node concept="2OqwBi" id="3WWbNXAVC6D" role="3uHU7w">
+              <node concept="2OqwBi" id="3WWbNXAVC6E" role="2Oq$k0">
+                <node concept="13iPFW" id="3WWbNXAVC6F" role="2Oq$k0" />
+                <node concept="2yIwOk" id="3WWbNXAVC6G" role="2OqNvi" />
+              </node>
+              <node concept="3n3YKJ" id="3WWbNXAVC6H" role="2OqNvi" />
+            </node>
+            <node concept="3cpWs3" id="3WWbNXAVC6I" role="3uHU7B">
+              <node concept="2OqwBi" id="3WWbNXAVC6J" role="3uHU7B">
+                <node concept="2OqwBi" id="3WWbNXAVC6K" role="2Oq$k0">
+                  <node concept="13iPFW" id="3WWbNXAVC6L" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3WWbNXAVC6M" role="2OqNvi">
+                    <ref role="3Tt5mk" to="mi3w:3HiHZeyhTo1" resolve="value" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="3WWbNXAVC6N" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="3WWbNXAVC6O" role="3uHU7w">
+                <property role="Xl_RC" value=" " />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2ky_aiZ9axY" role="1B3o_S" />
+      <node concept="17QB3L" id="3WWbNXAWhFC" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="3WWbNXAVC6r" role="13h7CW">
+      <node concept="3clFbS" id="3WWbNXAVC6s" role="2VODD2" />
+    </node>
+  </node>
 </model>
 

From 59b38d475f46e55b10624c303f99c7a87736e182 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Fri, 14 Apr 2023 16:35:48 +0200
Subject: [PATCH 08/10] renderReadable for makeDate and makeTime

---
 .../models/behavior.mps                       | 178 ++++++++++++++++--
 1 file changed, 158 insertions(+), 20 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index db7ec5340d..5cd4528716 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -1725,26 +1725,6 @@
       <node concept="3clFbS" id="5xLzI609Ewf" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="7k6A8WfqVL8">
-    <property role="3GE5qa" value="time" />
-    <ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
-    <node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
-      <node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
-      <property role="TrG5h" value="canBeSorted" />
-      <ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
-      <node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
-      <node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
-        <node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
-          <node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="3WWbNXAVC6q">
     <property role="3GE5qa" value="time.delta" />
     <ref role="13h7C2" to="mi3w:3HiHZeyhTnY" resolve="TimeDeltaLiteral" />
@@ -1787,5 +1767,163 @@
       <node concept="3clFbS" id="3WWbNXAVC6s" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="7k6A8WfqVL8">
+    <property role="3GE5qa" value="time" />
+    <ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
+    <node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
+      <node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
+      <property role="TrG5h" value="canBeSorted" />
+      <ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
+      <node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
+      <node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
+        <node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
+          <node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="3ctGy4wJOt4">
+    <property role="3GE5qa" value="date" />
+    <ref role="13h7C2" to="mi3w:7khFtBHlNKe" resolve="MakeDate" />
+    <node concept="13i0hz" id="3ctGy4wJOtf" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+      <node concept="3clFbS" id="3ctGy4wJOti" role="3clF47">
+        <node concept="3clFbF" id="3ctGy4wJOtG" role="3cqZAp">
+          <node concept="3cpWs3" id="3ctGy4wJTcY" role="3clFbG">
+            <node concept="Xl_RD" id="3ctGy4wJTd1" role="3uHU7w">
+              <property role="Xl_RC" value="/" />
+            </node>
+            <node concept="3cpWs3" id="3ctGy4wJSc0" role="3uHU7B">
+              <node concept="3cpWs3" id="3ctGy4wJS9P" role="3uHU7B">
+                <node concept="3cpWs3" id="3ctGy4wJQDC" role="3uHU7B">
+                  <node concept="3cpWs3" id="3ctGy4wJQBF" role="3uHU7B">
+                    <node concept="3cpWs3" id="3ctGy4wJOJX" role="3uHU7B">
+                      <node concept="Xl_RD" id="3ctGy4wJOtF" role="3uHU7B">
+                        <property role="Xl_RC" value="makeDate/" />
+                      </node>
+                      <node concept="2OqwBi" id="3ctGy4wJPQV" role="3uHU7w">
+                        <node concept="2OqwBi" id="3ctGy4wJOZ3" role="2Oq$k0">
+                          <node concept="13iPFW" id="3ctGy4wJOK4" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3ctGy4wJPjn" role="2OqNvi">
+                            <ref role="3Tt5mk" to="mi3w:7khFtBHlNKk" resolve="dayExpr" />
+                          </node>
+                        </node>
+                        <node concept="2qgKlT" id="3ctGy4wJQcT" role="2OqNvi">
+                          <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="3ctGy4wJQBI" role="3uHU7w">
+                      <property role="Xl_RC" value=" " />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3ctGy4wJRuC" role="3uHU7w">
+                    <node concept="2OqwBi" id="3ctGy4wJQMd" role="2Oq$k0">
+                      <node concept="13iPFW" id="3ctGy4wJQE0" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3ctGy4wJQNO" role="2OqNvi">
+                        <ref role="3Tt5mk" to="mi3w:7khFtBHlNKh" resolve="monthExpr" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="3ctGy4wJRR1" role="2OqNvi">
+                      <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="3ctGy4wJS9S" role="3uHU7w">
+                  <property role="Xl_RC" value=" " />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3ctGy4wJStC" role="3uHU7w">
+                <node concept="13iPFW" id="3ctGy4wJSe3" role="2Oq$k0" />
+                <node concept="3TrEf2" id="3ctGy4wJST3" role="2OqNvi">
+                  <ref role="3Tt5mk" to="mi3w:7khFtBHlNKf" resolve="yearExpr" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="3ctGy4wJOtv" role="3clF45" />
+      <node concept="3Tm1VV" id="3ctGy4wJOtw" role="1B3o_S" />
+    </node>
+    <node concept="13hLZK" id="3ctGy4wJOt5" role="13h7CW">
+      <node concept="3clFbS" id="3ctGy4wJOt6" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="3ctGy4wJW$m">
+    <property role="3GE5qa" value="time" />
+    <ref role="13h7C2" to="mi3w:3HiHZey9lU5" resolve="MakeTime" />
+    <node concept="13i0hz" id="3ctGy4wJW$x" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+      <node concept="3clFbS" id="3ctGy4wJW$y" role="3clF47">
+        <node concept="3clFbF" id="3ctGy4wJW$z" role="3cqZAp">
+          <node concept="3cpWs3" id="3ctGy4wJW$$" role="3clFbG">
+            <node concept="Xl_RD" id="3ctGy4wJW$_" role="3uHU7w">
+              <property role="Xl_RC" value="\\" />
+            </node>
+            <node concept="3cpWs3" id="3ctGy4wJW$A" role="3uHU7B">
+              <node concept="3cpWs3" id="3ctGy4wJW$B" role="3uHU7B">
+                <node concept="3cpWs3" id="3ctGy4wJW$C" role="3uHU7B">
+                  <node concept="3cpWs3" id="3ctGy4wJW$D" role="3uHU7B">
+                    <node concept="3cpWs3" id="3ctGy4wJW$E" role="3uHU7B">
+                      <node concept="Xl_RD" id="3ctGy4wJW$F" role="3uHU7B">
+                        <property role="Xl_RC" value="makeTime\\" />
+                      </node>
+                      <node concept="2OqwBi" id="3ctGy4wJW$G" role="3uHU7w">
+                        <node concept="2OqwBi" id="3ctGy4wJW$H" role="2Oq$k0">
+                          <node concept="13iPFW" id="3ctGy4wJW$I" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3ctGy4wJW$J" role="2OqNvi">
+                            <ref role="3Tt5mk" to="mi3w:3HiHZey9lU6" resolve="hourExpr" />
+                          </node>
+                        </node>
+                        <node concept="2qgKlT" id="3ctGy4wJW$K" role="2OqNvi">
+                          <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="3ctGy4wJW$L" role="3uHU7w">
+                      <property role="Xl_RC" value=":" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3ctGy4wJW$M" role="3uHU7w">
+                    <node concept="2OqwBi" id="3ctGy4wJW$N" role="2Oq$k0">
+                      <node concept="13iPFW" id="3ctGy4wJW$O" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3ctGy4wJW$P" role="2OqNvi">
+                        <ref role="3Tt5mk" to="mi3w:3HiHZey9lU7" resolve="minutesExpr" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="3ctGy4wJW$Q" role="2OqNvi">
+                      <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="3ctGy4wJW$R" role="3uHU7w">
+                  <property role="Xl_RC" value=":" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3ctGy4wJW$S" role="3uHU7w">
+                <node concept="13iPFW" id="3ctGy4wJW$T" role="2Oq$k0" />
+                <node concept="3TrEf2" id="3ctGy4wJW$U" role="2OqNvi">
+                  <ref role="3Tt5mk" to="mi3w:3HiHZeybRMz" resolve="secondsExpr" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="3ctGy4wJW$V" role="3clF45" />
+      <node concept="3Tm1VV" id="3ctGy4wJW$W" role="1B3o_S" />
+    </node>
+    <node concept="13hLZK" id="3ctGy4wJW$n" role="13h7CW">
+      <node concept="3clFbS" id="3ctGy4wJW$o" role="2VODD2" />
+    </node>
+  </node>
 </model>
 

From e5188492d0b0b7ea23e346b498dd1dd1975b2515 Mon Sep 17 00:00:00 2001
From: Markus Voelter <voelter@acm.org>
Date: Fri, 14 Apr 2023 18:15:33 +0200
Subject: [PATCH 09/10] renderReadable for makeDate and makeTime

---
 .../models/behavior.mps                       | 66 +++++++++++--------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index 5cd4528716..8996f1c4d7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -1767,26 +1767,6 @@
       <node concept="3clFbS" id="3WWbNXAVC6s" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="7k6A8WfqVL8">
-    <property role="3GE5qa" value="time" />
-    <ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
-    <node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
-      <node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
-      <property role="TrG5h" value="canBeSorted" />
-      <ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
-      <node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
-      <node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
-        <node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
-          <node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="3ctGy4wJOt4">
     <property role="3GE5qa" value="date" />
     <ref role="13h7C2" to="mi3w:7khFtBHlNKe" resolve="MakeDate" />
@@ -1839,10 +1819,15 @@
                   <property role="Xl_RC" value=" " />
                 </node>
               </node>
-              <node concept="2OqwBi" id="3ctGy4wJStC" role="3uHU7w">
-                <node concept="13iPFW" id="3ctGy4wJSe3" role="2Oq$k0" />
-                <node concept="3TrEf2" id="3ctGy4wJST3" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mi3w:7khFtBHlNKf" resolve="yearExpr" />
+              <node concept="2OqwBi" id="1WFKZdy4Db5" role="3uHU7w">
+                <node concept="2OqwBi" id="3ctGy4wJStC" role="2Oq$k0">
+                  <node concept="13iPFW" id="3ctGy4wJSe3" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3ctGy4wJST3" role="2OqNvi">
+                    <ref role="3Tt5mk" to="mi3w:7khFtBHlNKf" resolve="yearExpr" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="1WFKZdy4Dia" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
                 </node>
               </node>
             </node>
@@ -1908,10 +1893,15 @@
                   <property role="Xl_RC" value=":" />
                 </node>
               </node>
-              <node concept="2OqwBi" id="3ctGy4wJW$S" role="3uHU7w">
-                <node concept="13iPFW" id="3ctGy4wJW$T" role="2Oq$k0" />
-                <node concept="3TrEf2" id="3ctGy4wJW$U" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mi3w:3HiHZeybRMz" resolve="secondsExpr" />
+              <node concept="2OqwBi" id="1WFKZdy4BTe" role="3uHU7w">
+                <node concept="2OqwBi" id="3ctGy4wJW$S" role="2Oq$k0">
+                  <node concept="13iPFW" id="3ctGy4wJW$T" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3ctGy4wJW$U" role="2OqNvi">
+                    <ref role="3Tt5mk" to="mi3w:3HiHZeybRMz" resolve="secondsExpr" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="1WFKZdy4Cp7" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
                 </node>
               </node>
             </node>
@@ -1925,5 +1915,25 @@
       <node concept="3clFbS" id="3ctGy4wJW$o" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="7k6A8WfqVL8">
+    <property role="3GE5qa" value="time" />
+    <ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
+    <node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
+      <node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
+      <property role="TrG5h" value="canBeSorted" />
+      <ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
+      <node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
+      <node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
+        <node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
+          <node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
+    </node>
+  </node>
 </model>
 

From 5248c94cc6598ffe221ac24d00a53483ea83ab99 Mon Sep 17 00:00:00 2001
From: Michael Gronover <mgronover@itemis.com>
Date: Tue, 12 Nov 2024 11:14:07 +0100
Subject: [PATCH 10/10] Renamed Intention for inlining all function calls

---
 .../models/intentions.mps                     | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
index 1514194513..8ee50e9881 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
@@ -1026,54 +1026,9 @@
       <property role="1SWRpm" value="BUILDER" />
     </node>
   </node>
-  <node concept="2S6QgY" id="3sWKo0DWTli">
-    <property role="3GE5qa" value="record" />
-    <property role="TrG5h" value="AddComparisonOrder" />
-    <property role="2ZfUl0" value="true" />
-    <ref role="2ZfgGC" to="yv47:7D7uZV2dYyQ" resolve="RecordDeclaration" />
-    <node concept="2S6ZIM" id="3sWKo0DWTlj" role="2ZfVej">
-      <node concept="3clFbS" id="3sWKo0DWTlk" role="2VODD2">
-        <node concept="3clFbF" id="3sWKo0DWToP" role="3cqZAp">
-          <node concept="Xl_RD" id="3sWKo0DWToO" role="3clFbG">
-            <property role="Xl_RC" value="Add a Comparison Order" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="3sWKo0DWTll" role="2ZfgGD">
-      <node concept="3clFbS" id="3sWKo0DWTlm" role="2VODD2">
-        <node concept="3clFbF" id="3sWKo0DX2e4" role="3cqZAp">
-          <node concept="2OqwBi" id="3sWKo0DX715" role="3clFbG">
-            <node concept="2OqwBi" id="3sWKo0DX2$S" role="2Oq$k0">
-              <node concept="2Sf5sV" id="3sWKo0DX2e3" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="3sWKo0DX3no" role="2OqNvi">
-                <ref role="3TtcxE" to="yv47:6vUyz1z4RZG" resolve="comparisonOrder" />
-              </node>
-            </node>
-            <node concept="WFELt" id="3sWKo0DXabI" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2SaL7w" id="3sWKo0DWTqQ" role="2ZfVeh">
-      <node concept="3clFbS" id="3sWKo0DWTqR" role="2VODD2">
-        <node concept="3clFbF" id="3sWKo0DWTrj" role="3cqZAp">
-          <node concept="2OqwBi" id="3sWKo0DWYXd" role="3clFbG">
-            <node concept="2OqwBi" id="3sWKo0DWTUu" role="2Oq$k0">
-              <node concept="2Sf5sV" id="3sWKo0DWTri" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="3sWKo0DWUH7" role="2OqNvi">
-                <ref role="3TtcxE" to="yv47:6vUyz1z4RZG" resolve="comparisonOrder" />
-              </node>
-            </node>
-            <node concept="1v1jN8" id="3sWKo0DX27W" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="2S6QgY" id="4Xe8Fxr0BHJ">
     <property role="3GE5qa" value="function" />
-    <property role="TrG5h" value="inlineAll2" />
+    <property role="TrG5h" value="inlineAll" />
     <ref role="2ZfgGC" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="2S6ZIM" id="4Xe8Fxr0BHK" role="2ZfVej">
       <node concept="3clFbS" id="4Xe8Fxr0BHL" role="2VODD2">
@@ -1130,5 +1085,50 @@
       <property role="1SWRpm" value="EXPRESSIONS" />
     </node>
   </node>
+  <node concept="2S6QgY" id="3sWKo0DWTli">
+    <property role="3GE5qa" value="record" />
+    <property role="TrG5h" value="AddComparisonOrder" />
+    <property role="2ZfUl0" value="true" />
+    <ref role="2ZfgGC" to="yv47:7D7uZV2dYyQ" resolve="RecordDeclaration" />
+    <node concept="2S6ZIM" id="3sWKo0DWTlj" role="2ZfVej">
+      <node concept="3clFbS" id="3sWKo0DWTlk" role="2VODD2">
+        <node concept="3clFbF" id="3sWKo0DWToP" role="3cqZAp">
+          <node concept="Xl_RD" id="3sWKo0DWToO" role="3clFbG">
+            <property role="Xl_RC" value="Add a Comparison Order" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="3sWKo0DWTll" role="2ZfgGD">
+      <node concept="3clFbS" id="3sWKo0DWTlm" role="2VODD2">
+        <node concept="3clFbF" id="3sWKo0DX2e4" role="3cqZAp">
+          <node concept="2OqwBi" id="3sWKo0DX715" role="3clFbG">
+            <node concept="2OqwBi" id="3sWKo0DX2$S" role="2Oq$k0">
+              <node concept="2Sf5sV" id="3sWKo0DX2e3" role="2Oq$k0" />
+              <node concept="3Tsc0h" id="3sWKo0DX3no" role="2OqNvi">
+                <ref role="3TtcxE" to="yv47:6vUyz1z4RZG" resolve="comparisonOrder" />
+              </node>
+            </node>
+            <node concept="WFELt" id="3sWKo0DXabI" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="3sWKo0DWTqQ" role="2ZfVeh">
+      <node concept="3clFbS" id="3sWKo0DWTqR" role="2VODD2">
+        <node concept="3clFbF" id="3sWKo0DWTrj" role="3cqZAp">
+          <node concept="2OqwBi" id="3sWKo0DWYXd" role="3clFbG">
+            <node concept="2OqwBi" id="3sWKo0DWTUu" role="2Oq$k0">
+              <node concept="2Sf5sV" id="3sWKo0DWTri" role="2Oq$k0" />
+              <node concept="3Tsc0h" id="3sWKo0DWUH7" role="2OqNvi">
+                <ref role="3TtcxE" to="yv47:6vUyz1z4RZG" resolve="comparisonOrder" />
+              </node>
+            </node>
+            <node concept="1v1jN8" id="3sWKo0DX27W" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>