From 8bd1ba6590d16b00fc38a29382f7b3ce74492608 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Mon, 7 Sep 2020 19:19:53 +0300
Subject: [PATCH] Fix require statements given restriction of their semantics

Also explicitly require classifiers in Hierarchy rule table
---
 .../samples.lambdacalc/models/types.mps       |  42 +++
 ....mps.baseLanguage.collectionsExt.types.mps |  72 +++++
 .../jetbrains.mps.baseLanguageExt.types.mps   | 246 +++++++++++++-----
 3 files changed, 294 insertions(+), 66 deletions(-)

diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 003bd155..82222cbc 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -10423,6 +10423,27 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="2GIrmkQ9dll" role="1nK1Vg">
+      <property role="TrG5h" value="require_typeDecls" />
+      <node concept="3clFbS" id="2GIrmkQ9dlm" role="1nLNMH">
+        <node concept="1mebxG" id="2GIrmkQ9dK2" role="3cqZAp">
+          <node concept="2OqwBi" id="2GIrmkQ9dU8" role="1mebXD">
+            <node concept="3A2sRY" id="2GIrmkQ9dKb" role="2Oq$k0">
+              <ref role="3A2yKK" node="2GIrmkQ9dJH" resolve="varRef" />
+            </node>
+            <node concept="3TrEf2" id="2GIrmkQ9e6u" role="2OqNvi">
+              <ref role="3Tt5mk" to="8tt8:48ZGLP8$3cj" resolve="def" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="2GIrmkQ9dJG" role="1nLNMg">
+        <ref role="2t_S0q" to="8tt8:48ZGLP8$3c6" resolve="VarTypeRef" />
+        <node concept="3A20r5" id="2GIrmkQ9dJH" role="2t_VXX">
+          <property role="TrG5h" value="varRef" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="3gP95ZIu6HH" role="1nK1Vg">
       <property role="TrG5h" value="require_annotations" />
       <node concept="3clFbS" id="3gP95ZIu6HI" role="1nLNMH">
@@ -12477,6 +12498,27 @@
     <node concept="3AqmO8" id="47tET_WlK9C" role="8PkJo">
       <property role="TrG5h" value="reproduceTypeConstraints" />
     </node>
+    <node concept="1nLNMY" id="2GIrmkQ9bUP" role="1nK1Vg">
+      <property role="TrG5h" value="typeConstraints_require" />
+      <node concept="3clFbS" id="2GIrmkQ9bUQ" role="1nLNMH">
+        <node concept="1mebxG" id="2GIrmkQ9clD" role="3cqZAp">
+          <node concept="2OqwBi" id="2GIrmkQ9cuX" role="1mebXD">
+            <node concept="3A2sRY" id="2GIrmkQ9clM" role="2Oq$k0">
+              <ref role="3A2yKK" node="2GIrmkQ9c8h" resolve="ctr" />
+            </node>
+            <node concept="3TrEf2" id="2GIrmkQ9cDu" role="2OqNvi">
+              <ref role="3Tt5mk" to="8tt8:2O9ahh6mHvj" resolve="typeclass" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="2GIrmkQ9c8a" role="1nLNMg">
+        <ref role="2t_S0q" to="8tt8:2O9ahh6mHvg" resolve="Constraint" />
+        <node concept="3A20r5" id="2GIrmkQ9c8h" role="2t_VXX">
+          <property role="TrG5h" value="ctr" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="47tET_W4RYO" role="1nK1Vg">
       <property role="TrG5h" value="typeConstraints_mergeSets" />
       <node concept="3clFbS" id="47tET_W4RYP" role="1nLNMH">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index 0005b5f4..bdb27278 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -5398,6 +5398,62 @@
     <node concept="1nLNMY" id="1oUE7CX4MWv" role="1nK1Vg">
       <property role="TrG5h" value="baseCollection_toRuntimeType" />
       <node concept="3clFbS" id="1oUE7CX4MWw" role="1nLNMH">
+        <node concept="1mebxG" id="5HxDM7C3EPB" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3EVx" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3EVQ" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Collection" resolve="Collection" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3EXs" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FrJ" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FrK" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~List" resolve="List" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3F3H" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3Ftm" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3Ftn" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~LinkedList" resolve="LinkedList" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3F9y" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3Fv2" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3Fv3" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Deque" resolve="Deque" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3Ffo" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FwD" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FwE" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Set" resolve="Set" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3Flf" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FwX" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3Fxh" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~SortedSet" resolve="SortedSet" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3FyR" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FyS" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FLe" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Map" resolve="Map" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="5HxDM7C3FEO" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FEP" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FEQ" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~SortedMap" resolve="SortedMap" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="1oUE7CX4NRc" role="3cqZAp" />
         <node concept="1nLNNL" id="1oUE7CX4NnZ" role="3cqZAp">
           <node concept="1nLNMm" id="1oUE7CX4No0" role="1nLNNK">
@@ -6265,6 +6321,14 @@
     <node concept="1nLNMY" id="1oUE7CX4O8_" role="1nK1Vg">
       <property role="TrG5h" value="iterator_toRuntimeType" />
       <node concept="3clFbS" id="1oUE7CX4O8A" role="1nLNMH">
+        <node concept="1mebxG" id="5HxDM7C3FSQ" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FSR" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FVC" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Iterator" resolve="Iterator" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5HxDM7C3FV1" role="3cqZAp" />
         <node concept="1nLNNL" id="1oUE7CX4O8C" role="3cqZAp">
           <node concept="1nLNMm" id="1oUE7CX4O8D" role="1nLNNK">
             <node concept="3Aq93q" id="1oUE7CX4O8E" role="1nLNMb">
@@ -6352,6 +6416,14 @@
     <node concept="1nLNMY" id="3Z1xyIwARfv" role="1nK1Vg">
       <property role="TrG5h" value="modIterator_toRuntimeType" />
       <node concept="3clFbS" id="3Z1xyIwARfw" role="1nLNMH">
+        <node concept="1mebxG" id="5HxDM7C3FXe" role="3cqZAp">
+          <node concept="2tJFMh" id="5HxDM7C3FXf" role="1mebXD">
+            <node concept="ZC_QK" id="5HxDM7C3FXg" role="2tJFKM">
+              <ref role="2aWVGs" to="33ny:~Iterator" resolve="Iterator" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5HxDM7C3FY6" role="3cqZAp" />
         <node concept="1nLNNL" id="3Z1xyIwARfx" role="3cqZAp">
           <node concept="1nLNMm" id="3Z1xyIwARfy" role="1nLNNK">
             <node concept="3Aq93q" id="3Z1xyIwARfz" role="1nLNMb">
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 c0fdd793..71b7a55f 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
@@ -484,6 +484,9 @@
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
+        <child id="1154546920563" name="concept" index="3gmYPZ" />
+      </concept>
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
@@ -635,6 +638,7 @@
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -684,6 +688,7 @@
       <concept id="1228228912534" name="jetbrains.mps.baseLanguage.collections.structure.DowncastExpression" flags="nn" index="3S9uib">
         <child id="1228228959951" name="expression" index="3S9DZi" />
       </concept>
+      <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
       <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
@@ -1929,7 +1934,6 @@
   <node concept="AVZre" id="5MHpiylysUh">
     <property role="TrG5h" value="Hierarchy" />
     <property role="3GE5qa" value="rule.relation" />
-    <ref role="2YbDB9" node="4btN1w5Jfyx" resolve="Generics" />
     <node concept="3AqmO8" id="1qY0I4bFlcz" role="8PkJo">
       <property role="TrG5h" value="findHierarchy" />
       <node concept="1zAUYm" id="1qY0I4bFlc$" role="1zAUyy">
@@ -2031,6 +2035,59 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3TUC9qqhbir" role="3cqZAp" />
+        <node concept="Oftf1" id="3CquOVr5iP5" role="3cqZAp">
+          <node concept="2OqwBi" id="3CquOVr5z9H" role="Oftjs">
+            <node concept="2OqwBi" id="3CquOVr5xnV" role="2Oq$k0">
+              <node concept="2OqwBi" id="3CquOVr5k6i" role="2Oq$k0">
+                <node concept="37vLTw" id="3CquOVr5jhz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3bgqfmm2LKE" resolve="allPaths" />
+                </node>
+                <node concept="3goQfb" id="3CquOVr5kNl" role="2OqNvi">
+                  <node concept="1bVj0M" id="3CquOVr5kNn" role="23t8la">
+                    <node concept="3clFbS" id="3CquOVr5kNo" role="1bW5cS">
+                      <node concept="3clFbF" id="3CquOVr5kV5" role="3cqZAp">
+                        <node concept="2OqwBi" id="3CquOVr5leJ" role="3clFbG">
+                          <node concept="37vLTw" id="3CquOVr5kV4" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3CquOVr5kNp" resolve="it" />
+                          </node>
+                          <node concept="liA8E" id="3CquOVr5lvh" role="2OqNvi">
+                            <ref role="37wK5l" node="6$6scRbYuZ5" resolve="iterate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="3CquOVr5kNp" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="3CquOVr5kNq" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3$u5V9" id="3CquOVr5xPP" role="2OqNvi">
+                <node concept="1bVj0M" id="3CquOVr5xPR" role="23t8la">
+                  <node concept="3clFbS" id="3CquOVr5xPS" role="1bW5cS">
+                    <node concept="3clFbF" id="3CquOVr5xTs" role="3cqZAp">
+                      <node concept="2OqwBi" id="3CquOVr5ybj" role="3clFbG">
+                        <node concept="37vLTw" id="3CquOVr5xTr" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3CquOVr5xPT" resolve="it" />
+                        </node>
+                        <node concept="3TrEf2" id="3CquOVr5yJg" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="3CquOVr5xPT" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="3CquOVr5xPU" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1VAtEI" id="3CquOVr5zJm" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3clFbH" id="6_5E9TNz4WR" role="3cqZAp" />
         <node concept="3Hbl2A" id="2MpDLe9BBwi" role="3cqZAp">
           <node concept="3clFbS" id="2MpDLe9BBwk" role="9aQI4">
@@ -2972,6 +3029,12 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="7rH8bs2KlrA" role="3cqZAp" />
+            <node concept="1mebxG" id="7rH8bs2KlmD" role="3cqZAp">
+              <node concept="37vLTw" id="7rH8bs2Klnz" role="1mebXD">
+                <ref role="3cqZAo" node="53tmmMsBY8Z" resolve="thisCls" />
+              </node>
+            </node>
           </node>
           <node concept="37vLTw" id="53tmmMsHIvd" role="3clFbw">
             <ref role="3cqZAo" node="53tmmMsHGJg" resolve="isNotStatic" />
@@ -37082,6 +37145,88 @@
         <node concept="32pEOW" id="3hZrJU5TkeN" role="3gTf24" />
       </node>
     </node>
+    <node concept="1nLNMY" id="4pwDyRBZ6yM" role="1nK1Vg">
+      <property role="TrG5h" value="classifierType_requireClassifier" />
+      <node concept="3clFbS" id="4pwDyRBZ6yN" role="1nLNMH">
+        <node concept="1mebxG" id="4pwDyRBZ6_$" role="3cqZAp">
+          <node concept="2OqwBi" id="4pwDyRBZ6L6" role="1mebXD">
+            <node concept="3A2sRY" id="4pwDyRBZ6_K" role="2Oq$k0">
+              <ref role="3A2yKK" node="4pwDyRBZ6_o" resolve="ct" />
+            </node>
+            <node concept="3TrEf2" id="4pwDyRBZ6YI" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="4pwDyRBZ6_n" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:g7uibYu" resolve="ClassifierType" />
+        <node concept="3A20r5" id="4pwDyRBZ6_o" role="2t_VXX">
+          <property role="TrG5h" value="ct" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7rH8bs2KkXN" role="1nK1Vg">
+      <property role="TrG5h" value="classifier_requireTypeVariables" />
+      <node concept="3clFbS" id="7rH8bs2KkXO" role="1nLNMH">
+        <node concept="Oftf1" id="7rH8bs2Khy$" role="3cqZAp">
+          <node concept="2OqwBi" id="7rH8bs2KjsS" role="Oftjs">
+            <node concept="3A2sRY" id="7rH8bs2Klhn" role="2Oq$k0">
+              <ref role="3A2yKK" node="7rH8bs2Kl2g" resolve="cls" />
+            </node>
+            <node concept="3Tsc0h" id="7rH8bs2KkM3" role="2OqNvi">
+              <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="7rH8bs2Kl2f" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:g7pOWCK" resolve="Classifier" />
+        <node concept="3A20r5" id="7rH8bs2Kl2g" role="2t_VXX">
+          <property role="TrG5h" value="cls" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="1sJZ0_oUxQC" role="1nK1Vg">
+      <property role="TrG5h" value="typeVariable_requireDecl" />
+      <node concept="3clFbS" id="1sJZ0_oUxQD" role="1nLNMH">
+        <node concept="1mebxG" id="1sJZ0_oUI4K" role="3cqZAp">
+          <node concept="2OqwBi" id="1sJZ0_oUIit" role="1mebXD">
+            <node concept="3A2sRY" id="1sJZ0_oUI69" role="2Oq$k0">
+              <ref role="3A2yKK" node="1sJZ0_oU$$a" resolve="tv" />
+            </node>
+            <node concept="3TrEf2" id="1sJZ0_oUJhv" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g96sUm1" resolve="typeVariableDeclaration" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="4ZxjFYHln6u" role="3cqZAp">
+          <node concept="2OqwBi" id="4ZxjFYHlnOu" role="1mebXD">
+            <node concept="2OqwBi" id="4ZxjFYHlnj1" role="2Oq$k0">
+              <node concept="3A2sRY" id="4ZxjFYHln6H" role="2Oq$k0">
+                <ref role="3A2yKK" node="1sJZ0_oU$$a" resolve="tv" />
+              </node>
+              <node concept="3TrEf2" id="4ZxjFYHlnA6" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:g96sUm1" resolve="typeVariableDeclaration" />
+              </node>
+            </node>
+            <node concept="2Xjw5R" id="4ZxjFYHlo2d" role="2OqNvi">
+              <node concept="1xMEDy" id="4ZxjFYHlo2f" role="1xVPHs">
+                <node concept="chp4Y" id="4ZxjFYHlo4v" role="ri$Ld">
+                  <ref role="cht4Q" to="tpee:g96eOhU" resolve="GenericDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="1sJZ0_oU$$9" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:g96syBo" resolve="TypeVariableReference" />
+        <node concept="3A20r5" id="1sJZ0_oU$$a" role="2t_VXX">
+          <property role="TrG5h" value="tv" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="1sJZ0_oQtQ2" role="1nK1Vg">
       <property role="TrG5h" value="decl_TypeVariable" />
       <node concept="3clFbS" id="1sJZ0_oQtQ3" role="1nLNMH">
@@ -42682,6 +42827,40 @@
         <node concept="32pEOW" id="554EtBHJcrg" role="3gTf24" />
       </node>
     </node>
+    <node concept="1nLNMY" id="39eNUjlkRi8" role="1nK1Vg">
+      <property role="TrG5h" value="variableDeclaration_require" />
+      <node concept="3clFbS" id="39eNUjlkRi9" role="1nLNMH">
+        <node concept="Oftf1" id="39eNUjlkSf6" role="3cqZAp">
+          <node concept="2OqwBi" id="39eNUjlkSf7" role="Oftjs">
+            <node concept="2OqwBi" id="39eNUjlkSf8" role="2Oq$k0">
+              <node concept="3A2sRY" id="39eNUjlkSf9" role="2Oq$k0">
+                <ref role="3A2yKK" node="39eNUjlkRky" resolve="vdecl" />
+              </node>
+              <node concept="3TrEf2" id="39eNUjlkSfa" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+              </node>
+            </node>
+            <node concept="2Rf3mk" id="39eNUjlkSfb" role="2OqNvi">
+              <node concept="3gmYPX" id="39eNUjlkSlc" role="1xVPHs">
+                <node concept="3gn64h" id="39eNUjlkSld" role="3gmYPZ">
+                  <ref role="3gnhBz" to="tpee:g96syBo" resolve="TypeVariableReference" />
+                </node>
+                <node concept="3gn64h" id="39eNUjlkSnW" role="3gmYPZ">
+                  <ref role="3gnhBz" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+              <node concept="1xIGOp" id="2GIrmkQ99oh" role="1xVPHs" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="39eNUjlkRkx" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
+        <node concept="3A20r5" id="39eNUjlkRky" role="2t_VXX">
+          <property role="TrG5h" value="vdecl" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7snA" role="1nK1Vg">
       <property role="TrG5h" value="checkLocalVariable" />
       <node concept="2t___k" id="6lpwCiZbwic" role="1nLNMg">
@@ -53252,70 +53431,5 @@
       </node>
     </node>
   </node>
-  <node concept="AVZre" id="3Qp4N06bUEa">
-    <property role="TrG5h" value="ClassifierType" />
-    <property role="3GE5qa" value="rule.type" />
-    <node concept="1nLNMY" id="4pwDyRBZ6yM" role="1nK1Vg">
-      <property role="TrG5h" value="classifierType_requireClassifier" />
-      <node concept="3clFbS" id="4pwDyRBZ6yN" role="1nLNMH">
-        <node concept="1mebxG" id="4pwDyRBZ6_$" role="3cqZAp">
-          <node concept="2OqwBi" id="4pwDyRBZ6L6" role="1mebXD">
-            <node concept="3A2sRY" id="4pwDyRBZ6_K" role="2Oq$k0">
-              <ref role="3A2yKK" node="4pwDyRBZ6_o" resolve="ct" />
-            </node>
-            <node concept="3TrEf2" id="4pwDyRBZ6YI" role="2OqNvi">
-              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="4pwDyRBZ6_n" role="1nLNMg">
-        <ref role="2t_S0q" to="tpee:g7uibYu" resolve="ClassifierType" />
-        <node concept="3A20r5" id="4pwDyRBZ6_o" role="2t_VXX">
-          <property role="TrG5h" value="ct" />
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="1sJZ0_oUxQC" role="1nK1Vg">
-      <property role="TrG5h" value="typeVariable_requireDecl" />
-      <node concept="3clFbS" id="1sJZ0_oUxQD" role="1nLNMH">
-        <node concept="1mebxG" id="1sJZ0_oUI4K" role="3cqZAp">
-          <node concept="2OqwBi" id="1sJZ0_oUIit" role="1mebXD">
-            <node concept="3A2sRY" id="1sJZ0_oUI69" role="2Oq$k0">
-              <ref role="3A2yKK" node="1sJZ0_oU$$a" resolve="tv" />
-            </node>
-            <node concept="3TrEf2" id="1sJZ0_oUJhv" role="2OqNvi">
-              <ref role="3Tt5mk" to="tpee:g96sUm1" resolve="typeVariableDeclaration" />
-            </node>
-          </node>
-        </node>
-        <node concept="1mebxG" id="4ZxjFYHln6u" role="3cqZAp">
-          <node concept="2OqwBi" id="4ZxjFYHlnOu" role="1mebXD">
-            <node concept="2OqwBi" id="4ZxjFYHlnj1" role="2Oq$k0">
-              <node concept="3A2sRY" id="4ZxjFYHln6H" role="2Oq$k0">
-                <ref role="3A2yKK" node="1sJZ0_oU$$a" resolve="tv" />
-              </node>
-              <node concept="3TrEf2" id="4ZxjFYHlnA6" role="2OqNvi">
-                <ref role="3Tt5mk" to="tpee:g96sUm1" resolve="typeVariableDeclaration" />
-              </node>
-            </node>
-            <node concept="2Xjw5R" id="4ZxjFYHlo2d" role="2OqNvi">
-              <node concept="1xMEDy" id="4ZxjFYHlo2f" role="1xVPHs">
-                <node concept="chp4Y" id="4ZxjFYHlo4v" role="ri$Ld">
-                  <ref role="cht4Q" to="tpee:g96eOhU" resolve="GenericDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="1sJZ0_oU$$9" role="1nLNMg">
-        <ref role="2t_S0q" to="tpee:g96syBo" resolve="TypeVariableReference" />
-        <node concept="3A20r5" id="1sJZ0_oU$$a" role="2t_VXX">
-          <property role="TrG5h" value="tv" />
-        </node>
-      </node>
-    </node>
-  </node>
 </model>