From 08743b444c7a305a3cf5a88d7c819bdbcd357580 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Thu, 14 May 2020 20:07:51 +0300
Subject: [PATCH] Avoid producing typeOf in checkVariableDecl for unknown types
 (types without macros)

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 333 ++++++++++++------
 1 file changed, 220 insertions(+), 113 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 eb69af9a..888026fb 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
@@ -3055,27 +3055,6 @@
     <property role="TrG5h" value="MethodCall" />
     <property role="3GE5qa" value="rule.expression" />
     <ref role="2YbDB9" node="34$A1Mf51rY" resolve="TypeOf" />
-    <node concept="3AqmO8" id="1yt2T3T19j2" role="8PkJo">
-      <property role="TrG5h" value="checkArgs" />
-      <node concept="1zAUYm" id="1yt2T3T19O3" role="1zAUyy">
-        <property role="TrG5h" value="ParamTypes" />
-      </node>
-      <node concept="1zAUYm" id="1yt2T3T19RS" role="1zAUyy">
-        <property role="TrG5h" value="ArgTypes" />
-      </node>
-      <node concept="1zAUYm" id="1yt2T3TeNc_" role="1zAUyy">
-        <property role="TrG5h" value="ReportNodes" />
-      </node>
-    </node>
-    <node concept="3AqmO8" id="1yt2T3T1bZ_" role="8PkJo">
-      <property role="TrG5h" value="checkVarargs" />
-      <node concept="1zAUYm" id="1yt2T3T1cp6" role="1zAUyy">
-        <property role="TrG5h" value="ParamType" />
-      </node>
-      <node concept="1zAUYm" id="1yt2T3T1cNH" role="1zAUyy">
-        <property role="TrG5h" value="ArgTypes" />
-      </node>
-    </node>
     <node concept="1nLNMY" id="1yt2T3T1dJ$" role="1nK1Vg">
       <property role="TrG5h" value="checkVarargs" />
       <node concept="3clFbS" id="1yt2T3T1dJ_" role="1nLNMH">
@@ -4010,10 +3989,10 @@
               <node concept="aZer4" id="4xoHD1GsAAl" role="3XD1gS">
                 <property role="TrG5h" value="MethTyScheme" />
               </node>
+              <node concept="32pEOW" id="24ciDNzxNBK" role="3vLBG7" />
               <node concept="aZer4" id="4xoHD1GsAAm" role="3XD1gS">
                 <property role="TrG5h" value="InstTyScheme" />
               </node>
-              <node concept="32pEOW" id="24ciDNzxNBK" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6E2cNicdihT" role="3xSepv">
               <node concept="3Aq9E8" id="4xoHD1GsAwc" role="3xSepj">
@@ -6049,6 +6028,7 @@
               <node concept="aZer4" id="4xoHD1GdINs" role="3XD1gS">
                 <property role="TrG5h" value="TyScheme" />
               </node>
+              <node concept="32pEOW" id="24ciDNzxNBR" role="3vLBG7" />
               <node concept="aZer4" id="4xoHD1GdINt" role="3XD1gS">
                 <property role="TrG5h" value="TVs" />
                 <node concept="2OqwBi" id="4xoHD1GdINu" role="3gj$pD">
@@ -6067,7 +6047,6 @@
                   <node concept="34oBXx" id="4xoHD1GdIN$" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="32pEOW" id="24ciDNzxNBR" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6E2cNicdihV" role="3xSepv">
               <node concept="3Aq9E8" id="4xoHD1G0uJ2" role="3xSepj">
@@ -6086,28 +6065,6 @@
                           </node>
                           <node concept="3clFbH" id="4xoHD1GdBFc" role="3cqZAp" />
                         </node>
-                        <node concept="1Wc70l" id="5o9$c3zZZtq" role="3clFbw">
-                          <node concept="2OqwBi" id="5o9$c3$0249" role="3uHU7B">
-                            <node concept="37vLTw" id="5o9$c3zZZUg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
-                            </node>
-                            <node concept="3GX2aA" id="5o9$c3$0aaE" role="2OqNvi" />
-                          </node>
-                          <node concept="3y3z36" id="4xoHD1GdBFd" role="3uHU7w">
-                            <node concept="2OqwBi" id="4xoHD1GdBFe" role="3uHU7w">
-                              <node concept="37vLTw" id="4xoHD1GdBFf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4xoHD1G0uIE" resolve="ctvds" />
-                              </node>
-                              <node concept="34oBXx" id="4xoHD1GdBFg" role="2OqNvi" />
-                            </node>
-                            <node concept="2OqwBi" id="4xoHD1GdBFh" role="3uHU7B">
-                              <node concept="37vLTw" id="4xoHD1GdBFi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
-                              </node>
-                              <node concept="34oBXx" id="4xoHD1GdBFj" role="2OqNvi" />
-                            </node>
-                          </node>
-                        </node>
                         <node concept="9aQIb" id="4xoHD1GdBFk" role="9aQIa">
                           <node concept="3clFbS" id="4xoHD1GdBFl" role="9aQI4">
                             <node concept="3Aqczg" id="5itBwMaU4dM" role="3cqZAp">
@@ -6346,6 +6303,28 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="1Wc70l" id="5o9$c3zZZtq" role="3clFbw">
+                          <node concept="2OqwBi" id="5o9$c3$0249" role="3uHU7B">
+                            <node concept="37vLTw" id="5o9$c3zZZUg" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
+                            </node>
+                            <node concept="3GX2aA" id="5o9$c3$0aaE" role="2OqNvi" />
+                          </node>
+                          <node concept="3y3z36" id="4xoHD1GdBFd" role="3uHU7w">
+                            <node concept="2OqwBi" id="4xoHD1GdBFe" role="3uHU7w">
+                              <node concept="37vLTw" id="4xoHD1GdBFf" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4xoHD1G0uIE" resolve="ctvds" />
+                              </node>
+                              <node concept="34oBXx" id="4xoHD1GdBFg" role="2OqNvi" />
+                            </node>
+                            <node concept="2OqwBi" id="4xoHD1GdBFh" role="3uHU7B">
+                              <node concept="37vLTw" id="4xoHD1GdBFi" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
+                              </node>
+                              <node concept="34oBXx" id="4xoHD1GdBFj" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                       <node concept="3clFbH" id="4xoHD1GdB_d" role="3cqZAp" />
                     </node>
@@ -6422,6 +6401,9 @@
               <ref role="2I9WkF" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
             </node>
             <node concept="2OqwBi" id="4xoHD1GiwYs" role="33vP2m">
+              <node concept="3Tsc0h" id="4xoHD1Giz5m" role="2OqNvi">
+                <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+              </node>
               <node concept="2OqwBi" id="4xoHD1Givyq" role="2Oq$k0">
                 <node concept="3A2sRY" id="4xoHD1Givon" role="2Oq$k0">
                   <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
@@ -6430,9 +6412,6 @@
                   <ref role="3Tt5mk" to="tpee:2yoSzAaKW1s" resolve="constructorDeclaration" />
                 </node>
               </node>
-              <node concept="3Tsc0h" id="4xoHD1Giz5m" role="2OqNvi">
-                <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
-              </node>
             </node>
           </node>
         </node>
@@ -7015,6 +6994,7 @@
                 <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
               </node>
               <node concept="2OqwBi" id="4xoHD1Gqvl0" role="1m5AlR">
+                <node concept="1mfA1w" id="4xoHD1GqzoS" role="2OqNvi" />
                 <node concept="2OqwBi" id="4xoHD1GpWcC" role="2Oq$k0">
                   <node concept="3A2sRY" id="4xoHD1GqpLL" role="2Oq$k0">
                     <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
@@ -7023,7 +7003,6 @@
                     <ref role="3Tt5mk" to="tpee:hDpISCB" resolve="constructorDeclaration" />
                   </node>
                 </node>
-                <node concept="1mfA1w" id="4xoHD1GqzoS" role="2OqNvi" />
               </node>
             </node>
           </node>
@@ -7068,6 +7047,9 @@
               <ref role="2I9WkF" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
             </node>
             <node concept="2OqwBi" id="4xoHD1Gqj1H" role="33vP2m">
+              <node concept="3Tsc0h" id="4xoHD1Gqn8$" role="2OqNvi">
+                <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+              </node>
               <node concept="2OqwBi" id="4xoHD1GpWcW" role="2Oq$k0">
                 <node concept="3A2sRY" id="4xoHD1Gq9aT" role="2Oq$k0">
                   <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
@@ -7076,9 +7058,6 @@
                   <ref role="3Tt5mk" to="tpee:hDpISCB" resolve="constructorDeclaration" />
                 </node>
               </node>
-              <node concept="3Tsc0h" id="4xoHD1Gqn8$" role="2OqNvi">
-                <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
-              </node>
             </node>
           </node>
         </node>
@@ -7248,6 +7227,7 @@
                   <node concept="34oBXx" id="4xoHD1GpWdG" role="2OqNvi" />
                 </node>
               </node>
+              <node concept="32pEOW" id="24ciDNzxNBW" role="3vLBG7" />
               <node concept="aZer4" id="4xoHD1GpWdH" role="3XD1gS">
                 <property role="TrG5h" value="Bounds" />
                 <node concept="2OqwBi" id="4xoHD1GpWdI" role="3gj$pD">
@@ -7257,7 +7237,6 @@
                   <node concept="34oBXx" id="4xoHD1GpWdK" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="32pEOW" id="24ciDNzxNBW" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="4xoHD1GpWdM" role="0Rg$4">
               <node concept="aZer4" id="4xoHD1GpWdN" role="3XD1gS">
@@ -7868,6 +7847,27 @@
         </node>
       </node>
     </node>
+    <node concept="3AqmO8" id="1yt2T3T19j2" role="8PkJo">
+      <property role="TrG5h" value="checkArgs" />
+      <node concept="1zAUYm" id="1yt2T3T19O3" role="1zAUyy">
+        <property role="TrG5h" value="ParamTypes" />
+      </node>
+      <node concept="1zAUYm" id="1yt2T3T19RS" role="1zAUyy">
+        <property role="TrG5h" value="ArgTypes" />
+      </node>
+      <node concept="1zAUYm" id="1yt2T3TeNc_" role="1zAUyy">
+        <property role="TrG5h" value="ReportNodes" />
+      </node>
+    </node>
+    <node concept="3AqmO8" id="1yt2T3T1bZ_" role="8PkJo">
+      <property role="TrG5h" value="checkVarargs" />
+      <node concept="1zAUYm" id="1yt2T3T1cp6" role="1zAUyy">
+        <property role="TrG5h" value="ParamType" />
+      </node>
+      <node concept="1zAUYm" id="1yt2T3T1cNH" role="1zAUyy">
+        <property role="TrG5h" value="ArgTypes" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="tIwzd2cJHD">
     <property role="TrG5h" value="SubclassingUtil" />
@@ -17970,17 +17970,21 @@
     <node concept="3iyZe8" id="5itBwMau8m4" role="0oKgB">
       <ref role="3iRiWT" node="5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="5itBwMau8m5" role="3iwQuN">
-        <node concept="3Aqczg" id="4lCLOtwq46N" role="3cqZAp">
-          <node concept="3A8Hvi" id="4lCLOtwq46O" role="3Aqpz8">
-            <node concept="37jhX" id="5HLeEcf2UrE" role="3A8wtg">
-              <node concept="1nq8_$" id="5itBwMau8qD" role="37jj2">
-                <node concept="a7P8L" id="5itBwMau8qC" role="1nq8_t">
-                  <ref role="a7OzE" node="5itBwMau8qb" resolve="Type" />
+        <node concept="1X3_iC" id="3ZtutR9ZJkL" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3Aqczg" id="4lCLOtwq46N" role="8Wnug">
+            <node concept="3A8Hvi" id="4lCLOtwq46O" role="3Aqpz8">
+              <node concept="37jhX" id="5HLeEcf2UrE" role="3A8wtg">
+                <node concept="1nq8_$" id="5itBwMau8qD" role="37jj2">
+                  <node concept="a7P8L" id="5itBwMau8qC" role="1nq8_t">
+                    <ref role="a7OzE" node="5itBwMau8qb" resolve="Type" />
+                  </node>
                 </node>
               </node>
-            </node>
-            <node concept="ns1u0" id="4lCLOtwq4cs" role="3A8w4Q">
-              <ref role="ns1xF" node="4lCLOtwq2MF" resolve="type" />
+              <node concept="ns1u0" id="4lCLOtwq4cs" role="3A8w4Q">
+                <ref role="ns1xF" node="4lCLOtwq2MF" resolve="type" />
+              </node>
             </node>
           </node>
         </node>
@@ -38433,6 +38437,15 @@
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="4$mmEcR8qUH" role="0Rg$4">
+              <node concept="aZer4" id="4$mmEcR8qUI" role="3XD1gS">
+                <property role="TrG5h" value="Var" />
+              </node>
+              <node concept="32pEOW" id="4$mmEcR8qUU" role="3vLBG7" />
+              <node concept="aZer4" id="4$mmEcR8qV4" role="3XD1gS">
+                <property role="TrG5h" value="Bnd" />
+              </node>
+            </node>
             <node concept="3Aq93q" id="4$mmEcR8qVH" role="1nLNMb">
               <node concept="3I6sU6" id="4$mmEcR8qVI" role="3Ip0Jz">
                 <node concept="3I6s7M" id="4$mmEcR8qVR" role="3I6sU7">
@@ -38448,15 +38461,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="4$mmEcR8qUH" role="0Rg$4">
-              <node concept="aZer4" id="4$mmEcR8qUI" role="3XD1gS">
-                <property role="TrG5h" value="Var" />
-              </node>
-              <node concept="aZer4" id="4$mmEcR8qV4" role="3XD1gS">
-                <property role="TrG5h" value="Bnd" />
-              </node>
-              <node concept="32pEOW" id="4$mmEcR8qUU" role="3vLBG7" />
-            </node>
             <node concept="3xSepi" id="4$mmEcR8qWh" role="3xSepv">
               <node concept="3Aq9E8" id="4$mmEcR8qWi" role="3xSepj">
                 <node concept="3I6sU6" id="4$mmEcR8qWj" role="3Ip0Jz">
@@ -44677,10 +44681,10 @@
               <node concept="aZer4" id="1sJZ0_oQvOJ" role="3XD1gS">
                 <property role="TrG5h" value="Bound" />
               </node>
+              <node concept="32pEOW" id="1sJZ0_oQvQb" role="3vLBG7" />
               <node concept="aZer4" id="1sJZ0_oQvVs" role="3XD1gS">
                 <property role="TrG5h" value="TVar" />
               </node>
-              <node concept="32pEOW" id="1sJZ0_oQvQb" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="1sJZ0_oQw3D" role="3xSepv">
               <node concept="3Aq9E8" id="1sJZ0_oQw3E" role="3xSepj">
@@ -44819,6 +44823,7 @@
             </node>
             <node concept="2OqwBi" id="4ZxjFYHiCbX" role="33vP2m">
               <node concept="2OqwBi" id="4ZxjFYHiBER" role="2Oq$k0">
+                <node concept="1KnU$U" id="4ZxjFYHiC3x" role="2OqNvi" />
                 <node concept="2OqwBi" id="4ZxjFYHiAZv" role="2Oq$k0">
                   <node concept="2OqwBi" id="4ZxjFYHiwR8" role="2Oq$k0">
                     <node concept="37vLTw" id="7NX8kJ7gY_o" role="2Oq$k0">
@@ -44847,7 +44852,6 @@
                   </node>
                   <node concept="1VAtEI" id="4ZxjFYHiBm3" role="2OqNvi" />
                 </node>
-                <node concept="1KnU$U" id="4ZxjFYHiC3x" role="2OqNvi" />
               </node>
               <node concept="ANE8D" id="4ZxjFYHiC$x" role="2OqNvi" />
             </node>
@@ -45196,6 +45200,7 @@
                   <node concept="aZer4" id="4btN1w5KjwS" role="3XD1gS">
                     <property role="TrG5h" value="ClsTy" />
                   </node>
+                  <node concept="32pEOW" id="24ciDNzxNHz" role="3vLBG7" />
                   <node concept="aZer4" id="4btN1w5KoN7" role="3XD1gS">
                     <property role="TrG5h" value="TyArgs" />
                     <node concept="2OqwBi" id="4btN1w5LYyn" role="3gj$pD">
@@ -45214,40 +45219,6 @@
                       <node concept="34oBXx" id="5mvKPwwqxj2" role="2OqNvi" />
                     </node>
                   </node>
-                  <node concept="32pEOW" id="24ciDNzxNHz" role="3vLBG7" />
-                </node>
-                <node concept="3NuqgR" id="4btN1w5KovM" role="0Rg$4">
-                  <node concept="aZer4" id="4btN1w5KovN" role="3XD1gS">
-                    <property role="TrG5h" value="TyScheme" />
-                  </node>
-                  <node concept="aZer4" id="4btN1w5M40q" role="3XD1gS">
-                    <property role="TrG5h" value="TVs" />
-                    <node concept="2OqwBi" id="4btN1w5M4rl" role="3gj$pD">
-                      <node concept="37vLTw" id="4btN1w5M4fX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4btN1w5LWil" resolve="tyParams" />
-                      </node>
-                      <node concept="34oBXx" id="4btN1w5M4AT" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="aZer4" id="4btN1w5MfPo" role="3XD1gS">
-                    <property role="TrG5h" value="Bounds" />
-                    <node concept="2OqwBi" id="4btN1w5Mg05" role="3gj$pD">
-                      <node concept="37vLTw" id="4btN1w5MfX_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4btN1w5LWil" resolve="tyParams" />
-                      </node>
-                      <node concept="34oBXx" id="4btN1w5Mg7d" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="32pEOW" id="24ciDNzxNH$" role="3vLBG7" />
-                </node>
-                <node concept="3NuqgR" id="4btN1w5M4UZ" role="0Rg$4">
-                  <node concept="aZer4" id="4btN1w5M4V0" role="3XD1gS">
-                    <property role="TrG5h" value="ContextTVs" />
-                  </node>
-                  <node concept="aZer4" id="4btN1w5MgLQ" role="3XD1gS">
-                    <property role="TrG5h" value="ContextTVSubs" />
-                  </node>
-                  <node concept="VbTHi" id="7L5omgek2wQ" role="3vLBG7" />
                 </node>
                 <node concept="3xSepi" id="6E2cNicdim9" role="3xSepv">
                   <node concept="3Aq9E8" id="4btN1w5KnXf" role="3xSepj">
@@ -45577,6 +45548,39 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3NuqgR" id="4btN1w5KovM" role="0Rg$4">
+                  <node concept="aZer4" id="4btN1w5KovN" role="3XD1gS">
+                    <property role="TrG5h" value="TyScheme" />
+                  </node>
+                  <node concept="aZer4" id="4btN1w5M40q" role="3XD1gS">
+                    <property role="TrG5h" value="TVs" />
+                    <node concept="2OqwBi" id="4btN1w5M4rl" role="3gj$pD">
+                      <node concept="37vLTw" id="4btN1w5M4fX" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4btN1w5LWil" resolve="tyParams" />
+                      </node>
+                      <node concept="34oBXx" id="4btN1w5M4AT" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="aZer4" id="4btN1w5MfPo" role="3XD1gS">
+                    <property role="TrG5h" value="Bounds" />
+                    <node concept="2OqwBi" id="4btN1w5Mg05" role="3gj$pD">
+                      <node concept="37vLTw" id="4btN1w5MfX_" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4btN1w5LWil" resolve="tyParams" />
+                      </node>
+                      <node concept="34oBXx" id="4btN1w5Mg7d" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="32pEOW" id="24ciDNzxNH$" role="3vLBG7" />
+                </node>
+                <node concept="3NuqgR" id="4btN1w5M4UZ" role="0Rg$4">
+                  <node concept="aZer4" id="4btN1w5M4V0" role="3XD1gS">
+                    <property role="TrG5h" value="ContextTVs" />
+                  </node>
+                  <node concept="aZer4" id="4btN1w5MgLQ" role="3XD1gS">
+                    <property role="TrG5h" value="ContextTVSubs" />
+                  </node>
+                  <node concept="VbTHi" id="7L5omgek2wQ" role="3vLBG7" />
+                </node>
               </node>
             </node>
           </node>
@@ -47787,6 +47791,7 @@
               <node concept="aZer4" id="6EK6UBPpvFr" role="3XD1gS">
                 <property role="TrG5h" value="ClsDecl" />
               </node>
+              <node concept="32pEOW" id="6EK6UBPp8Y2" role="3vLBG7" />
               <node concept="aZer4" id="6EK6UBPqlwI" role="3XD1gS">
                 <property role="TrG5h" value="ClsT" />
               </node>
@@ -47796,7 +47801,6 @@
               <node concept="aZer4" id="6EK6UBPp8XQ" role="3XD1gS">
                 <property role="TrG5h" value="CtorDecl" />
               </node>
-              <node concept="32pEOW" id="6EK6UBPp8Y2" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="6EK6UBPpy3B" role="0Rg$4">
               <node concept="aZer4" id="6EK6UBPpQfo" role="3XD1gS">
@@ -49560,6 +49564,17 @@
     <property role="3GE5qa" value="rule.code" />
     <property role="TrG5h" value="VarDecl" />
     <ref role="2YbDB9" node="34$A1Mf51rY" resolve="TypeOf" />
+    <node concept="3AqmO8" id="554EtBHJcip" role="8PkJo">
+      <property role="TrG5h" value="varDeclImpl" />
+      <node concept="1zAUYm" id="554EtBHMOU2" role="1zAUyy">
+        <property role="TrG5h" value="vdecl" />
+        <node concept="3Tqbb2" id="554EtBHMPbZ" role="3gTf24" />
+      </node>
+      <node concept="1zAUYm" id="554EtBHJcrb" role="1zAUyy">
+        <property role="TrG5h" value="type" />
+        <node concept="32pEOW" id="554EtBHJcrg" role="3gTf24" />
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7sng" role="1nK1Vg">
       <property role="TrG5h" value="checkConstructorDeclaration" />
       <node concept="3clFbS" id="12QmIo_7snh" role="1nLNMH">
@@ -49703,6 +49718,40 @@
     <node concept="1nLNMY" id="12QmIo_7snE" role="1nK1Vg">
       <property role="TrG5h" value="checkVariableDeclaration" />
       <node concept="3clFbS" id="12QmIo_7snF" role="1nLNMH">
+        <node concept="3SKdUt" id="554EtBHJcQ0" role="3cqZAp">
+          <node concept="1PaTwC" id="554EtBHJcQ1" role="1aUNEU">
+            <node concept="3oM_SD" id="554EtBHJcQ2" role="1PaTwD">
+              <property role="3oM_SC" value="Produce" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcQU" role="1PaTwD">
+              <property role="3oM_SC" value="typeOf" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcQX" role="1PaTwD">
+              <property role="3oM_SC" value="only" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcR1" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcR6" role="1PaTwD">
+              <property role="3oM_SC" value="there" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcRc" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcRj" role="1PaTwD">
+              <property role="3oM_SC" value="macro" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcRr" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcR$" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHJcRI" role="1PaTwD">
+              <property role="3oM_SC" value="variable" />
+            </node>
+          </node>
+        </node>
         <node concept="1nLNNL" id="12QmIo_7snG" role="3cqZAp">
           <node concept="1nLNMm" id="12QmIo_7snH" role="1nLNNK">
             <node concept="3Aq93q" id="34$A1MfabSV" role="1nLNMb">
@@ -49741,14 +49790,14 @@
                     </node>
                   </node>
                   <node concept="3I6s7M" id="4nIWweBEUED" role="3I6sU7">
-                    <node concept="3Aqt3T" id="34$A1MfhpMl" role="3I6s78">
-                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="1TH_SRmhrtk" role="3AunhB">
-                        <node concept="3A2sRY" id="34$A1MfhpMj" role="37jj2">
+                    <node concept="3Aqt3T" id="554EtBHJcr8" role="3I6s78">
+                      <ref role="3AqCNq" node="554EtBHJcip" resolve="varDeclImpl" />
+                      <node concept="37jhX" id="554EtBHMPvO" role="3AunhB">
+                        <node concept="3A2sRY" id="554EtBHMPvM" role="37jj2">
                           <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
                         </node>
                       </node>
-                      <node concept="a7P8L" id="34$A1MfhpMk" role="3AunhB">
+                      <node concept="a7P8L" id="554EtBHJd15" role="3AunhB">
                         <ref role="a7OzE" node="5JTOzCQRR4L" resolve="Var" />
                       </node>
                     </node>
@@ -49772,6 +49821,64 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="554EtBHJcUD" role="3cqZAp" />
+        <node concept="1nLNNL" id="554EtBHJcir" role="3cqZAp">
+          <node concept="1nLNMm" id="554EtBHJcis" role="1nLNNK">
+            <node concept="3Aq93q" id="554EtBHJcit" role="1nLNMb">
+              <node concept="3I6sU6" id="554EtBHJciu" role="3Ip0Jz">
+                <node concept="3I6s7M" id="554EtBHJciv" role="3I6sU7">
+                  <node concept="3Aqt3T" id="554EtBHJcrl" role="3I6s78">
+                    <ref role="3AqCNq" node="554EtBHJcip" resolve="varDeclImpl" />
+                    <node concept="37jhX" id="554EtBHMOMs" role="3AunhB">
+                      <node concept="3A2sRY" id="554EtBHMPqt" role="37jj2">
+                        <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="554EtBHJcGL" role="3AunhB">
+                      <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="554EtBHJcix" role="0Rg$4">
+              <node concept="aZer4" id="554EtBHJciy" role="3XD1gS">
+                <property role="TrG5h" value="Var" />
+              </node>
+              <node concept="32pEOW" id="554EtBHJciz" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="554EtBHJci$" role="3xSepv">
+              <node concept="3Aq9E8" id="554EtBHJci_" role="3xSepj">
+                <node concept="3I6sU6" id="554EtBHJciA" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="554EtBHJciH" role="3I6sU7">
+                    <node concept="3Aqt3T" id="554EtBHJciI" role="3I6s78">
+                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="554EtBHJciJ" role="3AunhB">
+                        <node concept="3A2sRY" id="554EtBHJciK" role="37jj2">
+                          <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="554EtBHJciL" role="3AunhB">
+                        <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="554EtBHJcIC" role="1nLNMa">
+              <node concept="3I6sU6" id="554EtBHJcID" role="3Ip0Jz">
+                <node concept="3I6s7M" id="554EtBHJcIH" role="3I6sU7">
+                  <node concept="2aM9Np" id="554EtBHJcPQ" role="3I6s78">
+                    <node concept="a7P8L" id="554EtBHJcPT" role="2aLmnP">
+                      <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2t___k" id="7gr_rompslK" role="1nLNMg">
         <ref role="2t_S0q" to="tpee:fz3uBXI" resolve="VariableDeclaration" />