From 31e15fcaa9234056a5e253aebea38b58cfb819fb Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 28 Dec 2016 12:44:25 +0100
Subject: [PATCH] Typechecking templates: annotate the handlers with the
 primary constraints. Moderate pocessing speedup.

---
 .../models/types.mps                          | 730 +++++++++---------
 1 file changed, 379 insertions(+), 351 deletions(-)

diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
index 8356879f..a5c2f9ff 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
@@ -452,6 +452,9 @@
       <concept id="7509376976634006226" name="jetbrains.mps.lang.typesystem2.structure.IncludeFragmentClause" flags="ng" index="20WI10">
         <reference id="7509376976634006227" name="fragment" index="20WI11" />
       </concept>
+      <concept id="2876899482279399435" name="jetbrains.mps.lang.typesystem2.structure.ConstraintReference" flags="ng" index="8a1Nt">
+        <reference id="2876899482279399436" name="constraint" index="8a1Nq" />
+      </concept>
       <concept id="6928531011217292466" name="jetbrains.mps.lang.typesystem2.structure.IsfreeVariableConstraint" flags="ng" index="2aLmEc" />
       <concept id="6928531011217258898" name="jetbrains.mps.lang.typesystem2.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
         <child id="6928531011217290187" name="variable" index="2aLmnP" />
@@ -482,6 +485,7 @@
         <child id="6678105047444830024" name="iterateParameterBlock" index="39759w" />
       </concept>
       <concept id="8335224865066015764" name="jetbrains.mps.lang.typesystem2.structure.Handler" flags="ng" index="AVZre">
+        <child id="2876899482279399450" name="primary" index="8a1Nc" />
         <child id="7368070394767441299" name="rule" index="3ArX_J" />
       </concept>
       <concept id="535508562360354566" name="jetbrains.mps.lang.typesystem2.structure.RequiredNodeBlock" flags="ng" index="16LskP" />
@@ -5887,6 +5891,9 @@
         </node>
       </node>
     </node>
+    <node concept="8a1Nt" id="2TtA2rK44Ys" role="8a1Nc">
+      <ref role="8a1Nq" node="6KkyQm4aRV3" resolve="containedIn" />
+    </node>
   </node>
   <node concept="AVZre" id="7t5VLKGTNCo">
     <property role="TrG5h" value="Block" />
@@ -7761,6 +7768,12 @@
         </node>
       </node>
     </node>
+    <node concept="8a1Nt" id="2TtA2rKeGe_" role="8a1Nc">
+      <ref role="8a1Nq" node="3Qp4N06bUPr" resolve="ubound" />
+    </node>
+    <node concept="8a1Nt" id="2TtA2rKeGeE" role="8a1Nc">
+      <ref role="8a1Nq" node="3Qp4N06bUPs" resolve="lbound" />
+    </node>
   </node>
   <node concept="AVZre" id="24Vro6cM_J$">
     <property role="3GE5qa" value="relation" />
@@ -9062,6 +9075,12 @@
         </node>
       </node>
     </node>
+    <node concept="8a1Nt" id="2TtA2rK45fv" role="8a1Nc">
+      <ref role="8a1Nq" node="ONSj15RYDg" resolve="compatibleWith" />
+    </node>
+    <node concept="8a1Nt" id="2TtA2rK45f$" role="8a1Nc">
+      <ref role="8a1Nq" node="3Qp4N06bUPu" resolve="convertsTo" />
+    </node>
   </node>
   <node concept="0oKg$" id="E1U1n2RerB">
     <property role="TrG5h" value="Types" />
@@ -13773,6 +13792,12 @@
         </node>
       </node>
     </node>
+    <node concept="8a1Nt" id="2TtA2rK44Ib" role="8a1Nc">
+      <ref role="8a1Nq" node="13kcg0CRYw" resolve="capture" />
+    </node>
+    <node concept="8a1Nt" id="2TtA2rK44IC" role="8a1Nc">
+      <ref role="8a1Nq" node="L5gj21VPz6" resolve="captureVar" />
+    </node>
   </node>
   <node concept="AVZre" id="3Qp4N06bUEa">
     <property role="TrG5h" value="ClassifierType" />
@@ -14161,357 +14186,6 @@
       </node>
     </node>
   </node>
-  <node concept="AVZre" id="4jh9C$0lsH3">
-    <property role="3GE5qa" value="bounds" />
-    <property role="TrG5h" value="NewUBound" />
-    <node concept="AVZhu" id="4_RQpN_gucr" role="3ArX_J">
-      <property role="TrG5h" value="newUbound_merge" />
-      <node concept="3Aq9E8" id="4_RQpN_guiy" role="3otmyu">
-        <node concept="3clFbS" id="4_RQpN_guiz" role="3Aqf5P">
-          <node concept="3Aqczg" id="4_RQpN_guiC" role="3cqZAp">
-            <node concept="3Aqt3T" id="4_RQpN_guiA" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-              <node concept="a7P8L" id="4_RQpN_gupV" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_guhS" resolve="OldTUbound" />
-              </node>
-              <node concept="a7P8L" id="4_RQpN_guiG" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_gugU" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="4_RQpN_gugD" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="4_RQpN_gugH" role="3Nuqhd">
-          <node concept="aZer4" id="4_RQpN_gugI" role="3XD1gS">
-            <property role="TrG5h" value="T" />
-          </node>
-          <node concept="aZer4" id="4_RQpN_gugU" role="3XD1gS">
-            <property role="TrG5h" value="NewTUbound" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4_RQpN_gugE" role="3Aqf5P">
-          <node concept="3Aqczg" id="4_RQpN_gugQ" role="3cqZAp">
-            <node concept="3Aqt3T" id="4_RQpN_gugO" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="a7P8L" id="4_RQpN_guho" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_gugI" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="4_RQpN_guhu" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_gugU" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="4_RQpN_guh$" role="3orSU4">
-        <property role="3ArMco" value="true" />
-        <node concept="3NuqgR" id="4_RQpN_guhR" role="3Nuqhd">
-          <node concept="aZer4" id="4_RQpN_guhS" role="3XD1gS">
-            <property role="TrG5h" value="OldTUbound" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4_RQpN_guh_" role="3Aqf5P">
-          <node concept="3Aqczg" id="4_RQpN_guhN" role="3cqZAp">
-            <node concept="3Aqt3T" id="4_RQpN_guhL" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
-              <node concept="a7P8L" id="4_RQpN_guii" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_gugI" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="4_RQpN_guiq" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_guhS" resolve="OldTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="AVZhu" id="3yhgKRITYML" role="3ArX_J">
-      <property role="TrG5h" value="newUbound_fresh" />
-      <node concept="3Aq9_M" id="3yhgKRJKfEi" role="3oo59u">
-        <node concept="3clFbS" id="3yhgKRJKfEj" role="3Aqf5P">
-          <node concept="3Aqczg" id="3yhgKRJKfEn" role="3cqZAp">
-            <node concept="2aLmEc" id="3yhgKRJKfEm" role="3Aqpz8">
-              <node concept="a7P8L" id="3yhgKRJKfEq" role="2aLmnP">
-                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq9E8" id="3yhgKRITYMM" role="3otmyu">
-        <node concept="3clFbS" id="3yhgKRITYMN" role="3Aqf5P">
-          <node concept="3Aqczg" id="3yhgKRITYZs" role="3cqZAp">
-            <node concept="3Aqt3T" id="3yhgKRITYZo" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
-              <node concept="a7P8L" id="3yhgKRITYZ$" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="3yhgKRITYZG" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRITYMV" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="3yhgKRITYMS" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="3yhgKRITYMT" role="3Nuqhd">
-          <node concept="aZer4" id="3yhgKRITYMU" role="3XD1gS">
-            <property role="TrG5h" value="T" />
-          </node>
-          <node concept="aZer4" id="3yhgKRITYMV" role="3XD1gS">
-            <property role="TrG5h" value="NewTUbound" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="3yhgKRITYMW" role="3Aqf5P">
-          <node concept="3Aqczg" id="3yhgKRITYMX" role="3cqZAp">
-            <node concept="3Aqt3T" id="3yhgKRITYMY" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="a7P8L" id="3yhgKRITYMZ" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="3yhgKRITYN0" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRITYMV" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="AVZhu" id="4jh9C$0lt7H" role="3ArX_J">
-      <property role="TrG5h" value="newUBound_typeVar" />
-      <node concept="3Aq9E8" id="4jh9C$0lvLZ" role="3otmyu">
-        <node concept="3clFbS" id="4jh9C$0lvM0" role="3Aqf5P">
-          <node concept="3Aqczg" id="4jh9C$0lvM5" role="3cqZAp">
-            <node concept="3Aqt3T" id="4jh9C$0lvM3" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-              <node concept="a7P8L" id="4jh9C$0lvM9" role="3AunhB">
-                <ref role="a7OzE" node="4jh9C$0lvJF" resolve="TypeBnd" />
-              </node>
-              <node concept="a7P8L" id="4jh9C$0lvMh" role="3AunhB">
-                <ref role="a7OzE" node="4jh9C$0lvIi" resolve="NewUBnd" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="4jh9C$0lvI4" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="4jh9C$0lvI8" role="3Nuqhd">
-          <node concept="aZer4" id="4jh9C$0lvI9" role="3XD1gS">
-            <property role="TrG5h" value="Type" />
-          </node>
-          <node concept="aZer4" id="4jh9C$0lvJF" role="3XD1gS">
-            <property role="TrG5h" value="TypeBnd" />
-          </node>
-          <node concept="aZer4" id="4jh9C$0lvIi" role="3XD1gS">
-            <property role="TrG5h" value="NewUBnd" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4jh9C$0lvI5" role="3Aqf5P">
-          <node concept="3Aqczg" id="4jh9C$0lvIH" role="3cqZAp">
-            <node concept="3Aqt3T" id="4jh9C$0lvID" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="1uarlV" id="4jh9C$0nVzV" role="3AunhB">
-                <node concept="a7P8L" id="4jh9C$0mzqp" role="1uarlU">
-                  <ref role="a7OzE" node="4jh9C$0lvI9" resolve="Type" />
-                </node>
-                <node concept="1Q4cc8" id="4jh9C$0nVBI" role="1uarlW">
-                  <ref role="1Q4cdn" node="5YVX0wIhP7t" resolve="typeVariableType" />
-                  <node concept="1Q7qz5" id="4jh9C$0nVBJ" role="1Q7vaU" />
-                  <node concept="1RziaG" id="4jh9C$0nVBK" role="1Ryyee">
-                    <ref role="1RzibV" node="5YVX0wIhP7y" resolve="parameter" />
-                    <node concept="3AP2Rn" id="4jh9C$0nVBL" role="1RzmR7">
-                      <node concept="3clFbS" id="4jh9C$0nVBM" role="16YjZG">
-                        <node concept="3clFbF" id="4jh9C$0nVBN" role="3cqZAp">
-                          <node concept="3A9UF8" id="4jh9C$0nVBO" role="3clFbG">
-                            <node concept="a7P8L" id="4jh9C$0nVBP" role="3A9W3M">
-                              <ref role="a7OzE" node="4jh9C$0lvJF" resolve="TypeBnd" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="a7P8L" id="4jh9C$0lvLK" role="3AunhB">
-                <ref role="a7OzE" node="4jh9C$0lvIi" resolve="NewUBnd" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="AVZhu" id="6LlzxkXZArI" role="3ArX_J">
-      <property role="TrG5h" value="newUbound_classifier" />
-      <node concept="3Aq93q" id="6LlzxkXZAw0" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="6LlzxkXZAw4" role="3Nuqhd">
-          <node concept="aZer4" id="6LlzxkXZAw5" role="3XD1gS">
-            <property role="TrG5h" value="ClsType" />
-          </node>
-          <node concept="aZer4" id="6LlzxkXZAwh" role="3XD1gS">
-            <property role="TrG5h" value="NewUBnd" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="6LlzxkXZAw1" role="3Aqf5P">
-          <node concept="3Aqczg" id="6LlzxkXZAwJ" role="3cqZAp">
-            <node concept="3Aqt3T" id="6LlzxkXZAwF" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="1uarlV" id="6LlzxkXZAwW" role="3AunhB">
-                <node concept="a7P8L" id="6LlzxkXZAwQ" role="1uarlU">
-                  <ref role="a7OzE" node="6LlzxkXZAw5" resolve="ClsType" />
-                </node>
-                <node concept="1Q4cc8" id="6LlzxkXZAxe" role="1uarlW">
-                  <ref role="1Q4cdn" node="E1U1n2RerC" resolve="classifierType" />
-                  <node concept="1Q7qz5" id="6LlzxkXZAxg" role="1Q7vaU" />
-                </node>
-              </node>
-              <node concept="a7P8L" id="6LlzxkXZAxk" role="3AunhB">
-                <ref role="a7OzE" node="6LlzxkXZAwh" resolve="NewUBnd" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq9E8" id="6LlzxkXZAyg" role="3otmyu">
-        <node concept="3clFbS" id="6LlzxkXZAyh" role="3Aqf5P">
-          <node concept="3Aqczg" id="4nb5svnf_h" role="3cqZAp">
-            <node concept="3Aqt3T" id="4nb5svnf_f" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-              <node concept="a7P8L" id="4nb5svnf_l" role="3AunhB">
-                <ref role="a7OzE" node="6LlzxkXZAw5" resolve="ClsType" />
-              </node>
-              <node concept="a7P8L" id="4nb5svnf_t" role="3AunhB">
-                <ref role="a7OzE" node="6LlzxkXZAwh" resolve="NewUBnd" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="AVZhu" id="3yhgKRIV5hd" role="3ArX_J">
-      <property role="TrG5h" value="newUbound_no_bounds" />
-      <node concept="3Aq9_M" id="3yhgKRIV5nz" role="3oo59u">
-        <node concept="3clFbS" id="3yhgKRIV5n$" role="3Aqf5P">
-          <node concept="3Aqczg" id="3yhgKRIV5nC" role="3cqZAp">
-            <node concept="2aM9Np" id="3yhgKRIV5nB" role="3Aqpz8">
-              <node concept="a7P8L" id="3yhgKRIV5nF" role="2aLmnP">
-                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq9E8" id="3yhgKRIV5he" role="3otmyu">
-        <node concept="3clFbS" id="3yhgKRIV5hf" role="3Aqf5P">
-          <node concept="3Aqczg" id="4jh9C$0klO8" role="3cqZAp">
-            <node concept="3lcGGY" id="4jh9C$0klO6" role="3Aqpz8">
-              <node concept="3clFbT" id="4jh9C$0klOf" role="3wWo3s">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="3Aqczg" id="3yhgKRIV5nX" role="3cqZAp">
-            <node concept="3Aqt3T" id="3yhgKRIV5nV" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
-              <node concept="a7P8L" id="3yhgKRIV5o1" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="3yhgKRIV5o9" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRIV5hn" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="3yhgKRIV5hk" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="3yhgKRIV5hl" role="3Nuqhd">
-          <node concept="aZer4" id="3yhgKRIV5hm" role="3XD1gS">
-            <property role="TrG5h" value="T" />
-          </node>
-          <node concept="aZer4" id="3yhgKRIV5hn" role="3XD1gS">
-            <property role="TrG5h" value="NewTUbound" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="3yhgKRIV5ho" role="3Aqf5P">
-          <node concept="3Aqczg" id="3yhgKRIV5hp" role="3cqZAp">
-            <node concept="3Aqt3T" id="3yhgKRIV5hq" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="a7P8L" id="3yhgKRIV5hr" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="3yhgKRIV5hs" role="3AunhB">
-                <ref role="a7OzE" node="3yhgKRIV5hn" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="AVZhu" id="4_RQpN_guqp" role="3ArX_J">
-      <property role="TrG5h" value="newUbound_catchall" />
-      <node concept="3Aq9E8" id="4_RQpN_guqq" role="3otmyu">
-        <node concept="3clFbS" id="4_RQpN_guqr" role="3Aqf5P">
-          <node concept="3SKdUt" id="4jh9C$0klJa" role="3cqZAp">
-            <node concept="3SKdUq" id="4jh9C$0klJc" role="3SKWNk">
-              <property role="3SKdUp" value="FIXME WTF?" />
-            </node>
-          </node>
-          <node concept="1X3_iC" id="3yhgKRICTKQ" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3Aqczg" id="4_RQpN_guqw" role="8Wnug">
-              <node concept="3Aqt3T" id="4_RQpN_guqx" role="3Aqpz8">
-                <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
-                <node concept="a7P8L" id="4_RQpN_guqy" role="3AunhB">
-                  <ref role="a7OzE" node="4_RQpN_guqA" resolve="T" />
-                </node>
-                <node concept="a7P8L" id="4_RQpN_guqz" role="3AunhB">
-                  <ref role="a7OzE" node="4_RQpN_guqB" resolve="NewTUbound" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3Aqczg" id="3yhgKRICTLq" role="3cqZAp">
-            <node concept="3lcGGY" id="3yhgKRICTLo" role="3Aqpz8">
-              <node concept="3clFbT" id="3yhgKRICTLt" role="3wWo3s">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="4_RQpN_guq$" role="3orSU4">
-        <property role="3ArMco" value="false" />
-        <node concept="3NuqgR" id="4_RQpN_guq_" role="3Nuqhd">
-          <node concept="aZer4" id="4_RQpN_guqA" role="3XD1gS">
-            <property role="TrG5h" value="T" />
-          </node>
-          <node concept="aZer4" id="4_RQpN_guqB" role="3XD1gS">
-            <property role="TrG5h" value="NewTUbound" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4_RQpN_guqC" role="3Aqf5P">
-          <node concept="3Aqczg" id="4_RQpN_guqD" role="3cqZAp">
-            <node concept="3Aqt3T" id="4_RQpN_guqE" role="3Aqpz8">
-              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
-              <node concept="a7P8L" id="4_RQpN_guqF" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_guqA" resolve="T" />
-              </node>
-              <node concept="a7P8L" id="4_RQpN_guqG" role="3AunhB">
-                <ref role="a7OzE" node="4_RQpN_guqB" resolve="NewTUbound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="4nb5svirH4">
     <property role="3GE5qa" value="relation" />
     <property role="TrG5h" value="glb" />
@@ -14924,5 +14598,359 @@
       </node>
     </node>
   </node>
+  <node concept="AVZre" id="4jh9C$0lsH3">
+    <property role="3GE5qa" value="bounds" />
+    <property role="TrG5h" value="NewUBound" />
+    <node concept="AVZhu" id="4_RQpN_gucr" role="3ArX_J">
+      <property role="TrG5h" value="newUbound_merge" />
+      <node concept="3Aq9E8" id="4_RQpN_guiy" role="3otmyu">
+        <node concept="3clFbS" id="4_RQpN_guiz" role="3Aqf5P">
+          <node concept="3Aqczg" id="4_RQpN_guiC" role="3cqZAp">
+            <node concept="3Aqt3T" id="4_RQpN_guiA" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+              <node concept="a7P8L" id="4_RQpN_gupV" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_guhS" resolve="OldTUbound" />
+              </node>
+              <node concept="a7P8L" id="4_RQpN_guiG" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_gugU" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="4_RQpN_gugD" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="4_RQpN_gugH" role="3Nuqhd">
+          <node concept="aZer4" id="4_RQpN_gugI" role="3XD1gS">
+            <property role="TrG5h" value="T" />
+          </node>
+          <node concept="aZer4" id="4_RQpN_gugU" role="3XD1gS">
+            <property role="TrG5h" value="NewTUbound" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4_RQpN_gugE" role="3Aqf5P">
+          <node concept="3Aqczg" id="4_RQpN_gugQ" role="3cqZAp">
+            <node concept="3Aqt3T" id="4_RQpN_gugO" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="a7P8L" id="4_RQpN_guho" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_gugI" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="4_RQpN_guhu" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_gugU" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="4_RQpN_guh$" role="3orSU4">
+        <property role="3ArMco" value="true" />
+        <node concept="3NuqgR" id="4_RQpN_guhR" role="3Nuqhd">
+          <node concept="aZer4" id="4_RQpN_guhS" role="3XD1gS">
+            <property role="TrG5h" value="OldTUbound" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4_RQpN_guh_" role="3Aqf5P">
+          <node concept="3Aqczg" id="4_RQpN_guhN" role="3cqZAp">
+            <node concept="3Aqt3T" id="4_RQpN_guhL" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
+              <node concept="a7P8L" id="4_RQpN_guii" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_gugI" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="4_RQpN_guiq" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_guhS" resolve="OldTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="AVZhu" id="3yhgKRITYML" role="3ArX_J">
+      <property role="TrG5h" value="newUbound_fresh" />
+      <node concept="3Aq9_M" id="3yhgKRJKfEi" role="3oo59u">
+        <node concept="3clFbS" id="3yhgKRJKfEj" role="3Aqf5P">
+          <node concept="3Aqczg" id="3yhgKRJKfEn" role="3cqZAp">
+            <node concept="2aLmEc" id="3yhgKRJKfEm" role="3Aqpz8">
+              <node concept="a7P8L" id="3yhgKRJKfEq" role="2aLmnP">
+                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq9E8" id="3yhgKRITYMM" role="3otmyu">
+        <node concept="3clFbS" id="3yhgKRITYMN" role="3Aqf5P">
+          <node concept="3Aqczg" id="3yhgKRITYZs" role="3cqZAp">
+            <node concept="3Aqt3T" id="3yhgKRITYZo" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
+              <node concept="a7P8L" id="3yhgKRITYZ$" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="3yhgKRITYZG" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRITYMV" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="3yhgKRITYMS" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="3yhgKRITYMT" role="3Nuqhd">
+          <node concept="aZer4" id="3yhgKRITYMU" role="3XD1gS">
+            <property role="TrG5h" value="T" />
+          </node>
+          <node concept="aZer4" id="3yhgKRITYMV" role="3XD1gS">
+            <property role="TrG5h" value="NewTUbound" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3yhgKRITYMW" role="3Aqf5P">
+          <node concept="3Aqczg" id="3yhgKRITYMX" role="3cqZAp">
+            <node concept="3Aqt3T" id="3yhgKRITYMY" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="a7P8L" id="3yhgKRITYMZ" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRITYMU" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="3yhgKRITYN0" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRITYMV" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="AVZhu" id="4jh9C$0lt7H" role="3ArX_J">
+      <property role="TrG5h" value="newUBound_typeVar" />
+      <node concept="3Aq9E8" id="4jh9C$0lvLZ" role="3otmyu">
+        <node concept="3clFbS" id="4jh9C$0lvM0" role="3Aqf5P">
+          <node concept="3Aqczg" id="4jh9C$0lvM5" role="3cqZAp">
+            <node concept="3Aqt3T" id="4jh9C$0lvM3" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+              <node concept="a7P8L" id="4jh9C$0lvM9" role="3AunhB">
+                <ref role="a7OzE" node="4jh9C$0lvJF" resolve="TypeBnd" />
+              </node>
+              <node concept="a7P8L" id="4jh9C$0lvMh" role="3AunhB">
+                <ref role="a7OzE" node="4jh9C$0lvIi" resolve="NewUBnd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="4jh9C$0lvI4" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="4jh9C$0lvI8" role="3Nuqhd">
+          <node concept="aZer4" id="4jh9C$0lvI9" role="3XD1gS">
+            <property role="TrG5h" value="Type" />
+          </node>
+          <node concept="aZer4" id="4jh9C$0lvJF" role="3XD1gS">
+            <property role="TrG5h" value="TypeBnd" />
+          </node>
+          <node concept="aZer4" id="4jh9C$0lvIi" role="3XD1gS">
+            <property role="TrG5h" value="NewUBnd" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4jh9C$0lvI5" role="3Aqf5P">
+          <node concept="3Aqczg" id="4jh9C$0lvIH" role="3cqZAp">
+            <node concept="3Aqt3T" id="4jh9C$0lvID" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="1uarlV" id="4jh9C$0nVzV" role="3AunhB">
+                <node concept="a7P8L" id="4jh9C$0mzqp" role="1uarlU">
+                  <ref role="a7OzE" node="4jh9C$0lvI9" resolve="Type" />
+                </node>
+                <node concept="1Q4cc8" id="4jh9C$0nVBI" role="1uarlW">
+                  <ref role="1Q4cdn" node="5YVX0wIhP7t" resolve="typeVariableType" />
+                  <node concept="1Q7qz5" id="4jh9C$0nVBJ" role="1Q7vaU" />
+                  <node concept="1RziaG" id="4jh9C$0nVBK" role="1Ryyee">
+                    <ref role="1RzibV" node="5YVX0wIhP7y" resolve="parameter" />
+                    <node concept="3AP2Rn" id="4jh9C$0nVBL" role="1RzmR7">
+                      <node concept="3clFbS" id="4jh9C$0nVBM" role="16YjZG">
+                        <node concept="3clFbF" id="4jh9C$0nVBN" role="3cqZAp">
+                          <node concept="3A9UF8" id="4jh9C$0nVBO" role="3clFbG">
+                            <node concept="a7P8L" id="4jh9C$0nVBP" role="3A9W3M">
+                              <ref role="a7OzE" node="4jh9C$0lvJF" resolve="TypeBnd" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="a7P8L" id="4jh9C$0lvLK" role="3AunhB">
+                <ref role="a7OzE" node="4jh9C$0lvIi" resolve="NewUBnd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="AVZhu" id="6LlzxkXZArI" role="3ArX_J">
+      <property role="TrG5h" value="newUbound_classifier" />
+      <node concept="3Aq93q" id="6LlzxkXZAw0" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="6LlzxkXZAw4" role="3Nuqhd">
+          <node concept="aZer4" id="6LlzxkXZAw5" role="3XD1gS">
+            <property role="TrG5h" value="ClsType" />
+          </node>
+          <node concept="aZer4" id="6LlzxkXZAwh" role="3XD1gS">
+            <property role="TrG5h" value="NewUBnd" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="6LlzxkXZAw1" role="3Aqf5P">
+          <node concept="3Aqczg" id="6LlzxkXZAwJ" role="3cqZAp">
+            <node concept="3Aqt3T" id="6LlzxkXZAwF" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="1uarlV" id="6LlzxkXZAwW" role="3AunhB">
+                <node concept="a7P8L" id="6LlzxkXZAwQ" role="1uarlU">
+                  <ref role="a7OzE" node="6LlzxkXZAw5" resolve="ClsType" />
+                </node>
+                <node concept="1Q4cc8" id="6LlzxkXZAxe" role="1uarlW">
+                  <ref role="1Q4cdn" node="E1U1n2RerC" resolve="classifierType" />
+                  <node concept="1Q7qz5" id="6LlzxkXZAxg" role="1Q7vaU" />
+                </node>
+              </node>
+              <node concept="a7P8L" id="6LlzxkXZAxk" role="3AunhB">
+                <ref role="a7OzE" node="6LlzxkXZAwh" resolve="NewUBnd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq9E8" id="6LlzxkXZAyg" role="3otmyu">
+        <node concept="3clFbS" id="6LlzxkXZAyh" role="3Aqf5P">
+          <node concept="3Aqczg" id="4nb5svnf_h" role="3cqZAp">
+            <node concept="3Aqt3T" id="4nb5svnf_f" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+              <node concept="a7P8L" id="4nb5svnf_l" role="3AunhB">
+                <ref role="a7OzE" node="6LlzxkXZAw5" resolve="ClsType" />
+              </node>
+              <node concept="a7P8L" id="4nb5svnf_t" role="3AunhB">
+                <ref role="a7OzE" node="6LlzxkXZAwh" resolve="NewUBnd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="AVZhu" id="3yhgKRIV5hd" role="3ArX_J">
+      <property role="TrG5h" value="newUbound_no_bounds" />
+      <node concept="3Aq9_M" id="3yhgKRIV5nz" role="3oo59u">
+        <node concept="3clFbS" id="3yhgKRIV5n$" role="3Aqf5P">
+          <node concept="3Aqczg" id="3yhgKRIV5nC" role="3cqZAp">
+            <node concept="2aM9Np" id="3yhgKRIV5nB" role="3Aqpz8">
+              <node concept="a7P8L" id="3yhgKRIV5nF" role="2aLmnP">
+                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq9E8" id="3yhgKRIV5he" role="3otmyu">
+        <node concept="3clFbS" id="3yhgKRIV5hf" role="3Aqf5P">
+          <node concept="3Aqczg" id="4jh9C$0klO8" role="3cqZAp">
+            <node concept="3lcGGY" id="4jh9C$0klO6" role="3Aqpz8">
+              <node concept="3clFbT" id="4jh9C$0klOf" role="3wWo3s">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+          <node concept="3Aqczg" id="3yhgKRIV5nX" role="3cqZAp">
+            <node concept="3Aqt3T" id="3yhgKRIV5nV" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
+              <node concept="a7P8L" id="3yhgKRIV5o1" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="3yhgKRIV5o9" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRIV5hn" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="3yhgKRIV5hk" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="3yhgKRIV5hl" role="3Nuqhd">
+          <node concept="aZer4" id="3yhgKRIV5hm" role="3XD1gS">
+            <property role="TrG5h" value="T" />
+          </node>
+          <node concept="aZer4" id="3yhgKRIV5hn" role="3XD1gS">
+            <property role="TrG5h" value="NewTUbound" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3yhgKRIV5ho" role="3Aqf5P">
+          <node concept="3Aqczg" id="3yhgKRIV5hp" role="3cqZAp">
+            <node concept="3Aqt3T" id="3yhgKRIV5hq" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="a7P8L" id="3yhgKRIV5hr" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRIV5hm" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="3yhgKRIV5hs" role="3AunhB">
+                <ref role="a7OzE" node="3yhgKRIV5hn" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="AVZhu" id="4_RQpN_guqp" role="3ArX_J">
+      <property role="TrG5h" value="newUbound_catchall" />
+      <node concept="3Aq9E8" id="4_RQpN_guqq" role="3otmyu">
+        <node concept="3clFbS" id="4_RQpN_guqr" role="3Aqf5P">
+          <node concept="3SKdUt" id="4jh9C$0klJa" role="3cqZAp">
+            <node concept="3SKdUq" id="4jh9C$0klJc" role="3SKWNk">
+              <property role="3SKdUp" value="FIXME WTF?" />
+            </node>
+          </node>
+          <node concept="1X3_iC" id="3yhgKRICTKQ" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="3Aqczg" id="4_RQpN_guqw" role="8Wnug">
+              <node concept="3Aqt3T" id="4_RQpN_guqx" role="3Aqpz8">
+                <ref role="3AqCNq" node="3Qp4N06bUPr" resolve="ubound" />
+                <node concept="a7P8L" id="4_RQpN_guqy" role="3AunhB">
+                  <ref role="a7OzE" node="4_RQpN_guqA" resolve="T" />
+                </node>
+                <node concept="a7P8L" id="4_RQpN_guqz" role="3AunhB">
+                  <ref role="a7OzE" node="4_RQpN_guqB" resolve="NewTUbound" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Aqczg" id="3yhgKRICTLq" role="3cqZAp">
+            <node concept="3lcGGY" id="3yhgKRICTLo" role="3Aqpz8">
+              <node concept="3clFbT" id="3yhgKRICTLt" role="3wWo3s">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Aq93q" id="4_RQpN_guq$" role="3orSU4">
+        <property role="3ArMco" value="false" />
+        <node concept="3NuqgR" id="4_RQpN_guq_" role="3Nuqhd">
+          <node concept="aZer4" id="4_RQpN_guqA" role="3XD1gS">
+            <property role="TrG5h" value="T" />
+          </node>
+          <node concept="aZer4" id="4_RQpN_guqB" role="3XD1gS">
+            <property role="TrG5h" value="NewTUbound" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4_RQpN_guqC" role="3Aqf5P">
+          <node concept="3Aqczg" id="4_RQpN_guqD" role="3cqZAp">
+            <node concept="3Aqt3T" id="4_RQpN_guqE" role="3Aqpz8">
+              <ref role="3AqCNq" node="4_RQpN_gu5I" resolve="newUbound" />
+              <node concept="a7P8L" id="4_RQpN_guqF" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_guqA" resolve="T" />
+              </node>
+              <node concept="a7P8L" id="4_RQpN_guqG" role="3AunhB">
+                <ref role="a7OzE" node="4_RQpN_guqB" resolve="NewTUbound" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="8a1Nt" id="2TtA2rKiZJG" role="8a1Nc">
+      <ref role="8a1Nq" node="4_RQpN_gu5I" resolve="newUbound" />
+    </node>
+  </node>
 </model>