From 1e3c67949d854c8c83e9794f87dc2fbbffbb2943 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 18 May 2021 12:29:14 +0200
Subject: [PATCH] Fix BL types: conditional op, raw types, capture conversion

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 682 +++++++++++-------
 1 file changed, 424 insertions(+), 258 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 6ebd687f..2d721311 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -825,9 +825,6 @@
       <concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
-      <concept id="4363939677057762068" name="jetbrains.mps.lang.coderules.structure.TermConstructorDataForm" flags="ng" index="3sNhsn">
-        <child id="4363939677057762080" name="constructor" index="3sNhsz" />
-      </concept>
       <concept id="4816779767548751121" name="jetbrains.mps.lang.coderules.structure.MatchConstraint" flags="ng" index="3sO8UW">
         <child id="4816779767548751124" name="pattern" index="3sO8UT" />
         <child id="4816779767548751122" name="instance" index="3sO8UZ" />
@@ -1119,51 +1116,55 @@
                   <node concept="aZer4" id="2vhmmFsR$$B" role="3XD1gS">
                     <property role="TrG5h" value="ClassP" />
                   </node>
+                  <node concept="aZer4" id="24HkIxuns_t" role="3XD1gS">
+                    <property role="TrG5h" value="ClsT" />
+                  </node>
                   <node concept="32pEOW" id="24ciDNzxNB7" role="3vLBG7" />
                 </node>
                 <node concept="3xSepi" id="6E2cNicdiht" role="3xSepv">
                   <node concept="3Aq9E8" id="2vhmmFsFOgO" role="3xSepj">
                     <node concept="3I6sU6" id="2vhmmFsFOgP" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="2vhmmFsFOha" role="3I6sU7">
-                        <node concept="3Aqt3T" id="2vhmmFsFOh9" role="3I6s78">
-                          <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                          <node concept="37jhX" id="1TH_SRmhrsY" role="3AunhB">
-                            <node concept="3A2sRY" id="2vhmmFsFOho" role="37jj2">
-                              <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
-                            </node>
-                          </node>
-                          <node concept="ns1u0" id="2vhmmFsFOh$" role="3AunhB">
-                            <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                            <node concept="nsMwS" id="2vhmmFsFOhC" role="ns1xD">
-                              <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="h$QuP" id="ZNYuguvgHN" role="iSaTp">
-                                <ref role="h$OrH" to="wyt6:~Class" resolve="Class" />
+                      <node concept="3IrJb3" id="24HkIxunszI" role="3I6sU7">
+                        <node concept="3clFbS" id="24HkIxunszJ" role="3IrJb0">
+                          <node concept="3Aqczg" id="24HkIxuns$N" role="3cqZAp">
+                            <node concept="3jm4v3" id="24HkIxuns$L" role="3Aqpz8">
+                              <ref role="3jm46O" node="5itBwMaSqCk" resolve="classifierType" />
+                              <node concept="2OqwBi" id="24HkIxuns_P" role="3jicU7">
+                                <node concept="3A2sRY" id="24HkIxuns_Q" role="2Oq$k0">
+                                  <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
+                                </node>
+                                <node concept="3TrEf2" id="24HkIxuns_R" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:gfVsUgY" resolve="classifier" />
+                                </node>
+                              </node>
+                              <node concept="a7P8L" id="24HkIxuns_C" role="3jm6SO">
+                                <ref role="a7OzE" node="24HkIxuns_t" resolve="ClsT" />
                               </node>
                             </node>
-                            <node concept="nsMwS" id="2vhmmFsNmw_" role="ns1xD">
-                              <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
-                              <node concept="Hz6ka" id="ZNYugtnYPT" role="iSaTp">
-                                <node concept="KCUsM" id="3qUnz9vksuU" role="Hz6kd">
-                                  <node concept="3sNhsn" id="7uKpZGkMHUl" role="KCVpo">
-                                    <node concept="ns1u0" id="7uKpZGkMHUk" role="3sNhsz">
-                                      <ref role="ns1xF" node="7uKpZGkseba" resolve="raw" />
-                                      <node concept="nsMwS" id="7hlgk9KRzCQ" role="ns1xD">
-                                        <ref role="nsMwP" node="7hlgk9KRztF" resolve="erasure" />
-                                        <node concept="ns1u0" id="7hlgk9KRzRm" role="iSaTp">
-                                          <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                                          <node concept="nsMwS" id="7hlgk9KRzTA" role="ns1xD">
-                                            <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                                            <node concept="37jhX" id="7hlgk9KRzVR" role="iSaTp">
-                                              <node concept="2OqwBi" id="7hlgk9KR$3w" role="37jj2">
-                                                <node concept="3A2sRY" id="7hlgk9KRzVQ" role="2Oq$k0">
-                                                  <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
-                                                </node>
-                                                <node concept="3TrEf2" id="7hlgk9KR$jj" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="tpee:gfVsUgY" resolve="classifier" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
+                          </node>
+                          <node concept="3Aqczg" id="24HkIxunszK" role="3cqZAp">
+                            <node concept="3Aqt3T" id="2vhmmFsFOh9" role="3Aqpz8">
+                              <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                              <node concept="37jhX" id="1TH_SRmhrsY" role="3AunhB">
+                                <node concept="3A2sRY" id="2vhmmFsFOho" role="37jj2">
+                                  <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
+                                </node>
+                              </node>
+                              <node concept="ns1u0" id="2vhmmFsFOh$" role="3AunhB">
+                                <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
+                                <node concept="nsMwS" id="2vhmmFsFOhC" role="ns1xD">
+                                  <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                  <node concept="h$QuP" id="ZNYuguvgHN" role="iSaTp">
+                                    <ref role="h$OrH" to="wyt6:~Class" resolve="Class" />
+                                  </node>
+                                </node>
+                                <node concept="nsMwS" id="2vhmmFsNmw_" role="ns1xD">
+                                  <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
+                                  <node concept="Hz6ka" id="ZNYugtnYPT" role="iSaTp">
+                                    <node concept="KCUsM" id="3qUnz9vksuU" role="Hz6kd">
+                                      <node concept="3wAshV" id="24HkIxunsHx" role="KCVpo">
+                                        <node concept="a7P8L" id="24HkIxunsHw" role="3wAq21">
+                                          <ref role="a7OzE" node="24HkIxuns_t" resolve="ClsT" />
                                         </node>
                                       </node>
                                     </node>
@@ -10516,6 +10517,9 @@
               <node concept="aZer4" id="5kABJYbY8sX" role="3XD1gS">
                 <property role="TrG5h" value="BoolT" />
               </node>
+              <node concept="aZer4" id="24HkIxuuKzE" role="3XD1gS">
+                <property role="TrG5h" value="LUB" />
+              </node>
               <node concept="32pEOW" id="5kABJYbW7Hk" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="5kABJYbW7Hl" role="3xSepv">
@@ -10548,6 +10552,36 @@
                 </node>
               </node>
             </node>
+            <node concept="3xSepi" id="24HkIxuuKz5" role="3xSepv">
+              <node concept="3Aq9E8" id="24HkIxuuKz6" role="3xSepj">
+                <node concept="3I6sU6" id="24HkIxuuKz7" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="24HkIxuuKz$" role="3I6sU7">
+                    <node concept="3Aqt3T" id="24HkIxuuKzz" role="3I6s78">
+                      <ref role="3AqCNq" node="2q0gzCFHesp" resolve="lub" />
+                      <node concept="a7P8L" id="24HkIxuuK$p" role="3AunhB">
+                        <ref role="a7OzE" node="24HkIxuuKzE" resolve="LUB" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuK$h" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbW7Hh" resolve="T1" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuK$0" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbW7Hi" resolve="T2" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="24HkIxuuK$V" role="3I6sU7">
+                    <node concept="3A8Hvi" id="24HkIxuuK_1" role="3I6s78">
+                      <node concept="a7P8L" id="24HkIxuuK_p" role="3A8w4Q">
+                        <ref role="a7OzE" node="24HkIxuuKzE" resolve="LUB" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuK$C" role="3A8wtg">
+                        <ref role="a7OzE" node="5kABJYbW7Hg" resolve="ResultT" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="5kABJYbW7HA" role="3cqZAp" />
@@ -10622,6 +10656,9 @@
               <node concept="aZer4" id="5kABJYbY8vY" role="3XD1gS">
                 <property role="TrG5h" value="BoolT" />
               </node>
+              <node concept="aZer4" id="24HkIxuuKAz" role="3XD1gS">
+                <property role="TrG5h" value="LUB" />
+              </node>
               <node concept="32pEOW" id="5kABJYbWaoa" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="5kABJYbWaob" role="3xSepv">
@@ -10654,6 +10691,36 @@
                 </node>
               </node>
             </node>
+            <node concept="3xSepi" id="24HkIxuuK_v" role="3xSepv">
+              <node concept="3Aq9E8" id="24HkIxuuK_w" role="3xSepj">
+                <node concept="3I6sU6" id="24HkIxuuK_x" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="24HkIxuuK_X" role="3I6sU7">
+                    <node concept="3Aqt3T" id="24HkIxuuK_Y" role="3I6s78">
+                      <ref role="3AqCNq" node="2q0gzCFHesp" resolve="lub" />
+                      <node concept="a7P8L" id="24HkIxuuKAO" role="3AunhB">
+                        <ref role="a7OzE" node="24HkIxuuKAz" resolve="LUB" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuKA0" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbWao7" resolve="T1" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuKA1" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbWao8" resolve="T2" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="24HkIxuuKA2" role="3I6sU7">
+                    <node concept="3A8Hvi" id="24HkIxuuKA3" role="3I6s78">
+                      <node concept="a7P8L" id="24HkIxuuKAI" role="3A8w4Q">
+                        <ref role="a7OzE" node="24HkIxuuKAz" resolve="LUB" />
+                      </node>
+                      <node concept="a7P8L" id="24HkIxuuKA5" role="3A8wtg">
+                        <ref role="a7OzE" node="5kABJYbWao6" resolve="ResultT" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="5kABJYbWb38" role="3cqZAp" />
@@ -12734,6 +12801,171 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="12QmIo_7shO" role="1nK1Vg">
+      <property role="TrG5h" value="converts_captureOf_any" />
+      <node concept="3clFbS" id="12QmIo_7shP" role="1nLNMH">
+        <node concept="1nLNNL" id="12QmIo_7shQ" role="3cqZAp">
+          <node concept="1nLNMm" id="12QmIo_7shR" role="1nLNNK">
+            <node concept="3Aq93q" id="5310cdpWlrY" role="1nLNMb">
+              <node concept="3I6sU6" id="5310cdpWlrZ" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5310cdpWls3" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5310cdpWls2" role="3I6s78">
+                    <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="1mdVbTSaq3x" role="3AunhB">
+                      <node concept="ns1u0" id="JOGAOsVtae" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOf" />
+                        <node concept="nsMwS" id="JOGAOsVtaf" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
+                          <node concept="a7P8L" id="5310cdpWltM" role="iSaTp">
+                            <ref role="a7OzE" node="5310cdpWlt2" resolve="UBnd" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="5310cdpWlsy" role="1uarlU">
+                        <ref role="a7OzE" node="5310cdpWls8" resolve="Capture" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="5310cdpWlsU" role="3AunhB">
+                      <ref role="a7OzE" node="5310cdpWlse" resolve="To" />
+                    </node>
+                    <node concept="a7P8L" id="4O7HczO3zO6" role="3AunhB">
+                      <ref role="a7OzE" node="4O7HczO3zO4" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5310cdpWls7" role="0Rg$4">
+              <node concept="aZer4" id="5310cdpWls8" role="3XD1gS">
+                <property role="TrG5h" value="Capture" />
+              </node>
+              <node concept="aZer4" id="5310cdpWlt2" role="3XD1gS">
+                <property role="TrG5h" value="UBnd" />
+              </node>
+              <node concept="aZer4" id="5310cdpWlse" role="3XD1gS">
+                <property role="TrG5h" value="To" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNCK" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdiiH" role="3xSepv">
+              <node concept="3Aq9E8" id="5310cdpWlxg" role="3xSepj">
+                <node concept="3I6sU6" id="5310cdpWlxh" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5310cdpWlxt" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5310cdpWlxs" role="3I6s78">
+                      <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="a7P8L" id="5310cdpWlxy" role="3AunhB">
+                        <ref role="a7OzE" node="5310cdpWlt2" resolve="UBnd" />
+                      </node>
+                      <node concept="a7P8L" id="5310cdpWlxE" role="3AunhB">
+                        <ref role="a7OzE" node="5310cdpWlse" resolve="To" />
+                      </node>
+                      <node concept="a7P8L" id="4O7HczO3zO7" role="3AunhB">
+                        <ref role="a7OzE" node="4O7HczO3zO4" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="4O7HczO3zO2" role="0Rg$4">
+              <node concept="3uibUv" id="4O7HczO3zO3" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="4O7HczO3zO4" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="12QmIo_7shS" role="1nK1Vg">
+      <property role="TrG5h" value="converts_any_captureOf" />
+      <node concept="3clFbS" id="12QmIo_7shT" role="1nLNMH">
+        <node concept="1nLNNL" id="12QmIo_7shU" role="3cqZAp">
+          <node concept="1nLNMm" id="12QmIo_7shV" role="1nLNNK">
+            <node concept="3Aq93q" id="5310cdq4Er4" role="1nLNMb">
+              <node concept="3I6sU6" id="5310cdq4Er5" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5310cdq4Er6" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5310cdq4Er7" role="3I6s78">
+                    <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="a7P8L" id="5310cdq4Erh" role="3AunhB">
+                      <ref role="a7OzE" node="5310cdq4Erl" resolve="From" />
+                    </node>
+                    <node concept="1HFMs5" id="1mdVbTSaq2P" role="3AunhB">
+                      <node concept="ns1u0" id="JOGAOsVt9c" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOf" />
+                        <node concept="nsMwS" id="JOGAOsVt9d" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
+                          <node concept="a7P8L" id="5310cdq4Erg" role="iSaTp">
+                            <ref role="a7OzE" node="5310cdq4Erk" resolve="LBnd" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="7XekScVDB3N" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
+                          <node concept="a7P8L" id="7XekScVDB46" role="iSaTp">
+                            <ref role="a7OzE" node="7XekScVDB3V" resolve="UBnd" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="5310cdq4Er9" role="1uarlU">
+                        <ref role="a7OzE" node="5310cdq4Erj" resolve="Capture" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="4O7HczO3zOf" role="3AunhB">
+                      <ref role="a7OzE" node="4O7HczO3zOd" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5310cdq4Eri" role="0Rg$4">
+              <node concept="aZer4" id="5310cdq4Erj" role="3XD1gS">
+                <property role="TrG5h" value="Capture" />
+              </node>
+              <node concept="aZer4" id="5310cdq4Erk" role="3XD1gS">
+                <property role="TrG5h" value="LBnd" />
+              </node>
+              <node concept="aZer4" id="7XekScVDB3V" role="3XD1gS">
+                <property role="TrG5h" value="UBnd" />
+              </node>
+              <node concept="aZer4" id="5310cdq4Erl" role="3XD1gS">
+                <property role="TrG5h" value="From" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNCL" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdiiI" role="3xSepv">
+              <node concept="3Aq9E8" id="5310cdq4EqY" role="3xSepj">
+                <node concept="3I6sU6" id="5310cdq4EqZ" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5310cdq4Er0" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5310cdq4Er1" role="3I6s78">
+                      <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="a7P8L" id="5310cdq4Er3" role="3AunhB">
+                        <ref role="a7OzE" node="5310cdq4Erl" resolve="From" />
+                      </node>
+                      <node concept="a7P8L" id="5310cdq4Er2" role="3AunhB">
+                        <ref role="a7OzE" node="5310cdq4Erk" resolve="LBnd" />
+                      </node>
+                      <node concept="a7P8L" id="4O7HczO3zOg" role="3AunhB">
+                        <ref role="a7OzE" node="4O7HczO3zOd" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="4O7HczO3zOb" role="0Rg$4">
+              <node concept="3uibUv" id="4O7HczO3zOc" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="4O7HczO3zOd" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="4dm7SwSiD5A" role="1nK1Vg">
       <property role="TrG5h" value="converts_string_classifier" />
       <node concept="3clFbS" id="4dm7SwSiD5B" role="1nLNMH">
@@ -13400,171 +13632,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="12QmIo_7shO" role="1nK1Vg">
-      <property role="TrG5h" value="converts_captureOf_any" />
-      <node concept="3clFbS" id="12QmIo_7shP" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7shQ" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7shR" role="1nLNNK">
-            <node concept="3Aq93q" id="5310cdpWlrY" role="1nLNMb">
-              <node concept="3I6sU6" id="5310cdpWlrZ" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5310cdpWls3" role="3I6sU7">
-                  <node concept="3Aqt3T" id="5310cdpWls2" role="3I6s78">
-                    <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
-                    <node concept="1HFMs5" id="1mdVbTSaq3x" role="3AunhB">
-                      <node concept="ns1u0" id="JOGAOsVtae" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOf" />
-                        <node concept="nsMwS" id="JOGAOsVtaf" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                          <node concept="a7P8L" id="5310cdpWltM" role="iSaTp">
-                            <ref role="a7OzE" node="5310cdpWlt2" resolve="UBnd" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="5310cdpWlsy" role="1uarlU">
-                        <ref role="a7OzE" node="5310cdpWls8" resolve="Capture" />
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="5310cdpWlsU" role="3AunhB">
-                      <ref role="a7OzE" node="5310cdpWlse" resolve="To" />
-                    </node>
-                    <node concept="a7P8L" id="4O7HczO3zO6" role="3AunhB">
-                      <ref role="a7OzE" node="4O7HczO3zO4" resolve="Options" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="5310cdpWls7" role="0Rg$4">
-              <node concept="aZer4" id="5310cdpWls8" role="3XD1gS">
-                <property role="TrG5h" value="Capture" />
-              </node>
-              <node concept="aZer4" id="5310cdpWlt2" role="3XD1gS">
-                <property role="TrG5h" value="UBnd" />
-              </node>
-              <node concept="aZer4" id="5310cdpWlse" role="3XD1gS">
-                <property role="TrG5h" value="To" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNCK" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdiiH" role="3xSepv">
-              <node concept="3Aq9E8" id="5310cdpWlxg" role="3xSepj">
-                <node concept="3I6sU6" id="5310cdpWlxh" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5310cdpWlxt" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5310cdpWlxs" role="3I6s78">
-                      <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="a7P8L" id="5310cdpWlxy" role="3AunhB">
-                        <ref role="a7OzE" node="5310cdpWlt2" resolve="UBnd" />
-                      </node>
-                      <node concept="a7P8L" id="5310cdpWlxE" role="3AunhB">
-                        <ref role="a7OzE" node="5310cdpWlse" resolve="To" />
-                      </node>
-                      <node concept="a7P8L" id="4O7HczO3zO7" role="3AunhB">
-                        <ref role="a7OzE" node="4O7HczO3zO4" resolve="Options" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="4O7HczO3zO2" role="0Rg$4">
-              <node concept="3uibUv" id="4O7HczO3zO3" role="3vLBG7">
-                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
-              </node>
-              <node concept="aZer4" id="4O7HczO3zO4" role="3XD1gS">
-                <property role="TrG5h" value="Options" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="12QmIo_7shS" role="1nK1Vg">
-      <property role="TrG5h" value="converts_any_captureOf" />
-      <node concept="3clFbS" id="12QmIo_7shT" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7shU" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7shV" role="1nLNNK">
-            <node concept="3Aq93q" id="5310cdq4Er4" role="1nLNMb">
-              <node concept="3I6sU6" id="5310cdq4Er5" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5310cdq4Er6" role="3I6sU7">
-                  <node concept="3Aqt3T" id="5310cdq4Er7" role="3I6s78">
-                    <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
-                    <node concept="a7P8L" id="5310cdq4Erh" role="3AunhB">
-                      <ref role="a7OzE" node="5310cdq4Erl" resolve="From" />
-                    </node>
-                    <node concept="1HFMs5" id="1mdVbTSaq2P" role="3AunhB">
-                      <node concept="ns1u0" id="JOGAOsVt9c" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOf" />
-                        <node concept="nsMwS" id="JOGAOsVt9d" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
-                          <node concept="a7P8L" id="5310cdq4Erg" role="iSaTp">
-                            <ref role="a7OzE" node="5310cdq4Erk" resolve="LBnd" />
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="7XekScVDB3N" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                          <node concept="a7P8L" id="7XekScVDB46" role="iSaTp">
-                            <ref role="a7OzE" node="7XekScVDB3V" resolve="UBnd" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="5310cdq4Er9" role="1uarlU">
-                        <ref role="a7OzE" node="5310cdq4Erj" resolve="Capture" />
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="4O7HczO3zOf" role="3AunhB">
-                      <ref role="a7OzE" node="4O7HczO3zOd" resolve="Options" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="5310cdq4Eri" role="0Rg$4">
-              <node concept="aZer4" id="5310cdq4Erj" role="3XD1gS">
-                <property role="TrG5h" value="Capture" />
-              </node>
-              <node concept="aZer4" id="5310cdq4Erk" role="3XD1gS">
-                <property role="TrG5h" value="LBnd" />
-              </node>
-              <node concept="aZer4" id="7XekScVDB3V" role="3XD1gS">
-                <property role="TrG5h" value="UBnd" />
-              </node>
-              <node concept="aZer4" id="5310cdq4Erl" role="3XD1gS">
-                <property role="TrG5h" value="From" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNCL" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdiiI" role="3xSepv">
-              <node concept="3Aq9E8" id="5310cdq4EqY" role="3xSepj">
-                <node concept="3I6sU6" id="5310cdq4EqZ" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5310cdq4Er0" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5310cdq4Er1" role="3I6s78">
-                      <ref role="3AqCNq" node="3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="a7P8L" id="5310cdq4Er3" role="3AunhB">
-                        <ref role="a7OzE" node="5310cdq4Erl" resolve="From" />
-                      </node>
-                      <node concept="a7P8L" id="5310cdq4Er2" role="3AunhB">
-                        <ref role="a7OzE" node="5310cdq4Erk" resolve="LBnd" />
-                      </node>
-                      <node concept="a7P8L" id="4O7HczO3zOg" role="3AunhB">
-                        <ref role="a7OzE" node="4O7HczO3zOd" resolve="Options" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="4O7HczO3zOb" role="0Rg$4">
-              <node concept="3uibUv" id="4O7HczO3zOc" role="3vLBG7">
-                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
-              </node>
-              <node concept="aZer4" id="4O7HczO3zOd" role="3XD1gS">
-                <property role="TrG5h" value="Options" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="12QmIo_7shW" role="1nK1Vg">
       <property role="TrG5h" value="converts_typeVar_id" />
       <node concept="3clFbS" id="12QmIo_7shX" role="1nLNMH">
@@ -24088,14 +24155,8 @@
                       <node concept="a7P8L" id="1fKFQTSps_M" role="3AunhB">
                         <ref role="a7OzE" node="1fKFQTSps_u" resolve="Node" />
                       </node>
-                      <node concept="ns1u0" id="541xd$P9Mn5" role="3AunhB">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="541xd$P9Mna" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="h$QuP" id="ZNYuguvgIc" role="iSaTp">
-                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
-                          </node>
-                        </node>
+                      <node concept="ns1u0" id="24HkIxuBgSj" role="3AunhB">
+                        <ref role="ns1xF" node="JOGAOsVt2$" resolve="wildcard" />
                       </node>
                     </node>
                   </node>
@@ -30239,6 +30300,11 @@
         </node>
       </node>
       <node concept="3clFbS" id="3qUnz9vk$1q" role="3hEL4E">
+        <node concept="1mebxG" id="IFW4V3MSy9" role="3cqZAp">
+          <node concept="3hN9Ij" id="IFW4V3MSyq" role="1mebXD">
+            <ref role="3hLkJx" node="3qUnz9vk$cM" resolve="cls" />
+          </node>
+        </node>
         <node concept="3Aqczg" id="3qUnz9vk$dz" role="3cqZAp">
           <node concept="3A8Hvi" id="3qUnz9vk$dw" role="3Aqpz8">
             <node concept="a7P8L" id="3qUnz9vk$dC" role="3A8wtg">
@@ -47505,6 +47571,106 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbJ" id="IFW4V3STxY" role="3cqZAp">
+                        <node concept="3clFbS" id="IFW4V3STy0" role="3clFbx">
+                          <node concept="3SKdUt" id="IFW4V3SUrR" role="3cqZAp">
+                            <node concept="1PaTwC" id="IFW4V3SUrS" role="1aUNEU">
+                              <node concept="3oM_SD" id="IFW4V3SUsf" role="1PaTwD">
+                                <property role="3oM_SC" value="skip" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsh" role="1PaTwD">
+                                <property role="3oM_SC" value="creating" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsk" role="1PaTwD">
+                                <property role="3oM_SC" value="bounds" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUso" role="1PaTwD">
+                                <property role="3oM_SC" value="in" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUst" role="1PaTwD">
+                                <property role="3oM_SC" value="case" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsz" role="1PaTwD">
+                                <property role="3oM_SC" value="of" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsE" role="1PaTwD">
+                                <property role="3oM_SC" value="a" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsM" role="1PaTwD">
+                                <property role="3oM_SC" value="raw" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUsV" role="1PaTwD">
+                                <property role="3oM_SC" value="class" />
+                              </node>
+                              <node concept="3oM_SD" id="IFW4V3SUt5" role="1PaTwD">
+                                <property role="3oM_SC" value="instantiation" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1Dw8fO" id="53tmmMslPPT" role="3cqZAp">
+                            <node concept="3clFbS" id="53tmmMslPPU" role="2LFqv$">
+                              <node concept="3Aqczg" id="53tmmMslPQa" role="3cqZAp">
+                                <node concept="3Aqt3T" id="53tmmMslPQb" role="3Aqpz8">
+                                  <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
+                                  <node concept="a7P8L" id="53tmmMslPQc" role="3AunhB">
+                                    <ref role="a7OzE" node="53tmmMs9ij0" resolve="InstTyVars" />
+                                    <node concept="37vLTw" id="53tmmMslPQd" role="3gCZO6">
+                                      <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
+                                    </node>
+                                  </node>
+                                  <node concept="a7P8L" id="53tmmMslPQe" role="3AunhB">
+                                    <ref role="a7OzE" node="53tmmMs9ij7" resolve="Bounds" />
+                                    <node concept="37vLTw" id="53tmmMslPQf" role="3gCZO6">
+                                      <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWsn" id="53tmmMslPQg" role="1Duv9x">
+                              <property role="TrG5h" value="i" />
+                              <node concept="10Oyi0" id="53tmmMslPQh" role="1tU5fm" />
+                              <node concept="3cmrfG" id="53tmmMslPQi" role="33vP2m">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                            </node>
+                            <node concept="3eOVzh" id="53tmmMslPQj" role="1Dwp0S">
+                              <node concept="2OqwBi" id="53tmmMslPQk" role="3uHU7w">
+                                <node concept="37vLTw" id="53tmmMtqdGm" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="53tmmMslPMt" resolve="tvds" />
+                                </node>
+                                <node concept="34oBXx" id="53tmmMslPQm" role="2OqNvi" />
+                              </node>
+                              <node concept="37vLTw" id="53tmmMslPQn" role="3uHU7B">
+                                <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
+                              </node>
+                            </node>
+                            <node concept="3uNrnE" id="53tmmMslPQo" role="1Dwrff">
+                              <node concept="37vLTw" id="53tmmMslPQp" role="2$L3a6">
+                                <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="22lmx$" id="IFW4V3ZH2e" role="3clFbw">
+                          <node concept="2OqwBi" id="IFW4V3ZH2R" role="3uHU7w">
+                            <node concept="3hN9Ij" id="IFW4V3ZH2u" role="2Oq$k0">
+                              <ref role="3hLkJx" node="53tmmMs9Jdj" resolve="origin" />
+                            </node>
+                            <node concept="1mIQ4w" id="IFW4V3ZI3X" role="2OqNvi">
+                              <node concept="chp4Y" id="IFW4V3ZI48" role="cj9EA">
+                                <ref role="cht4Q" to="tpee:fKQs72_" resolve="EnumClass" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="IFW4V3STKW" role="3uHU7B">
+                            <node concept="3hN9Ij" id="IFW4V3STym" role="2Oq$k0">
+                              <ref role="3hLkJx" node="53tmmMs9igS" resolve="tyArgs" />
+                            </node>
+                            <node concept="3GX2aA" id="IFW4V3SUhw" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                     <node concept="2OqwBi" id="6GOqnFkoVIe" role="3clFbw">
                       <node concept="3hN9Ij" id="6GOqnFkoVzL" role="2Oq$k0">
@@ -47546,54 +47712,54 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="1Dw8fO" id="IFW4V3SUpT" role="3cqZAp">
+                          <node concept="3clFbS" id="IFW4V3SUpU" role="2LFqv$">
+                            <node concept="3Aqczg" id="IFW4V3SUpV" role="3cqZAp">
+                              <node concept="3Aqt3T" id="IFW4V3SUpW" role="3Aqpz8">
+                                <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
+                                <node concept="a7P8L" id="IFW4V3SUpX" role="3AunhB">
+                                  <ref role="a7OzE" node="53tmmMs9ij0" resolve="InstTyVars" />
+                                  <node concept="37vLTw" id="IFW4V3SUpY" role="3gCZO6">
+                                    <ref role="3cqZAo" node="IFW4V3SUq1" resolve="i" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="IFW4V3SUpZ" role="3AunhB">
+                                  <ref role="a7OzE" node="53tmmMs9ij7" resolve="Bounds" />
+                                  <node concept="37vLTw" id="IFW4V3SUq0" role="3gCZO6">
+                                    <ref role="3cqZAo" node="IFW4V3SUq1" resolve="i" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWsn" id="IFW4V3SUq1" role="1Duv9x">
+                            <property role="TrG5h" value="i" />
+                            <node concept="10Oyi0" id="IFW4V3SUq2" role="1tU5fm" />
+                            <node concept="3cmrfG" id="IFW4V3SUq3" role="33vP2m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                          </node>
+                          <node concept="3eOVzh" id="IFW4V3SUq4" role="1Dwp0S">
+                            <node concept="2OqwBi" id="IFW4V3SUq5" role="3uHU7w">
+                              <node concept="37vLTw" id="IFW4V3SUq6" role="2Oq$k0">
+                                <ref role="3cqZAo" node="53tmmMslPMt" resolve="tvds" />
+                              </node>
+                              <node concept="34oBXx" id="IFW4V3SUq7" role="2OqNvi" />
+                            </node>
+                            <node concept="37vLTw" id="IFW4V3SUq8" role="3uHU7B">
+                              <ref role="3cqZAo" node="IFW4V3SUq1" resolve="i" />
+                            </node>
+                          </node>
+                          <node concept="3uNrnE" id="IFW4V3SUq9" role="1Dwrff">
+                            <node concept="37vLTw" id="IFW4V3SUqa" role="2$L3a6">
+                              <ref role="3cqZAo" node="IFW4V3SUq1" resolve="i" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="6GOqnFkcRcd" role="3cqZAp" />
-                  <node concept="1Dw8fO" id="53tmmMslPPT" role="3cqZAp">
-                    <node concept="3clFbS" id="53tmmMslPPU" role="2LFqv$">
-                      <node concept="3Aqczg" id="53tmmMslPQa" role="3cqZAp">
-                        <node concept="3Aqt3T" id="53tmmMslPQb" role="3Aqpz8">
-                          <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
-                          <node concept="a7P8L" id="53tmmMslPQc" role="3AunhB">
-                            <ref role="a7OzE" node="53tmmMs9ij0" resolve="InstTyVars" />
-                            <node concept="37vLTw" id="53tmmMslPQd" role="3gCZO6">
-                              <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="53tmmMslPQe" role="3AunhB">
-                            <ref role="a7OzE" node="53tmmMs9ij7" resolve="Bounds" />
-                            <node concept="37vLTw" id="53tmmMslPQf" role="3gCZO6">
-                              <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="53tmmMslPQg" role="1Duv9x">
-                      <property role="TrG5h" value="i" />
-                      <node concept="10Oyi0" id="53tmmMslPQh" role="1tU5fm" />
-                      <node concept="3cmrfG" id="53tmmMslPQi" role="33vP2m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                    <node concept="3eOVzh" id="53tmmMslPQj" role="1Dwp0S">
-                      <node concept="2OqwBi" id="53tmmMslPQk" role="3uHU7w">
-                        <node concept="37vLTw" id="53tmmMtqdGm" role="2Oq$k0">
-                          <ref role="3cqZAo" node="53tmmMslPMt" resolve="tvds" />
-                        </node>
-                        <node concept="34oBXx" id="53tmmMslPQm" role="2OqNvi" />
-                      </node>
-                      <node concept="37vLTw" id="53tmmMslPQn" role="3uHU7B">
-                        <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
-                      </node>
-                    </node>
-                    <node concept="3uNrnE" id="53tmmMslPQo" role="1Dwrff">
-                      <node concept="37vLTw" id="53tmmMslPQp" role="2$L3a6">
-                        <ref role="3cqZAo" node="53tmmMslPQg" resolve="i" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3SKdUt" id="53tmmMslPPV" role="3cqZAp">
                     <node concept="1PaTwC" id="53tmmMslPPW" role="1aUNEU">
                       <node concept="3oM_SD" id="53tmmMslPPX" role="1PaTwD">