From 42deb2b5e196e2c7f740bf92d237249f335604f2 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 8 Jun 2015 13:08:46 +0200
Subject: [PATCH] Rules collecting/generating: boundParam in required(),
 pre/post processing of static rule templates

---
 .../mps/typechecking/rule/collection.mps      | 84 +++++++++++++++----
 .../mps/typechecking/rule/generator.mps       | 17 ++--
 2 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/collection.mps b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/collection.mps
index 24be9979..558e59d5 100644
--- a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/collection.mps
+++ b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/collection.mps
@@ -296,7 +296,6 @@
                 <node concept="3vKaQO" id="12yN8DyFl3v" role="3rHtpV">
                   <node concept="3uibUv" id="1ffsG7c4kC3" role="3O5elw">
                     <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                    <node concept="3qTvmN" id="1ffsG7c4kVj" role="11_B2D" />
                   </node>
                 </node>
               </node>
@@ -347,7 +346,6 @@
         <node concept="1LlUBW" id="7t5VLKHa5QV" role="A3Ik2">
           <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
             <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-            <node concept="3qTvmN" id="1ffsG7c4gQd" role="11_B2D" />
           </node>
           <node concept="3uibUv" id="7t5VLKHa8iL" role="1Lm7xW">
             <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -363,7 +361,6 @@
               <node concept="1LlUBW" id="7t5VLKHacJO" role="_ZDj9">
                 <node concept="3uibUv" id="1ffsG7c4ntm" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                  <node concept="3qTvmN" id="1ffsG7c4pVh" role="11_B2D" />
                 </node>
                 <node concept="3uibUv" id="7t5VLKHafvy" role="1Lm7xW">
                   <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -375,7 +372,6 @@
                 <node concept="1LlUBW" id="7t5VLKHa9fr" role="HW$YZ">
                   <node concept="3uibUv" id="1ffsG7c4r9t" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                    <node concept="3qTvmN" id="1ffsG7c4t$6" role="11_B2D" />
                   </node>
                   <node concept="3uibUv" id="7t5VLKHabQB" role="1Lm7xW">
                     <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -464,7 +460,6 @@
                     <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
                       <node concept="3uibUv" id="1ffsG7c4xd9" role="3O5elw">
                         <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                        <node concept="3qTvmN" id="1ffsG7c4xII" role="11_B2D" />
                       </node>
                     </node>
                     <node concept="3EllGN" id="12yN8DywoJa" role="33vP2m">
@@ -560,7 +555,6 @@
                     <property role="TrG5h" value="tpl" />
                     <node concept="3uibUv" id="1ffsG7c4uLt" role="1tU5fm">
                       <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                      <node concept="3qTvmN" id="1ffsG7c4voQ" role="11_B2D" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="12yN8DyDOdR" role="1DdaDG">
@@ -635,6 +629,10 @@
     <node concept="2tJIrI" id="5NuEpF1qqA9" role="jymVt" />
     <node concept="3clFb_" id="5NuEpF1qn9x" role="jymVt">
       <property role="TrG5h" value="allTemplatesWithNoInput" />
+      <node concept="37vLTG" id="3x8pcoFuE1e" role="3clF46">
+        <property role="TrG5h" value="postProcess" />
+        <node concept="10P_77" id="3x8pcoFuELY" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="5NuEpF1qn9$" role="3clF46">
         <property role="TrG5h" value="visited" />
         <node concept="2hMVRd" id="5NuEpF1qn9_" role="1tU5fm">
@@ -647,7 +645,6 @@
         <node concept="1LlUBW" id="7t5VLKHaWTl" role="A3Ik2">
           <node concept="3uibUv" id="1ffsG7c4bl4" role="1Lm7xW">
             <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-            <node concept="3qTvmN" id="1ffsG7c4doO" role="11_B2D" />
           </node>
           <node concept="3uibUv" id="7t5VLKHaZmN" role="1Lm7xW">
             <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -663,7 +660,6 @@
               <node concept="1LlUBW" id="7t5VLKHb0SG" role="_ZDj9">
                 <node concept="3uibUv" id="1ffsG7c4_ll" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                  <node concept="3qTvmN" id="1ffsG7c4BHA" role="11_B2D" />
                 </node>
                 <node concept="3uibUv" id="7t5VLKHb0SI" role="1Lm7xW">
                   <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -675,7 +671,6 @@
                 <node concept="1LlUBW" id="7t5VLKHb1Xg" role="HW$YZ">
                   <node concept="3uibUv" id="1ffsG7c4CSJ" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                    <node concept="3qTvmN" id="1ffsG7c4E0X" role="11_B2D" />
                   </node>
                   <node concept="3uibUv" id="7t5VLKHb1Xi" role="1Lm7xW">
                     <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -694,7 +689,6 @@
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
                   <node concept="3uibUv" id="1ffsG7c4Fce" role="3O5elw">
                     <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                    <node concept="3qTvmN" id="1ffsG7c4FI9" role="11_B2D" />
                   </node>
                 </node>
                 <node concept="3EllGN" id="5NuEpF1qnap" role="33vP2m">
@@ -732,11 +726,13 @@
                     </node>
                   </node>
                   <node concept="1rXfSq" id="5NuEpF1qnaL" role="3clFbw">
-                    <ref role="37wK5l" node="12yN8DywHOS" resolve="testApplicable" />
+                    <ref role="37wK5l" node="3x8pcoFuEOz" resolve="testApplicableNoInput" />
                     <node concept="37vLTw" id="5NuEpF1qnaM" role="37wK5m">
                       <ref role="3cqZAo" node="5NuEpF1qnaO" resolve="tpl" />
                     </node>
-                    <node concept="10Nm6u" id="5NuEpF1qPKH" role="37wK5m" />
+                    <node concept="37vLTw" id="3x8pcoFuJcx" role="37wK5m">
+                      <ref role="3cqZAo" node="3x8pcoFuE1e" resolve="postProcess" />
+                    </node>
                     <node concept="10Nm6u" id="7t5VLKHarXy" role="37wK5m" />
                   </node>
                 </node>
@@ -745,7 +741,6 @@
                 <property role="TrG5h" value="tpl" />
                 <node concept="3uibUv" id="1ffsG7c4G83" role="1tU5fm">
                   <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                  <node concept="3qTvmN" id="1ffsG7c4GIl" role="11_B2D" />
                 </node>
               </node>
               <node concept="37vLTw" id="5NuEpF1qnaQ" role="1DdaDG">
@@ -943,6 +938,66 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3x8pcoFuFIi" role="jymVt" />
+    <node concept="3clFb_" id="3x8pcoFuEOz" role="jymVt">
+      <property role="TrG5h" value="testApplicableNoInput" />
+      <node concept="37vLTG" id="3x8pcoFuEO$" role="3clF46">
+        <property role="TrG5h" value="template" />
+        <node concept="3uibUv" id="3x8pcoFuEO_" role="1tU5fm">
+          <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3x8pcoFuHl$" role="3clF46">
+        <property role="TrG5h" value="postProcess" />
+        <node concept="10P_77" id="3x8pcoFuI7m" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3x8pcoFuEOC" role="3clF46">
+        <property role="TrG5h" value="boundParam" />
+        <node concept="3uibUv" id="3x8pcoFuEOD" role="1tU5fm">
+          <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="10P_77" id="3x8pcoFuEOE" role="3clF45" />
+      <node concept="3Tm6S6" id="3x8pcoFuEOF" role="1B3o_S" />
+      <node concept="3clFbS" id="3x8pcoFuEOG" role="3clF47">
+        <node concept="3SKdUt" id="3x8pcoFuEOH" role="3cqZAp">
+          <node concept="3SKdUq" id="3x8pcoFuEOI" role="3SKWNk">
+            <property role="3SKdUp" value="TODO user code" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3x8pcoFuEOJ" role="3cqZAp">
+          <node concept="1Wc70l" id="3x8pcoFuIpW" role="3clFbG">
+            <node concept="1eOMI4" id="3x8pcoFuIuT" role="3uHU7w">
+              <node concept="3clFbC" id="3x8pcoFuIYs" role="1eOMHV">
+                <node concept="37vLTw" id="3x8pcoFuJ2x" role="3uHU7w">
+                  <ref role="3cqZAo" node="3x8pcoFuHl$" resolve="postProcess" />
+                </node>
+                <node concept="2OqwBi" id="3x8pcoFuI_d" role="3uHU7B">
+                  <node concept="37vLTw" id="3x8pcoFuIyq" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3x8pcoFuEO$" resolve="template" />
+                  </node>
+                  <node concept="liA8E" id="3x8pcoFuIQ9" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:3x8pcoFtaj1" resolve="isPostProcess" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3x8pcoFuEOK" role="3uHU7B">
+              <node concept="37vLTw" id="3x8pcoFuEOL" role="2Oq$k0">
+                <ref role="3cqZAo" node="3x8pcoFuEO$" resolve="template" />
+              </node>
+              <node concept="liA8E" id="3x8pcoFuEOM" role="2OqNvi">
+                <ref role="37wK5l" to="i348:1ffsG7bWA3o" resolve="isApplicable" />
+                <node concept="10Nm6u" id="3x8pcoFuIc1" role="37wK5m" />
+                <node concept="37vLTw" id="3x8pcoFuEOO" role="37wK5m">
+                  <ref role="3cqZAo" node="3x8pcoFuEOC" resolve="boundParam" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="7t5VLKHahfv" role="jymVt" />
     <node concept="312cEu" id="6fdr4Ugfypo" role="jymVt">
       <property role="2bfB8j" value="true" />
@@ -967,7 +1022,6 @@
               <node concept="3vKaQO" id="12yN8DyF8dz" role="1tU5fm">
                 <node concept="3uibUv" id="1ffsG7c4i2u" role="3O5elw">
                   <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                  <node concept="3qTvmN" id="1ffsG7c4is8" role="11_B2D" />
                 </node>
               </node>
               <node concept="3EllGN" id="12yN8DyF8dE" role="33vP2m">
@@ -995,7 +1049,6 @@
                         <node concept="Tc6Ow" id="12yN8DyFgDP" role="2ShVmc">
                           <node concept="3uibUv" id="1ffsG7c4k6n" role="HW$YZ">
                             <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                            <node concept="3qTvmN" id="1ffsG7c4kpX" role="11_B2D" />
                           </node>
                         </node>
                       </node>
@@ -1056,7 +1109,6 @@
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
           <node concept="3uibUv" id="1ffsG7c47Mm" role="3O5elw">
             <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-            <node concept="3qTvmN" id="1ffsG7c49vM" role="11_B2D" />
           </node>
         </node>
       </node>
diff --git a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
index e05d8229..5b72db73 100644
--- a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
+++ b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
@@ -147,7 +147,6 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -306,6 +305,10 @@
           <ref role="3uigEE" to="nc4n:7eGEHDlcEJ0" resolve="ConstraintRulesHandler" />
         </node>
       </node>
+      <node concept="37vLTG" id="3x8pcoFuNwM" role="3clF46">
+        <property role="TrG5h" value="postProcess" />
+        <node concept="10P_77" id="3x8pcoFuOpV" role="1tU5fm" />
+      </node>
       <node concept="3uibUv" id="5NuEpF1pL7k" role="3clF45">
         <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
       </node>
@@ -336,7 +339,6 @@
               <node concept="1LlUBW" id="7t5VLKHaWTl" role="A3Ik2">
                 <node concept="3uibUv" id="1ffsG7c4WcZ" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                  <node concept="3qTvmN" id="1ffsG7c4WpX" role="11_B2D" />
                 </node>
                 <node concept="3uibUv" id="7t5VLKHaZmN" role="1Lm7xW">
                   <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -349,6 +351,9 @@
               </node>
               <node concept="liA8E" id="5NuEpF1qhgH" role="2OqNvi">
                 <ref role="37wK5l" to="138j:5NuEpF1qn9x" resolve="allTemplatesWithNoInput" />
+                <node concept="37vLTw" id="3x8pcoFuOQ9" role="37wK5m">
+                  <ref role="3cqZAo" node="3x8pcoFuNwM" resolve="postProcess" />
+                </node>
                 <node concept="2ShNRf" id="5NuEpF1qhgJ" role="37wK5m">
                   <node concept="2i4dXS" id="5NuEpF1qhgK" role="2ShVmc">
                     <node concept="3uibUv" id="5NuEpF1qhgL" role="HW$YZ">
@@ -1041,7 +1046,6 @@
           <node concept="1LlUBW" id="7t5VLKHawYT" role="A3Ik2">
             <node concept="3uibUv" id="1ffsG7c4WJ7" role="1Lm7xW">
               <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-              <node concept="3qTvmN" id="1ffsG7c4YwD" role="11_B2D" />
             </node>
             <node concept="3uibUv" id="7t5VLKHayek" role="1Lm7xW">
               <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -1237,10 +1241,13 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="tIwzd1Igsq" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:1ffsG7bWC2M" resolve="required" />
+                      <ref role="37wK5l" to="i348:2q0gzCFLe4l" resolve="required" />
                       <node concept="37vLTw" id="tIwzd1Z9kY" role="37wK5m">
                         <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                       </node>
+                      <node concept="37vLTw" id="2q0gzCFMiDZ" role="37wK5m">
+                        <ref role="3cqZAo" node="7t5VLKHaCPm" resolve="boundParam" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1252,7 +1259,6 @@
             <node concept="1LlUBW" id="7t5VLKHazo3" role="1tU5fm">
               <node concept="3uibUv" id="1ffsG7c4Zfy" role="1Lm7xW">
                 <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                <node concept="3qTvmN" id="1ffsG7c50Dt" role="11_B2D" />
               </node>
               <node concept="3uibUv" id="7t5VLKHa_uS" role="1Lm7xW">
                 <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
@@ -1339,7 +1345,6 @@
                 <node concept="1LlUBW" id="7t5VLKHavfN" role="A3Ik2">
                   <node concept="3uibUv" id="1ffsG7c5hrm" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bWxcy" resolve="ApplicableToConcept" />
-                    <node concept="3qTvmN" id="1ffsG7c5hNk" role="11_B2D" />
                   </node>
                   <node concept="3uibUv" id="7t5VLKHaw07" role="1Lm7xW">
                     <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />