From 583358dc258214eb979515e6fac5b81412456ad8 Mon Sep 17 00:00:00 2001
From: "grigorii.kirgizov" <grigorii.kirgizov@jetbrains.com>
Date: Wed, 9 Jan 2019 11:54:27 +0300
Subject: [PATCH] lc: modify name assignment to variables in 'forall'

---
 .../samples.lambdacalc/models/types.mps       | 348 +++++++-----------
 .../models/samples.lambdacalc.demo@tests.mps  |  34 ++
 2 files changed, 174 insertions(+), 208 deletions(-)

diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 74b14ca8..9143da4b 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -6048,23 +6048,41 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3Aqczg" id="48ZGLP8rJPo" role="3cqZAp">
-                      <node concept="3A8Hvi" id="48ZGLP8rJS9" role="3Aqpz8">
-                        <node concept="a7P8L" id="48ZGLP8weC3" role="3A8wtg">
+                    <node concept="3Aqczg" id="RcyXiSW3P_" role="3cqZAp">
+                      <node concept="3A8Hvi" id="RcyXiSW3SI" role="3Aqpz8">
+                        <node concept="a7P8L" id="RcyXiSW3SR" role="3A8wtg">
                           <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
                         </node>
-                        <node concept="ns1u0" id="48ZGLP8rJSn" role="3A8w4Q">
-                          <ref role="ns1xF" node="48ZGLP7GYxP" />
-                          <node concept="nsMwS" id="48ZGLP8rJSp" role="ns1xD">
-                            <ref role="nsMwP" node="48ZGLP7GYyd" />
-                            <node concept="2YIFZM" id="48ZGLP8rJUo" role="nsMwV">
-                              <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-                              <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
-                              <node concept="1nq8_$" id="48ZGLP8rJV_" role="37wK5m">
-                                <node concept="HKQnh" id="48ZGLP8rJV$" role="1nq8_t">
-                                  <node concept="1nq8_$" id="48ZGLP8rJXe" role="HKQng">
-                                    <node concept="a7P8L" id="48ZGLP8rJXd" role="1nq8_t">
-                                      <ref role="a7OzE" node="48ZGLP8beNw" />
+                        <node concept="ns1u0" id="RcyXiSW3SW" role="3A8w4Q">
+                          <ref role="ns1xF" node="48ZGLP7GYxP" resolve="Var" />
+                          <node concept="nsMwS" id="RcyXiSW3SY" role="ns1xD">
+                            <ref role="nsMwP" node="48ZGLP7GYyd" resolve="name" />
+                            <node concept="1nq8_$" id="RcyXiSW3T4" role="nsMwV">
+                              <node concept="a7P8L" id="RcyXiSZstY" role="1nq8_t">
+                                <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1X3_iC" id="RcyXiSZsaN" role="lGtFl">
+                      <property role="3V$3am" value="statement" />
+                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                      <node concept="3Aqczg" id="RcyXiSZrXf" role="8Wnug">
+                        <node concept="3A8Hvi" id="RcyXiSZrXg" role="3Aqpz8">
+                          <node concept="a7P8L" id="RcyXiSZrXh" role="3A8wtg">
+                            <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
+                          </node>
+                          <node concept="ns1u0" id="RcyXiSZrXi" role="3A8w4Q">
+                            <ref role="ns1xF" node="48ZGLP7GYxP" resolve="Var" />
+                            <node concept="nsMwS" id="RcyXiSZrXj" role="ns1xD">
+                              <ref role="nsMwP" node="48ZGLP7GYyd" resolve="name" />
+                              <node concept="1nq8_$" id="RcyXiSZrXk" role="nsMwV">
+                                <node concept="HKQnh" id="RcyXiSZrXl" role="1nq8_t">
+                                  <node concept="1nq8_$" id="RcyXiSZrXm" role="HKQng">
+                                    <node concept="a7P8L" id="RcyXiSZrXn" role="1nq8_t">
+                                      <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
                                     </node>
                                   </node>
                                 </node>
@@ -6074,34 +6092,26 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1X3_iC" id="48ZGLP8t7aB" role="lGtFl">
+                    <node concept="1X3_iC" id="RcyXiSYDgg" role="lGtFl">
                       <property role="3V$3am" value="statement" />
                       <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3Aqczg" id="48ZGLP8spKC" role="8Wnug">
-                        <node concept="3A8Hvi" id="48ZGLP8spKD" role="3Aqpz8">
-                          <node concept="a7P8L" id="48ZGLP8y8ZP" role="3A8wtg">
+                      <node concept="3Aqczg" id="48ZGLP8rJPo" role="8Wnug">
+                        <node concept="3A8Hvi" id="48ZGLP8rJS9" role="3Aqpz8">
+                          <node concept="a7P8L" id="48ZGLP8weC3" role="3A8wtg">
                             <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
                           </node>
-                          <node concept="ns1u0" id="48ZGLP8spKF" role="3A8w4Q">
+                          <node concept="ns1u0" id="48ZGLP8rJSn" role="3A8w4Q">
                             <ref role="ns1xF" node="48ZGLP7GYxP" resolve="Var" />
-                            <node concept="nsMwS" id="48ZGLP8spKG" role="ns1xD">
+                            <node concept="nsMwS" id="48ZGLP8rJSp" role="ns1xD">
                               <ref role="nsMwP" node="48ZGLP7GYyd" resolve="name" />
-                              <node concept="2YIFZM" id="48ZGLP8spKH" role="nsMwV">
+                              <node concept="2YIFZM" id="48ZGLP8rJUo" role="nsMwV">
                                 <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
                                 <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
-                                <node concept="1nq8_$" id="48ZGLP8spKI" role="37wK5m">
-                                  <node concept="HKQnh" id="48ZGLP8spKJ" role="1nq8_t">
-                                    <node concept="2OqwBi" id="48ZGLP8sqgX" role="HKQng">
-                                      <node concept="37vLTw" id="48ZGLP8sq9s" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="48ZGLP7Ssij" resolve="varNames" />
-                                      </node>
-                                      <node concept="liA8E" id="48ZGLP8stJI" role="2OqNvi">
-                                        <ref role="37wK5l" node="48ZGLP8jcvb" resolve="getNameOf" />
-                                        <node concept="1nq8_$" id="48ZGLP8stKZ" role="37wK5m">
-                                          <node concept="a7P8L" id="48ZGLP8stKY" role="1nq8_t">
-                                            <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
-                                          </node>
-                                        </node>
+                                <node concept="1nq8_$" id="48ZGLP8rJV_" role="37wK5m">
+                                  <node concept="HKQnh" id="48ZGLP8rJV$" role="1nq8_t">
+                                    <node concept="1nq8_$" id="48ZGLP8rJXe" role="HKQng">
+                                      <node concept="a7P8L" id="48ZGLP8rJXd" role="1nq8_t">
+                                        <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
                                       </node>
                                     </node>
                                   </node>
@@ -6176,84 +6186,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1X3_iC" id="48ZGLP8rJJB" role="lGtFl">
-                      <property role="3V$3am" value="statement" />
-                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3Aqczg" id="48ZGLP8bgoM" role="8Wnug">
-                        <node concept="3GeI9q" id="48ZGLP8bgqU" role="3Aqpz8">
-                          <node concept="a7P8L" id="48ZGLP8y9ai" role="3GeI8F">
-                            <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
-                          </node>
-                          <node concept="ns1u0" id="48ZGLP8bgr8" role="3GeI8D">
-                            <ref role="ns1xF" node="48ZGLP7GYxP" resolve="Var" />
-                            <node concept="nsMwS" id="48ZGLP8bgtW" role="ns1xD">
-                              <ref role="nsMwP" node="48ZGLP7GYyd" resolve="name" />
-                              <node concept="2YIFZM" id="48ZGLP8cF4J" role="nsMwV">
-                                <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-                                <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
-                                <node concept="2YIFZM" id="48ZGLP8haJ3" role="37wK5m">
-                                  <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
-                                  <ref role="37wK5l" to="7n8k:7HUwyZb7chj" resolve="asVariable" />
-                                  <node concept="1nq8_$" id="48ZGLP8haKU" role="37wK5m">
-                                    <node concept="a7P8L" id="48ZGLP8lYRr" role="1nq8_t">
-                                      <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="1X3_iC" id="48ZGLP8p69H" role="lGtFl">
-                      <property role="3V$3am" value="statement" />
-                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3Aqczg" id="48ZGLP8lYZW" role="8Wnug">
-                        <node concept="3A8Hvi" id="48ZGLP8lZ5m" role="3Aqpz8">
-                          <node concept="a7P8L" id="48ZGLP8y8Ww" role="3A8wtg">
-                            <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
-                          </node>
-                          <node concept="HKQnh" id="48ZGLP8lZ5$" role="3A8w4Q">
-                            <node concept="1nq8_$" id="48ZGLP8lZ5E" role="HKQng">
-                              <node concept="ns1u0" id="48ZGLP8lZ5D" role="1nq8_t">
-                                <ref role="ns1xF" node="48ZGLP7GYxP" resolve="Var" />
-                                <node concept="nsMwS" id="48ZGLP8lZ5L" role="ns1xD">
-                                  <ref role="nsMwP" node="48ZGLP7GYyd" resolve="name" />
-                                  <node concept="2OqwBi" id="48ZGLP8lZcy" role="nsMwV">
-                                    <node concept="37vLTw" id="48ZGLP8lZ6H" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="48ZGLP7Ssij" resolve="varNames" />
-                                    </node>
-                                    <node concept="liA8E" id="48ZGLP8m2Ei" role="2OqNvi">
-                                      <ref role="37wK5l" node="48ZGLP8jcvb" resolve="getNameOf" />
-                                      <node concept="1nq8_$" id="48ZGLP8m2Fe" role="37wK5m">
-                                        <node concept="a7P8L" id="48ZGLP8m2Fd" role="1nq8_t">
-                                          <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="1X3_iC" id="48ZGLP8otsg" role="lGtFl">
-                      <property role="3V$3am" value="statement" />
-                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3Aqczg" id="48ZGLP8nO91" role="8Wnug">
-                        <node concept="3A8Hvi" id="48ZGLP8nOe6" role="3Aqpz8">
-                          <node concept="a7P8L" id="48ZGLP8y8W3" role="3A8wtg">
-                            <ref role="a7OzE" node="48ZGLP8weBp" resolve="TV" />
-                          </node>
-                          <node concept="a7P8L" id="48ZGLP8nOek" role="3A8w4Q">
-                            <ref role="a7OzE" node="48ZGLP8beNw" resolve="Name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
                     <node concept="3Aqczg" id="48ZGLP8weLk" role="3cqZAp">
                       <node concept="3A8Hvi" id="48ZGLP8weRt" role="3Aqpz8">
                         <node concept="a7P8L" id="48ZGLP8weRA" role="3A8wtg">
@@ -7926,33 +7858,33 @@
               <node concept="3I6sU6" id="48ZGLP8pG8G" role="3Ip0Jz">
                 <node concept="3I6s7M" id="48ZGLP8pG8H" role="3I6sU7">
                   <node concept="3Aqt3T" id="48ZGLP8pG8I" role="3I6s78">
-                    <ref role="3AqCNq" node="48ZGLP8pG4u" />
+                    <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
                     <node concept="1HFMs5" id="48ZGLP8pG8J" role="3AunhB">
                       <node concept="a7P8L" id="48ZGLP8pG8K" role="1uarlU">
-                        <ref role="a7OzE" node="48ZGLP8pG8C" />
+                        <ref role="a7OzE" node="48ZGLP8pG8C" resolve="F" />
                       </node>
                       <node concept="ns1u0" id="48ZGLP8pG8L" role="1uarlW">
-                        <ref role="ns1xF" node="7VBaGntJSG6" />
+                        <ref role="ns1xF" node="7VBaGntJSG6" resolve="Forall" />
                         <node concept="nsMwS" id="48ZGLP8pG8M" role="ns1xD">
-                          <ref role="nsMwP" node="7VBaGntJSG8" />
+                          <ref role="nsMwP" node="7VBaGntJSG8" resolve="type" />
                           <node concept="1nq8_$" id="48ZGLP8pG8N" role="nsMwV">
                             <node concept="a7P8L" id="48ZGLP8pG8O" role="1nq8_t">
-                              <ref role="a7OzE" node="48ZGLP8pG8D" />
+                              <ref role="a7OzE" node="48ZGLP8pG8D" resolve="T" />
                             </node>
                           </node>
                         </node>
                         <node concept="nsMwS" id="48ZGLP8pG8P" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pnre" />
+                          <ref role="nsMwP" node="48ZGLP7pnre" resolve="typeVars" />
                           <node concept="1nq8_$" id="48ZGLP8pG8Q" role="nsMwV">
                             <node concept="a7P8L" id="48ZGLP8pG8R" role="1nq8_t">
-                              <ref role="a7OzE" node="48ZGLP8pG8E" />
+                              <ref role="a7OzE" node="48ZGLP8pG8E" resolve="TVs" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                     <node concept="a7P8L" id="48ZGLP8pGkl" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pGjw" />
+                      <ref role="a7OzE" node="48ZGLP8pGjw" resolve="R" />
                     </node>
                   </node>
                 </node>
@@ -7962,26 +7894,26 @@
               <node concept="3I6sU6" id="48ZGLP8pGk$" role="3Ip0Jz">
                 <node concept="3I6s7M" id="1IKbs5XviIb" role="3I6sU7">
                   <node concept="3Aqt3T" id="48ZGLP8pH71" role="3I6s78">
-                    <ref role="3AqCNq" node="12dHl3ZCEx3" />
+                    <ref role="3AqCNq" node="12dHl3ZCEx3" resolve="inst" />
                     <node concept="a7P8L" id="48ZGLP8pH7B" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pH76" />
+                      <ref role="a7OzE" node="48ZGLP8pH76" resolve="I" />
                     </node>
                     <node concept="a7P8L" id="48ZGLP8pH7M" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pG8C" />
+                      <ref role="a7OzE" node="48ZGLP8pG8C" resolve="F" />
                     </node>
                     <node concept="a7P8L" id="48ZGLP8pH7T" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pH7l" />
+                      <ref role="a7OzE" node="48ZGLP8pH7l" resolve="ITVs" />
                     </node>
                   </node>
                 </node>
                 <node concept="3I6s7M" id="1IKbs5XviIc" role="3I6sU7">
                   <node concept="3Aqt3T" id="48ZGLP8pH87" role="3I6s78">
-                    <ref role="3AqCNq" node="48ZGLP8pG4u" />
+                    <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
                     <node concept="a7P8L" id="48ZGLP8pH8h" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pH76" />
+                      <ref role="a7OzE" node="48ZGLP8pH76" resolve="I" />
                     </node>
                     <node concept="a7P8L" id="48ZGLP8pH8o" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pGjw" />
+                      <ref role="a7OzE" node="48ZGLP8pGjw" resolve="R" />
                     </node>
                   </node>
                 </node>
@@ -7989,10 +7921,10 @@
                   <node concept="3Aqt3T" id="PORTCHCQNV" role="3I6s78">
                     <ref role="3AqCNq" node="48ZGLP92BQW" resolve="renameTypeVars" />
                     <node concept="a7P8L" id="PORTCHCQO9" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pH7l" />
+                      <ref role="a7OzE" node="48ZGLP8pH7l" resolve="ITVs" />
                     </node>
                     <node concept="a7P8L" id="PORTCHCQOg" role="3AunhB">
-                      <ref role="a7OzE" node="48ZGLP8pG8E" />
+                      <ref role="a7OzE" node="48ZGLP8pG8E" resolve="TVs" />
                     </node>
                   </node>
                 </node>
@@ -8460,34 +8392,34 @@
                   <node concept="3I6s7M" id="1IKbs5Xwa43" role="3I6sU7">
                     <node concept="3A8Hvi" id="1IKbs5Xwa3X" role="3I6s78">
                       <node concept="a7P8L" id="1IKbs5Xwa4c" role="3A8wtg">
-                        <ref role="a7OzE" node="1IKbs5Xwa0k" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0k" resolve="TestITVs" />
                       </node>
                       <node concept="9KH4l" id="1IKbs5Xwa4h" role="3A8w4Q">
                         <node concept="a7P8L" id="1IKbs5Xwa4n" role="9KHbC">
-                          <ref role="a7OzE" node="1IKbs5Xwa0h" />
+                          <ref role="a7OzE" node="1IKbs5Xwa0h" resolve="ITVs" />
                         </node>
                       </node>
                     </node>
                   </node>
                   <node concept="3I6s7M" id="1IKbs5Xwa4H" role="3I6sU7">
                     <node concept="3Aqt3T" id="1IKbs5XwTNi" role="3I6s78">
-                      <ref role="3AqCNq" node="48ZGLP92BQW" />
+                      <ref role="3AqCNq" node="48ZGLP92BQW" resolve="renameTypeVars" />
                       <node concept="a7P8L" id="1IKbs5XwTNr" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0k" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0k" resolve="TestITVs" />
                       </node>
                       <node concept="a7P8L" id="1IKbs5XwTNz" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0i" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0i" resolve="TVs" />
                       </node>
                     </node>
                   </node>
                   <node concept="3I6s7M" id="1IKbs5Xwa0b" role="3I6sU7">
                     <node concept="3Aqt3T" id="1IKbs5Xwa0c" role="3I6s78">
-                      <ref role="3AqCNq" node="1IKbs5XihHK" />
+                      <ref role="3AqCNq" node="1IKbs5XihHK" resolve="checkTypeVars" />
                       <node concept="a7P8L" id="1IKbs5Xwa5Y" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0h" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0h" resolve="ITVs" />
                       </node>
                       <node concept="a7P8L" id="1IKbs5Xwa66" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0i" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0i" resolve="TVs" />
                       </node>
                     </node>
                   </node>
@@ -8512,12 +8444,12 @@
                 <node concept="3I6sU6" id="1IKbs5Xwa0p" role="3Ip0Jz">
                   <node concept="3I6s7M" id="1IKbs5Xwa0q" role="3I6sU7">
                     <node concept="3Aqt3T" id="1IKbs5Xwa0r" role="3I6s78">
-                      <ref role="3AqCNq" node="1IKbs5Xw9SC" />
+                      <ref role="3AqCNq" node="1IKbs5Xw9SC" resolve="tryRenameTypeVars" />
                       <node concept="a7P8L" id="1IKbs5Xwa3m" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0h" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0h" resolve="ITVs" />
                       </node>
                       <node concept="a7P8L" id="1IKbs5Xwa3s" role="3AunhB">
-                        <ref role="a7OzE" node="1IKbs5Xwa0i" />
+                        <ref role="a7OzE" node="1IKbs5Xwa0i" resolve="TVs" />
                       </node>
                     </node>
                   </node>
@@ -8576,23 +8508,23 @@
                 <node concept="3I6s7M" id="JqEP$8hXJW" role="3I6sU7">
                   <node concept="3A8Hvi" id="JqEP$8hXJT" role="3I6s78">
                     <node concept="a7P8L" id="JqEP$8hXK1" role="3A8wtg">
-                      <ref role="a7OzE" node="JqEP$8hXJs" />
+                      <ref role="a7OzE" node="JqEP$8hXJs" resolve="T" />
                     </node>
                     <node concept="ns1u0" id="JqEP$8hXK6" role="3A8w4Q">
-                      <ref role="ns1xF" node="7VBaGntJSG0" />
+                      <ref role="ns1xF" node="7VBaGntJSG0" resolve="Bool" />
                     </node>
                   </node>
                 </node>
                 <node concept="3I6s7M" id="JqEP$8hXKg" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8hXKe" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8hXKn" role="3AunhB">
                       <node concept="3A2sRY" id="JqEP$8hXKF" role="3BlFb_">
-                        <ref role="3A2yKK" node="JqEP$8hXob" />
+                        <ref role="3A2yKK" node="JqEP$8hXob" resolve="boolType" />
                       </node>
                     </node>
                     <node concept="a7P8L" id="JqEP$8hXKT" role="3AunhB">
-                      <ref role="a7OzE" node="JqEP$8hXJs" />
+                      <ref role="a7OzE" node="JqEP$8hXJs" resolve="T" />
                     </node>
                   </node>
                 </node>
@@ -8618,7 +8550,7 @@
               <node concept="3I6sU6" id="JqEP$8hYNb" role="3Ip0Jz">
                 <node concept="3I6s7M" id="JqEP$8hYNf" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8hYNe" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8hYNm" role="3AunhB">
                       <node concept="2OqwBi" id="JqEP$8hYVn" role="3BlFb_">
                         <node concept="3A2sRY" id="JqEP$8hYNA" role="2Oq$k0">
@@ -8641,7 +8573,7 @@
               <node concept="3I6sU6" id="JqEP$8hZyv" role="3Ip0Jz">
                 <node concept="3I6s7M" id="JqEP$8hZyG" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8hZyF" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8hZyW" role="3AunhB">
                       <node concept="2OqwBi" id="JqEP$8hZEO" role="3BlFb_">
                         <node concept="3A2sRY" id="JqEP$8hZz3" role="2Oq$k0">
@@ -8677,20 +8609,20 @@
                 <node concept="3I6s7M" id="JqEP$8hXZu" role="3I6sU7">
                   <node concept="3A8Hvi" id="JqEP$8hXZv" role="3I6s78">
                     <node concept="a7P8L" id="JqEP$8hXZw" role="3A8wtg">
-                      <ref role="a7OzE" node="JqEP$8hXZq" />
+                      <ref role="a7OzE" node="JqEP$8hXZq" resolve="T" />
                     </node>
                     <node concept="ns1u0" id="JqEP$8hXZx" role="3A8w4Q">
-                      <ref role="ns1xF" node="7VBaGntJSG2" />
+                      <ref role="ns1xF" node="7VBaGntJSG2" resolve="Fun" />
                       <node concept="nsMwS" id="JqEP$8hXZy" role="ns1xD">
-                        <ref role="nsMwP" node="7VBaGntJSG4" />
+                        <ref role="nsMwP" node="7VBaGntJSG4" resolve="arg" />
                         <node concept="1nq8_$" id="JqEP$8hXZz" role="nsMwV">
                           <node concept="a7P8L" id="JqEP$8hXZ$" role="1nq8_t">
-                            <ref role="a7OzE" node="JqEP$8hXZr" />
+                            <ref role="a7OzE" node="JqEP$8hXZr" resolve="A" />
                           </node>
                         </node>
                       </node>
                       <node concept="nsMwS" id="JqEP$8i0jS" role="ns1xD">
-                        <ref role="nsMwP" node="7VBaGntJSG5" />
+                        <ref role="nsMwP" node="7VBaGntJSG5" resolve="res" />
                         <node concept="1nq8_$" id="JqEP$8i0k1" role="nsMwV">
                           <node concept="a7P8L" id="JqEP$8i0jZ" role="1nq8_t">
                             <ref role="a7OzE" node="JqEP$8hYdR" resolve="R" />
@@ -8702,14 +8634,14 @@
                 </node>
                 <node concept="3I6s7M" id="JqEP$8hXZ_" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8hXZA" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8hXZB" role="3AunhB">
                       <node concept="3A2sRY" id="JqEP$8hXZC" role="3BlFb_">
                         <ref role="3A2yKK" node="JqEP$8hXZF" resolve="funType" />
                       </node>
                     </node>
                     <node concept="a7P8L" id="JqEP$8hXZD" role="3AunhB">
-                      <ref role="a7OzE" node="JqEP$8hXZq" />
+                      <ref role="a7OzE" node="JqEP$8hXZq" resolve="T" />
                     </node>
                   </node>
                 </node>
@@ -8735,11 +8667,11 @@
               <node concept="3I6sU6" id="JqEP$8snf1" role="3Ip0Jz">
                 <node concept="3I6s7M" id="JqEP$8snf2" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8snf3" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8snf4" role="3AunhB">
                       <node concept="2OqwBi" id="JqEP$8snf5" role="3BlFb_">
                         <node concept="3A2sRY" id="JqEP$8snf6" role="2Oq$k0">
-                          <ref role="3A2yKK" node="JqEP$8snfD" />
+                          <ref role="3A2yKK" node="JqEP$8snfD" resolve="pairType" />
                         </node>
                         <node concept="3TrEf2" id="JqEP$8somY" role="2OqNvi">
                           <ref role="3Tt5mk" to="8tt8:JqEP$8shbd" resolve="fstType" />
@@ -8747,7 +8679,7 @@
                       </node>
                     </node>
                     <node concept="a7P8L" id="JqEP$8snf8" role="3AunhB">
-                      <ref role="a7OzE" node="JqEP$8snfl" />
+                      <ref role="a7OzE" node="JqEP$8snfl" resolve="L" />
                     </node>
                   </node>
                 </node>
@@ -8758,11 +8690,11 @@
               <node concept="3I6sU6" id="JqEP$8snfa" role="3Ip0Jz">
                 <node concept="3I6s7M" id="JqEP$8snfb" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8snfc" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8snfd" role="3AunhB">
                       <node concept="2OqwBi" id="JqEP$8snfe" role="3BlFb_">
                         <node concept="3A2sRY" id="JqEP$8snff" role="2Oq$k0">
-                          <ref role="3A2yKK" node="JqEP$8snfD" />
+                          <ref role="3A2yKK" node="JqEP$8snfD" resolve="pairType" />
                         </node>
                         <node concept="3TrEf2" id="JqEP$8so_z" role="2OqNvi">
                           <ref role="3Tt5mk" to="8tt8:JqEP$8shbb" resolve="sndType" />
@@ -8770,7 +8702,7 @@
                       </node>
                     </node>
                     <node concept="a7P8L" id="JqEP$8snfh" role="3AunhB">
-                      <ref role="a7OzE" node="JqEP$8snfm" />
+                      <ref role="a7OzE" node="JqEP$8snfm" resolve="R" />
                     </node>
                   </node>
                 </node>
@@ -8794,23 +8726,23 @@
                 <node concept="3I6s7M" id="JqEP$8snfp" role="3I6sU7">
                   <node concept="3A8Hvi" id="JqEP$8snfq" role="3I6s78">
                     <node concept="a7P8L" id="JqEP$8snfr" role="3A8wtg">
-                      <ref role="a7OzE" node="JqEP$8snfk" />
+                      <ref role="a7OzE" node="JqEP$8snfk" resolve="T" />
                     </node>
                     <node concept="ns1u0" id="JqEP$8snfs" role="3A8w4Q">
-                      <ref role="ns1xF" node="JqEP$8smGC" />
+                      <ref role="ns1xF" node="JqEP$8smGC" resolve="Pair" />
                       <node concept="nsMwS" id="JqEP$8snft" role="ns1xD">
-                        <ref role="nsMwP" node="JqEP$8smGP" />
+                        <ref role="nsMwP" node="JqEP$8smGP" resolve="fst" />
                         <node concept="1nq8_$" id="JqEP$8snfu" role="nsMwV">
                           <node concept="a7P8L" id="JqEP$8snfv" role="1nq8_t">
-                            <ref role="a7OzE" node="JqEP$8snfl" />
+                            <ref role="a7OzE" node="JqEP$8snfl" resolve="L" />
                           </node>
                         </node>
                       </node>
                       <node concept="nsMwS" id="JqEP$8snfw" role="ns1xD">
-                        <ref role="nsMwP" node="JqEP$8smGY" />
+                        <ref role="nsMwP" node="JqEP$8smGY" resolve="snd" />
                         <node concept="1nq8_$" id="JqEP$8snfx" role="nsMwV">
                           <node concept="a7P8L" id="JqEP$8snfy" role="1nq8_t">
-                            <ref role="a7OzE" node="JqEP$8snfm" />
+                            <ref role="a7OzE" node="JqEP$8snfm" resolve="R" />
                           </node>
                         </node>
                       </node>
@@ -8819,14 +8751,14 @@
                 </node>
                 <node concept="3I6s7M" id="JqEP$8snfz" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8snf$" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8snf_" role="3AunhB">
                       <node concept="3A2sRY" id="JqEP$8snfA" role="3BlFb_">
-                        <ref role="3A2yKK" node="JqEP$8snfD" />
+                        <ref role="3A2yKK" node="JqEP$8snfD" resolve="pairType" />
                       </node>
                     </node>
                     <node concept="a7P8L" id="JqEP$8snfB" role="3AunhB">
-                      <ref role="a7OzE" node="JqEP$8snfk" />
+                      <ref role="a7OzE" node="JqEP$8snfk" resolve="T" />
                     </node>
                   </node>
                 </node>
@@ -9214,10 +9146,10 @@
               <node concept="3I6sU6" id="JqEP$8ppYm" role="3Ip0Jz">
                 <node concept="3I6s7M" id="JqEP$8ppYs" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8ppYt" role="3I6s78">
-                    <ref role="3AqCNq" node="JqEP$8fyVv" />
+                    <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                     <node concept="3BlFb$" id="JqEP$8ppYu" role="3AunhB">
                       <node concept="3A2sRY" id="JqEP$8ppYv" role="3BlFb_">
-                        <ref role="3A2yKK" node="JqEP$8ppYy" />
+                        <ref role="3A2yKK" node="JqEP$8ppYy" resolve="varTypeRef" />
                       </node>
                     </node>
                     <node concept="ns1u0" id="48ZGLP8OiU_" role="3AunhB">
@@ -9261,14 +9193,14 @@
                         <node concept="1TmgYN" id="JqEP$8pULN" role="3uHU7B">
                           <node concept="1nq8_$" id="JqEP$8pULO" role="1Tms7$">
                             <node concept="a7P8L" id="JqEP$8pULP" role="1nq8_t">
-                              <ref role="a7OzE" node="JqEP$8pUMf" />
+                              <ref role="a7OzE" node="JqEP$8pUMf" resolve="N1" />
                             </node>
                           </node>
                         </node>
                         <node concept="1TmgYN" id="JqEP$8pULQ" role="3uHU7w">
                           <node concept="1nq8_$" id="JqEP$8pULR" role="1Tms7$">
                             <node concept="a7P8L" id="JqEP$8pULS" role="1nq8_t">
-                              <ref role="a7OzE" node="JqEP$8pUMg" />
+                              <ref role="a7OzE" node="JqEP$8pUMg" resolve="N2" />
                             </node>
                           </node>
                         </node>
@@ -9283,7 +9215,7 @@
                     <node concept="3wWvb2" id="JqEP$8pVu$" role="3I6s78">
                       <node concept="2OqwBi" id="JqEP$8pVu_" role="3wWo3s">
                         <node concept="3A2sRY" id="JqEP$8pVuA" role="2Oq$k0">
-                          <ref role="3A2yKK" node="JqEP$8pVhW" />
+                          <ref role="3A2yKK" node="JqEP$8pVhW" resolve="varType" />
                         </node>
                         <node concept="2s7oft" id="JqEP$8pVuB" role="2OqNvi">
                           <property role="2s7ueQ" value="error" />
@@ -9296,14 +9228,14 @@
                             <node concept="1TmgYN" id="JqEP$8pVuF" role="37wK5m">
                               <node concept="1nq8_$" id="JqEP$8pVuG" role="1Tms7$">
                                 <node concept="a7P8L" id="JqEP$8pWrh" role="1nq8_t">
-                                  <ref role="a7OzE" node="JqEP$8pUMf" />
+                                  <ref role="a7OzE" node="JqEP$8pUMf" resolve="N1" />
                                 </node>
                               </node>
                             </node>
                             <node concept="1TmgYN" id="JqEP$8pWHh" role="37wK5m">
                               <node concept="1nq8_$" id="JqEP$8pYrv" role="1Tms7$">
                                 <node concept="a7P8L" id="JqEP$8pYru" role="1nq8_t">
-                                  <ref role="a7OzE" node="JqEP$8pUMg" />
+                                  <ref role="a7OzE" node="JqEP$8pUMg" resolve="N2" />
                                 </node>
                               </node>
                             </node>
@@ -9314,12 +9246,12 @@
                   </node>
                   <node concept="3I6s7M" id="JqEP$8pULV" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8pULW" role="3I6s78">
-                      <ref role="3AqCNq" node="JqEP$8pb_j" />
+                      <ref role="3AqCNq" node="JqEP$8pb_j" resolve="varTypeNameConflict" />
                       <node concept="a7P8L" id="JqEP$8pULX" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMd" />
+                        <ref role="a7OzE" node="JqEP$8pUMd" resolve="T" />
                       </node>
                       <node concept="a7P8L" id="JqEP$8pULY" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMf" />
+                        <ref role="a7OzE" node="JqEP$8pUMf" resolve="N1" />
                       </node>
                     </node>
                   </node>
@@ -9329,12 +9261,12 @@
                 <node concept="3I6sU6" id="JqEP$8pUM0" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8pUM1" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8pUM2" role="3I6s78">
-                      <ref role="3AqCNq" node="JqEP$8kz$w" />
+                      <ref role="3AqCNq" node="JqEP$8kz$w" resolve="varTypeName" />
                       <node concept="a7P8L" id="JqEP$8pUM3" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMd" />
+                        <ref role="a7OzE" node="JqEP$8pUMd" resolve="T" />
                       </node>
                       <node concept="a7P8L" id="JqEP$8pUM4" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMf" />
+                        <ref role="a7OzE" node="JqEP$8pUMf" resolve="N1" />
                       </node>
                     </node>
                   </node>
@@ -9345,12 +9277,12 @@
                 <node concept="3I6sU6" id="JqEP$8pUM6" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8pUM7" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8pUM8" role="3I6s78">
-                      <ref role="3AqCNq" node="JqEP$8kz$w" />
+                      <ref role="3AqCNq" node="JqEP$8kz$w" resolve="varTypeName" />
                       <node concept="a7P8L" id="JqEP$8pUM9" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMd" />
+                        <ref role="a7OzE" node="JqEP$8pUMd" resolve="T" />
                       </node>
                       <node concept="a7P8L" id="JqEP$8pUMa" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMg" />
+                        <ref role="a7OzE" node="JqEP$8pUMg" resolve="N2" />
                       </node>
                     </node>
                   </node>
@@ -9361,14 +9293,14 @@
                 <node concept="3I6sU6" id="JqEP$8pVi9" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8pVip" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8pVio" role="3I6s78">
-                      <ref role="3AqCNq" node="JqEP$8fyVv" />
+                      <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                       <node concept="3BlFb$" id="JqEP$8pVis" role="3AunhB">
                         <node concept="3A2sRY" id="JqEP$8pViz" role="3BlFb_">
                           <ref role="3A2yKK" node="JqEP$8pVhW" resolve="varType" />
                         </node>
                       </node>
                       <node concept="a7P8L" id="JqEP$8pViJ" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8pUMd" />
+                        <ref role="a7OzE" node="JqEP$8pUMd" resolve="T" />
                       </node>
                     </node>
                   </node>
@@ -9417,7 +9349,7 @@
                 </node>
                 <node concept="2OqwBi" id="PORTCHCZPZ" role="1m5AlR">
                   <node concept="3A2sRY" id="PORTCHCZHc" role="2Oq$k0">
-                    <ref role="3A2yKK" node="PORTCHCVzb" />
+                    <ref role="3A2yKK" node="PORTCHCVzb" resolve="lvb" />
                   </node>
                   <node concept="3TrEf2" id="PORTCHD0i7" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQj" resolve="var" />
@@ -9550,7 +9482,7 @@
                 </node>
                 <node concept="2OqwBi" id="PORTCHD3Uj" role="1m5AlR">
                   <node concept="3A2sRY" id="PORTCHD41J" role="2Oq$k0">
-                    <ref role="3A2yKK" node="48ZGLP8XXDA" />
+                    <ref role="3A2yKK" node="48ZGLP8XXDA" resolve="lvb" />
                   </node>
                   <node concept="3TrEf2" id="PORTCHD4hE" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQq" resolve="var" />
@@ -9906,10 +9838,10 @@
                 </node>
                 <node concept="3I6s7M" id="JqEP$8fxKo" role="3I6sU7">
                   <node concept="3Aqt3T" id="JqEP$8fzcc" role="3I6s78">
-                    <ref role="3AqCNq" node="4KALGUEgLbG" />
+                    <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
                     <node concept="3BlFb$" id="JqEP$8fzo$" role="3AunhB">
                       <node concept="3A2sRY" id="JqEP$8fzoF" role="3BlFb_">
-                        <ref role="3A2yKK" node="JqEP$8fvDt" />
+                        <ref role="3A2yKK" node="JqEP$8fvDt" resolve="anno" />
                       </node>
                     </node>
                     <node concept="a7P8L" id="PORTCHPpmP" role="3AunhB">
@@ -10090,11 +10022,11 @@
                 <node concept="3I6sU6" id="JqEP$8f_qG" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8f_qH" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8f_qI" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" />
+                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
                       <node concept="3BlFb$" id="JqEP$8f_qJ" role="3AunhB">
                         <node concept="2OqwBi" id="JqEP$8fAJq" role="3BlFb_">
                           <node concept="3A2sRY" id="JqEP$8f_qL" role="2Oq$k0">
-                            <ref role="3A2yKK" node="JqEP$8f_qZ" />
+                            <ref role="3A2yKK" node="JqEP$8f_qZ" resolve="anno" />
                           </node>
                           <node concept="3TrEf2" id="JqEP$8fB4x" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:JqEP$8fvrp" resolve="var" />
@@ -10102,7 +10034,7 @@
                         </node>
                       </node>
                       <node concept="a7P8L" id="JqEP$8f_qN" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8f_qQ" />
+                        <ref role="a7OzE" node="JqEP$8f_qQ" resolve="T" />
                       </node>
                     </node>
                   </node>
@@ -10119,10 +10051,10 @@
                 <node concept="3I6sU6" id="JqEP$8f_qS" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8f_qT" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8f_qU" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" />
+                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
                       <node concept="3BlFb$" id="JqEP$8f_qV" role="3AunhB">
                         <node concept="3A2sRY" id="JqEP$8f_qW" role="3BlFb_">
-                          <ref role="3A2yKK" node="JqEP$8f_qZ" />
+                          <ref role="3A2yKK" node="JqEP$8f_qZ" resolve="anno" />
                         </node>
                       </node>
                       <node concept="a7P8L" id="JqEP$8f_qX" role="3AunhB">
@@ -10160,20 +10092,20 @@
                         <ref role="a7OzE" node="JqEP$8i1_A" resolve="T" />
                       </node>
                       <node concept="a7P8L" id="48ZGLP8SeYj" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8fxWF" />
+                        <ref role="a7OzE" node="JqEP$8fxWF" resolve="Ann" />
                       </node>
                     </node>
                   </node>
                   <node concept="3I6s7M" id="48ZGLP8TCWJ" role="3I6sU7">
                     <node concept="3Aqt3T" id="48ZGLP8TCWH" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" />
+                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
                       <node concept="3BlFb$" id="48ZGLP8TCWQ" role="3AunhB">
                         <node concept="3A2sRY" id="48ZGLP8TCWX" role="3BlFb_">
                           <ref role="3A2yKK" node="JqEP$8fxWi" resolve="anno" />
                         </node>
                       </node>
                       <node concept="a7P8L" id="48ZGLP8TCX9" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8fxWF" />
+                        <ref role="a7OzE" node="JqEP$8fxWF" resolve="Ann" />
                       </node>
                     </node>
                   </node>
@@ -10195,7 +10127,7 @@
                     <node concept="3wWvb2" id="JqEP$8ox9c" role="3I6s78">
                       <node concept="2OqwBi" id="JqEP$8ox9d" role="3wWo3s">
                         <node concept="3A2sRY" id="JqEP$8oxe0" role="2Oq$k0">
-                          <ref role="3A2yKK" node="JqEP$8fxWi" />
+                          <ref role="3A2yKK" node="JqEP$8fxWi" resolve="anno" />
                         </node>
                         <node concept="2s7oft" id="JqEP$8ox9f" role="2OqNvi">
                           <property role="2s7ueQ" value="error" />
@@ -10208,7 +10140,7 @@
                             <node concept="1TmgYN" id="JqEP$8ox9i" role="37wK5m">
                               <node concept="1nq8_$" id="JqEP$8ox9j" role="1Tms7$">
                                 <node concept="a7P8L" id="JqEP$8oy0F" role="1nq8_t">
-                                  <ref role="a7OzE" node="JqEP$8i1_A" />
+                                  <ref role="a7OzE" node="JqEP$8i1_A" resolve="T" />
                                 </node>
                               </node>
                             </node>
@@ -10223,11 +10155,11 @@
                 <node concept="3I6sU6" id="JqEP$8i1y5" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8fxX5" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8fxX4" role="3I6s78">
-                      <ref role="3AqCNq" node="JqEP$8fyVv" />
+                      <ref role="3AqCNq" node="JqEP$8fyVv" resolve="getType" />
                       <node concept="3BlFb$" id="JqEP$8fxX8" role="3AunhB">
                         <node concept="2OqwBi" id="JqEP$8fy50" role="3BlFb_">
                           <node concept="3A2sRY" id="JqEP$8fxXf" role="2Oq$k0">
-                            <ref role="3A2yKK" node="JqEP$8fxWi" />
+                            <ref role="3A2yKK" node="JqEP$8fxWi" resolve="anno" />
                           </node>
                           <node concept="3TrEf2" id="JqEP$8fyh9" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:JqEP$8fvrd" resolve="ann" />
@@ -10235,7 +10167,7 @@
                         </node>
                       </node>
                       <node concept="a7P8L" id="JqEP$8iuIe" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8fxWF" />
+                        <ref role="a7OzE" node="JqEP$8fxWF" resolve="Ann" />
                       </node>
                     </node>
                   </node>
@@ -10245,14 +10177,14 @@
                 <node concept="3I6sU6" id="JqEP$8i1$H" role="3Ip0Jz">
                   <node concept="3I6s7M" id="JqEP$8i1$U" role="3I6sU7">
                     <node concept="3Aqt3T" id="JqEP$8i1$T" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" />
+                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
                       <node concept="3BlFb$" id="JqEP$8i1$Y" role="3AunhB">
                         <node concept="3A2sRY" id="JqEP$8i1_5" role="3BlFb_">
-                          <ref role="3A2yKK" node="JqEP$8fxWi" />
+                          <ref role="3A2yKK" node="JqEP$8fxWi" resolve="anno" />
                         </node>
                       </node>
                       <node concept="a7P8L" id="JqEP$8i1_Q" role="3AunhB">
-                        <ref role="a7OzE" node="JqEP$8i1_A" />
+                        <ref role="a7OzE" node="JqEP$8i1_A" resolve="T" />
                       </node>
                     </node>
                   </node>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 5d0bb414..decc8688 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -374,6 +374,40 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="1IKbs5XIs8G" role="1SL9yI">
+      <property role="TrG5h" value="DemoScopes" />
+      <node concept="3cqZAl" id="1IKbs5XIs8H" role="3clF45" />
+      <node concept="3clFbS" id="1IKbs5XIs8L" role="3clF47">
+        <node concept="2Hmddi" id="RcyXiSVPlH" role="3cqZAp">
+          <node concept="2OqwBi" id="RcyXiSVPlI" role="2Hmdds">
+            <node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
+              <node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to=":^" resolve="ofNode" />
+                <node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
+                  <node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
+                  <node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
+                      <node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="RcyXiSVPlR" role="2OqNvi">
+                <ref role="37wK5l" to=":^" resolve="skipLocal" />
+              </node>
+            </node>
+            <node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
+              <ref role="37wK5l" to=":^" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2XrIbr" id="35YJGAJTxCf" role="1qtyYc">
       <property role="TrG5h" value="resolve" />
       <node concept="37vLTG" id="35YJGAJTxCF" role="3clF46">