From cee12bbef3b45e9853eb1ce2b9e4768216276c07 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 27 Aug 2015 13:55:11 +0200
Subject: [PATCH] Pull up boundParameterBlock as AbstractRule.letBlock

---
 .../generator/template/main@generator.mps     | 38 +++++++++----------
 .../languageModels/constraints.mps            |  2 +-
 .../languageModels/editor.mps                 |  2 +-
 .../languageModels/structure.mps              |  6 +++
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 13d1ee91..8f7abbab 100644
--- a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -2856,7 +2856,7 @@
                   <node concept="2OqwBi" id="2q0gzCFMa3x" role="2Oq$k0">
                     <node concept="30H73N" id="2q0gzCFMa3y" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2q0gzCFMa3z" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="2q0gzCFMa3$" role="2OqNvi" />
@@ -2881,7 +2881,7 @@
                   <node concept="2OqwBi" id="2q0gzCFMa3H" role="2Oq$k0">
                     <node concept="30H73N" id="2q0gzCFMa3I" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2q0gzCFMa3J" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="2q0gzCFMa3K" role="2OqNvi">
@@ -3165,7 +3165,7 @@
                               <node concept="2OqwBi" id="1ffsG7ci1PZ" role="2Oq$k0">
                                 <node concept="30H73N" id="1ffsG7ci1Q0" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="1ffsG7ci1Q1" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                                  <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                                 </node>
                               </node>
                               <node concept="3x8VRR" id="1ffsG7ci1Q2" role="2OqNvi" />
@@ -3285,7 +3285,7 @@
                   <node concept="2OqwBi" id="1zN1RIkWr93" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkWqMc" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkWrx3" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="1zN1RIkWsgc" role="2OqNvi" />
@@ -3310,7 +3310,7 @@
                   <node concept="2OqwBi" id="1zN1RIkWwak" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkWvEI" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkWwwb" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="1zN1RIkWwWH" role="2OqNvi">
@@ -3339,7 +3339,7 @@
                   <node concept="2OqwBi" id="1zN1RIkUYSa" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkUYJN" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkUZj4" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="1zN1RIkV084" role="2OqNvi" />
@@ -3361,7 +3361,7 @@
                   <node concept="2OqwBi" id="1zN1RIkV0rX" role="2Oq$k0">
                     <node concept="2OqwBi" id="1zN1RIkUYmI" role="2Oq$k0">
                       <node concept="3TrEf2" id="1zN1RIkUYmL" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                        <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                       </node>
                       <node concept="30H73N" id="1zN1RIkUYmM" role="2Oq$k0" />
                     </node>
@@ -4583,7 +4583,7 @@
                   <node concept="2OqwBi" id="2q0gzCFLUHv" role="2Oq$k0">
                     <node concept="30H73N" id="2q0gzCFLUHw" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2q0gzCFLUHx" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="2q0gzCFLUHy" role="2OqNvi" />
@@ -4608,7 +4608,7 @@
                   <node concept="2OqwBi" id="2q0gzCFLUHF" role="2Oq$k0">
                     <node concept="30H73N" id="2q0gzCFLUHG" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2q0gzCFLUHH" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="2q0gzCFLUHI" role="2OqNvi">
@@ -4777,7 +4777,7 @@
                   <node concept="2OqwBi" id="1zN1RIkWsTC" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkWsjZ" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkWthC" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="1zN1RIkWu0U" role="2OqNvi" />
@@ -4802,7 +4802,7 @@
                   <node concept="2OqwBi" id="1zN1RIkWu7u" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkWu29" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkWutl" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="1zN1RIkWuU0" role="2OqNvi">
@@ -5042,7 +5042,7 @@
                               <node concept="2OqwBi" id="1ffsG7chKPG" role="2Oq$k0">
                                 <node concept="30H73N" id="1ffsG7chKPH" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="1ffsG7chKPI" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                                  <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                                 </node>
                               </node>
                               <node concept="3x8VRR" id="1ffsG7chKPJ" role="2OqNvi" />
@@ -5114,7 +5114,7 @@
                   <node concept="2OqwBi" id="1zN1RIkUPuL" role="2Oq$k0">
                     <node concept="30H73N" id="1zN1RIkUPlY" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1zN1RIkUPTW" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="1zN1RIkUQJB" role="2OqNvi" />
@@ -5136,7 +5136,7 @@
                   <node concept="2OqwBi" id="1zN1RIkUMSz" role="2Oq$k0">
                     <node concept="2OqwBi" id="1zN1RIkUM8u" role="2Oq$k0">
                       <node concept="3TrEf2" id="1zN1RIkUM8x" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                        <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                       </node>
                       <node concept="30H73N" id="1zN1RIkUM8y" role="2Oq$k0" />
                     </node>
@@ -7480,7 +7480,7 @@
                     <node concept="2OqwBi" id="3KXGt7WP7VB" role="2Oq$k0">
                       <node concept="30H73N" id="3KXGt7WP7VC" role="2Oq$k0" />
                       <node concept="3TrEf2" id="3KXGt7WP7VD" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                        <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                       </node>
                     </node>
                     <node concept="3x8VRR" id="3KXGt7WP7VE" role="2OqNvi" />
@@ -7505,7 +7505,7 @@
                     <node concept="2OqwBi" id="3KXGt7WP7VN" role="2Oq$k0">
                       <node concept="30H73N" id="3KXGt7WP7VO" role="2Oq$k0" />
                       <node concept="3TrEf2" id="3KXGt7WP7VP" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                        <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                       </node>
                     </node>
                     <node concept="3TrEf2" id="3KXGt7WP7VQ" role="2OqNvi">
@@ -7674,7 +7674,7 @@
                         <node concept="2OqwBi" id="1zN1RIl3FXD" role="2Oq$k0">
                           <node concept="30H73N" id="1zN1RIl3FXE" role="2Oq$k0" />
                           <node concept="3TrEf2" id="1zN1RIl3FXF" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                            <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                           </node>
                         </node>
                       </node>
@@ -7701,7 +7701,7 @@
                     <node concept="2OqwBi" id="1zN1RIl3FXY" role="2Oq$k0">
                       <node concept="2OqwBi" id="1zN1RIl3FXZ" role="2Oq$k0">
                         <node concept="3TrEf2" id="1zN1RIl3FY0" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                          <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                         </node>
                         <node concept="30H73N" id="1zN1RIl3FY1" role="2Oq$k0" />
                       </node>
@@ -7726,7 +7726,7 @@
                 <node concept="2OqwBi" id="1zN1RIl3FXN" role="3clFbG">
                   <node concept="2OqwBi" id="1zN1RIl3FXO" role="2Oq$k0">
                     <node concept="3TrEf2" id="1zN1RIl3FXP" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                      <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                     </node>
                     <node concept="30H73N" id="1zN1RIl3FXQ" role="2Oq$k0" />
                   </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index acf1f933..bfa6866f 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -272,7 +272,7 @@
                             <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
                           </node>
                           <node concept="3TrEf2" id="1zN1RIkRgUh" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
+                            <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" />
                           </node>
                         </node>
                         <node concept="3TrEf2" id="1zN1RIkRhBO" role="2OqNvi">
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 374da726..7acd1323 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -599,7 +599,7 @@
             </node>
             <node concept="3F1sOY" id="1zN1RIkQKV0" role="3EZMnx">
               <property role="1$x2rV" value="with no bindings" />
-              <ref role="1NtTu8" to="wq2x:1zN1RIkQKTu" />
+              <ref role="1NtTu8" to="wq2x:6wQEDbCHGnY" />
               <node concept="ljvvj" id="1zN1RIkQKV1" role="3F10Kt">
                 <property role="VOm3f" value="true" />
               </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index a8b859d0..f39793f5 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -148,6 +148,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="boundParameterBlock" />
       <ref role="20lvS9" node="1zN1RIkQtcr" resolve="BoundParameterBlock" />
+      <node concept="asaX9" id="6wQEDbCIWty" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="5bC6UNl$TEw" role="PzmwI">
       <ref role="PrY4T" node="1CgWc1Tyjkz" resolve="ICanBeCommented" />
@@ -540,6 +541,11 @@
       <property role="20kJfa" value="requiredNodeBlock" />
       <ref role="20lvS9" node="tIwzd1EOs6" resolve="RequiredNodeBlock" />
     </node>
+    <node concept="1TJgyj" id="6wQEDbCHGnY" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="letBlock" />
+      <ref role="20lvS9" node="1zN1RIkQtcr" resolve="BoundParameterBlock" />
+    </node>
     <node concept="1TJgyj" id="1ffsG7bnJXK" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="applyCondition" />