From edbd77c7487ed3e3d8d332a2c9d7bcf555c17778 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Mon, 9 Sep 2019 22:51:29 +0300
Subject: [PATCH] Prepare for migration from spliced Logicals in ListNode to
 LogicalDataForm

---
 .../generator/template/main@generator.mps     |  69 ++-
 .../languageModels/editor.mps                 |  10 +
 .../languageModels/migration.mps              | 478 +++++++++++++++++-
 .../languageModels/structure.mps              |  22 +
 4 files changed, 571 insertions(+), 8 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 83dc75c5..cf3c669b 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -643,16 +643,16 @@
       <node concept="30G5F_" id="4lNgnaL7FI9" role="30HLyM">
         <node concept="3clFbS" id="4lNgnaL7FIa" role="2VODD2">
           <node concept="3clFbF" id="4lNgnaL7FJf" role="3cqZAp">
-            <node concept="2OqwBi" id="4lNgnaL7FVj" role="3clFbG">
-              <node concept="2OqwBi" id="4lNgnaL7FLq" role="2Oq$k0">
-                <node concept="30H73N" id="4lNgnaL7FJe" role="2Oq$k0" />
-                <node concept="3CFZ6_" id="4lNgnaL7FPd" role="2OqNvi">
-                  <node concept="3CFYIy" id="4lNgnaL7FRg" role="3CFYIz">
+            <node concept="2OqwBi" id="PltxfHQhdD" role="3clFbG">
+              <node concept="2OqwBi" id="PltxfHQglg" role="2Oq$k0">
+                <node concept="30H73N" id="PltxfHQg7L" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="PltxfHQgxC" role="2OqNvi">
+                  <node concept="3CFYIy" id="PltxfHQgDU" role="3CFYIz">
                     <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
                   </node>
                 </node>
               </node>
-              <node concept="3x8VRR" id="4lNgnaL7G6i" role="2OqNvi" />
+              <node concept="3x8VRR" id="PltxfHQhjy" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -706,6 +706,63 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="PltxfHQdoQ" role="3acgRq">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+      <node concept="30G5F_" id="PltxfHQdoR" role="30HLyM">
+        <node concept="3clFbS" id="PltxfHQdoS" role="2VODD2">
+          <node concept="3clFbF" id="PltxfHQqEf" role="3cqZAp">
+            <node concept="2OqwBi" id="PltxfHM2A7" role="3clFbG">
+              <node concept="2OqwBi" id="4lNgnaL7FLq" role="2Oq$k0">
+                <node concept="30H73N" id="4lNgnaL7FJe" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="PltxfHM29v" role="2OqNvi">
+                  <node concept="1xMEDy" id="PltxfHM29x" role="1xVPHs">
+                    <node concept="chp4Y" id="PltxfHM2nf" role="ri$Ld">
+                      <ref role="cht4Q" to="5j4j:PltxfHKvEb" resolve="LogicalUnwrapContext" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="PltxfHM2LA" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="PltxfHQdp1" role="1lVwrX">
+        <node concept="10Nm6u" id="PltxfHQdp2" role="gfFT$">
+          <node concept="1sPUBX" id="PltxfHQdp3" role="lGtFl">
+            <ref role="v9R2y" node="677NV56thjr" resolve="Expression_logical2treeform" />
+            <node concept="30H73N" id="PltxfHQdp4" role="v9R3O" />
+            <node concept="2OqwBi" id="PltxfHQdp5" role="v9R3O">
+              <node concept="2OqwBi" id="PltxfHQdp6" role="2Oq$k0">
+                <node concept="1iwH7S" id="PltxfHQdp7" role="2Oq$k0" />
+                <node concept="12$id9" id="PltxfHQdp8" role="2OqNvi">
+                  <node concept="2OqwBi" id="PltxfHQdp9" role="12$y8L">
+                    <node concept="30H73N" id="PltxfHQdpa" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="PltxfHQ8pY" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3JvlWi" id="PltxfHQdpb" role="2OqNvi" />
+            </node>
+            <node concept="3NFfHV" id="PltxfHQdpc" role="1sPUBK">
+              <node concept="3clFbS" id="PltxfHQdpd" role="2VODD2">
+                <node concept="3clFbF" id="PltxfHQ74C" role="3cqZAp">
+                  <node concept="2OqwBi" id="PltxfHQ7fd" role="3clFbG">
+                    <node concept="30H73N" id="PltxfHQ74B" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="PltxfHQ7s5" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="29_L5zQWy8j" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index bb0012ba..9ce9449a 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -4127,5 +4127,15 @@
     <property role="3GE5qa" value="dataform.role" />
     <ref role="aqKnT" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
   </node>
+  <node concept="24kQdi" id="PltxfHNefA">
+    <property role="3GE5qa" value="dataform" />
+    <ref role="1XX52x" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+    <node concept="3EZMnI" id="PltxfHNeGf" role="2wV5jI">
+      <node concept="3F1sOY" id="PltxfHNeK9" role="3EZMnx">
+        <ref role="1NtTu8" to="5j4j:PltxfHNdqi" resolve="logical" />
+      </node>
+      <node concept="l2Vlx" id="PltxfHNeGi" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index 8e94815f..01417e2b 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -5,6 +5,8 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -16,15 +18,34 @@
     <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" implicit="true" />
+    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -34,9 +55,21 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -46,8 +79,16 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1208623485264" name="jetbrains.mps.baseLanguage.structure.AbstractOperation" flags="nn" index="1B$H19" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
       <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
         <reference id="8880393040217294897" name="decl" index="ffrpq" />
@@ -66,7 +107,9 @@
         <property id="6478870542308703667" name="caption" index="3tTeZt" />
         <reference id="6478870542308703669" name="decl" index="3tTeZr" />
       </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH" />
+      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
+        <property id="6478870542308871876" name="value" index="3tYpME" />
+      </concept>
       <concept id="6478870542308871428" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.StringPropertyInstance" flags="ig" index="3tYpXE">
         <property id="6478870542308871429" name="value" index="3tYpXF" />
       </concept>
@@ -77,16 +120,87 @@
         <child id="2034914114981261753" name="message" index="RRSoy" />
       </concept>
     </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
+        <child id="1180031783297" name="conceptArgument" index="2Zo12j" />
+      </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
+        <reference id="1139867957129" name="concept" index="1_rbq0" />
+      </concept>
+      <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
+        <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
+      </concept>
+      <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
+        <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
+    </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">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
     </language>
     <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
       <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
         <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
       </concept>
     </language>
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
+      <concept id="7738379549910147341" name="jetbrains.mps.lang.smodel.query.structure.InstancesExpression" flags="ng" index="qVDSY">
+        <child id="7738379549910147342" name="conceptArg" index="qVDSX" />
+      </concept>
+      <concept id="4234138103881610891" name="jetbrains.mps.lang.smodel.query.structure.WithStatement" flags="ng" index="L3pyB">
+        <child id="4234138103881610935" name="scope" index="L3pyr" />
+        <child id="4234138103881610892" name="stmts" index="L3pyw" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+    </language>
   </registry>
   <node concept="3SyAh_" id="5NAQwIkSyC5">
     <property role="qMTe8" value="0" />
@@ -206,5 +320,365 @@
       <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
     </node>
   </node>
+  <node concept="3SyAh_" id="PltxfHM6qm">
+    <property role="qMTe8" value="2" />
+    <property role="TrG5h" value="Remove_Splice_from_ListNode" />
+    <node concept="3Tm1VV" id="PltxfHM6qn" role="1B3o_S" />
+    <node concept="3tTeZs" id="PltxfHM6qo" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="PltxfHM6qp" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
+    </node>
+    <node concept="3tTeZs" id="PltxfHM6qq" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
+    </node>
+    <node concept="2tJIrI" id="PltxfHM6qr" role="jymVt" />
+    <node concept="3tYpMH" id="PltxfHM6qs" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="PltxfHM6qt" role="1B3o_S" />
+      <node concept="10P_77" id="PltxfHM6qu" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="PltxfHOk$P" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Replace usages of Splice annotation on LogicalVariables for LogicalDataForm concept" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="PltxfHOk$R" role="1B3o_S" />
+      <node concept="17QB3L" id="PltxfHOk$S" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="PltxfHM6qw" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="PltxfHM6qy" role="1B3o_S" />
+      <node concept="3clFbS" id="PltxfHM6q$" role="3clF47">
+        <node concept="L3pyB" id="PltxfHMc9M" role="3cqZAp">
+          <node concept="3clFbS" id="PltxfHMc9N" role="L3pyw">
+            <node concept="1X3_iC" id="PltxfHQ5ow" role="lGtFl">
+              <property role="3V$3am" value="statement" />
+              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+              <node concept="3clFbF" id="PltxfHOYcj" role="8Wnug">
+                <node concept="2OqwBi" id="PltxfHP5mF" role="3clFbG">
+                  <node concept="2OqwBi" id="PltxfHP40p" role="2Oq$k0">
+                    <node concept="2OqwBi" id="PltxfHP17d" role="2Oq$k0">
+                      <node concept="2OqwBi" id="PltxfHOYcl" role="2Oq$k0">
+                        <node concept="qVDSY" id="PltxfHOYcm" role="2Oq$k0">
+                          <node concept="chp4Y" id="PltxfHOYrV" role="qVDSX">
+                            <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
+                          </node>
+                        </node>
+                        <node concept="3zZkjj" id="PltxfHOYco" role="2OqNvi">
+                          <node concept="1bVj0M" id="PltxfHOYcp" role="23t8la">
+                            <property role="3yWfEV" value="true" />
+                            <node concept="3clFbS" id="PltxfHOYcq" role="1bW5cS">
+                              <node concept="3clFbF" id="PltxfHOYHj" role="3cqZAp">
+                                <node concept="2OqwBi" id="PltxfHOZDu" role="3clFbG">
+                                  <node concept="2OqwBi" id="PltxfHOYT8" role="2Oq$k0">
+                                    <node concept="37vLTw" id="PltxfHOYHh" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="PltxfHOYc$" resolve="it" />
+                                    </node>
+                                    <node concept="3CFZ6_" id="PltxfHOZge" role="2OqNvi">
+                                      <node concept="3CFYIy" id="PltxfHOZtU" role="3CFYIz">
+                                        <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3w_OXm" id="PltxfHP0mW" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="PltxfHOYc$" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="PltxfHOYc_" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3goQfb" id="PltxfHP1ye" role="2OqNvi">
+                        <node concept="1bVj0M" id="PltxfHP1yg" role="23t8la">
+                          <property role="3yWfEV" value="true" />
+                          <node concept="3clFbS" id="PltxfHP1yh" role="1bW5cS">
+                            <node concept="3clFbF" id="PltxfHP1Ro" role="3cqZAp">
+                              <node concept="2OqwBi" id="PltxfHP2aO" role="3clFbG">
+                                <node concept="37vLTw" id="PltxfHP1Rn" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="PltxfHP1yi" resolve="it" />
+                                </node>
+                                <node concept="2Rf3mk" id="PltxfHP2Tb" role="2OqNvi">
+                                  <node concept="1xMEDy" id="PltxfHP2Td" role="1xVPHs">
+                                    <node concept="chp4Y" id="PltxfHP3m3" role="ri$Ld">
+                                      <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="PltxfHP1yi" role="1bW2Oz">
+                            <property role="TrG5h" value="it" />
+                            <node concept="2jxLKc" id="PltxfHP1yj" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3zZkjj" id="PltxfHP4Xy" role="2OqNvi">
+                      <node concept="1bVj0M" id="PltxfHP4Xz" role="23t8la">
+                        <property role="3yWfEV" value="true" />
+                        <node concept="3clFbS" id="PltxfHP4X$" role="1bW5cS">
+                          <node concept="3clFbF" id="PltxfHP4X_" role="3cqZAp">
+                            <node concept="2OqwBi" id="PltxfHP4XA" role="3clFbG">
+                              <node concept="2OqwBi" id="PltxfHP4XB" role="2Oq$k0">
+                                <node concept="2OqwBi" id="PltxfHP4XC" role="2Oq$k0">
+                                  <node concept="37vLTw" id="PltxfHP4XD" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="PltxfHP4XI" resolve="it" />
+                                  </node>
+                                  <node concept="1mfA1w" id="PltxfHP4XE" role="2OqNvi" />
+                                </node>
+                                <node concept="2yIwOk" id="PltxfHP4XF" role="2OqNvi" />
+                              </node>
+                              <node concept="2Zo12i" id="PltxfHP4XG" role="2OqNvi">
+                                <node concept="chp4Y" id="PltxfHP4XH" role="2Zo12j">
+                                  <ref role="cht4Q" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="PltxfHP4XI" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="PltxfHP4XJ" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1B$H19" id="PltxfHPIVY" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="PltxfHOXP8" role="3cqZAp" />
+            <node concept="3clFbF" id="PltxfHN$4G" role="3cqZAp">
+              <node concept="2OqwBi" id="PltxfHN_3L" role="3clFbG">
+                <node concept="2es0OD" id="PltxfHN_Iq" role="2OqNvi">
+                  <node concept="1bVj0M" id="PltxfHN_Is" role="23t8la">
+                    <node concept="3clFbS" id="PltxfHN_It" role="1bW5cS">
+                      <node concept="3cpWs8" id="PltxfHNxwv" role="3cqZAp">
+                        <node concept="3cpWsn" id="PltxfHNxww" role="3cpWs9">
+                          <property role="TrG5h" value="logicalItem" />
+                          <node concept="3Tqbb2" id="PltxfHNxwx" role="1tU5fm">
+                            <ref role="ehGHo" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+                          </node>
+                          <node concept="2OqwBi" id="PltxfHNxwy" role="33vP2m">
+                            <node concept="1PxgMI" id="PltxfHNxwz" role="2Oq$k0">
+                              <property role="1BlNFB" value="true" />
+                              <node concept="chp4Y" id="PltxfHNxw$" role="3oSUPX">
+                                <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                              </node>
+                              <node concept="37vLTw" id="PltxfHNNHi" role="1m5AlR">
+                                <ref role="3cqZAo" node="PltxfHN_Iu" resolve="lie" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="PltxfHNxwC" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="PltxfHNxwD" role="3cqZAp">
+                        <node concept="3clFbS" id="PltxfHNxwE" role="3clFbx">
+                          <node concept="3clFbH" id="PltxfHQ50e" role="3cqZAp" />
+                          <node concept="3cpWs8" id="PltxfHPTzw" role="3cqZAp">
+                            <node concept="3cpWsn" id="PltxfHPTzz" role="3cpWs9">
+                              <property role="TrG5h" value="replaced" />
+                              <node concept="3Tqbb2" id="PltxfHPTzu" role="1tU5fm">
+                                <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
+                              </node>
+                              <node concept="1PxgMI" id="PltxfHPXSS" role="33vP2m">
+                                <node concept="chp4Y" id="PltxfHQ2T4" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
+                                </node>
+                                <node concept="2OqwBi" id="PltxfHPWrx" role="1m5AlR">
+                                  <node concept="1PxgMI" id="PltxfHPVS9" role="2Oq$k0">
+                                    <node concept="chp4Y" id="PltxfHPW0b" role="3oSUPX">
+                                      <ref role="cht4Q" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                    </node>
+                                    <node concept="2OqwBi" id="PltxfHPUYd" role="1m5AlR">
+                                      <node concept="37vLTw" id="PltxfHPUGK" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="PltxfHN_Iu" resolve="lie" />
+                                      </node>
+                                      <node concept="1mfA1w" id="PltxfHPVxS" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                  <node concept="1mfA1w" id="PltxfHPX6v" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs8" id="PltxfHOajD" role="3cqZAp">
+                            <node concept="3cpWsn" id="PltxfHOajG" role="3cpWs9">
+                              <property role="TrG5h" value="ldf" />
+                              <node concept="3Tqbb2" id="PltxfHOajB" role="1tU5fm">
+                                <ref role="ehGHo" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+                              </node>
+                              <node concept="2OqwBi" id="PltxfHNS0l" role="33vP2m">
+                                <node concept="1_qnLN" id="PltxfHNUaf" role="2OqNvi">
+                                  <ref role="1_rbq0" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+                                </node>
+                                <node concept="37vLTw" id="PltxfHQ3x4" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="PltxfHPTzz" resolve="replaced" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="PltxfHOb6C" role="3cqZAp">
+                            <node concept="37vLTI" id="PltxfHObpa" role="3clFbG">
+                              <node concept="2OqwBi" id="PltxfHOefk" role="37vLTJ">
+                                <node concept="37vLTw" id="PltxfHOb6A" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="PltxfHOajG" resolve="ldf" />
+                                </node>
+                                <node concept="3TrEf2" id="PltxfHOeBd" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="PltxfHOjw_" role="37vLTx">
+                                <node concept="1PxgMI" id="PltxfHOhY0" role="2Oq$k0">
+                                  <property role="1BlNFB" value="true" />
+                                  <node concept="chp4Y" id="PltxfHOi7e" role="3oSUPX">
+                                    <ref role="cht4Q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+                                  </node>
+                                  <node concept="37vLTw" id="PltxfHOhFQ" role="1m5AlR">
+                                    <ref role="3cqZAo" node="PltxfHNxww" resolve="logicalItem" />
+                                  </node>
+                                </node>
+                                <node concept="3YRAZt" id="PltxfHOjTu" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="PltxfHNxwH" role="3clFbw">
+                          <node concept="2OqwBi" id="PltxfHNxwI" role="2Oq$k0">
+                            <node concept="37vLTw" id="PltxfHNxwJ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="PltxfHNxww" resolve="logicalItem" />
+                            </node>
+                            <node concept="2yIwOk" id="PltxfHNxwK" role="2OqNvi" />
+                          </node>
+                          <node concept="2Zo12i" id="PltxfHNxwL" role="2OqNvi">
+                            <node concept="chp4Y" id="PltxfHNxwM" role="2Zo12j">
+                              <ref role="cht4Q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="PltxfHN_Iu" role="1bW2Oz">
+                      <property role="TrG5h" value="lie" />
+                      <node concept="2jxLKc" id="PltxfHN_Iv" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="PltxfHPpuG" role="2Oq$k0">
+                  <node concept="2OqwBi" id="PltxfHNJkH" role="2Oq$k0">
+                    <node concept="qVDSY" id="PltxfHNJkI" role="2Oq$k0">
+                      <node concept="chp4Y" id="PltxfHNJkJ" role="qVDSX">
+                        <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                      </node>
+                    </node>
+                    <node concept="3zZkjj" id="PltxfHNJkK" role="2OqNvi">
+                      <node concept="1bVj0M" id="PltxfHNJkL" role="23t8la">
+                        <property role="3yWfEV" value="true" />
+                        <node concept="3clFbS" id="PltxfHNJkM" role="1bW5cS">
+                          <node concept="3clFbF" id="PltxfHNJkN" role="3cqZAp">
+                            <node concept="2OqwBi" id="PltxfHNJkO" role="3clFbG">
+                              <node concept="2OqwBi" id="PltxfHNJkP" role="2Oq$k0">
+                                <node concept="2OqwBi" id="PltxfHNJkQ" role="2Oq$k0">
+                                  <node concept="37vLTw" id="PltxfHNJkR" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="PltxfHNJkW" resolve="it" />
+                                  </node>
+                                  <node concept="1mfA1w" id="PltxfHNJkS" role="2OqNvi" />
+                                </node>
+                                <node concept="2yIwOk" id="PltxfHNJkT" role="2OqNvi" />
+                              </node>
+                              <node concept="2Zo12i" id="PltxfHNJkU" role="2OqNvi">
+                                <node concept="chp4Y" id="PltxfHNJkV" role="2Zo12j">
+                                  <ref role="cht4Q" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="PltxfHNJkW" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="PltxfHNJkX" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="PltxfHPq3i" role="2OqNvi">
+                    <node concept="1bVj0M" id="PltxfHPq3k" role="23t8la">
+                      <property role="3yWfEV" value="true" />
+                      <node concept="3clFbS" id="PltxfHPq3l" role="1bW5cS">
+                        <node concept="3clFbF" id="PltxfHPua0" role="3cqZAp">
+                          <node concept="2OqwBi" id="PltxfHPvEO" role="3clFbG">
+                            <node concept="2OqwBi" id="PltxfHPusN" role="2Oq$k0">
+                              <node concept="1PxgMI" id="PltxfHPxTg" role="2Oq$k0">
+                                <node concept="chp4Y" id="PltxfHPy4O" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                </node>
+                                <node concept="2OqwBi" id="PltxfHPx0L" role="1m5AlR">
+                                  <node concept="37vLTw" id="PltxfHPu9Z" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="PltxfHPq3m" resolve="it" />
+                                  </node>
+                                  <node concept="1mfA1w" id="PltxfHPxu6" role="2OqNvi" />
+                                </node>
+                              </node>
+                              <node concept="2Xjw5R" id="PltxfHPuXr" role="2OqNvi">
+                                <node concept="1xMEDy" id="PltxfHPuXt" role="1xVPHs">
+                                  <node concept="chp4Y" id="PltxfHPvgM" role="ri$Ld">
+                                    <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3x8VRR" id="PltxfHPwf8" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="PltxfHPq3m" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="PltxfHPq3n" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="PltxfHMctr" role="L3pyr">
+            <ref role="3cqZAo" node="PltxfHM6qA" resolve="m" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="PltxfHM6qA" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="PltxfHM6q_" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="PltxfHM6qB" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="PltxfHM6qw" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="PltxfHM6qC" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+    <node concept="3uibUv" id="PltxfHM6qD" role="1zkMxy">
+      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 19d09836..d8b2e3ad 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -296,6 +296,9 @@
       <property role="IQ2ns" value="2105510410850136264" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
+    <node concept="PrWs8" id="PltxfHM3cd" role="PzmwI">
+      <ref role="PrY4T" node="PltxfHKvEb" resolve="LogicalUnwrapContext" />
+    </node>
   </node>
   <node concept="PlHQZ" id="75vUFrS_9Sg">
     <property role="3GE5qa" value="logical.variable" />
@@ -634,5 +637,24 @@
       <ref role="2wpffI" node="6dP_abdQo2a" />
     </node>
   </node>
+  <node concept="PlHQZ" id="PltxfHKvEb">
+    <property role="EcuMT" value="960803923478837899" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="LogicalUnwrapContext" />
+  </node>
+  <node concept="1TIwiD" id="PltxfHNb9C">
+    <property role="EcuMT" value="960803923479540328" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="LogicalDataForm" />
+    <property role="34LRSv" value="logical" />
+    <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
+    <node concept="1TJgyj" id="PltxfHNdqi" role="1TKVEi">
+      <property role="IQ2ns" value="960803923479549586" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="logical" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariable" />
+    </node>
+  </node>
 </model>