From cbb9ac919ea26d72235ab18b4c2ea7256bcf474b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 14 Apr 2020 16:17:15 +0200
Subject: [PATCH] Rename LogicalDataForm to LogicalVariableDataForm. Fix
 generator to not rely on type.

LogicalVariableDataForm generates to either a list node or a term.
This choice can be made based on the structure alone.
Logical variable "array" corresponds to list node, everything else to a term.
---
 .../generator/template/main@generator.mps     | 201 +++++++++---------
 .../languageModels/behavior.mps               |  55 ++++-
 .../languageModels/editor.mps                 |  12 +-
 .../languageModels/structure.mps              |   9 +-
 4 files changed, 158 insertions(+), 119 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 e0e8843c..eaac4b92 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -219,6 +219,7 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <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" />
@@ -238,7 +239,9 @@
       <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" />
+      <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>
@@ -480,105 +483,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="PltxfHQdoQ" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
-      <node concept="14YyZ8" id="1fvYCPCmGm2" role="1lVwrX">
-        <node concept="14ZrTv" id="1fvYCPCmGxz" role="14ZwWg">
-          <node concept="30G5F_" id="1fvYCPCmGx$" role="150hEN">
-            <node concept="3clFbS" id="1fvYCPCmGx_" role="2VODD2">
-              <node concept="3clFbF" id="3MfP0fxgQMR" role="3cqZAp">
-                <node concept="2OqwBi" id="3MfP0fxgS3I" role="3clFbG">
-                  <node concept="1UaxmW" id="3MfP0fxgQMO" role="2Oq$k0">
-                    <node concept="1Yb3XT" id="3MfP0fxgRx0" role="1Ub_4A">
-                      <property role="TrG5h" value="unused" />
-                      <node concept="2DMOqp" id="3MfP0fxgRx2" role="1YbcFS">
-                        <node concept="2c44tf" id="3MfP0fxgRx4" role="HM535">
-                          <node concept="3uibUv" id="3MfP0fxgRKi" role="2c44tc">
-                            <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3MfP0fxgRlW" role="1Ub_4B">
-                      <node concept="2OqwBi" id="3MfP0fxgQYY" role="2Oq$k0">
-                        <node concept="30H73N" id="3MfP0fxgQNn" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="3MfP0fxgRbn" role="2OqNvi">
-                          <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
-                        </node>
-                      </node>
-                      <node concept="3JvlWi" id="3MfP0fxgRwh" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="3MfP0fxgSkN" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="1fvYCPCmIOF" role="150oIE">
-            <node concept="3clFbS" id="1fvYCPCmIOG" role="1Koe22">
-              <node concept="3cpWs8" id="1fvYCPCmIOH" role="3cqZAp">
-                <node concept="3cpWsn" id="1fvYCPCmIOI" role="3cpWs9">
-                  <property role="TrG5h" value="mlp" />
-                  <node concept="3uibUv" id="1fvYCPCmIOJ" role="1tU5fm">
-                    <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1fvYCPCmIOK" role="3cqZAp">
-                <node concept="2YIFZM" id="1fvYCPCmIOL" role="3clFbG">
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <node concept="2YIFZM" id="1fvYCPCmIOM" role="37wK5m">
-                    <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-                    <ref role="37wK5l" to="oy3s:7HUwyZb7b7C" resolve="asDataFormArray" />
-                    <node concept="37vLTw" id="1fvYCPCmION" role="37wK5m">
-                      <ref role="3cqZAo" node="1fvYCPCmIOI" resolve="mlp" />
-                      <node concept="29HgVG" id="1fvYCPCmIOO" role="lGtFl">
-                        <node concept="3NFfHV" id="1fvYCPCmIOP" role="3NFExx">
-                          <node concept="3clFbS" id="1fvYCPCmIOQ" role="2VODD2">
-                            <node concept="3clFbF" id="1fvYCPCmIOR" role="3cqZAp">
-                              <node concept="2OqwBi" id="1fvYCPC_acZ" role="3clFbG">
-                                <node concept="30H73N" id="1fvYCPCmIOS" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="1fvYCPC_an1" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="1fvYCPCmIOT" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="1fvYCPA2_Zx" role="14YRTM">
-          <node concept="2YIFZM" id="1fvYCPA2A5R" role="gfFT$">
-            <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-            <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-            <node concept="10Nm6u" id="1fvYCPA2A8d" role="37wK5m">
-              <node concept="29HgVG" id="1fvYCPA2Abr" role="lGtFl">
-                <node concept="3NFfHV" id="1fvYCPA2AcL" role="3NFExx">
-                  <node concept="3clFbS" id="1fvYCPA2AcM" role="2VODD2">
-                    <node concept="3clFbF" id="1fvYCPA2Agd" role="3cqZAp">
-                      <node concept="2OqwBi" id="1fvYCPA2Ast" role="3clFbG">
-                        <node concept="30H73N" id="1fvYCPA2Agc" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="1fvYCPA2AB4" role="2OqNvi">
-                          <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="4lNgnaL7Fky" role="3acgRq">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
@@ -1248,6 +1152,103 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="PltxfHQdoQ" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:PltxfHNb9C" resolve="LogicalVariableDataForm" />
+      <node concept="14YyZ8" id="1fvYCPCmGm2" role="1lVwrX">
+        <node concept="14ZrTv" id="1fvYCPCmGxz" role="14ZwWg">
+          <node concept="30G5F_" id="1fvYCPCmGx$" role="150hEN">
+            <node concept="3clFbS" id="1fvYCPCmGx_" role="2VODD2">
+              <node concept="3clFbF" id="4U$Q3dJM0uA" role="3cqZAp">
+                <node concept="2OqwBi" id="4U$Q3dJM14E" role="3clFbG">
+                  <node concept="1PxgMI" id="4U$Q3dJM11Q" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="4U$Q3dJM13p" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+                    </node>
+                    <node concept="2OqwBi" id="4U$Q3dJOMF_" role="1m5AlR">
+                      <node concept="1iwH7S" id="4U$Q3dJOMwx" role="2Oq$k0" />
+                      <node concept="12$id9" id="4U$Q3dJOMLq" role="2OqNvi">
+                        <node concept="2OqwBi" id="4U$Q3dJOMZf" role="12$y8L">
+                          <node concept="30H73N" id="4U$Q3dJOMML" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4U$Q3dJON8P" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="variable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="4U$Q3dJM1k7" role="2OqNvi">
+                    <ref role="37wK5l" to="ha02:3MfP0fxd5Oz" resolve="isArray" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="1fvYCPCmIOF" role="150oIE">
+            <node concept="3clFbS" id="1fvYCPCmIOG" role="1Koe22">
+              <node concept="3cpWs8" id="1fvYCPCmIOH" role="3cqZAp">
+                <node concept="3cpWsn" id="1fvYCPCmIOI" role="3cpWs9">
+                  <property role="TrG5h" value="mlp" />
+                  <node concept="3uibUv" id="1fvYCPCmIOJ" role="1tU5fm">
+                    <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="1fvYCPCmIOK" role="3cqZAp">
+                <node concept="2YIFZM" id="1fvYCPCmIOL" role="3clFbG">
+                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                  <node concept="2YIFZM" id="1fvYCPCmIOM" role="37wK5m">
+                    <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+                    <ref role="37wK5l" to="oy3s:7HUwyZb7b7C" resolve="asDataFormArray" />
+                    <node concept="37vLTw" id="1fvYCPCmION" role="37wK5m">
+                      <ref role="3cqZAo" node="1fvYCPCmIOI" resolve="mlp" />
+                      <node concept="29HgVG" id="1fvYCPCmIOO" role="lGtFl">
+                        <node concept="3NFfHV" id="1fvYCPCmIOP" role="3NFExx">
+                          <node concept="3clFbS" id="1fvYCPCmIOQ" role="2VODD2">
+                            <node concept="3clFbF" id="1fvYCPCmIOR" role="3cqZAp">
+                              <node concept="2OqwBi" id="1fvYCPC_acZ" role="3clFbG">
+                                <node concept="30H73N" id="1fvYCPCmIOS" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="1fvYCPC_an1" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="variable" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="1fvYCPCmIOT" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="1fvYCPA2_Zx" role="14YRTM">
+          <node concept="2YIFZM" id="1fvYCPA2A5R" role="gfFT$">
+            <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+            <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
+            <node concept="10Nm6u" id="1fvYCPA2A8d" role="37wK5m">
+              <node concept="29HgVG" id="1fvYCPA2Abr" role="lGtFl">
+                <node concept="3NFfHV" id="1fvYCPA2AcL" role="3NFExx">
+                  <node concept="3clFbS" id="1fvYCPA2AcM" role="2VODD2">
+                    <node concept="3clFbF" id="1fvYCPA2Agd" role="3cqZAp">
+                      <node concept="2OqwBi" id="1fvYCPA2Ast" role="3clFbG">
+                        <node concept="30H73N" id="1fvYCPA2Agc" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="1fvYCPA2AB4" role="2OqNvi">
+                          <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="variable" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="jVnub" id="677NV56thjr">
     <property role="TrG5h" value="Expression_logical2treeform" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index eb62e2a8..823ef82f 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -68,9 +68,16 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -78,6 +85,7 @@
         <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
@@ -88,6 +96,7 @@
       <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="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <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" />
@@ -100,6 +109,7 @@
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </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="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
         <child id="5944356402132808753" name="case" index="1_3QMm" />
@@ -296,6 +306,24 @@
         <ref role="ehGHo" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
       </node>
     </node>
+    <node concept="13i0hz" id="4U$Q3dJRAQ9" role="13h7CS">
+      <property role="TrG5h" value="isArray" />
+      <node concept="3Tm1VV" id="4U$Q3dJRAQa" role="1B3o_S" />
+      <node concept="10P_77" id="4U$Q3dJRAQW" role="3clF45" />
+      <node concept="3clFbS" id="4U$Q3dJRAQc" role="3clF47">
+        <node concept="3clFbF" id="4U$Q3dJRARo" role="3cqZAp">
+          <node concept="2OqwBi" id="4U$Q3dJRBk$" role="3clFbG">
+            <node concept="2OqwBi" id="4U$Q3dJRB14" role="2Oq$k0">
+              <node concept="13iPFW" id="4U$Q3dJRARn" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4U$Q3dJRB9n" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="4U$Q3dJRBtw" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13hLZK" id="75vUFrSLzLQ" role="13h7CW">
       <node concept="3clFbS" id="75vUFrSLzLR" role="2VODD2" />
     </node>
@@ -442,15 +470,28 @@
       <node concept="3Tm1VV" id="3MfP0fxd5O$" role="1B3o_S" />
       <node concept="10P_77" id="3MfP0fxd5ON" role="3clF45" />
       <node concept="3clFbS" id="3MfP0fxd5OA" role="3clF47">
-        <node concept="3clFbF" id="3MfP0fxd5Pf" role="3cqZAp">
-          <node concept="2OqwBi" id="3MfP0fxd6kc" role="3clFbG">
-            <node concept="2OqwBi" id="3MfP0fxd5YV" role="2Oq$k0">
-              <node concept="13iPFW" id="3MfP0fxd5Pe" role="2Oq$k0" />
-              <node concept="3TrEf2" id="3MfP0fxd67e" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:5f6wxQ3pnWr" resolve="indexExpr" />
+        <node concept="3clFbF" id="4U$Q3dJRAdT" role="3cqZAp">
+          <node concept="1Wc70l" id="4U$Q3dJWCLr" role="3clFbG">
+            <node concept="2OqwBi" id="4U$Q3dJWDis" role="3uHU7w">
+              <node concept="2OqwBi" id="4U$Q3dJWCWk" role="2Oq$k0">
+                <node concept="13iPFW" id="4U$Q3dJWCMk" role="2Oq$k0" />
+                <node concept="3TrEf2" id="4U$Q3dJWD8B" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5j4j:5f6wxQ3pnWr" resolve="indexExpr" />
+                </node>
+              </node>
+              <node concept="3w_OXm" id="4U$Q3dJWDvo" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="4U$Q3dJRAEo" role="3uHU7B">
+              <node concept="2OqwBi" id="4U$Q3dJRAn_" role="2Oq$k0">
+                <node concept="13iPFW" id="4U$Q3dJRAdS" role="2Oq$k0" />
+                <node concept="3TrEf2" id="4U$Q3dJRAwb" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                </node>
+              </node>
+              <node concept="2qgKlT" id="4U$Q3dJRBJx" role="2OqNvi">
+                <ref role="37wK5l" node="4U$Q3dJRAQ9" resolve="isArray" />
               </node>
             </node>
-            <node concept="3x8VRR" id="3MfP0fxd6uZ" role="2OqNvi" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index fc4ed85d..4d732dc8 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -3284,17 +3284,17 @@
   </node>
   <node concept="24kQdi" id="PltxfHNefA">
     <property role="3GE5qa" value="dataform" />
-    <ref role="1XX52x" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+    <ref role="1XX52x" to="5j4j:PltxfHNb9C" resolve="LogicalVariableDataForm" />
     <node concept="3EZMnI" id="PltxfHNeGf" role="2wV5jI">
       <node concept="3F1sOY" id="PltxfHNeK9" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:PltxfHNdqi" resolve="logical" />
+        <ref role="1NtTu8" to="5j4j:PltxfHNdqi" resolve="variable" />
       </node>
       <node concept="l2Vlx" id="PltxfHNeGi" role="2iSdaV" />
     </node>
   </node>
   <node concept="3p36aQ" id="PltxfIrOTO">
     <property role="3GE5qa" value="dataform" />
-    <ref role="aqKnT" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+    <ref role="aqKnT" to="5j4j:PltxfHNb9C" resolve="LogicalVariableDataForm" />
     <node concept="3N5dw7" id="PltxfIrYl_" role="3ft7WO">
       <node concept="3N5aqt" id="PltxfIrYlA" role="3Na0zg">
         <node concept="3clFbS" id="PltxfIrYlB" role="2VODD2">
@@ -3302,12 +3302,12 @@
             <node concept="3cpWsn" id="PltxfIrYUP" role="3cpWs9">
               <property role="TrG5h" value="ldf" />
               <node concept="3Tqbb2" id="PltxfIrYUL" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+                <ref role="ehGHo" to="5j4j:PltxfHNb9C" resolve="LogicalVariableDataForm" />
               </node>
               <node concept="2ShNRf" id="PltxfIrZhg" role="33vP2m">
                 <node concept="3zrR0B" id="PltxfIrZLl" role="2ShVmc">
                   <node concept="3Tqbb2" id="PltxfIrZLn" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
+                    <ref role="ehGHo" to="5j4j:PltxfHNb9C" resolve="LogicalVariableDataForm" />
                   </node>
                 </node>
               </node>
@@ -3320,7 +3320,7 @@
                   <ref role="3cqZAo" node="PltxfIrYUP" resolve="ldf" />
                 </node>
                 <node concept="3TrEf2" id="PltxfIs0$h" role="2OqNvi">
-                  <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="logical" />
+                  <ref role="3Tt5mk" to="5j4j:PltxfHNdqi" resolve="variable" />
                 </node>
               </node>
               <node concept="2oxUTD" id="PltxfIs16o" role="2OqNvi">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index fd4c7c2d..ebc95608 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -414,22 +414,19 @@
   <node concept="1TIwiD" id="PltxfHNb9C">
     <property role="EcuMT" value="960803923479540328" />
     <property role="3GE5qa" value="dataform" />
-    <property role="TrG5h" value="LogicalDataForm" />
+    <property role="TrG5h" value="LogicalVariableDataForm" />
     <property role="34LRSv" value="logical" />
     <property role="R4oN_" value="logical variable" />
     <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="20kJfa" value="variable" />
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariable" />
-      <node concept="t5JxF" id="3MfP0fx22K0" role="lGtFl">
-        <property role="t5JxN" value="!!FIXME rename to variable!!" />
-      </node>
     </node>
     <node concept="t5JxF" id="3MfP0fwg9H8" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to LogicalVariableDataForm!! Allows to use a logical variable that represents a data form." />
+      <property role="t5JxN" value="Allows to use a logical variable that represents a data form." />
     </node>
   </node>
   <node concept="1TIwiD" id="7zIaasjAAux">