From a9fe6bf973e93eeb5f5a876cc768603a6e336dc0 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Sat, 21 Feb 2015 12:41:05 +0100
Subject: [PATCH] Fixed calling of rule template methods recursively; use trees
 as anchors; some editor beautification

---
 .../generator/template/main@generator.mps     | 621 ++++++++++++++++--
 .../jetbrains.mps.lang.typesystem2.mpl        |   2 +
 .../languageModels/editor.mps                 |   2 +-
 ...jetbrains.mps.lang.typesystem2.runtime.msd |   2 +
 .../mps/lang/typesystem2/runtime/template.mps | 325 ++++++++-
 5 files changed, 889 insertions(+), 63 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 bee27f8a..63b88b74 100644
--- a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="-1" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
@@ -169,6 +168,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <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" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
@@ -1630,48 +1630,48 @@
         <node concept="3clFbS" id="4vbeH84Jm_b" role="1Koe22">
           <node concept="3clFbF" id="4vbeH84KkIO" role="3cqZAp">
             <node concept="15s5l7" id="6w6CYIRgtIT" role="lGtFl" />
-            <node concept="2YIFZM" id="aFQeb4hMty" role="3clFbG">
+            <node concept="2YIFZM" id="1lUeO1Ncdir" role="3clFbG">
+              <ref role="37wK5l" to="qiww:1lUeO1NbZUR" resolve="anchorTree" />
               <ref role="1Pybhc" to="qiww:6ntBQ9KIZRc" resolve="AnchorUtil" />
-              <ref role="37wK5l" to="qiww:6ntBQ9KJ1a_" resolve="asAnchor" />
-              <node concept="10Nm6u" id="aFQeb4hOgF" role="37wK5m">
-                <node concept="29HgVG" id="aFQeb4hOp5" role="lGtFl">
-                  <node concept="3NFfHV" id="aFQeb4hOp6" role="3NFExx">
-                    <node concept="3clFbS" id="aFQeb4hOp7" role="2VODD2">
-                      <node concept="3clFbF" id="aFQeb4hOpd" role="3cqZAp">
-                        <node concept="2OqwBi" id="aFQeb4hOp8" role="3clFbG">
-                          <node concept="3TrEf2" id="aFQeb4hOpb" role="2OqNvi">
+              <node concept="10Nm6u" id="1lUeO1Ncdis" role="37wK5m">
+                <node concept="29HgVG" id="1lUeO1Ncdit" role="lGtFl">
+                  <node concept="3NFfHV" id="1lUeO1Ncdiu" role="3NFExx">
+                    <node concept="3clFbS" id="1lUeO1Ncdiv" role="2VODD2">
+                      <node concept="3clFbF" id="1lUeO1Ncdiw" role="3cqZAp">
+                        <node concept="2OqwBi" id="1lUeO1Ncdix" role="3clFbG">
+                          <node concept="3TrEf2" id="1lUeO1Ncdiy" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:6p0DfM0hKQz" />
                           </node>
-                          <node concept="30H73N" id="aFQeb4hOpc" role="2Oq$k0" />
+                          <node concept="30H73N" id="1lUeO1Ncdiz" role="2Oq$k0" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="aFQeb4hOk5" role="lGtFl" />
-              <node concept="1W57fq" id="aFQeb4hOww" role="lGtFl">
+              <node concept="raruj" id="1lUeO1Ncdi$" role="lGtFl" />
+              <node concept="1W57fq" id="1lUeO1Ncdi_" role="lGtFl">
                 <property role="34cw8o" value="  code.type &lt;: node&lt;&gt; " />
-                <node concept="3IZrLx" id="aFQeb4hOwy" role="3IZSJc">
-                  <node concept="3clFbS" id="aFQeb4hOw$" role="2VODD2">
-                    <node concept="3clFbF" id="aFQeb4hOIQ" role="3cqZAp">
-                      <node concept="2OqwBi" id="aFQeb4hOIR" role="3clFbG">
-                        <node concept="1UaxmW" id="aFQeb4hOIS" role="2Oq$k0">
-                          <node concept="1YaCAy" id="aFQeb4hOIT" role="1Ub_4A">
+                <node concept="3IZrLx" id="1lUeO1NcdiA" role="3IZSJc">
+                  <node concept="3clFbS" id="1lUeO1NcdiB" role="2VODD2">
+                    <node concept="3clFbF" id="1lUeO1NcdiC" role="3cqZAp">
+                      <node concept="2OqwBi" id="1lUeO1NcdiD" role="3clFbG">
+                        <node concept="1UaxmW" id="1lUeO1NcdiE" role="2Oq$k0">
+                          <node concept="1YaCAy" id="1lUeO1NcdiF" role="1Ub_4A">
                             <property role="TrG5h" value="sNodeType" />
                             <ref role="1YaFvo" to="tp25:gzTqbfa" resolve="SNodeType" />
                           </node>
-                          <node concept="2OqwBi" id="aFQeb4hOIU" role="1Ub_4B">
-                            <node concept="2OqwBi" id="aFQeb4hOIV" role="2Oq$k0">
-                              <node concept="30H73N" id="aFQeb4hOIW" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="aFQeb4hOIX" role="2OqNvi">
+                          <node concept="2OqwBi" id="1lUeO1NcdiG" role="1Ub_4B">
+                            <node concept="2OqwBi" id="1lUeO1NcdiH" role="2Oq$k0">
+                              <node concept="30H73N" id="1lUeO1NcdiI" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="1lUeO1NcdiJ" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:6p0DfM0hKQz" />
                               </node>
                             </node>
-                            <node concept="3JvlWi" id="aFQeb4hOIY" role="2OqNvi" />
+                            <node concept="3JvlWi" id="1lUeO1NcdiK" role="2OqNvi" />
                           </node>
                         </node>
-                        <node concept="3x8VRR" id="aFQeb4hP99" role="2OqNvi" />
+                        <node concept="3x8VRR" id="1lUeO1NcdiL" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -4707,64 +4707,308 @@
     <node concept="3aamgX" id="6FQzrygTsJf" role="3acgRq">
       <ref role="30HIoZ" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
       <node concept="j$656" id="6FQzrygUS4l" role="1lVwrX">
-        <ref role="v9R2y" node="6FQzrygUxlL" resolve="rulemethod_call" />
+        <ref role="v9R2y" node="6FQzrygUxlL" resolve="rulemethod_call_rulePart" />
       </node>
       <node concept="30G5F_" id="6FQzrygTtrs" role="30HLyM">
         <node concept="3clFbS" id="6FQzrygTtrt" role="2VODD2">
-          <node concept="3clFbF" id="6FQzrygTtA_" role="3cqZAp">
-            <node concept="1Wc70l" id="6FQzrygTFKv" role="3clFbG">
-              <node concept="3clFbC" id="6FQzrygTHR$" role="3uHU7w">
-                <node concept="28GBK8" id="6FQzrygUrCC" role="3uHU7w">
-                  <ref role="28GBKb" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                  <ref role="28H3Ia" to="tpee:fzclF8k" />
-                </node>
-                <node concept="2OqwBi" id="6FQzrygTGhW" role="3uHU7B">
-                  <node concept="30H73N" id="6FQzrygTG9g" role="2Oq$k0" />
-                  <node concept="25OxAV" id="6FQzrygUhlB" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6FQzrygTD0q" role="3uHU7B">
-                <node concept="2OqwBi" id="6FQzrygTyIm" role="2Oq$k0">
-                  <node concept="2OqwBi" id="6FQzrygTuOM" role="2Oq$k0">
-                    <node concept="2OqwBi" id="6FQzrygTtGR" role="2Oq$k0">
-                      <node concept="30H73N" id="6FQzrygTtA$" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="6FQzrygTua1" role="2OqNvi">
+          <node concept="3cpWs8" id="2QE4RCGdwDe" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGdwDf" role="3cpWs9">
+              <property role="TrG5h" value="isRuleTemplateMtd" />
+              <node concept="10P_77" id="2QE4RCGdwCN" role="1tU5fm" />
+              <node concept="2OqwBi" id="2QE4RCGdwDg" role="33vP2m">
+                <node concept="2OqwBi" id="2QE4RCGdwDh" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2QE4RCGdwDi" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2QE4RCGdwDj" role="2Oq$k0">
+                      <node concept="30H73N" id="2QE4RCGdwDk" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2QE4RCGdwDl" role="2OqNvi">
                         <ref role="3Tt5mk" to="tpee:fIYIWN3" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="6FQzrygTwD$" role="2OqNvi">
+                    <node concept="3Tsc0h" id="2QE4RCGdwDm" role="2OqNvi">
                       <ref role="3TtcxE" to="tpee:hiAJF2X" />
                     </node>
                   </node>
-                  <node concept="3$u5V9" id="6FQzrygTA88" role="2OqNvi">
-                    <node concept="1bVj0M" id="6FQzrygTA8a" role="23t8la">
-                      <node concept="3clFbS" id="6FQzrygTA8b" role="1bW5cS">
-                        <node concept="3clFbF" id="6FQzrygTAyE" role="3cqZAp">
-                          <node concept="2OqwBi" id="6FQzrygTAGa" role="3clFbG">
-                            <node concept="37vLTw" id="6FQzrygTAyD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6FQzrygTA8c" resolve="it" />
+                  <node concept="3$u5V9" id="2QE4RCGdwDn" role="2OqNvi">
+                    <node concept="1bVj0M" id="2QE4RCGdwDo" role="23t8la">
+                      <node concept="3clFbS" id="2QE4RCGdwDp" role="1bW5cS">
+                        <node concept="3clFbF" id="2QE4RCGdwDq" role="3cqZAp">
+                          <node concept="2OqwBi" id="2QE4RCGdwDr" role="3clFbG">
+                            <node concept="37vLTw" id="2QE4RCGdwDs" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2QE4RCGdwDu" resolve="it" />
                             </node>
-                            <node concept="3TrEf2" id="6FQzrygTBey" role="2OqNvi">
+                            <node concept="3TrEf2" id="2QE4RCGdwDt" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:hiAI5P0" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6FQzrygTA8c" role="1bW2Oz">
+                      <node concept="Rh6nW" id="2QE4RCGdwDu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6FQzrygTA8d" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2QE4RCGdwDv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3JPx81" id="6FQzrygTEuk" role="2OqNvi">
-                  <node concept="3B5_sB" id="6FQzrygTERb" role="25WWJ7">
+                <node concept="3JPx81" id="2QE4RCGdwDw" role="2OqNvi">
+                  <node concept="3B5_sB" id="2QE4RCGdwDx" role="25WWJ7">
                     <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="2QE4RCGdyJE" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGdyJF" role="3cpWs9">
+              <property role="TrG5h" value="isExpressionStmt" />
+              <node concept="10P_77" id="2QE4RCGdyJB" role="1tU5fm" />
+              <node concept="3clFbC" id="2QE4RCGdyJG" role="33vP2m">
+                <node concept="28GBK8" id="2QE4RCGdyJH" role="3uHU7w">
+                  <ref role="28GBKb" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                  <ref role="28H3Ia" to="tpee:fzclF8k" />
+                </node>
+                <node concept="2OqwBi" id="2QE4RCGdyJI" role="3uHU7B">
+                  <node concept="30H73N" id="2QE4RCGdyJJ" role="2Oq$k0" />
+                  <node concept="25OxAV" id="2QE4RCGdyJK" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2QE4RCGdInS" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGdInT" role="3cpWs9">
+              <property role="TrG5h" value="isWithinRulePart" />
+              <node concept="10P_77" id="2QE4RCGdInO" role="1tU5fm" />
+              <node concept="2OqwBi" id="2QE4RCGdInU" role="33vP2m">
+                <node concept="2OqwBi" id="2QE4RCGdInV" role="2Oq$k0">
+                  <node concept="30H73N" id="2QE4RCGdInW" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="2QE4RCGdInX" role="2OqNvi">
+                    <node concept="3gmYPX" id="2QE4RCGdInY" role="1xVPHs">
+                      <node concept="3gn64h" id="2QE4RCGdInZ" role="3gmYPZ">
+                        <ref role="3gnhBz" to="wq2x:6p0DfM0a3d3" resolve="RulePart" />
+                      </node>
+                      <node concept="3gn64h" id="2QE4RCGdIo0" role="3gmYPZ">
+                        <ref role="3gnhBz" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2QE4RCGdIo1" role="2OqNvi">
+                  <node concept="chp4Y" id="2QE4RCGdIo2" role="cj9EA">
+                    <ref role="cht4Q" to="wq2x:6p0DfM0a3d3" resolve="RulePart" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6FQzrygTtA_" role="3cqZAp">
+            <node concept="1Wc70l" id="2QE4RCGdAW3" role="3clFbG">
+              <node concept="37vLTw" id="2QE4RCGdIo3" role="3uHU7w">
+                <ref role="3cqZAo" node="2QE4RCGdInT" resolve="isWithinRulePart" />
+              </node>
+              <node concept="1Wc70l" id="6FQzrygTFKv" role="3uHU7B">
+                <node concept="37vLTw" id="2QE4RCGdwDy" role="3uHU7B">
+                  <ref role="3cqZAo" node="2QE4RCGdwDf" resolve="isRuleTemplateMtd" />
+                </node>
+                <node concept="37vLTw" id="2QE4RCGdyJL" role="3uHU7w">
+                  <ref role="3cqZAo" node="2QE4RCGdyJF" resolve="isExpressionStmt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2QE4RCGfm6I" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+      <node concept="j$656" id="2QE4RCGfn3G" role="1lVwrX">
+        <ref role="v9R2y" node="2QE4RCGdVo8" resolve="rulemethod_call_method" />
+      </node>
+      <node concept="30G5F_" id="2QE4RCGfm6K" role="30HLyM">
+        <node concept="3clFbS" id="2QE4RCGfm6L" role="2VODD2">
+          <node concept="3cpWs8" id="2QE4RCGfm6M" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGfm6N" role="3cpWs9">
+              <property role="TrG5h" value="isRuleTemplateMtd" />
+              <node concept="10P_77" id="2QE4RCGfm6O" role="1tU5fm" />
+              <node concept="2OqwBi" id="2QE4RCGfm6P" role="33vP2m">
+                <node concept="2OqwBi" id="2QE4RCGfm6Q" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2QE4RCGfm6R" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2QE4RCGfm6S" role="2Oq$k0">
+                      <node concept="30H73N" id="2QE4RCGfm6T" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2QE4RCGfm6U" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:fIYIWN3" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="2QE4RCGfm6V" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:hiAJF2X" />
+                    </node>
+                  </node>
+                  <node concept="3$u5V9" id="2QE4RCGfm6W" role="2OqNvi">
+                    <node concept="1bVj0M" id="2QE4RCGfm6X" role="23t8la">
+                      <node concept="3clFbS" id="2QE4RCGfm6Y" role="1bW5cS">
+                        <node concept="3clFbF" id="2QE4RCGfm6Z" role="3cqZAp">
+                          <node concept="2OqwBi" id="2QE4RCGfm70" role="3clFbG">
+                            <node concept="37vLTw" id="2QE4RCGfm71" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2QE4RCGfm73" resolve="it" />
+                            </node>
+                            <node concept="3TrEf2" id="2QE4RCGfm72" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:hiAI5P0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="2QE4RCGfm73" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="2QE4RCGfm74" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3JPx81" id="2QE4RCGfm75" role="2OqNvi">
+                  <node concept="3B5_sB" id="2QE4RCGfm76" role="25WWJ7">
+                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2QE4RCGfm77" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGfm78" role="3cpWs9">
+              <property role="TrG5h" value="isExpressionStmt" />
+              <node concept="10P_77" id="2QE4RCGfm79" role="1tU5fm" />
+              <node concept="3clFbC" id="2QE4RCGfm7a" role="33vP2m">
+                <node concept="28GBK8" id="2QE4RCGfm7b" role="3uHU7w">
+                  <ref role="28GBKb" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                  <ref role="28H3Ia" to="tpee:fzclF8k" />
+                </node>
+                <node concept="2OqwBi" id="2QE4RCGfm7c" role="3uHU7B">
+                  <node concept="30H73N" id="2QE4RCGfm7d" role="2Oq$k0" />
+                  <node concept="25OxAV" id="2QE4RCGfm7e" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2QE4RCGfm7f" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGfm7g" role="3cpWs9">
+              <property role="TrG5h" value="isWithinMethod" />
+              <node concept="10P_77" id="2QE4RCGfm7h" role="1tU5fm" />
+              <node concept="2OqwBi" id="2QE4RCGfm7i" role="33vP2m">
+                <node concept="2OqwBi" id="2QE4RCGfm7j" role="2Oq$k0">
+                  <node concept="30H73N" id="2QE4RCGfm7k" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="2QE4RCGfm7l" role="2OqNvi">
+                    <node concept="3gmYPX" id="2QE4RCGfm7m" role="1xVPHs">
+                      <node concept="3gn64h" id="2QE4RCGfm7n" role="3gmYPZ">
+                        <ref role="3gnhBz" to="wq2x:6p0DfM0a3d3" resolve="RulePart" />
+                      </node>
+                      <node concept="3gn64h" id="2QE4RCGfm7o" role="3gmYPZ">
+                        <ref role="3gnhBz" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2QE4RCGfm7p" role="2OqNvi">
+                  <node concept="chp4Y" id="2QE4RCGfoXU" role="cj9EA">
+                    <ref role="cht4Q" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2QE4RCGfm7r" role="3cqZAp">
+            <node concept="1Wc70l" id="2QE4RCGfm7s" role="3clFbG">
+              <node concept="37vLTw" id="2QE4RCGfm7t" role="3uHU7w">
+                <ref role="3cqZAo" node="2QE4RCGfm7g" resolve="isWithinMethod" />
+              </node>
+              <node concept="1Wc70l" id="2QE4RCGfm7u" role="3uHU7B">
+                <node concept="37vLTw" id="2QE4RCGfm7v" role="3uHU7B">
+                  <ref role="3cqZAo" node="2QE4RCGfm6N" resolve="isRuleTemplateMtd" />
+                </node>
+                <node concept="37vLTw" id="2QE4RCGfm7w" role="3uHU7w">
+                  <ref role="3cqZAo" node="2QE4RCGfm78" resolve="isExpressionStmt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2QE4RCGfs5p" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:6LFqxSRBTg4" resolve="LocalMethodCall" />
+      <node concept="j$656" id="2QE4RCGfs5q" role="1lVwrX">
+        <ref role="v9R2y" node="2QE4RCGdVo8" resolve="rulemethod_call_method" />
+      </node>
+      <node concept="30G5F_" id="2QE4RCGfs5r" role="30HLyM">
+        <node concept="3clFbS" id="2QE4RCGfs5s" role="2VODD2">
+          <node concept="3cpWs8" id="2QE4RCGfs5t" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGfs5u" role="3cpWs9">
+              <property role="TrG5h" value="isRuleTemplateMtd" />
+              <node concept="10P_77" id="2QE4RCGfs5v" role="1tU5fm" />
+              <node concept="2OqwBi" id="2QE4RCGfs5w" role="33vP2m">
+                <node concept="2OqwBi" id="2QE4RCGfs5x" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2QE4RCGfs5y" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2QE4RCGfs5z" role="2Oq$k0">
+                      <node concept="30H73N" id="2QE4RCGfs5$" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2QE4RCGfueF" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:6LFqxSRBTg7" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="2QE4RCGfs5A" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:hiAJF2X" />
+                    </node>
+                  </node>
+                  <node concept="3$u5V9" id="2QE4RCGfs5B" role="2OqNvi">
+                    <node concept="1bVj0M" id="2QE4RCGfs5C" role="23t8la">
+                      <node concept="3clFbS" id="2QE4RCGfs5D" role="1bW5cS">
+                        <node concept="3clFbF" id="2QE4RCGfs5E" role="3cqZAp">
+                          <node concept="2OqwBi" id="2QE4RCGfs5F" role="3clFbG">
+                            <node concept="37vLTw" id="2QE4RCGfs5G" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2QE4RCGfs5I" resolve="it" />
+                            </node>
+                            <node concept="3TrEf2" id="2QE4RCGfs5H" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:hiAI5P0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="2QE4RCGfs5I" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="2QE4RCGfs5J" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3JPx81" id="2QE4RCGfs5K" role="2OqNvi">
+                  <node concept="3B5_sB" id="2QE4RCGfs5L" role="25WWJ7">
+                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2QE4RCGfs5M" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGfs5N" role="3cpWs9">
+              <property role="TrG5h" value="isExpressionStmt" />
+              <node concept="10P_77" id="2QE4RCGfs5O" role="1tU5fm" />
+              <node concept="3clFbC" id="2QE4RCGfs5P" role="33vP2m">
+                <node concept="28GBK8" id="2QE4RCGfs5Q" role="3uHU7w">
+                  <ref role="28GBKb" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                  <ref role="28H3Ia" to="tpee:fzclF8k" />
+                </node>
+                <node concept="2OqwBi" id="2QE4RCGfs5R" role="3uHU7B">
+                  <node concept="30H73N" id="2QE4RCGfs5S" role="2Oq$k0" />
+                  <node concept="25OxAV" id="2QE4RCGfs5T" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2QE4RCGfs66" role="3cqZAp">
+            <node concept="1Wc70l" id="2QE4RCGfs69" role="3clFbG">
+              <node concept="37vLTw" id="2QE4RCGfs6a" role="3uHU7B">
+                <ref role="3cqZAo" node="2QE4RCGfs5u" resolve="isRuleTemplateMtd" />
+              </node>
+              <node concept="37vLTw" id="2QE4RCGfs6b" role="3uHU7w">
+                <ref role="3cqZAo" node="2QE4RCGfs5N" resolve="isExpressionStmt" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
@@ -4892,7 +5136,7 @@
     </node>
   </node>
   <node concept="13MO4I" id="6FQzrygUxlL">
-    <property role="TrG5h" value="rulemethod_call" />
+    <property role="TrG5h" value="rulemethod_call_rulePart" />
     <ref role="3gUMe" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
     <node concept="312cEu" id="6FQzrygU_0X" role="13RCb5">
       <property role="2bfB8j" value="true" />
@@ -5835,5 +6079,266 @@
       </node>
     </node>
   </node>
+  <node concept="13MO4I" id="2QE4RCGdVo8">
+    <property role="TrG5h" value="rulemethod_call_method" />
+    <ref role="3gUMe" to="tpee:fz7wK6G" resolve="BaseMethodCall" />
+    <node concept="312cEu" id="2QE4RCGdVo9" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Context" />
+      <node concept="2tJIrI" id="2QE4RCGdVoa" role="jymVt" />
+      <node concept="2YIFZL" id="2QE4RCGdVob" role="jymVt">
+        <property role="TrG5h" value="method" />
+        <node concept="3uibUv" id="2QE4RCGdVoc" role="3clF45">
+          <ref role="3uigEE" to="nc4n:7eGEHDlc$ap" resolve="RuleBuilder" />
+        </node>
+        <node concept="3Tm1VV" id="2QE4RCGdVod" role="1B3o_S" />
+        <node concept="3clFbS" id="2QE4RCGdVoe" role="3clF47">
+          <node concept="3clFbF" id="2QE4RCGdVof" role="3cqZAp">
+            <node concept="10Nm6u" id="2QE4RCGdVog" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2QE4RCGdVoh" role="3clF46">
+          <property role="TrG5h" value="param" />
+          <node concept="8X2XB" id="2QE4RCGdVoi" role="1tU5fm">
+            <node concept="3uibUv" id="2QE4RCGdVoj" role="8Xvag">
+              <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2QE4RCGdVok" role="jymVt" />
+      <node concept="2YIFZL" id="2QE4RCGdVol" role="jymVt">
+        <property role="TrG5h" value="context" />
+        <node concept="3cqZAl" id="2QE4RCGdVom" role="3clF45" />
+        <node concept="3Tm1VV" id="2QE4RCGdVon" role="1B3o_S" />
+        <node concept="3clFbS" id="2QE4RCGdVoo" role="3clF47">
+          <node concept="3cpWs8" id="2QE4RCGdVop" role="3cqZAp">
+            <node concept="3cpWsn" id="2QE4RCGdVoq" role="3cpWs9">
+              <property role="TrG5h" value="builder" />
+              <node concept="3uibUv" id="2QE4RCGdVor" role="1tU5fm">
+                <ref role="3uigEE" to="nc4n:7eGEHDlc$ap" resolve="RuleBuilder" />
+              </node>
+              <node concept="2ShNRf" id="2QE4RCGdVos" role="33vP2m">
+                <node concept="1pGfFk" id="2QE4RCGdVot" role="2ShVmc">
+                  <ref role="37wK5l" to="nc4n:7eGEHDlc$ar" resolve="RuleBuilder" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2QE4RCGdVou" role="3cqZAp" />
+          <node concept="3clFbF" id="2QE4RCGdVov" role="3cqZAp">
+            <node concept="2OqwBi" id="2QE4RCGdVow" role="3clFbG">
+              <node concept="37vLTw" id="2QE4RCGdVox" role="2Oq$k0">
+                <ref role="3cqZAo" node="2QE4RCGdVoq" resolve="builder" />
+                <node concept="1ZhdrF" id="2QE4RCGdVoy" role="lGtFl">
+                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                  <property role="2qtEX8" value="variableDeclaration" />
+                  <node concept="3$xsQk" id="2QE4RCGdVoz" role="3$ytzL">
+                    <node concept="3clFbS" id="2QE4RCGdVo$" role="2VODD2">
+                      <node concept="3clFbF" id="2QE4RCGdVo_" role="3cqZAp">
+                        <node concept="2OqwBi" id="2QE4RCGdVoA" role="3clFbG">
+                          <node concept="1iwH7S" id="2QE4RCGdVoB" role="2Oq$k0" />
+                          <node concept="1iwH70" id="2QE4RCGdVoC" role="2OqNvi">
+                            <ref role="1iwH77" node="6FQzrygSZ4e" resolve="builder_variable_rulemethod" />
+                            <node concept="2OqwBi" id="2QE4RCGdVoD" role="1iwH7V">
+                              <node concept="2Xjw5R" id="2QE4RCGdVoE" role="2OqNvi">
+                                <node concept="1xMEDy" id="2QE4RCGdVoF" role="1xVPHs">
+                                  <node concept="chp4Y" id="2QE4RCGe1XC" role="ri$Ld">
+                                    <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="30H73N" id="2QE4RCGdVoH" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="2QE4RCGdVoI" role="2OqNvi">
+                <ref role="37wK5l" to="nc4n:77AxcO4ZwMR" resolve="merge" />
+                <node concept="2YIFZM" id="2QE4RCGdVoJ" role="37wK5m">
+                  <ref role="1Pybhc" node="2QE4RCGdVo9" resolve="Context" />
+                  <ref role="37wK5l" node="2QE4RCGdVob" resolve="method" />
+                  <node concept="10Nm6u" id="2QE4RCGdVoK" role="37wK5m">
+                    <node concept="2b32R4" id="2QE4RCGdVoL" role="lGtFl">
+                      <node concept="3JmXsc" id="2QE4RCGdVoM" role="2P8S$">
+                        <node concept="3clFbS" id="2QE4RCGdVoN" role="2VODD2">
+                          <node concept="3clFbF" id="2QE4RCGdVoO" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QE4RCGdVoP" role="3clFbG">
+                              <node concept="3Tsc0h" id="2QE4RCGdVoQ" role="2OqNvi">
+                                <ref role="3TtcxE" to="tpee:fz7wK6I" />
+                              </node>
+                              <node concept="30H73N" id="2QE4RCGdVoR" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1ZhdrF" id="2QE4RCGdVoS" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                    <property role="2qtEX8" value="baseMethodDeclaration" />
+                    <node concept="3$xsQk" id="2QE4RCGdVoT" role="3$ytzL">
+                      <node concept="3clFbS" id="2QE4RCGdVoU" role="2VODD2">
+                        <node concept="3clFbF" id="2QE4RCGdVoV" role="3cqZAp">
+                          <node concept="2OqwBi" id="2QE4RCGdVoW" role="3clFbG">
+                            <node concept="3TrEf2" id="2QE4RCGdVoX" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:fIYIWN3" />
+                            </node>
+                            <node concept="1PxgMI" id="2QE4RCGf9r5" role="2Oq$k0">
+                              <ref role="1PxNhF" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                              <node concept="30H73N" id="2QE4RCGdVoY" role="1PxMeX" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1ZhdrF" id="2QE4RCGdVoZ" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1081236700937/1144433194310" />
+                    <property role="2qtEX8" value="classConcept" />
+                    <node concept="3$xsQk" id="2QE4RCGdVp0" role="3$ytzL">
+                      <node concept="3clFbS" id="2QE4RCGdVp1" role="2VODD2">
+                        <node concept="3clFbF" id="2QE4RCGdVp2" role="3cqZAp">
+                          <node concept="1PxgMI" id="2QE4RCGdVp3" role="3clFbG">
+                            <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
+                            <node concept="2OqwBi" id="2QE4RCGdVp4" role="1PxMeX">
+                              <node concept="2OqwBi" id="2QE4RCGdVp5" role="2Oq$k0">
+                                <node concept="3TrEf2" id="2QE4RCGdVp6" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:fIYIWN3" />
+                                </node>
+                                <node concept="1PxgMI" id="2QE4RCGf7mk" role="2Oq$k0">
+                                  <ref role="1PxNhF" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                                  <node concept="30H73N" id="2QE4RCGdVp7" role="1PxMeX" />
+                                </node>
+                              </node>
+                              <node concept="1mfA1w" id="2QE4RCGdVp8" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="2QE4RCGdVp9" role="lGtFl" />
+              <node concept="1W57fq" id="2QE4RCGeXB9" role="lGtFl">
+                <node concept="3IZrLx" id="2QE4RCGeXBb" role="3IZSJc">
+                  <node concept="3clFbS" id="2QE4RCGeXBd" role="2VODD2">
+                    <node concept="3clFbF" id="2QE4RCGeYbA" role="3cqZAp">
+                      <node concept="2OqwBi" id="2QE4RCGeYht" role="3clFbG">
+                        <node concept="30H73N" id="2QE4RCGeYb_" role="2Oq$k0" />
+                        <node concept="1mIQ4w" id="2QE4RCGeYOd" role="2OqNvi">
+                          <node concept="chp4Y" id="2QE4RCGeZ3v" role="cj9EA">
+                            <ref role="cht4Q" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2QE4RCGf4TI" role="3cqZAp">
+            <node concept="2OqwBi" id="2QE4RCGf5Hl" role="3clFbG">
+              <node concept="37vLTw" id="2QE4RCGf4TG" role="2Oq$k0">
+                <ref role="3cqZAo" node="2QE4RCGdVoq" resolve="builder" />
+                <node concept="1ZhdrF" id="2QE4RCGf6Z7" role="lGtFl">
+                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                  <property role="2qtEX8" value="variableDeclaration" />
+                  <node concept="3$xsQk" id="2QE4RCGf6Z8" role="3$ytzL">
+                    <node concept="3clFbS" id="2QE4RCGf6Z9" role="2VODD2">
+                      <node concept="3clFbF" id="2QE4RCGf74e" role="3cqZAp">
+                        <node concept="2OqwBi" id="2QE4RCGf74f" role="3clFbG">
+                          <node concept="1iwH7S" id="2QE4RCGf74g" role="2Oq$k0" />
+                          <node concept="1iwH70" id="2QE4RCGf74h" role="2OqNvi">
+                            <ref role="1iwH77" node="6FQzrygSZ4e" resolve="builder_variable_rulemethod" />
+                            <node concept="2OqwBi" id="2QE4RCGf74i" role="1iwH7V">
+                              <node concept="2Xjw5R" id="2QE4RCGf74j" role="2OqNvi">
+                                <node concept="1xMEDy" id="2QE4RCGf74k" role="1xVPHs">
+                                  <node concept="chp4Y" id="2QE4RCGf74l" role="ri$Ld">
+                                    <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="30H73N" id="2QE4RCGf74m" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="2QE4RCGf6jk" role="2OqNvi">
+                <ref role="37wK5l" to="nc4n:77AxcO4ZwMR" resolve="merge" />
+                <node concept="1rXfSq" id="2QE4RCGf6Cf" role="37wK5m">
+                  <ref role="37wK5l" node="2QE4RCGdVob" resolve="method" />
+                  <node concept="10Nm6u" id="2QE4RCGf6GV" role="37wK5m">
+                    <node concept="2b32R4" id="2QE4RCGfd3j" role="lGtFl">
+                      <node concept="3JmXsc" id="2QE4RCGfd3m" role="2P8S$">
+                        <node concept="3clFbS" id="2QE4RCGfd3n" role="2VODD2">
+                          <node concept="3clFbF" id="2QE4RCGfd3t" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QE4RCGfd3o" role="3clFbG">
+                              <node concept="3Tsc0h" id="2QE4RCGfd3r" role="2OqNvi">
+                                <ref role="3TtcxE" to="tpee:fz7wK6I" />
+                              </node>
+                              <node concept="30H73N" id="2QE4RCGfd3s" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1ZhdrF" id="2QE4RCGfaZ9" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                    <property role="2qtEX8" value="baseMethodDeclaration" />
+                    <node concept="3$xsQk" id="2QE4RCGfaZa" role="3$ytzL">
+                      <node concept="3clFbS" id="2QE4RCGfaZb" role="2VODD2">
+                        <node concept="3clFbF" id="2QE4RCGfbaR" role="3cqZAp">
+                          <node concept="2OqwBi" id="2QE4RCGfbwG" role="3clFbG">
+                            <node concept="1PxgMI" id="2QE4RCGfbib" role="2Oq$k0">
+                              <ref role="1PxNhF" to="tpee:6LFqxSRBTg4" resolve="LocalMethodCall" />
+                              <node concept="30H73N" id="2QE4RCGfbaQ" role="1PxMeX" />
+                            </node>
+                            <node concept="3TrEf2" id="2QE4RCGfcdU" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:6LFqxSRBTg7" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="2QE4RCGf6Mn" role="lGtFl" />
+              <node concept="1W57fq" id="2QE4RCGfevK" role="lGtFl">
+                <node concept="3IZrLx" id="2QE4RCGfevM" role="3IZSJc">
+                  <node concept="3clFbS" id="2QE4RCGfevO" role="2VODD2">
+                    <node concept="3clFbF" id="2QE4RCGff2$" role="3cqZAp">
+                      <node concept="2OqwBi" id="2QE4RCGff8r" role="3clFbG">
+                        <node concept="30H73N" id="2QE4RCGff2z" role="2Oq$k0" />
+                        <node concept="1mIQ4w" id="2QE4RCGffFF" role="2OqNvi">
+                          <node concept="chp4Y" id="2QE4RCGffTL" role="cj9EA">
+                            <ref role="cht4Q" to="tpee:6LFqxSRBTg4" resolve="LocalMethodCall" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2QE4RCGdVpa" role="3cqZAp" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2QE4RCGdVpb" role="1B3o_S" />
+    </node>
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index eff788a6..6e4aa6d3 100644
--- a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -31,6 +31,7 @@
         <usedLanguage>9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</usedLanguage>
         <usedLanguage>7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</usedLanguage>
         <usedLanguage>c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)</usedLanguage>
+        <usedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</usedLanguage>
       </usedLanguages>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -53,6 +54,7 @@
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
         <language id="c4803b19-6d89-4a3b-bf82-390769514add" fqName="jetbrains.mps.lang.typesystem2" version="0" />
+        <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
       </languageVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index dd455cc5..d286911d 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -1656,7 +1656,7 @@
     <node concept="3EZMnI" id="60B5zVESIDp" role="2wV5jI">
       <node concept="PMmxH" id="60B5zVESIFc" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <node concept="Vb9p2" id="7xE5ZvRYuIK" role="3F10Kt" />
       </node>
       <node concept="3F0ifn" id="60B5zVESIG7" role="3EZMnx">
         <property role="3F0ifm" value="(" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index ccb0ae23..11b44a0a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -15,6 +15,7 @@
   </dependencies>
   <usedLanguages>
     <usedLanguage>f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)</usedLanguage>
+    <usedLanguage>daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</usedLanguage>
   </usedLanguages>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -28,6 +29,7 @@
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
+    <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
index 7b2fa91c..27987fa5 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -13,7 +14,8 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="ec5l" ref="f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.model(MPS.OpenAPI/org.jetbrains.mps.openapi.model@java_stub)" />
     <import index="rzz2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang.annotation(JDK/java.lang.annotation@java_stub)" />
-    <import index="t3eg" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.language(MPS.OpenAPI/org.jetbrains.mps.openapi.language@java_stub)" implicit="true" />
+    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.unification.tree)" />
+    <import index="t3eg" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.language(MPS.OpenAPI/org.jetbrains.mps.openapi.language@java_stub)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -219,6 +221,39 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
+      <concept id="1174909099093" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReferenceRegexp" flags="ng" index="2e2xP4">
+        <reference id="1174909113141" name="match" index="2e2_8$" />
+      </concept>
+      <concept id="1175161264766" name="jetbrains.mps.baseLanguage.regexp.structure.LineStartRegexp" flags="ng" index="2t4tHJ" />
+      <concept id="1175169009571" name="jetbrains.mps.baseLanguage.regexp.structure.FindMatchStatement" flags="nn" index="2ty0qM">
+        <child id="1175169023932" name="expr" index="2ty3UH" />
+        <child id="1175169154112" name="body" index="2tyzPh" />
+      </concept>
+      <concept id="1174482804200" name="jetbrains.mps.baseLanguage.regexp.structure.PlusRegexp" flags="ng" index="1OClNT" />
+      <concept id="1174482808826" name="jetbrains.mps.baseLanguage.regexp.structure.StarRegexp" flags="ng" index="1OCmVF" />
+      <concept id="1174484562151" name="jetbrains.mps.baseLanguage.regexp.structure.SeqRegexp" flags="ng" index="1OJ37Q" />
+      <concept id="1174485167097" name="jetbrains.mps.baseLanguage.regexp.structure.BinaryRegexp" flags="ng" index="1OLmFC">
+        <child id="1174485176897" name="left" index="1OLpdg" />
+        <child id="1174485181039" name="right" index="1OLqdY" />
+      </concept>
+      <concept id="1174485235885" name="jetbrains.mps.baseLanguage.regexp.structure.UnaryRegexp" flags="ng" index="1OLBAW">
+        <child id="1174485243418" name="regexp" index="1OLDsb" />
+      </concept>
+      <concept id="1174510540317" name="jetbrains.mps.baseLanguage.regexp.structure.InlineRegexpExpression" flags="nn" index="1Qi9sc">
+        <child id="1174510571016" name="regexp" index="1QigWp" />
+      </concept>
+      <concept id="1174556813606" name="jetbrains.mps.baseLanguage.regexp.structure.DotRegexp" flags="ng" index="1T2EwR" />
+      <concept id="1174564062919" name="jetbrains.mps.baseLanguage.regexp.structure.MatchParensRegexp" flags="ng" index="1Tukvm">
+        <child id="1174564160889" name="regexp" index="1TuGhC" />
+      </concept>
+      <concept id="1174565027678" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReference" flags="nn" index="1TxZTf">
+        <reference id="1174565035929" name="match" index="1Ty1U8" />
+      </concept>
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+        <child id="1174653387388" name="regexp" index="1YN4dH" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
         <child id="1176906787974" name="rightExpression" index="576Qk" />
@@ -387,9 +422,7 @@
         <property role="TrG5h" value="node" />
         <node concept="3Tqbb2" id="6ntBQ9KJ1gj" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="6ntBQ9KJ1aC" role="3clF45">
-        <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
-      </node>
+      <node concept="17QB3L" id="1lUeO1N84Pa" role="3clF45" />
       <node concept="3Tm1VV" id="6ntBQ9KJ1aD" role="1B3o_S" />
       <node concept="3clFbS" id="6ntBQ9KJ1aE" role="3clF47">
         <node concept="3cpWs8" id="aFQeb4bEdq" role="3cqZAp">
@@ -498,6 +531,290 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1lUeO1NbZ__" role="jymVt" />
+    <node concept="2YIFZL" id="1lUeO1NbZUR" role="jymVt">
+      <property role="TrG5h" value="anchorTree" />
+      <node concept="37vLTG" id="1lUeO1Nc1F3" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="1lUeO1Nc1HN" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="1lUeO1Nc033" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+      </node>
+      <node concept="3Tm1VV" id="1lUeO1NbZUU" role="1B3o_S" />
+      <node concept="3clFbS" id="1lUeO1NbZUV" role="3clF47">
+        <node concept="3clFbJ" id="1lUeO1NeAy$" role="3cqZAp">
+          <node concept="3clFbS" id="1lUeO1NeAyA" role="3clFbx">
+            <node concept="3cpWs6" id="1lUeO1NeFFN" role="3cqZAp">
+              <node concept="2YIFZM" id="1lUeO1NeGyi" role="3cqZAk">
+                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <node concept="2YIFZM" id="1lUeO1NeGyj" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+                  <node concept="Xl_RD" id="1lUeO1NeGyk" role="37wK5m">
+                    <property role="Xl_RC" value="node" />
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NeGyl" role="37wK5m">
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="1lUeO1NeGym" role="37wK5m">
+                      <property role="Xl_RC" value="node" />
+                    </node>
+                    <node concept="Xl_RD" id="1lUeO1NePTh" role="37wK5m">
+                      <property role="Xl_RC" value="null" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="1lUeO1NeCsx" role="3clFbw">
+            <node concept="10Nm6u" id="1lUeO1NeDdw" role="3uHU7w" />
+            <node concept="37vLTw" id="1lUeO1NeBmQ" role="3uHU7B">
+              <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1lUeO1NeERv" role="3cqZAp" />
+        <node concept="3cpWs8" id="1lUeO1NexFO" role="3cqZAp">
+          <node concept="3cpWsn" id="1lUeO1NexFP" role="3cpWs9">
+            <property role="TrG5h" value="cpt" />
+            <node concept="17QB3L" id="1lUeO1NezAK" role="1tU5fm" />
+            <node concept="2OqwBi" id="1lUeO1NexFQ" role="33vP2m">
+              <node concept="2OqwBi" id="1lUeO1NexFR" role="2Oq$k0">
+                <node concept="2JrnkZ" id="1lUeO1NexFS" role="2Oq$k0">
+                  <node concept="37vLTw" id="1lUeO1NexFT" role="2JrQYb">
+                    <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1lUeO1NexFU" role="2OqNvi">
+                  <ref role="37wK5l" to="ec5l:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
+                </node>
+              </node>
+              <node concept="liA8E" id="1lUeO1NexFV" role="2OqNvi">
+                <ref role="37wK5l" to="t3eg:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1lUeO1NeywL" role="3cqZAp">
+          <node concept="3cpWsn" id="1lUeO1NeywM" role="3cpWs9">
+            <property role="TrG5h" value="id" />
+            <node concept="17QB3L" id="1lUeO1NezPL" role="1tU5fm" />
+            <node concept="2YIFZM" id="1lUeO1NeywN" role="33vP2m">
+              <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
+              <node concept="2OqwBi" id="1lUeO1NeywO" role="37wK5m">
+                <node concept="2JrnkZ" id="1lUeO1NeywP" role="2Oq$k0">
+                  <node concept="37vLTw" id="1lUeO1NeywQ" role="2JrQYb">
+                    <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1lUeO1NeywR" role="2OqNvi">
+                  <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1lUeO1Ngnn1" role="3cqZAp" />
+        <node concept="3clFbJ" id="1lUeO1NgoLN" role="3cqZAp">
+          <node concept="3clFbS" id="1lUeO1NgoLP" role="3clFbx">
+            <node concept="3cpWs8" id="1lUeO1NewCH" role="3cqZAp">
+              <node concept="3cpWsn" id="1lUeO1NewCI" role="3cpWs9">
+                <property role="TrG5h" value="name" />
+                <node concept="17QB3L" id="1lUeO1NewCJ" role="1tU5fm" />
+                <node concept="2OqwBi" id="1lUeO1NewCL" role="33vP2m">
+                  <node concept="1PxgMI" id="1lUeO1NewCM" role="2Oq$k0">
+                    <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    <node concept="37vLTw" id="1lUeO1NewCN" role="1PxMeX">
+                      <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="1lUeO1NewCO" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="1lUeO1NgAl$" role="3cqZAp">
+              <node concept="2YIFZM" id="1lUeO1NgBIZ" role="3cqZAk">
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+                <node concept="2YIFZM" id="1lUeO1NgBJ0" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+                  <node concept="Xl_RD" id="1lUeO1NgBJ1" role="37wK5m">
+                    <property role="Xl_RC" value="node" />
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NgBJ2" role="37wK5m">
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <node concept="Xl_RD" id="1lUeO1NgBJ3" role="37wK5m">
+                      <property role="Xl_RC" value="concept" />
+                    </node>
+                    <node concept="37vLTw" id="1lUeO1NgBJ4" role="37wK5m">
+                      <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NgBJ5" role="37wK5m">
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="1lUeO1NgBJ6" role="37wK5m">
+                      <property role="Xl_RC" value="name" />
+                    </node>
+                    <node concept="37vLTw" id="1lUeO1NgBJ7" role="37wK5m">
+                      <ref role="3cqZAo" node="1lUeO1NewCI" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NgBJ8" role="37wK5m">
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <node concept="Xl_RD" id="1lUeO1NgBJ9" role="37wK5m">
+                      <property role="Xl_RC" value="id" />
+                    </node>
+                    <node concept="37vLTw" id="1lUeO1NgBJa" role="37wK5m">
+                      <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="1lUeO1NgqRU" role="3clFbw">
+            <node concept="37vLTw" id="1lUeO1NgqbO" role="2Oq$k0">
+              <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+            </node>
+            <node concept="1mIQ4w" id="1lUeO1NgAdW" role="2OqNvi">
+              <node concept="chp4Y" id="1lUeO1NgAfr" role="cj9EA">
+                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1lUeO1NinP6" role="3cqZAp" />
+        <node concept="3cpWs8" id="1lUeO1Nhag3" role="3cqZAp">
+          <node concept="3cpWsn" id="1lUeO1Nhag4" role="3cpWs9">
+            <property role="TrG5h" value="text" />
+            <node concept="17QB3L" id="1lUeO1Nhag1" role="1tU5fm" />
+            <node concept="2OqwBi" id="1lUeO1Nhag5" role="33vP2m">
+              <node concept="2YIFZM" id="1lUeO1Nhag6" role="2Oq$k0">
+                <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
+                <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <node concept="37vLTw" id="1lUeO1Nhag7" role="37wK5m">
+                  <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                </node>
+              </node>
+              <node concept="EvHYZ" id="1lUeO1Nhag8" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2ty0qM" id="1lUeO1NhMzg" role="3cqZAp">
+          <node concept="1Qi9sc" id="1lUeO1NhMzi" role="1YN4dH">
+            <node concept="1OJ37Q" id="1lUeO1NhPT9" role="1QigWp">
+              <node concept="2t4tHJ" id="1lUeO1NhPPo" role="1OLpdg" />
+              <node concept="1OJ37Q" id="1lUeO1NhQ3Z" role="1OLqdY">
+                <node concept="1Tukvm" id="1lUeO1NhPT7" role="1OLpdg">
+                  <property role="TrG5h" value="ascii" />
+                  <node concept="1OClNT" id="1lUeO1NhQ2Q" role="1TuGhC">
+                    <node concept="2e2xP4" id="1lUeO1NhPZd" role="1OLDsb">
+                      <ref role="2e2_8$" node="1lUeO1NhPT7" resolve="ascii" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1OCmVF" id="1lUeO1NhQ7a" role="1OLqdY">
+                  <node concept="1T2EwR" id="1lUeO1NhQ5d" role="1OLDsb" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="1lUeO1NhP52" role="2ty3UH">
+            <ref role="3cqZAo" node="1lUeO1Nhag4" resolve="text" />
+          </node>
+          <node concept="3clFbS" id="1lUeO1NhMzm" role="2tyzPh">
+            <node concept="3cpWs6" id="1lUeO1NhSaB" role="3cqZAp">
+              <node concept="2YIFZM" id="1lUeO1NhSaC" role="3cqZAk">
+                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <node concept="2YIFZM" id="1lUeO1NhSaD" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+                  <node concept="Xl_RD" id="1lUeO1NhSaE" role="37wK5m">
+                    <property role="Xl_RC" value="node" />
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NhSaF" role="37wK5m">
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <node concept="Xl_RD" id="1lUeO1NhSaG" role="37wK5m">
+                      <property role="Xl_RC" value="concept" />
+                    </node>
+                    <node concept="37vLTw" id="1lUeO1NhSaH" role="37wK5m">
+                      <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NhSaI" role="37wK5m">
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="1lUeO1NhSaJ" role="37wK5m">
+                      <property role="Xl_RC" value="text" />
+                    </node>
+                    <node concept="1TxZTf" id="1lUeO1NifzY" role="37wK5m">
+                      <ref role="1Ty1U8" node="1lUeO1NhPT7" resolve="ascii" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="1lUeO1NhSS2" role="37wK5m">
+                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="1lUeO1NhSS3" role="37wK5m">
+                      <property role="Xl_RC" value="id" />
+                    </node>
+                    <node concept="37vLTw" id="1lUeO1NhSS4" role="37wK5m">
+                      <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1lUeO1NhKzJ" role="3cqZAp" />
+        <node concept="3cpWs6" id="1lUeO1Nhr2c" role="3cqZAp">
+          <node concept="2YIFZM" id="1lUeO1Nc2xK" role="3cqZAk">
+            <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+            <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+            <node concept="2YIFZM" id="1lUeO1Nc4Ei" role="37wK5m">
+              <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+              <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+              <node concept="Xl_RD" id="1lUeO1Nc4Qd" role="37wK5m">
+                <property role="Xl_RC" value="node" />
+              </node>
+              <node concept="2YIFZM" id="1lUeO1Nf3pS" role="37wK5m">
+                <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <node concept="Xl_RD" id="1lUeO1Nf44O" role="37wK5m">
+                  <property role="Xl_RC" value="concept" />
+                </node>
+                <node concept="37vLTw" id="1lUeO1Nf67U" role="37wK5m">
+                  <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="1lUeO1NeZtl" role="37wK5m">
+                <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <node concept="Xl_RD" id="1lUeO1NeZUZ" role="37wK5m">
+                  <property role="Xl_RC" value="id" />
+                </node>
+                <node concept="37vLTw" id="1lUeO1Nf1jT" role="37wK5m">
+                  <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1lUeO1Nc1OI" role="jymVt" />
     <node concept="3Tm1VV" id="6ntBQ9KIZRd" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="6ntBQ9KKtmQ">