From 7cef550a085a5b184eaceed87ca5d51dec339962 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 29 Apr 2021 14:50:11 +0200
Subject: [PATCH] Fix logic and coderules types: logical and termlist
 conversions to classfier

---
 .../jetbrains.mps.lang.coderulesExt.types.mps | 366 +++++++++++++++---
 .../models/jetbrains.mps.logicExt.types.mps   |  77 +++-
 2 files changed, 385 insertions(+), 58 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 8bda6d67..1eaa841c 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -2385,7 +2385,7 @@
     <property role="TrG5h" value="Converts" />
     <ref role="2YbDB9" to="kqnc:24Vro6cM_J$" resolve="ConversionMain" />
     <node concept="1nLNMY" id="WIYGzYIbKT" role="1nK1Vg">
-      <property role="TrG5h" value="convertsForm2Term" />
+      <property role="TrG5h" value="form_convertsTo_term" />
       <node concept="3clFbS" id="WIYGzYIbKU" role="1nLNMH">
         <node concept="1nLNNL" id="WIYGzYIbM3" role="3cqZAp">
           <node concept="1nLNMm" id="WIYGzYIbM4" role="1nLNNK">
@@ -2548,8 +2548,182 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="7LI_gNNfeNb" role="1nK1Vg">
+      <property role="TrG5h" value="termList_convertsTo_classifier" />
+      <node concept="3clFbS" id="7LI_gNNfeNc" role="1nLNMH">
+        <node concept="1nLNNL" id="7LI_gNNfeNd" role="3cqZAp">
+          <node concept="1nLNMm" id="7LI_gNNfeNe" role="1nLNNK">
+            <node concept="3Aq93q" id="7LI_gNNfeNf" role="1nLNMb">
+              <node concept="3I6sU6" id="7LI_gNNfeNg" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7LI_gNNfeNh" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7LI_gNNfeNi" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="7LI_gNNfeNj" role="3AunhB">
+                      <node concept="a7P8L" id="7LI_gNNfeNk" role="1uarlU">
+                        <ref role="a7OzE" node="7LI_gNNfeNx" resolve="TermType" />
+                      </node>
+                      <node concept="ns1u0" id="7LI_gNNfeQ7" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeOT" resolve="termList" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="7LI_gNNfeNo" role="3AunhB">
+                      <node concept="a7P8L" id="7LI_gNNfeNp" role="1uarlU">
+                        <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
+                      </node>
+                      <node concept="ns1u0" id="61G6TdCWQS$" role="1uarlW">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="3OUB6BCUAvY" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="7LI_gNNfeNw" role="0Rg$4">
+              <node concept="aZer4" id="7LI_gNNfeNx" role="3XD1gS">
+                <property role="TrG5h" value="TermType" />
+              </node>
+              <node concept="aZer4" id="7LI_gNNfeNy" role="3XD1gS">
+                <property role="TrG5h" value="ClsType" />
+              </node>
+              <node concept="32pEOW" id="7LI_gNNfeNz" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="61G6TdCWQRs" role="3xSepv">
+              <node concept="3Aq9E8" id="61G6TdCWQRt" role="3xSepj">
+                <node concept="3I6sU6" id="61G6TdCWQRu" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="61G6TdCWQRz" role="3I6sU7">
+                    <node concept="3Aqt3T" id="61G6TdCWQRy" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="ns1u0" id="61G6TdCWQRC" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                        <node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2OqwBi" id="3CulEO1Y7_c" role="nsMwV">
+                            <node concept="2c44tf" id="3CulEO1Y7_d" role="2Oq$k0">
+                              <node concept="3uibUv" id="3CulEO1Y7_e" role="2c44tc">
+                                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="3CulEO1Y7_f" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="61G6TdCWQRT" role="3AunhB">
+                        <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
+                      </node>
+                      <node concept="a7P8L" id="3OUB6BCUAvZ" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3OUB6BCUAvU" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUAvV" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="3OUB6BCUAvW" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7kXqzcTKrr_" role="1nK1Vg">
+      <property role="TrG5h" value="classifier_convertsTo_termList" />
+      <node concept="3clFbS" id="7kXqzcTKrrA" role="1nLNMH">
+        <node concept="1nLNNL" id="7kXqzcTKrrB" role="3cqZAp">
+          <node concept="1nLNMm" id="7kXqzcTKrrC" role="1nLNNK">
+            <node concept="3Aq93q" id="7kXqzcTKrrD" role="1nLNMb">
+              <node concept="3I6sU6" id="7kXqzcTKrrE" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7kXqzcTKrrF" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7kXqzcTKrrG" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="7kXqzcTKrrK" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKrrL" role="1uarlU">
+                        <ref role="a7OzE" node="7kXqzcTKrrQ" resolve="ClsType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKrrM" role="1uarlW">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="7kXqzcTKrrH" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKrrI" role="1uarlU">
+                        <ref role="a7OzE" node="7kXqzcTKrrP" resolve="TermType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKrrJ" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeOT" resolve="termList" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="7kXqzcTKrrN" role="3AunhB">
+                      <ref role="a7OzE" node="7kXqzcTKrs7" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="7kXqzcTKrrO" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTKrrP" role="3XD1gS">
+                <property role="TrG5h" value="TermType" />
+              </node>
+              <node concept="aZer4" id="7kXqzcTKrrQ" role="3XD1gS">
+                <property role="TrG5h" value="ClsType" />
+              </node>
+              <node concept="32pEOW" id="7kXqzcTKrrR" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="7kXqzcTKrrS" role="3xSepv">
+              <node concept="3Aq9E8" id="7kXqzcTKrrT" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTKrrU" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTKrrV" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTKrrW" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="a7P8L" id="7kXqzcTKrs3" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKrrQ" resolve="ClsType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKrrX" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                        <node concept="nsMwS" id="7kXqzcTKrrY" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2OqwBi" id="7kXqzcTKrrZ" role="nsMwV">
+                            <node concept="2c44tf" id="7kXqzcTKrs0" role="2Oq$k0">
+                              <node concept="3uibUv" id="7kXqzcTKrs1" role="2c44tc">
+                                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="7kXqzcTKrs2" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="7kXqzcTKrs4" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKrs7" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="7kXqzcTKrs5" role="0Rg$4">
+              <node concept="3uibUv" id="7kXqzcTKrs6" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="7kXqzcTKrs7" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="7LI_gNNfeIA" role="1nK1Vg">
-      <property role="TrG5h" value="convertsTerm2Classifier" />
+      <property role="TrG5h" value="term_convertsTo_classifier" />
       <node concept="3clFbS" id="7LI_gNNfeIG" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNNfeIE" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNNfeIF" role="1nLNNK">
@@ -2635,86 +2809,86 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="7LI_gNNfeNb" role="1nK1Vg">
-      <property role="TrG5h" value="convertsTermList2Classifier" />
-      <node concept="3clFbS" id="7LI_gNNfeNc" role="1nLNMH">
-        <node concept="1nLNNL" id="7LI_gNNfeNd" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNNfeNe" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNNfeNf" role="1nLNMb">
-              <node concept="3I6sU6" id="7LI_gNNfeNg" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNNfeNh" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNNfeNi" role="3I6s78">
+    <node concept="1nLNMY" id="7kXqzcTKrvW" role="1nK1Vg">
+      <property role="TrG5h" value="classifier_convertsTo_term" />
+      <node concept="3clFbS" id="7kXqzcTKrvX" role="1nLNMH">
+        <node concept="1nLNNL" id="7kXqzcTKrvY" role="3cqZAp">
+          <node concept="1nLNMm" id="7kXqzcTKrvZ" role="1nLNNK">
+            <node concept="3Aq93q" id="7kXqzcTKrw0" role="1nLNMb">
+              <node concept="3I6sU6" id="7kXqzcTKrw1" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7kXqzcTKrw2" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7kXqzcTKrw3" role="3I6s78">
                     <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
-                    <node concept="1HFMs5" id="7LI_gNNfeNj" role="3AunhB">
-                      <node concept="a7P8L" id="7LI_gNNfeNk" role="1uarlU">
-                        <ref role="a7OzE" node="7LI_gNNfeNx" resolve="TermType" />
+                    <node concept="1HFMs5" id="7kXqzcTKrw7" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKrw8" role="1uarlU">
+                        <ref role="a7OzE" node="7kXqzcTKrwd" resolve="ClsType" />
                       </node>
-                      <node concept="ns1u0" id="7LI_gNNfeQ7" role="1uarlW">
-                        <ref role="ns1xF" node="7LI_gNNfeOT" resolve="termList" />
-                      </node>
-                    </node>
-                    <node concept="1HFMs5" id="7LI_gNNfeNo" role="3AunhB">
-                      <node concept="a7P8L" id="7LI_gNNfeNp" role="1uarlU">
-                        <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
-                      </node>
-                      <node concept="ns1u0" id="61G6TdCWQS$" role="1uarlW">
+                      <node concept="ns1u0" id="7kXqzcTKrw9" role="1uarlW">
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="3OUB6BCUAvY" role="3AunhB">
-                      <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
+                    <node concept="1HFMs5" id="7kXqzcTKrw4" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKrw5" role="1uarlU">
+                        <ref role="a7OzE" node="7kXqzcTKrwc" resolve="TermType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKrw6" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="7kXqzcTKrwa" role="3AunhB">
+                      <ref role="a7OzE" node="7kXqzcTKrwu" resolve="Options" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="7LI_gNNfeNw" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNNfeNx" role="3XD1gS">
+            <node concept="3NuqgR" id="7kXqzcTKrwb" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTKrwc" role="3XD1gS">
                 <property role="TrG5h" value="TermType" />
               </node>
-              <node concept="aZer4" id="7LI_gNNfeNy" role="3XD1gS">
+              <node concept="aZer4" id="7kXqzcTKrwd" role="3XD1gS">
                 <property role="TrG5h" value="ClsType" />
               </node>
-              <node concept="32pEOW" id="7LI_gNNfeNz" role="3vLBG7" />
+              <node concept="32pEOW" id="7kXqzcTKrwe" role="3vLBG7" />
             </node>
-            <node concept="3xSepi" id="61G6TdCWQRs" role="3xSepv">
-              <node concept="3Aq9E8" id="61G6TdCWQRt" role="3xSepj">
-                <node concept="3I6sU6" id="61G6TdCWQRu" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="61G6TdCWQRz" role="3I6sU7">
-                    <node concept="3Aqt3T" id="61G6TdCWQRy" role="3I6s78">
+            <node concept="3xSepi" id="7kXqzcTKrwf" role="3xSepv">
+              <node concept="3Aq9E8" id="7kXqzcTKrwg" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTKrwh" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTKrwi" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTKrwj" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="ns1u0" id="61G6TdCWQRC" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKrwq" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKrwd" resolve="ClsType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKrwk" role="3AunhB">
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
+                        <node concept="nsMwS" id="7kXqzcTKrwl" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2OqwBi" id="3CulEO1Y7_c" role="nsMwV">
-                            <node concept="2c44tf" id="3CulEO1Y7_d" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7_e" role="2c44tc">
-                                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                          <node concept="2OqwBi" id="7kXqzcTKrwm" role="nsMwV">
+                            <node concept="2c44tf" id="7kXqzcTKrwn" role="2Oq$k0">
+                              <node concept="3uibUv" id="7kXqzcTKrwo" role="2c44tc">
+                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7_f" role="2OqNvi">
+                            <node concept="3TrEf2" id="7kXqzcTKrwp" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="a7P8L" id="61G6TdCWQRT" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
-                      </node>
-                      <node concept="a7P8L" id="3OUB6BCUAvZ" role="3AunhB">
-                        <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
+                      <node concept="a7P8L" id="7kXqzcTKrwr" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKrwu" resolve="Options" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="3OUB6BCUAvU" role="0Rg$4">
-              <node concept="3uibUv" id="3OUB6BCUAvV" role="3vLBG7">
+            <node concept="3NuqgR" id="7kXqzcTKrws" role="0Rg$4">
+              <node concept="3uibUv" id="7kXqzcTKrwt" role="3vLBG7">
                 <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
-              <node concept="aZer4" id="3OUB6BCUAvW" role="3XD1gS">
+              <node concept="aZer4" id="7kXqzcTKrwu" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
@@ -3488,8 +3662,21 @@
                 <node concept="3I6s7M" id="51ek2rScB4l" role="3I6sU7">
                   <node concept="3Aqt3T" id="51ek2rScB4k" role="3I6s78">
                     <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
-                    <node concept="a7P8L" id="7FV1iGvM0Kq" role="3AunhB">
-                      <ref role="a7OzE" node="51ek2rScB48" resolve="S" />
+                    <node concept="1HFMs5" id="7kXqzcTKec1" role="3AunhB">
+                      <node concept="a7P8L" id="7FV1iGvM0Kq" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScB48" resolve="S" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKeck" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="7kXqzcTKecp" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="7kXqzcTKecJ" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTKecI" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTKecx" resolve="SDataType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                     <node concept="1HFMs5" id="51ek2rScB6i" role="3AunhB">
                       <node concept="a7P8L" id="51ek2rScB6g" role="1uarlU">
@@ -3515,6 +3702,9 @@
               <node concept="aZer4" id="51ek2rScB48" role="3XD1gS">
                 <property role="TrG5h" value="S" />
               </node>
+              <node concept="aZer4" id="7kXqzcTKecx" role="3XD1gS">
+                <property role="TrG5h" value="SDataType" />
+              </node>
               <node concept="aZer4" id="51ek2rScB4z" role="3XD1gS">
                 <property role="TrG5h" value="T" />
               </node>
@@ -3526,13 +3716,13 @@
             <node concept="3xSepi" id="vq9UdHmPKu" role="3xSepv">
               <node concept="3Aq9E8" id="vq9UdHmPKv" role="3xSepj">
                 <node concept="3I6sU6" id="vq9UdHmPKw" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="vq9UdHmPMH" role="3I6sU7">
-                    <node concept="3Aqt3T" id="vq9UdHmPMG" role="3I6s78">
-                      <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
-                      <node concept="a7P8L" id="7FV1iGvM6r0" role="3AunhB">
-                        <ref role="a7OzE" node="51ek2rScB48" resolve="S" />
+                  <node concept="3I6s7M" id="7kXqzcTKed0" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTKecY" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6RzTUCTeZel" resolve="comparable" />
+                      <node concept="a7P8L" id="7kXqzcTKeda" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKecx" resolve="SDataType" />
                       </node>
-                      <node concept="a7P8L" id="vq9UdHmPXN" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKedk" role="3AunhB">
                         <ref role="a7OzE" node="vq9UdHmP$m" resolve="TDataType" />
                       </node>
                     </node>
@@ -3542,6 +3732,68 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="7kXqzcTKe94" role="3cqZAp" />
+        <node concept="1nLNNL" id="7kXqzcTKe5i" role="3cqZAp">
+          <node concept="1nLNMm" id="7kXqzcTKe5j" role="1nLNNK">
+            <node concept="3Aq93q" id="7kXqzcTKe5k" role="1nLNMb">
+              <node concept="3I6sU6" id="7kXqzcTKe5l" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7kXqzcTKe5m" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7kXqzcTKe5n" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="a7P8L" id="7kXqzcTKe5o" role="3AunhB">
+                      <ref role="a7OzE" node="7kXqzcTKe5w" resolve="S" />
+                    </node>
+                    <node concept="1HFMs5" id="7kXqzcTKe5p" role="3AunhB">
+                      <node concept="a7P8L" id="7kXqzcTKe5q" role="1uarlU">
+                        <ref role="a7OzE" node="7kXqzcTKe5x" resolve="T" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTKe5r" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="7kXqzcTKe5s" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="7kXqzcTKe5t" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTKe5u" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTKe5y" resolve="TDataType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="7kXqzcTKe5v" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTKe5w" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="7kXqzcTKe5x" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="7kXqzcTKe5y" role="3XD1gS">
+                <property role="TrG5h" value="TDataType" />
+              </node>
+              <node concept="32pEOW" id="7kXqzcTKe5z" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="7kXqzcTKe5$" role="3xSepv">
+              <node concept="3Aq9E8" id="7kXqzcTKe5_" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTKe5A" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTKe5B" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTKe5C" role="3I6s78">
+                      <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                      <node concept="a7P8L" id="7kXqzcTKe5D" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKe5w" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="7kXqzcTKe5E" role="3AunhB">
+                        <ref role="a7OzE" node="7kXqzcTKe5y" resolve="TDataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="51ek2rScBbK" role="3cqZAp" />
         <node concept="1nLNNL" id="51ek2rScB9n" role="3cqZAp">
           <node concept="1nLNMm" id="51ek2rScB9o" role="1nLNNK">
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
index 8049494d..156d83c7 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
@@ -96,8 +96,11 @@
       </concept>
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
+        <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
+      </concept>
+      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
+        <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
-      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
@@ -958,11 +961,83 @@
               <node concept="aZer4" id="7LI_gNMpTiv" role="3XD1gS">
                 <property role="TrG5h" value="CType" />
               </node>
+              <node concept="aZer4" id="7kXqzcTLKVf" role="3XD1gS">
+                <property role="TrG5h" value="DataType" />
+                <node concept="3cmrfG" id="7kXqzcTLKVz" role="3gj$pD">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
               <node concept="32pEOW" id="7LI_gNMpTiF" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="7LI_gNMpTAc" role="3xSepv">
               <node concept="3Aq9E8" id="7LI_gNMpTAd" role="3xSepj">
                 <node concept="3I6sU6" id="7LI_gNMpTAe" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTLKrK" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTLKrJ" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                      <node concept="a7P8L" id="7kXqzcTLKrQ" role="3AunhB">
+                        <ref role="a7OzE" node="7LI_gNMpTiv" resolve="CType" />
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTLKs0" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                        <node concept="nsMwS" id="7kXqzcTLKs4" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2OqwBi" id="7kXqzcTLKJ3" role="nsMwV">
+                            <node concept="2c44tf" id="7kXqzcTLKU2" role="2Oq$k0">
+                              <node concept="3uibUv" id="7kXqzcTLKU3" role="2c44tc">
+                                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="7kXqzcTLKTU" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="7kXqzcTLKUL" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
+                          <node concept="1nq8_$" id="7kXqzcTLKVC" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTLKVB" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="7kXqzcTLKVW" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTLKVX" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTLKWe" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7kXqzcTLKWf" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="7kXqzcTLKWg" role="3AunhB">
+                        <node concept="3A2sRY" id="7kXqzcTLKWh" role="37jj2">
+                          <ref role="3A2yKK" node="7LI_gNMpTia" resolve="ei" />
+                        </node>
+                      </node>
+                      <node concept="ns1u0" id="7kXqzcTLKWi" role="3AunhB">
+                        <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="7kXqzcTLKWj" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="7kXqzcTLKWk" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTLKWC" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
+                              <node concept="3cmrfG" id="7kXqzcTLS7r" role="3gCZO6">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3xSepi" id="7kXqzcTLKqS" role="3xSepv">
+              <node concept="3Aq9E8" id="7kXqzcTLKqT" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTLKqU" role="3Ip0Jz">
                   <node concept="3I6s7M" id="7LI_gNMpTAj" role="3I6sU7">
                     <node concept="3Aqt3T" id="7LI_gNMpTAi" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />