From 0fdc2ada2a1330389125963761fb03843039b4d0 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 15 Oct 2019 21:29:07 +0300
Subject: [PATCH] Rewrite BL Recover base rules to make dependencies between
 rules visible (i.e. to actually reeval 'eval' predicates in rules
 incrementally)

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 481 ++++++++++++------
 1 file changed, 314 insertions(+), 167 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 880d4924..c9dace72 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
@@ -22641,9 +22641,13 @@
         <property role="TrG5h" value="location" />
         <node concept="2sp9CU" id="35YJGAJTTpv" role="3gTf24" />
       </node>
-      <node concept="1zAUYm" id="5fMWD6H$6bt" role="1zAUyy">
-        <property role="TrG5h" value="type" />
-        <node concept="3Tqbb2" id="5fMWD6H$6hR" role="3gTf24" />
+      <node concept="1zAUYm" id="6QbNnfq39Uv" role="1zAUyy">
+        <property role="TrG5h" value="typeCollector" />
+        <node concept="3uibUv" id="6QbNnfq39Uw" role="3gTf24">
+          <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+          <node concept="2sp9CU" id="6QbNnfq39Ux" role="11_B2D" />
+          <node concept="3Tqbb2" id="6QbNnfq39Uy" role="11_B2D" />
+        </node>
       </node>
     </node>
     <node concept="1nLNMY" id="12QmIo_7seY" role="1nK1Vg">
@@ -22662,12 +22666,6 @@
                   <node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
                 </node>
               </node>
-              <node concept="3NuqgR" id="20Zoq4kTOEm" role="0eVf_">
-                <node concept="aZer4" id="20Zoq4kTOEn" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="3Tqbb2" id="5f6wxQ33Vvl" role="3vLBG7" />
-              </node>
               <node concept="3NuqgR" id="20Zoq4kTODF" role="0eVf_">
                 <node concept="aZer4" id="20Zoq4kTODG" role="3XD1gS">
                   <property role="TrG5h" value="Type" />
@@ -22697,37 +22695,8 @@
                         <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="expr" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$6jz" role="3AunhB">
-                      <ref role="a7OzE" node="20Zoq4kTOEn" resolve="Node" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="5fMWD6H$6lF" role="3I6sU7">
-                  <node concept="3wWvb2" id="5fMWD6H$6lB" role="3I6s78">
-                    <node concept="2OqwBi" id="5fMWD6Im8AZ" role="3wWo3s">
-                      <node concept="1TmgYN" id="5fMWD6H$6lO" role="2Oq$k0">
-                        <node concept="1nq8_$" id="5fMWD6H$6lZ" role="1Tms7$">
-                          <node concept="a7P8L" id="5fMWD6H$6lX" role="1nq8_t">
-                            <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5fMWD6Im8XT" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
-                        <node concept="2OqwBi" id="5fMWD6Im95t" role="37wK5m">
-                          <node concept="3A2sRY" id="5fMWD6Im95u" role="2Oq$k0">
-                            <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="expr" />
-                          </node>
-                          <node concept="iZEcu" id="5fMWD6Im95v" role="2OqNvi" />
-                        </node>
-                        <node concept="1TmgYN" id="5fMWD6Im9qg" role="37wK5m">
-                          <node concept="1nq8_$" id="5fMWD6Im9qh" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6Im9qi" role="1nq8_t">
-                              <ref role="a7OzE" node="20Zoq4kTOEn" resolve="Node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="a7P8L" id="6QbNnfq3aV8" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -22759,12 +22728,6 @@
                   <node concept="3Tqbb2" id="5fMWD6HQY2G" role="11_B2D" />
                 </node>
               </node>
-              <node concept="3NuqgR" id="5upUcEtfuXu" role="0eVf_">
-                <node concept="aZer4" id="5upUcEtfuXv" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="3Tqbb2" id="5f6wxQ33VvC" role="3vLBG7" />
-              </node>
               <node concept="3NuqgR" id="5upUcEtfuXF" role="0eVf_">
                 <node concept="aZer4" id="5upUcEtfuXG" role="3XD1gS">
                   <property role="TrG5h" value="Type" />
@@ -22794,37 +22757,8 @@
                         <ref role="3A2yKK" node="5upUcEtfuXQ" resolve="op" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$80O" role="3AunhB">
-                      <ref role="a7OzE" node="5upUcEtfuXv" resolve="Node" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="5fMWD6H$82L" role="3I6sU7">
-                  <node concept="3wWvb2" id="5fMWD6H$82M" role="3I6s78">
-                    <node concept="2OqwBi" id="5fMWD6Im9P1" role="3wWo3s">
-                      <node concept="1TmgYN" id="5fMWD6Im9P2" role="2Oq$k0">
-                        <node concept="1nq8_$" id="5fMWD6Im9P3" role="1Tms7$">
-                          <node concept="a7P8L" id="5fMWD6Im9P4" role="1nq8_t">
-                            <ref role="a7OzE" node="5fMWD6H$7XC" resolve="TypeCollector" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5fMWD6Im9P5" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
-                        <node concept="2OqwBi" id="5fMWD6Im9P6" role="37wK5m">
-                          <node concept="3A2sRY" id="5fMWD6Im9Tz" role="2Oq$k0">
-                            <ref role="3A2yKK" node="5upUcEtfuXQ" resolve="op" />
-                          </node>
-                          <node concept="iZEcu" id="5fMWD6Im9P8" role="2OqNvi" />
-                        </node>
-                        <node concept="1TmgYN" id="5fMWD6Im9P9" role="37wK5m">
-                          <node concept="1nq8_$" id="5fMWD6Im9Pa" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6Im9Pb" role="1nq8_t">
-                              <ref role="a7OzE" node="5upUcEtfuXv" resolve="Node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="a7P8L" id="6QbNnfq3bkW" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$7XC" resolve="TypeCollector" />
                     </node>
                   </node>
                 </node>
@@ -22856,12 +22790,6 @@
                   <node concept="3Tqbb2" id="5fMWD6HQY4i" role="11_B2D" />
                 </node>
               </node>
-              <node concept="3NuqgR" id="4BHjwwGCsOO" role="0eVf_">
-                <node concept="aZer4" id="4BHjwwGCsOP" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="3Tqbb2" id="5f6wxQ33VvV" role="3vLBG7" />
-              </node>
               <node concept="3NuqgR" id="4BHjwwGCsNj" role="0eVf_">
                 <node concept="aZer4" id="4BHjwwGCsNk" role="3XD1gS">
                   <property role="TrG5h" value="Type" />
@@ -22891,37 +22819,8 @@
                         <ref role="3A2yKK" node="4BHjwwGCsMO" resolve="vd" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$87Z" role="3AunhB">
-                      <ref role="a7OzE" node="4BHjwwGCsOP" resolve="Node" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="5fMWD6H$89W" role="3I6sU7">
-                  <node concept="3wWvb2" id="5fMWD6H$89X" role="3I6s78">
-                    <node concept="2OqwBi" id="5fMWD6Ima89" role="3wWo3s">
-                      <node concept="1TmgYN" id="5fMWD6Ima8a" role="2Oq$k0">
-                        <node concept="1nq8_$" id="5fMWD6Ima8b" role="1Tms7$">
-                          <node concept="a7P8L" id="5fMWD6Ima8c" role="1nq8_t">
-                            <ref role="a7OzE" node="5fMWD6H$84T" resolve="TypeCollector" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5fMWD6Ima8d" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
-                        <node concept="2OqwBi" id="5fMWD6Ima8e" role="37wK5m">
-                          <node concept="3A2sRY" id="5fMWD6Imadf" role="2Oq$k0">
-                            <ref role="3A2yKK" node="4BHjwwGCsMO" resolve="vd" />
-                          </node>
-                          <node concept="iZEcu" id="5fMWD6Ima8g" role="2OqNvi" />
-                        </node>
-                        <node concept="1TmgYN" id="5fMWD6Ima8h" role="37wK5m">
-                          <node concept="1nq8_$" id="5fMWD6Ima8i" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6Ima8j" role="1nq8_t">
-                              <ref role="a7OzE" node="4BHjwwGCsOP" resolve="Node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="a7P8L" id="6QbNnfq3bol" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$84T" resolve="TypeCollector" />
                     </node>
                   </node>
                 </node>
@@ -22953,12 +22852,6 @@
                   <node concept="3Tqbb2" id="5fMWD6HQY5V" role="11_B2D" />
                 </node>
               </node>
-              <node concept="3NuqgR" id="5upUcEthcNI" role="0eVf_">
-                <node concept="aZer4" id="5upUcEthcNJ" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="3Tqbb2" id="5f6wxQ33Vwe" role="3vLBG7" />
-              </node>
               <node concept="3NuqgR" id="5upUcEthcNT" role="0eVf_">
                 <node concept="aZer4" id="5upUcEthcNU" role="3XD1gS">
                   <property role="TrG5h" value="Type" />
@@ -22988,37 +22881,8 @@
                         <ref role="3A2yKK" node="5upUcEthcNW" resolve="ac" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8eO" role="3AunhB">
-                      <ref role="a7OzE" node="5upUcEthcNJ" resolve="Node" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="5fMWD6H$8gL" role="3I6sU7">
-                  <node concept="3wWvb2" id="5fMWD6H$8gM" role="3I6s78">
-                    <node concept="2OqwBi" id="5fMWD6Imath" role="3wWo3s">
-                      <node concept="1TmgYN" id="5fMWD6Imati" role="2Oq$k0">
-                        <node concept="1nq8_$" id="5fMWD6Imatj" role="1Tms7$">
-                          <node concept="a7P8L" id="5fMWD6Imatk" role="1nq8_t">
-                            <ref role="a7OzE" node="5fMWD6H$8bO" resolve="TypeCollector" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5fMWD6Imatl" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
-                        <node concept="2OqwBi" id="5fMWD6Imatm" role="37wK5m">
-                          <node concept="3A2sRY" id="5fMWD6Imay9" role="2Oq$k0">
-                            <ref role="3A2yKK" node="5upUcEthcNW" resolve="ac" />
-                          </node>
-                          <node concept="iZEcu" id="5fMWD6Imato" role="2OqNvi" />
-                        </node>
-                        <node concept="1TmgYN" id="5fMWD6Imatp" role="37wK5m">
-                          <node concept="1nq8_$" id="5fMWD6Imatq" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6Imatr" role="1nq8_t">
-                              <ref role="a7OzE" node="5upUcEthcNJ" resolve="Node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="a7P8L" id="6QbNnfq3btf" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$8bO" resolve="TypeCollector" />
                     </node>
                   </node>
                 </node>
@@ -23073,6 +22937,16 @@
         <node concept="1nLNNL" id="35YJGAJTRFq" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTRFr" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTRFs" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aCx" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aCy" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aCz" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aC$" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aC_" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTRFt" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTRFu" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23096,8 +22970,8 @@
                         <ref role="3A2yKK" node="35YJGAJTRFW" resolve="expr" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8iN" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3d6Z" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23134,6 +23008,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3bZU" role="3I6sU7">
+                  <node concept="3wWvb2" id="5fMWD6H$6lB" role="3I6s78">
+                    <node concept="2OqwBi" id="5fMWD6Im8AZ" role="3wWo3s">
+                      <node concept="1TmgYN" id="5fMWD6H$6lO" role="2Oq$k0">
+                        <node concept="1nq8_$" id="5fMWD6H$6lZ" role="1Tms7$">
+                          <node concept="a7P8L" id="5fMWD6H$6lX" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5fMWD6Im8XT" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="5fMWD6Im95t" role="37wK5m">
+                          <node concept="3A2sRY" id="5fMWD6Im95u" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTRFW" resolve="expr" />
+                          </node>
+                          <node concept="iZEcu" id="5fMWD6Im95v" role="2OqNvi" />
+                        </node>
+                        <node concept="1TmgYN" id="5fMWD6Im9qg" role="37wK5m">
+                          <node concept="1nq8_$" id="5fMWD6Im9qh" role="1Tms7$">
+                            <node concept="a7P8L" id="5fMWD6Im9qi" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23152,6 +23055,16 @@
         <node concept="1nLNNL" id="35YJGAJTSkC" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTSkD" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTSkE" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aE7" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aE8" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aE9" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aEa" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aEb" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTSkF" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTSkG" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23179,8 +23092,8 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8kQ" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTSkG" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3dcl" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aE8" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23217,6 +23130,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3c5y" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3c68" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3c69" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3c6a" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3c6b" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3c6c" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aE8" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3c6d" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3c6e" role="37wK5m">
+                          <node concept="3A2sRY" id="6QbNnfq3c9I" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTSla" resolve="op" />
+                          </node>
+                          <node concept="iZEcu" id="6QbNnfq3c6g" role="2OqNvi" />
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3c6h" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3c6i" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3c6j" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTSkG" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23235,6 +23177,16 @@
         <node concept="1nLNNL" id="35YJGAJTTb8" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTTb9" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTTba" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aFK" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aFL" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aFM" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aFN" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aFO" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTTbb" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTTbc" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23258,8 +23210,8 @@
                         <ref role="3A2yKK" node="35YJGAJTTbE" resolve="vd" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8mT" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTTbc" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3do$" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aFL" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23296,6 +23248,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3chn" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3chZ" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3ci0" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3ci1" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3ci2" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3ci3" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aFL" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3ci4" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3ci5" role="37wK5m">
+                          <node concept="iZEcu" id="6QbNnfq3ci7" role="2OqNvi" />
+                          <node concept="3A2sRY" id="6QbNnfq3cvG" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTTbE" resolve="vd" />
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3ci8" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3ci9" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3cia" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTTbc" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23314,6 +23295,16 @@
         <node concept="1nLNNL" id="35YJGAJTTqv" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTTqw" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTTqx" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aHs" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aHt" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aHu" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aHv" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aHw" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTTqy" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTTqz" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23337,8 +23328,8 @@
                         <ref role="3A2yKK" node="35YJGAJTTr1" resolve="ac" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8oU" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTTqz" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3dAX" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aHt" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23375,6 +23366,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3cDq" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3cDy" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3cDz" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3cD$" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3cD_" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3cDA" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aHt" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3cDB" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3cDC" role="37wK5m">
+                          <node concept="iZEcu" id="6QbNnfq3cDE" role="2OqNvi" />
+                          <node concept="3A2sRY" id="6QbNnfq3cVz" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTTr1" resolve="ac" />
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3cDF" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3cDG" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3cDH" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTTqz" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23393,6 +23413,16 @@
         <node concept="1nLNNL" id="35YJGAJTUlh" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTUli" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTUlj" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aJb" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aJc" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aJd" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aJe" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aJf" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTUlk" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTUll" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23416,8 +23446,8 @@
                         <ref role="3A2yKK" node="35YJGAJTUl$" resolve="expr" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8qV" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTUll" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3aUb" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aJc" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23451,6 +23481,16 @@
         <node concept="1nLNNL" id="35YJGAJTUkV" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTUkW" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTUkX" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aKX" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aKY" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aKZ" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aL0" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aL1" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTUkY" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTUkZ" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23474,8 +23514,8 @@
                         <ref role="3A2yKK" node="35YJGAJTUle" resolve="op" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8rq" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTUkZ" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3aST" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aKY" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23505,6 +23545,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3e2e" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3e2f" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3e2g" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3e2h" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3e2i" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3e2j" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aKY" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3e2k" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3e2l" role="37wK5m">
+                          <node concept="iZEcu" id="6QbNnfq3e2m" role="2OqNvi" />
+                          <node concept="3A2sRY" id="6QbNnfq3eoC" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTUle" resolve="op" />
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3e2o" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3e2p" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3e2q" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTUkZ" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23523,6 +23592,16 @@
         <node concept="1nLNNL" id="35YJGAJTUk_" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTUkA" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTUkB" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aMM" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aMN" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aMO" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aMP" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aMQ" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTUkC" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTUkD" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23546,8 +23625,8 @@
                         <ref role="3A2yKK" node="35YJGAJTUkS" resolve="vd" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8Ex" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTUkD" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3aRR" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aMN" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23577,6 +23656,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3evl" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3evm" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3evn" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3evo" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3evp" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3evq" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aMN" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3evr" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3evs" role="37wK5m">
+                          <node concept="iZEcu" id="6QbNnfq3evt" role="2OqNvi" />
+                          <node concept="3A2sRY" id="6QbNnfq3eSH" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTUkS" resolve="vd" />
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3evv" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3evw" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3evx" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTUkD" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -23595,6 +23703,16 @@
         <node concept="1nLNNL" id="35YJGAJTUkf" role="3cqZAp">
           <node concept="1nLNMm" id="35YJGAJTUkg" role="1nLNNK">
             <node concept="0eUR_" id="35YJGAJTUkh" role="0UC6o">
+              <node concept="3NuqgR" id="6QbNnfq3aOE" role="0eVf_">
+                <node concept="aZer4" id="6QbNnfq3aOF" role="3XD1gS">
+                  <property role="TrG5h" value="TypesUpdate" />
+                </node>
+                <node concept="3uibUv" id="6QbNnfq3aOG" role="3vLBG7">
+                  <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                  <node concept="2sp9CU" id="6QbNnfq3aOH" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6QbNnfq3aOI" role="11_B2D" />
+                </node>
+              </node>
               <node concept="3NuqgR" id="35YJGAJTUki" role="0eVf_">
                 <node concept="aZer4" id="35YJGAJTUkj" role="3XD1gS">
                   <property role="TrG5h" value="Node" />
@@ -23618,8 +23736,8 @@
                         <ref role="3A2yKK" node="35YJGAJTUky" resolve="ac" />
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5fMWD6H$8O7" role="3AunhB">
-                      <ref role="a7OzE" node="35YJGAJTUkj" resolve="Node" />
+                    <node concept="a7P8L" id="6QbNnfq3aQ_" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aOF" resolve="TypesUpdate" />
                     </node>
                   </node>
                 </node>
@@ -23649,6 +23767,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3I6s7M" id="6QbNnfq3eY8" role="3I6sU7">
+                  <node concept="3wWvb2" id="6QbNnfq3eY9" role="3I6s78">
+                    <node concept="2OqwBi" id="6QbNnfq3eYa" role="3wWo3s">
+                      <node concept="1TmgYN" id="6QbNnfq3eYb" role="2Oq$k0">
+                        <node concept="1nq8_$" id="6QbNnfq3eYc" role="1Tms7$">
+                          <node concept="a7P8L" id="6QbNnfq3eYd" role="1nq8_t">
+                            <ref role="a7OzE" node="6QbNnfq3aOF" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6QbNnfq3eYe" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                        <node concept="2OqwBi" id="6QbNnfq3eYf" role="37wK5m">
+                          <node concept="iZEcu" id="6QbNnfq3eYg" role="2OqNvi" />
+                          <node concept="3A2sRY" id="6QbNnfq3eYh" role="2Oq$k0">
+                            <ref role="3A2yKK" node="35YJGAJTUky" resolve="ac" />
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="6QbNnfq3eYi" role="37wK5m">
+                          <node concept="1nq8_$" id="6QbNnfq3eYj" role="1Tms7$">
+                            <node concept="a7P8L" id="6QbNnfq3eYk" role="1nq8_t">
+                              <ref role="a7OzE" node="35YJGAJTUkj" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>