From 7211a0a44670d2169e92d149f9b851a349eb0b58 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 30 Jul 2015 15:51:56 +0200
Subject: [PATCH] Minor updates in the typechecking templates

---
 .../typesystem2/samplechecker/template.mps    | 200 +++++++++++-------
 1 file changed, 121 insertions(+), 79 deletions(-)

diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
index f3fbf4b4..f52faee1 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
@@ -21,15 +21,15 @@
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.unification.tree)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="jfki" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/f:java_stub#7526e0cf-1ce7-46f8-a555-9eca1e06c23b#jetbrains.mps.unification(jetbrains.mps.unification.tree/jetbrains.mps.unification@java_stub)" />
+    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.unification.tree/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="4t1t" ref="r:703839e2-c38f-4b71-8602-72ccb87dd74e(jetbrains.mps.lang.typesystem2.runtime.util)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="w2rx" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/f:java_stub#b984ee52-f34d-4b6d-8812-866c1d3eae31#runtime(jetbrains.mps.jchr.runtime/runtime@java_stub)" />
-    <import index="ec5l" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.model(MPS.OpenAPI/org.jetbrains.mps.openapi.model@java_stub)" />
+    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
-    <import index="k7g3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
-    <import index="e2lb" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
   </imports>
   <registry>
@@ -859,7 +859,7 @@
             <node concept="2ShNRf" id="tIwzd2b7sq" role="3clFbG">
               <node concept="2HTt$P" id="tIwzd2b7_Z" role="2ShVmc">
                 <node concept="3B5_sB" id="tIwzd2b7AD" role="2HTEbv">
-                  <ref role="3B5MYn" to="e2lb:~String" resolve="String" />
+                  <ref role="3B5MYn" to="wyt6:~String" resolve="String" />
                 </node>
                 <node concept="3Tqbb2" id="tIwzd2b7Am" role="2HTBi0" />
               </node>
@@ -901,7 +901,7 @@
               </node>
               <node concept="aYllk" id="tIwzd2a6$k" role="3A0lYS">
                 <node concept="3B5_sB" id="tIwzd2a6$o" role="aYrYs">
-                  <ref role="3B5MYn" to="e2lb:~String" resolve="String" />
+                  <ref role="3B5MYn" to="wyt6:~String" resolve="String" />
                 </node>
               </node>
             </node>
@@ -1832,7 +1832,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="7mm1a3qX8ZS" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -3008,7 +3008,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="4iklERDa2P8" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -3036,9 +3036,26 @@
       </node>
     </node>
     <node concept="AVZhu" id="4JRKVCvenYJ" role="3ArX_J">
-      <property role="TrG5h" value="meetSingleton" />
+      <property role="TrG5h" value="intersectionSingleton" />
       <node concept="3Aq9_M" id="4JRKVCvfhwF" role="3oo59u">
         <node concept="3clFbS" id="4JRKVCvfhwG" role="3Aqf5P">
+          <node concept="3SKdUt" id="4hh8ocmqVh2" role="3cqZAp">
+            <node concept="3SKdUq" id="4hh8ocmqVhk" role="3SKWNk">
+              <property role="3SKdUp" value="using the fact that LubType must be unbound here" />
+            </node>
+          </node>
+          <node concept="3SKdUt" id="4hh8ocmqVhD" role="3cqZAp">
+            <node concept="3SKdUq" id="4hh8ocmqVhX" role="3SKWNk">
+              <property role="3SKdUp" value="otherwise we'd have to use a tmp var, which is not supported" />
+            </node>
+          </node>
+          <node concept="3Aqczg" id="4hh8ocmqVgu" role="3cqZAp">
+            <node concept="2aLmEc" id="4hh8ocmqVgs" role="3Aqpz8">
+              <node concept="a7P8L" id="4hh8ocmqVgH" role="2aLmnP">
+                <ref role="a7OzE" node="4JRKVCveqBy" resolve="LubType" />
+              </node>
+            </node>
+          </node>
           <node concept="3Aqczg" id="4JRKVCveqhf" role="3cqZAp">
             <node concept="3A8Hvi" id="4JRKVCveqAS" role="3Aqpz8">
               <node concept="aYllk" id="4JRKVCveqBB" role="3A8w4Q">
@@ -3052,7 +3069,7 @@
                           <node concept="22Ky0T" id="4JRKVCverKx" role="lGtFl">
                             <node concept="3A9UF8" id="4JRKVCverKz" role="22Ky0K">
                               <node concept="a7P8L" id="4JRKVCverKB" role="3A9W3M">
-                                <ref role="a7OzE" node="4JRKVCveqBy" resolve="Type" />
+                                <ref role="a7OzE" node="4JRKVCveqBy" resolve="LubType" />
                               </node>
                             </node>
                           </node>
@@ -3084,7 +3101,7 @@
                           <node concept="22Ky0T" id="4JRKVCvfiDj" role="lGtFl">
                             <node concept="3A9UF8" id="4JRKVCvfiDk" role="22Ky0K">
                               <node concept="a7P8L" id="4JRKVCvfiDl" role="3A9W3M">
-                                <ref role="a7OzE" node="4JRKVCveqBy" resolve="Type" />
+                                <ref role="a7OzE" node="4JRKVCveqBy" resolve="LubType" />
                               </node>
                             </node>
                           </node>
@@ -3116,18 +3133,18 @@
               <property role="TrG5h" value="Lub" />
             </node>
             <node concept="aZer4" id="4JRKVCveqBy" role="3XD1gS">
-              <property role="TrG5h" value="Type" />
+              <property role="TrG5h" value="LubType" />
             </node>
           </node>
           <node concept="3clFbH" id="4JRKVCvfdUD" role="3cqZAp" />
           <node concept="3Aqczg" id="4JRKVCvffh5" role="3cqZAp">
             <node concept="3Aqt3T" id="4JRKVCvffhp" role="3Aqpz8">
-              <ref role="3AqCNq" node="4JRKVCvfdUU" resolve="meet" />
+              <ref role="3AqCNq" node="4JRKVCvfdUU" resolve="intersection" />
               <node concept="a7P8L" id="4JRKVCvfgp4" role="3AunhB">
                 <ref role="a7OzE" node="4JRKVCveqCX" resolve="Lub" />
               </node>
               <node concept="a7P8L" id="4JRKVCvfgp8" role="3AunhB">
-                <ref role="a7OzE" node="4JRKVCveqBy" resolve="Type" />
+                <ref role="a7OzE" node="4JRKVCveqBy" resolve="LubType" />
               </node>
             </node>
           </node>
@@ -3182,7 +3199,7 @@
       <property role="3AqDzJ" value="3" />
     </node>
     <node concept="3AqmO8" id="4JRKVCvfdUU" role="3AqmFx">
-      <property role="TrG5h" value="meet" />
+      <property role="TrG5h" value="intersection" />
       <property role="3AqDzJ" value="2" />
     </node>
   </node>
@@ -5836,7 +5853,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="2ev$9JFPC3V" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -5935,7 +5952,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="2ev$9JFPBa9" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -5996,7 +6013,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="2ev$9JFPBbj" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -6234,7 +6251,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="2ev$9JFPAfA" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                           </node>
                         </node>
                       </node>
@@ -7069,43 +7086,46 @@
             <node concept="17QB3L" id="5zfvpQ73OCA" role="3vLBG7" />
           </node>
           <node concept="3clFbH" id="5zfvpQ73OyZ" role="3cqZAp" />
-          <node concept="3Aqczg" id="6BU$YTNH6O1" role="3cqZAp">
-            <node concept="3A8Hvi" id="6BU$YTNH6O2" role="3Aqpz8">
-              <node concept="aYllk" id="6BU$YTNH6O3" role="3A8wtg">
-                <node concept="1oi1Uc" id="6BU$YTNH6O4" role="aYrYs">
-                  <node concept="1oi5UN" id="6BU$YTNH6O5" role="1oi0x0">
-                    <node concept="1oi5ST" id="6BU$YTNH6O6" role="1ojpOf">
+          <node concept="3Aqczg" id="y3V7LPWgoA" role="3cqZAp">
+            <node concept="3A8Hvi" id="y3V7LPWgow" role="3Aqpz8">
+              <node concept="a7P8L" id="y3V7LPWgum" role="3A8wtg">
+                <ref role="a7OzE" node="2q0gzCFHfJA" resolve="TypeA" />
+              </node>
+              <node concept="aYllk" id="y3V7LPWgur" role="3A8w4Q">
+                <node concept="1oi1Uc" id="y3V7LPWgus" role="aYrYs">
+                  <node concept="1oi5UN" id="y3V7LPWgut" role="1oi0x0">
+                    <node concept="1oi5ST" id="y3V7LPWguu" role="1ojpOf">
                       <property role="TrG5h" value="parameter" />
-                      <node concept="KCUsM" id="6BU$YTNH6O7" role="1oi5TL">
-                        <node concept="2IllgU" id="6BU$YTNH6O8" role="KCVpo" />
+                      <node concept="KCUsM" id="y3V7LPWguv" role="1oi5TL">
+                        <node concept="2IllgU" id="y3V7LPWguw" role="KCVpo" />
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH6O9" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWgux" role="1ojpOf">
                       <property role="TrG5h" value="concept" />
-                      <node concept="1oi5XN" id="6BU$YTNH6Oa" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWguy" role="1oi5zu">
                         <property role="1oi5yK" value="ClassifierType" />
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH6Ob" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWguz" role="1ojpOf">
                       <property role="TrG5h" value="classifier" />
-                      <node concept="1oi5XN" id="6BU$YTNH6Oc" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWgu$" role="1oi5zu">
                         <property role="1oi5yK" value="_" />
-                        <node concept="22Ky0T" id="6BU$YTNH6Od" role="lGtFl">
-                          <node concept="3A9UF8" id="6BU$YTNH6Oe" role="22Ky0K">
-                            <node concept="a7P8L" id="6BU$YTNH6Of" role="3A9W3M">
+                        <node concept="22Ky0T" id="y3V7LPWgu_" role="lGtFl">
+                          <node concept="3A9UF8" id="y3V7LPWguA" role="22Ky0K">
+                            <node concept="a7P8L" id="y3V7LPWguB" role="3A9W3M">
                               <ref role="a7OzE" node="6BU$YTNH6Z$" resolve="ClsA" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH6Og" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWguC" role="1ojpOf">
                       <property role="TrG5h" value="cid" />
-                      <node concept="1oi5XN" id="6BU$YTNH6Oh" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWguD" role="1oi5zu">
                         <property role="1oi5yK" value="_" />
-                        <node concept="22Ky0T" id="6BU$YTNH6Oi" role="lGtFl">
-                          <node concept="3A9UF8" id="6BU$YTNH6Oj" role="22Ky0K">
-                            <node concept="a7P8L" id="6BU$YTNH6Ok" role="3A9W3M">
+                        <node concept="22Ky0T" id="y3V7LPWguE" role="lGtFl">
+                          <node concept="3A9UF8" id="y3V7LPWguF" role="22Ky0K">
+                            <node concept="a7P8L" id="y3V7LPWguG" role="3A9W3M">
                               <ref role="a7OzE" node="6BU$YTNH6ZE" resolve="CidA" />
                             </node>
                           </node>
@@ -7115,48 +7135,48 @@
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6BU$YTNH7Mz" role="3A8w4Q">
-                <ref role="a7OzE" node="2q0gzCFHfJA" resolve="TypeA" />
-              </node>
             </node>
           </node>
-          <node concept="3Aqczg" id="6BU$YTNH9Zy" role="3cqZAp">
-            <node concept="3A8Hvi" id="6BU$YTNH9Zz" role="3Aqpz8">
-              <node concept="aYllk" id="6BU$YTNH9Z$" role="3A8wtg">
-                <node concept="1oi1Uc" id="6BU$YTNH9Z_" role="aYrYs">
-                  <node concept="1oi5UN" id="6BU$YTNH9ZA" role="1oi0x0">
-                    <node concept="1oi5ST" id="6BU$YTNH9ZB" role="1ojpOf">
+          <node concept="3Aqczg" id="y3V7LPWgA1" role="3cqZAp">
+            <node concept="3A8Hvi" id="y3V7LPWg_V" role="3Aqpz8">
+              <node concept="a7P8L" id="y3V7LPWgIM" role="3A8wtg">
+                <ref role="a7OzE" node="2q0gzCFHkzO" resolve="TypeB" />
+              </node>
+              <node concept="aYllk" id="y3V7LPWgIR" role="3A8w4Q">
+                <node concept="1oi1Uc" id="y3V7LPWgIS" role="aYrYs">
+                  <node concept="1oi5UN" id="y3V7LPWgIT" role="1oi0x0">
+                    <node concept="1oi5ST" id="y3V7LPWgIU" role="1ojpOf">
                       <property role="TrG5h" value="parameter" />
-                      <node concept="KCUsM" id="6BU$YTNH9ZC" role="1oi5TL">
-                        <node concept="2IllgU" id="6BU$YTNH9ZD" role="KCVpo" />
+                      <node concept="KCUsM" id="y3V7LPWgIV" role="1oi5TL">
+                        <node concept="2IllgU" id="y3V7LPWgIW" role="KCVpo" />
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH9ZE" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWgIX" role="1ojpOf">
                       <property role="TrG5h" value="concept" />
-                      <node concept="1oi5XN" id="6BU$YTNH9ZF" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWgIY" role="1oi5zu">
                         <property role="1oi5yK" value="ClassifierType" />
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH9ZG" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWgIZ" role="1ojpOf">
                       <property role="TrG5h" value="classifier" />
-                      <node concept="1oi5XN" id="6BU$YTNH9ZH" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWgJ0" role="1oi5zu">
                         <property role="1oi5yK" value="_" />
-                        <node concept="22Ky0T" id="6BU$YTNH9ZI" role="lGtFl">
-                          <node concept="3A9UF8" id="6BU$YTNH9ZJ" role="22Ky0K">
-                            <node concept="a7P8L" id="6BU$YTNHa1j" role="3A9W3M">
+                        <node concept="22Ky0T" id="y3V7LPWgJ1" role="lGtFl">
+                          <node concept="3A9UF8" id="y3V7LPWgJ2" role="22Ky0K">
+                            <node concept="a7P8L" id="y3V7LPWgJ3" role="3A9W3M">
                               <ref role="a7OzE" node="6BU$YTNH7Mi" resolve="ClsB" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6BU$YTNH9ZL" role="1ojpOf">
+                    <node concept="1oi5Wm" id="y3V7LPWgJ4" role="1ojpOf">
                       <property role="TrG5h" value="cid" />
-                      <node concept="1oi5XN" id="6BU$YTNH9ZM" role="1oi5zu">
+                      <node concept="1oi5XN" id="y3V7LPWgJ5" role="1oi5zu">
                         <property role="1oi5yK" value="_" />
-                        <node concept="22Ky0T" id="6BU$YTNH9ZN" role="lGtFl">
-                          <node concept="3A9UF8" id="6BU$YTNH9ZO" role="22Ky0K">
-                            <node concept="a7P8L" id="6BU$YTNHa1m" role="3A9W3M">
+                        <node concept="22Ky0T" id="y3V7LPWgJ6" role="lGtFl">
+                          <node concept="3A9UF8" id="y3V7LPWgJ7" role="22Ky0K">
+                            <node concept="a7P8L" id="y3V7LPWgJ8" role="3A9W3M">
                               <ref role="a7OzE" node="6BU$YTNH7Mq" resolve="CidB" />
                             </node>
                           </node>
@@ -7166,12 +7186,8 @@
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6BU$YTNHa1p" role="3A8w4Q">
-                <ref role="a7OzE" node="2q0gzCFHkzO" resolve="TypeB" />
-              </node>
             </node>
           </node>
-          <node concept="3clFbH" id="6BU$YTNH6Ma" role="3cqZAp" />
           <node concept="3clFbH" id="6BU$YTNHb9b" role="3cqZAp" />
           <node concept="3X$Joe" id="6BU$YTNHdJS" role="3cqZAp">
             <node concept="aZer4" id="6BU$YTNHdLC" role="3XD1gS">
@@ -7346,9 +7362,12 @@
             </node>
           </node>
           <node concept="3clFbH" id="4JRKVCvg4tQ" role="3cqZAp" />
+          <node concept="3clFbH" id="5SPO52V$6EP" role="3cqZAp" />
+          <node concept="3clFbH" id="5SPO52V$6H_" role="3cqZAp" />
+          <node concept="3clFbH" id="5SPO52V$6JR" role="3cqZAp" />
           <node concept="3Aqczg" id="4JRKVCvg4z3" role="3cqZAp">
             <node concept="3Aqt3T" id="4JRKVCvg4_G" role="3Aqpz8">
-              <ref role="3AqCNq" node="4JRKVCvfdUU" resolve="meet" />
+              <ref role="3AqCNq" node="4JRKVCvfdUU" resolve="intersection" />
               <node concept="a7P8L" id="4JRKVCvg6V8" role="3AunhB">
                 <ref role="a7OzE" node="4JRKVCvg6UN" resolve="Lub" />
               </node>
@@ -10362,7 +10381,7 @@
                   <node concept="YS8fn" id="tIwzd2cL2o" role="3cqZAp">
                     <node concept="2ShNRf" id="tIwzd2cL2p" role="YScLw">
                       <node concept="1pGfFk" id="tIwzd2cL2q" role="2ShVmc">
-                        <ref role="37wK5l" to="e2lb:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                         <node concept="3cpWs3" id="tIwzd2cL2r" role="37wK5m">
                           <node concept="Xl_RD" id="tIwzd2cL2s" role="3uHU7B">
                             <property role="Xl_RC" value="unexpected instance: " />
@@ -10899,7 +10918,7 @@
                   <node concept="YS8fn" id="5H6hZahjb5U" role="3cqZAp">
                     <node concept="2ShNRf" id="5H6hZahjb6w" role="YScLw">
                       <node concept="1pGfFk" id="5H6hZahjbje" role="2ShVmc">
-                        <ref role="37wK5l" to="e2lb:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                         <node concept="3cpWs3" id="5H6hZahjbxw" role="37wK5m">
                           <node concept="37vLTw" id="5H6hZahjbxV" role="3uHU7w">
                             <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
@@ -10927,7 +10946,7 @@
                         <node concept="TSZUe" id="4JRKVCv9HaI" role="2OqNvi">
                           <node concept="2c44tf" id="4JRKVCv9HaJ" role="25WWJ7">
                             <node concept="3uibUv" id="4JRKVCv9HaK" role="2c44tc">
-                              <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                             </node>
                           </node>
                         </node>
@@ -10936,7 +10955,7 @@
                   </node>
                   <node concept="3y3z36" id="4JRKVCvbX9A" role="3clFbw">
                     <node concept="3B5_sB" id="4JRKVCvc0QG" role="3uHU7w">
-                      <ref role="3B5MYn" to="e2lb:~Object" resolve="Object" />
+                      <ref role="3B5MYn" to="wyt6:~Object" resolve="Object" />
                     </node>
                     <node concept="2OqwBi" id="4JRKVCvbZXn" role="3uHU7B">
                       <node concept="2OqwBi" id="4JRKVCvbOQb" role="2Oq$k0">
@@ -11753,13 +11772,34 @@
                 <node concept="aZer4" id="4EfgX2EFs8J" role="3XD1gS">
                   <property role="TrG5h" value="Lub" />
                   <node concept="aYllk" id="4EfgX2EFs8M" role="aZjLW">
-                    <node concept="3cpWsd" id="4EfgX2EFyfx" role="aYrYs">
-                      <node concept="3cmrfG" id="4EfgX2EFyf$" role="3uHU7w">
-                        <property role="3cmrfH" value="1" />
+                    <node concept="2OqwBi" id="4EfgX2EFs_3" role="aYrYs">
+                      <node concept="34oBXx" id="4EfgX2EFwdR" role="2OqNvi" />
+                      <node concept="39rIew" id="4EfgX2EGYEH" role="2Oq$k0">
+                        <ref role="39rHqR" node="7t5VLKGTNCS" resolve="retExpr" />
                       </node>
-                      <node concept="2OqwBi" id="4EfgX2EFs_3" role="3uHU7B">
-                        <node concept="34oBXx" id="4EfgX2EFwdR" role="2OqNvi" />
-                        <node concept="39rIew" id="4EfgX2EGYEH" role="2Oq$k0">
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aqczg" id="5SPO52V$9aq" role="3cqZAp">
+                <node concept="3A8Hvi" id="5SPO52V$9ak" role="3Aqpz8">
+                  <node concept="a7P8L" id="5SPO52V$9cc" role="3A8w4Q">
+                    <ref role="a7OzE" node="7t5VLKGUb$a" resolve="RetExprType" />
+                    <node concept="aYllk" id="5SPO52V$9cG" role="aYIAd">
+                      <node concept="2OqwBi" id="5SPO52V$9cX" role="aYrYs">
+                        <node concept="34oBXx" id="5SPO52V$9cY" role="2OqNvi" />
+                        <node concept="39rIew" id="5SPO52V$9cZ" role="2Oq$k0">
+                          <ref role="39rHqR" node="7t5VLKGTNCS" resolve="retExpr" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="a7P8L" id="5SPO52V$9ba" role="3A8wtg">
+                    <ref role="a7OzE" node="4EfgX2EFs8J" resolve="Lub" />
+                    <node concept="aYllk" id="5SPO52V$9bb" role="aYIAd">
+                      <node concept="2OqwBi" id="5SPO52V$9bn" role="aYrYs">
+                        <node concept="34oBXx" id="5SPO52V$9bo" role="2OqNvi" />
+                        <node concept="39rIew" id="5SPO52V$9bp" role="2Oq$k0">
                           <ref role="39rHqR" node="7t5VLKGTNCS" resolve="retExpr" />
                         </node>
                       </node>
@@ -11767,6 +11807,7 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="5SPO52V$9dM" role="3cqZAp" />
               <node concept="1Dw8fO" id="7t5VLKGUk69" role="3cqZAp">
                 <node concept="3clFbS" id="7t5VLKGUk6b" role="2LFqv$">
                   <node concept="3Aqczg" id="6BU$YTNGUZ8" role="3cqZAp">
@@ -11789,7 +11830,7 @@
                         </node>
                       </node>
                       <node concept="a7P8L" id="6BU$YTNHXFJ" role="3AunhB">
-                        <ref role="a7OzE" node="7t5VLKGUb$a" resolve="RetExprType" />
+                        <ref role="a7OzE" node="4EfgX2EFs8J" resolve="Lub" />
                         <node concept="aYllk" id="6BU$YTNHXFK" role="aYIAd">
                           <node concept="3cpWs3" id="6BU$YTNHXFL" role="aYrYs">
                             <node concept="3cmrfG" id="6BU$YTNHXFM" role="3uHU7w">
@@ -11833,6 +11874,7 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="5SPO52V$7Nn" role="3cqZAp" />
               <node concept="3Aqczg" id="4EfgX2EFXph" role="3cqZAp">
                 <node concept="3A8Hvi" id="4EfgX2EFXZa" role="3Aqpz8">
                   <node concept="a7P8L" id="4EfgX2EFXZm" role="3A8w4Q">