From 0a77dcb33b83253e27c267f56ea10795e033462f Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 6 Jan 2021 10:25:07 +0100
Subject: [PATCH] Coderules types: fix unifiable relation, add missing typing
 rules

---
 .../jetbrains.mps.lang.coderulesExt.types.mps | 362 +++++++++++++++++-
 1 file changed, 343 insertions(+), 19 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 ca9ff01d..34caabf7 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
@@ -400,6 +400,101 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="3GLv42MFcrQ" role="1nK1Vg">
+      <property role="TrG5h" value="patternLogicalVariable" />
+      <node concept="3clFbS" id="3GLv42MFcrR" role="1nLNMH">
+        <node concept="1nLNNL" id="3GLv42MFcCl" role="3cqZAp">
+          <node concept="1nLNMm" id="3GLv42MFcCn" role="1nLNNK">
+            <node concept="3Aq93q" id="3GLv42MFcCr" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="3GLv42MFcCs" role="3Ip0Jz">
+                <node concept="3I6s7M" id="3GLv42MFcCw" role="3I6sU7">
+                  <node concept="3Aqt3T" id="3GLv42MFcCv" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="3GLv42MFcF_" role="3AunhB">
+                      <node concept="2OqwBi" id="3GLv42MFcND" role="37jj2">
+                        <node concept="3A2sRY" id="3GLv42MFcFz" role="2Oq$k0">
+                          <ref role="3A2yKK" node="3GLv42MFcrT" resolve="plv" />
+                        </node>
+                        <node concept="3TrEf2" id="3GLv42MFcVQ" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:4sSe4$p4oON" resolve="variable" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="3GLv42MFcVZ" role="3AunhB">
+                      <ref role="a7OzE" node="3GLv42MFcFr" resolve="VarT" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="3GLv42MFcWj" role="3I6sU7">
+                  <node concept="3Aqt3T" id="3GLv42MFcWh" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="3GLv42MFcWx" role="3AunhB">
+                      <node concept="2OqwBi" id="3GLv42MFd4X" role="37jj2">
+                        <node concept="3A2sRY" id="3GLv42MFcWv" role="2Oq$k0">
+                          <ref role="3A2yKK" node="3GLv42MFcrT" resolve="plv" />
+                        </node>
+                        <node concept="3TrEf2" id="3GLv42MFddZ" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:4sSe4$p4oOP" resolve="value" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="3GLv42MFdek" role="3AunhB">
+                      <ref role="a7OzE" node="3GLv42MFcWe" resolve="ValT" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3GLv42MFcFq" role="0Rg$4">
+              <node concept="aZer4" id="3GLv42MFcFr" role="3XD1gS">
+                <property role="TrG5h" value="VarT" />
+              </node>
+              <node concept="aZer4" id="3GLv42MFcWe" role="3XD1gS">
+                <property role="TrG5h" value="ValT" />
+              </node>
+              <node concept="32pEOW" id="3GLv42MFcFw" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="3GLv42MFdeq" role="3xSepv">
+              <node concept="3Aq9E8" id="3GLv42MFder" role="3xSepj">
+                <node concept="3I6sU6" id="3GLv42MFdes" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="3GLv42MFdez" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MFdey" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                      <node concept="a7P8L" id="3GLv42MFdeC" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFcWe" resolve="ValT" />
+                      </node>
+                      <node concept="a7P8L" id="3GLv42MFdeH" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFcFr" resolve="VarT" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="3GLv42MFdeS" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MFdeQ" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="3GLv42MFdf3" role="3AunhB">
+                        <node concept="3A2sRY" id="3GLv42MFdf1" role="37jj2">
+                          <ref role="3A2yKK" node="3GLv42MFcrT" resolve="plv" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="3GLv42MFdfa" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFcFr" resolve="VarT" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="3GLv42MFcrS" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+        <node concept="3A20r5" id="3GLv42MFcrT" role="2t_VXX">
+          <property role="TrG5h" value="plv" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="14oWJ2NFh5g" role="1nK1Vg">
       <property role="TrG5h" value="logicalItemValueExpression" />
       <node concept="3clFbS" id="14oWJ2NFh5h" role="1nLNMH">
@@ -1873,12 +1968,12 @@
                       <property role="TrG5h" value="Type" />
                       <node concept="2OqwBi" id="7LI_gNMXUFL" role="3gj$pD">
                         <node concept="2OqwBi" id="7LI_gNMXUFM" role="2Oq$k0">
-                          <node concept="3A2sRY" id="7LI_gNMXUFN" role="2Oq$k0">
-                            <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                          </node>
                           <node concept="3Tsc0h" id="7LI_gNMXUFO" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
                           </node>
+                          <node concept="3A2sRY" id="7LI_gNMXUFN" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                          </node>
                         </node>
                         <node concept="34oBXx" id="7LI_gNMXUFP" role="2OqNvi" />
                       </node>
@@ -1956,10 +2051,18 @@
                                         <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
                                       </node>
                                     </node>
-                                    <node concept="a7P8L" id="7LI_gNMXY0n" role="3AunhB">
-                                      <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
-                                      <node concept="37vLTw" id="7LI_gNMXY0W" role="3gCZO6">
-                                        <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                    <node concept="ns1u0" id="3QaPPfnPf$j" role="3AunhB">
+                                      <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                                      <node concept="nsMwS" id="3QaPPfnPfII" role="ns1xD">
+                                        <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                                        <node concept="1nq8_$" id="3QaPPfnPgsk" role="nsMwV">
+                                          <node concept="a7P8L" id="3QaPPfnPgsj" role="1nq8_t">
+                                            <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
+                                            <node concept="37vLTw" id="3QaPPfnPh8K" role="3gCZO6">
+                                              <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -2131,6 +2234,167 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="3GLv42MFaRF" role="1nK1Vg">
+      <property role="TrG5h" value="copyItem" />
+      <node concept="3clFbS" id="3GLv42MFaRG" role="1nLNMH">
+        <node concept="1nLNNL" id="3GLv42MFb3_" role="3cqZAp">
+          <node concept="1nLNMm" id="3GLv42MFb3A" role="1nLNNK">
+            <node concept="3Aq93q" id="3GLv42MFb3D" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="3GLv42MFb3E" role="3Ip0Jz">
+                <node concept="3I6s7M" id="3GLv42MFb3I" role="3I6sU7">
+                  <node concept="3Aqt3T" id="3GLv42MFb3H" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="3GLv42MFb3Z" role="3AunhB">
+                      <node concept="2OqwBi" id="3GLv42MFc4v" role="37jj2">
+                        <node concept="3A2sRY" id="3GLv42MFb3X" role="2Oq$k0">
+                          <ref role="3A2yKK" node="3GLv42MFaRI" resolve="ci" />
+                        </node>
+                        <node concept="3TrEf2" id="3GLv42MFcd1" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:1HWyn8iJ_Iq" resolve="origin" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="3GLv42MFcd4" role="3AunhB">
+                      <ref role="a7OzE" node="3GLv42MFb3N" resolve="OriginT" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3GLv42MFb3M" role="0Rg$4">
+              <node concept="aZer4" id="3GLv42MFb3N" role="3XD1gS">
+                <property role="TrG5h" value="OriginT" />
+              </node>
+              <node concept="aZer4" id="3GLv42MFcdW" role="3XD1gS">
+                <property role="TrG5h" value="TermT" />
+              </node>
+              <node concept="32pEOW" id="3GLv42MFb3S" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="3GLv42MFcda" role="3xSepv">
+              <node concept="3Aq9E8" id="3GLv42MFcdb" role="3xSepj">
+                <node concept="3I6sU6" id="3GLv42MFcdc" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="3GLv42MFcel" role="3I6sU7">
+                    <node concept="3A8Hvi" id="3GLv42MFcer" role="3I6s78">
+                      <node concept="ns1u0" id="3GLv42MFcf8" role="3A8w4Q">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                      <node concept="a7P8L" id="3GLv42MFce8" role="3A8wtg">
+                        <ref role="a7OzE" node="3GLv42MFcdW" resolve="TermT" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="3GLv42MFcdh" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MFcdg" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                      <node concept="a7P8L" id="3GLv42MFcdm" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFb3N" resolve="OriginT" />
+                      </node>
+                      <node concept="a7P8L" id="3GLv42MFcfd" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFcdW" resolve="TermT" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="3GLv42MFcdN" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MFcdL" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="3GLv42MFcfi" role="3AunhB">
+                        <node concept="3A2sRY" id="3GLv42MFcfg" role="37jj2">
+                          <ref role="3A2yKK" node="3GLv42MFaRI" resolve="ci" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="3GLv42MFcfp" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MFcdW" resolve="TermT" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="3GLv42MFaRH" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:1HWyn8iJ_xB" resolve="CopyItem" />
+        <node concept="3A20r5" id="3GLv42MFaRI" role="2t_VXX">
+          <property role="TrG5h" value="ci" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="3GLv42MGiMR" role="1nK1Vg">
+      <property role="TrG5h" value="provideFeedbackOperation" />
+      <node concept="3clFbS" id="3GLv42MGiMS" role="1nLNMH">
+        <node concept="1nLNNL" id="3GLv42MGiZU" role="3cqZAp">
+          <node concept="1nLNMm" id="3GLv42MGiZV" role="1nLNNK">
+            <node concept="3Aq93q" id="3GLv42MGiZY" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="3GLv42MGiZZ" role="3Ip0Jz">
+                <node concept="3I6s7M" id="3GLv42MGj0b" role="3I6sU7">
+                  <node concept="3Aqt3T" id="3GLv42MGj0a" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="3GLv42MGj0s" role="3AunhB">
+                      <node concept="2OqwBi" id="3GLv42MGk4c" role="37jj2">
+                        <node concept="3A2sRY" id="3GLv42MGj0q" role="2Oq$k0">
+                          <ref role="3A2yKK" node="3GLv42MGiMU" resolve="pfo" />
+                        </node>
+                        <node concept="3TrEf2" id="3GLv42MGkeq" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6mHZizzmtL_" resolve="message" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="3GLv42MGkez" role="3AunhB">
+                      <ref role="a7OzE" node="3GLv42MGj0g" resolve="MsgT" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3GLv42MGj0f" role="0Rg$4">
+              <node concept="aZer4" id="3GLv42MGj0g" role="3XD1gS">
+                <property role="TrG5h" value="MsgT" />
+              </node>
+              <node concept="32pEOW" id="3GLv42MGj0l" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="3GLv42MGkeD" role="3xSepv">
+              <node concept="3Aq9E8" id="3GLv42MGkeE" role="3xSepj">
+                <node concept="3I6sU6" id="3GLv42MGkeF" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="3GLv42MGkeK" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MGkeJ" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                      <node concept="a7P8L" id="3GLv42MGkeP" role="3AunhB">
+                        <ref role="a7OzE" node="3GLv42MGj0g" resolve="MsgT" />
+                      </node>
+                      <node concept="ns1u0" id="3GLv42MGkeU" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:2HYHa0WV2R$" resolve="string" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="3GLv42MGkf5" role="3I6sU7">
+                    <node concept="3Aqt3T" id="3GLv42MGkf3" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="3GLv42MGkfg" role="3AunhB">
+                        <node concept="3A2sRY" id="3GLv42MGkfe" role="37jj2">
+                          <ref role="3A2yKK" node="3GLv42MGiMU" resolve="pfo" />
+                        </node>
+                      </node>
+                      <node concept="ns1u0" id="3GLv42MGk$0" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt3a" resolve="_void_" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="3GLv42MGiMT" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+        <node concept="3A20r5" id="3GLv42MGiMU" role="2t_VXX">
+          <property role="TrG5h" value="pfo" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="AVZre" id="7LI_gNN9o2r">
     <property role="TrG5h" value="Converts" />
@@ -3111,7 +3375,7 @@
                         <ref role="a7OzE" node="51ek2rScB48" resolve="S" />
                       </node>
                       <node concept="a7P8L" id="51ek2rScB8A" role="1uarlW">
-                        <ref role="a7OzE" node="51ek2rScB7P" resolve="DType" />
+                        <ref role="a7OzE" node="51ek2rScB7P" resolve="SDataType" />
                       </node>
                     </node>
                     <node concept="1HFMs5" id="51ek2rScB6i" role="3AunhB">
@@ -3123,8 +3387,8 @@
                         <node concept="nsMwS" id="51ek2rScB7k" role="ns1xD">
                           <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
                           <node concept="1nq8_$" id="51ek2rScB9a" role="nsMwV">
-                            <node concept="a7P8L" id="51ek2rScB99" role="1nq8_t">
-                              <ref role="a7OzE" node="51ek2rScB7P" resolve="DType" />
+                            <node concept="a7P8L" id="vq9UdHmPHY" role="1nq8_t">
+                              <ref role="a7OzE" node="vq9UdHmP$m" resolve="TDataType" />
                             </node>
                           </node>
                         </node>
@@ -3142,10 +3406,30 @@
                 <property role="TrG5h" value="T" />
               </node>
               <node concept="aZer4" id="51ek2rScB7P" role="3XD1gS">
-                <property role="TrG5h" value="DType" />
+                <property role="TrG5h" value="SDataType" />
+              </node>
+              <node concept="aZer4" id="vq9UdHmP$m" role="3XD1gS">
+                <property role="TrG5h" value="TDataType" />
               </node>
               <node concept="32pEOW" id="51ek2rScB4p" role="3vLBG7" />
             </node>
+            <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" to="kqnc:6RzTUCTeZel" resolve="comparable" />
+                      <node concept="a7P8L" id="vq9UdHmPR5" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rScB7P" resolve="SDataType" />
+                      </node>
+                      <node concept="a7P8L" id="vq9UdHmPXN" role="3AunhB">
+                        <ref role="a7OzE" node="vq9UdHmP$m" resolve="TDataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="51ek2rScBbK" role="3cqZAp" />
@@ -3166,7 +3450,7 @@
                           <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
                           <node concept="1nq8_$" id="51ek2rScB9A" role="nsMwV">
                             <node concept="a7P8L" id="51ek2rScB9B" role="1nq8_t">
-                              <ref role="a7OzE" node="51ek2rScB9F" resolve="DType" />
+                              <ref role="a7OzE" node="51ek2rScB9F" resolve="SDataType" />
                             </node>
                           </node>
                         </node>
@@ -3176,8 +3460,8 @@
                       <node concept="a7P8L" id="51ek2rScBe4" role="1uarlU">
                         <ref role="a7OzE" node="51ek2rScB9E" resolve="T" />
                       </node>
-                      <node concept="a7P8L" id="51ek2rScB9x" role="1uarlW">
-                        <ref role="a7OzE" node="51ek2rScB9F" resolve="DType" />
+                      <node concept="a7P8L" id="vq9UdHmQg6" role="1uarlW">
+                        <ref role="a7OzE" node="vq9UdHmQ3t" resolve="TDataType" />
                       </node>
                     </node>
                   </node>
@@ -3192,10 +3476,30 @@
                 <property role="TrG5h" value="T" />
               </node>
               <node concept="aZer4" id="51ek2rScB9F" role="3XD1gS">
-                <property role="TrG5h" value="DType" />
+                <property role="TrG5h" value="SDataType" />
+              </node>
+              <node concept="aZer4" id="vq9UdHmQ3t" role="3XD1gS">
+                <property role="TrG5h" value="TDataType" />
               </node>
               <node concept="32pEOW" id="51ek2rScB9G" role="3vLBG7" />
             </node>
+            <node concept="3xSepi" id="vq9UdHmQiM" role="3xSepv">
+              <node concept="3Aq9E8" id="vq9UdHmQiN" role="3xSepj">
+                <node concept="3I6sU6" id="vq9UdHmQiO" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="vq9UdHmQlb" role="3I6sU7">
+                    <node concept="3Aqt3T" id="vq9UdHmQla" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6RzTUCTeZel" resolve="comparable" />
+                      <node concept="a7P8L" id="vq9UdHmQpR" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rScB9F" resolve="SDataType" />
+                      </node>
+                      <node concept="a7P8L" id="vq9UdHmQwH" role="3AunhB">
+                        <ref role="a7OzE" node="vq9UdHmQ3t" resolve="TDataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="51ek2rScBh9" role="3cqZAp" />
@@ -3216,7 +3520,7 @@
                           <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
                           <node concept="1nq8_$" id="51ek2rScBez" role="nsMwV">
                             <node concept="a7P8L" id="51ek2rScBe$" role="1nq8_t">
-                              <ref role="a7OzE" node="51ek2rScBeH" resolve="DType" />
+                              <ref role="a7OzE" node="51ek2rScBeH" resolve="SDataType" />
                             </node>
                           </node>
                         </node>
@@ -3231,8 +3535,8 @@
                         <node concept="nsMwS" id="51ek2rScBiy" role="ns1xD">
                           <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
                           <node concept="1nq8_$" id="51ek2rScBiz" role="nsMwV">
-                            <node concept="a7P8L" id="51ek2rScBi$" role="1nq8_t">
-                              <ref role="a7OzE" node="51ek2rScBeH" resolve="DType" />
+                            <node concept="a7P8L" id="vq9UdHmQRb" role="1nq8_t">
+                              <ref role="a7OzE" node="vq9UdHmQGe" resolve="TDataType" />
                             </node>
                           </node>
                         </node>
@@ -3250,10 +3554,30 @@
                 <property role="TrG5h" value="T" />
               </node>
               <node concept="aZer4" id="51ek2rScBeH" role="3XD1gS">
-                <property role="TrG5h" value="DType" />
+                <property role="TrG5h" value="SDataType" />
+              </node>
+              <node concept="aZer4" id="vq9UdHmQGe" role="3XD1gS">
+                <property role="TrG5h" value="TDataType" />
               </node>
               <node concept="32pEOW" id="51ek2rScBeI" role="3vLBG7" />
             </node>
+            <node concept="3xSepi" id="vq9UdHmQU4" role="3xSepv">
+              <node concept="3Aq9E8" id="vq9UdHmQU5" role="3xSepj">
+                <node concept="3I6sU6" id="vq9UdHmQU6" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="vq9UdHmR1D" role="3I6sU7">
+                    <node concept="3Aqt3T" id="vq9UdHmR1C" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6RzTUCTeZel" resolve="comparable" />
+                      <node concept="a7P8L" id="vq9UdHmR6D" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rScBeH" resolve="SDataType" />
+                      </node>
+                      <node concept="a7P8L" id="vq9UdHmRe4" role="3AunhB">
+                        <ref role="a7OzE" node="vq9UdHmQGe" resolve="TDataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="51ek2rScKEM" role="3cqZAp" />