From a1bd3024a5bc55a8daff812628326e4407ad6538 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 29 Nov 2018 12:48:26 +0100
Subject: [PATCH] Tests for lambdacalc sample. Annotate places where errors are
 expected.

---
 .../models/samples.lamdacalc.build.mps        |  17 +-
 .../models/samples.lambdacalc.demo.mps        |  26 +-
 .../models/samples.lambdacalc.demo@tests.mps  | 379 ++++++++++++++++++
 .../samples.lambdacalc.demo.msd               |  29 ++
 4 files changed, 438 insertions(+), 13 deletions(-)
 create mode 100644 samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps

diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
index c32b9df5..c4c8f860 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
@@ -61,11 +61,9 @@
       </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
-        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
-        <property id="5253498789149547713" name="reexport" index="3bR36h" />
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
@@ -89,7 +87,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="samples.lambdacalc" />
         <property role="3LESm3" value="af858d84-85f2-42f4-a854-0b3c6b5cd482" />
-        <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="7E7FS_VaVAm" role="3LF7KH">
           <node concept="2Ry0Ak" id="7E7FS_VaVAs" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
@@ -103,49 +100,41 @@
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAC" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAD" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAE" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAF" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAG" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAH" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAI" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAJ" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAK" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAL" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAM" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAN" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAO" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAP" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
         <node concept="1SiIV0" id="7E7FS_VaVAQ" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAR" role="1SiIV1">
-            <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
           </node>
         </node>
@@ -154,7 +143,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="samples.lambdacalc.demo" />
         <property role="3LESm3" value="05f15741-5274-4aed-a086-84d9a15ab93b" />
-        <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="7E7FS_VaVBC" role="3LF7KH">
           <node concept="2Ry0Ak" id="7E7FS_VaVC3" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
@@ -166,6 +154,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="6EwjVjWv06c" role="3bR37C">
+          <node concept="3bR9La" id="6EwjVjWv06d" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7E7FS_VaV_9" role="1l3spa">
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
index 1b48f2f8..d3f6710d 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
@@ -3,10 +3,19 @@
   <persistence version="9" />
   <languages>
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="0" />
+    <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
   </languages>
   <imports />
   <registry>
+    <language id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation">
+      <concept id="1942415814694854601" name="jetbrains.mps.typechecking.annotation.structure.ErrorAnnotation" flags="ng" index="1U20sH">
+        <property id="1942415814694854612" name="text" index="1U20sK" />
+      </concept>
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -318,6 +327,9 @@
                   <node concept="t0$VC" id="3TFdEPZdg7m" role="1DVIo8">
                     <ref role="t0$VJ" node="2jleysRWYDZ" resolve="x" />
                   </node>
+                  <node concept="1U20sH" id="6EwjVjWvyrS" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
                 <node concept="t0$VC" id="3TFdEPZdg7i" role="1DVIo4">
                   <ref role="t0$VJ" node="2jleysRWYE9" resolve="f" />
@@ -341,6 +353,9 @@
                   <node concept="t0$VC" id="3TFdEPZdg7s" role="1DVIo8">
                     <ref role="t0$VJ" node="2jleysRWYE7" resolve="x" />
                   </node>
+                  <node concept="1U20sH" id="6EwjVjWvyrU" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
               </node>
               <node concept="1DVIrB" id="2jleysRWYE6" role="1DVIr_">
@@ -491,7 +506,7 @@
     </node>
   </node>
   <node concept="1DVIrt" id="7Et5j8uqHKT">
-    <property role="TrG5h" value=" SKI" />
+    <property role="TrG5h" value="SKI" />
     <node concept="1DVJbV" id="7Et5j8uqHKU" role="1DVIru">
       <node concept="1DVIrG" id="2jleysRWY_e" role="j9CMd">
         <node concept="1DVIoH" id="2jleysRWY_k" role="1DVIrJ">
@@ -617,6 +632,9 @@
             <node concept="t0$VC" id="3TFdEPZdg6Y" role="1DVIo8">
               <ref role="t0$VJ" node="2jleysRWY_W" resolve="k" />
             </node>
+            <node concept="1U20sH" id="6EwjVjWvqNL" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
           </node>
           <node concept="1DVIo5" id="2jleysRWYD6" role="1DVIo8">
             <node concept="1DVIo5" id="2jleysRWYD7" role="1DVIo4">
@@ -652,6 +670,9 @@
                       <node concept="t0$VC" id="3TFdEPZdg7e" role="1DVIo8">
                         <ref role="t0$VJ" node="2jleysRWY_W" resolve="k" />
                       </node>
+                      <node concept="1U20sH" id="6EwjVjWvsbT" role="lGtFl">
+                        <property role="1U20sK" value="error" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -680,6 +701,9 @@
             <node concept="t0$VC" id="3TFdEPZdg7G" role="1DVIo8">
               <ref role="t0$VJ" node="2jleysRWYyL" resolve="x" />
             </node>
+            <node concept="1U20sH" id="6EwjVjWvydP" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
           </node>
           <node concept="1DVIrB" id="2jleysRWYyK" role="1DVIr_">
             <node concept="1DVIoH" id="2jleysRWYyL" role="1DVIrA">
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
new file mode 100644
index 00000000..7461e2dc
--- /dev/null
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:f6344a84-a2b8-4892-8b2e-6291d7f50a97(samples.lambdacalc.demo@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+  </languages>
+  <imports>
+    <import index="ysck" ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(samples.lambdacalc.demo)" />
+    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(samples.lambdacalc.structure)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" implicit="true" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
+        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
+      </concept>
+      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
+      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
+        <child id="1216993439383" name="methods" index="1qtyYc" />
+        <child id="1217501895093" name="testMethods" index="1SL9yI" />
+      </concept>
+      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
+      <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
+      <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
+        <child id="1205770614681" name="actualArgument" index="2XxRq1" />
+      </concept>
+    </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
+        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="2XOHcx" id="6EwjVjWuXZY">
+    <property role="2XOHcw" value="${lambdacalc_home}" />
+  </node>
+  <node concept="1lH9Xt" id="6EwjVjWuYhl">
+    <property role="TrG5h" value="Demo" />
+    <node concept="1LZb2c" id="5s5QomKHHK1" role="1SL9yI">
+      <property role="TrG5h" value="Demo" />
+      <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
+      <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
+        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
+          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
+              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
+              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWuYwA" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWv75i" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWv9xk" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWv74z" role="1SL9yI">
+      <property role="TrG5h" value="Fix" />
+      <node concept="3cqZAl" id="6EwjVjWv74$" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWv74_" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWv74A" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWvgUR" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWvgUS" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWvgUT" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWvgUU" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWvgUV" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWvgUW" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWvgUX" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWvjW7" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWv0Y3" role="1SL9yI">
+      <property role="TrG5h" value="Peculiar" />
+      <node concept="3cqZAl" id="6EwjVjWv0Y4" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWv0Y5" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWv0Y6" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWv0Y7" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWv0Y8" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWv0Y9" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWv0Ya" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWv0Yb" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWv0Y$" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWv0Yd" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWvpYG" role="1SL9yI">
+      <property role="TrG5h" value="SKI" />
+      <node concept="3cqZAl" id="6EwjVjWvpYH" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWvpYI" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWvpYJ" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWvpYK" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWvpYL" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWvpYM" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWvpYN" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWvpYO" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWvpZ_" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWvpYQ" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWvsGf" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWvvH4" role="1SL9yI">
+      <property role="TrG5h" value="Numerals" />
+      <node concept="3cqZAl" id="6EwjVjWvvH5" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWvvH6" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWvvH7" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWvvH8" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWvvH9" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWvvHa" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWvvHb" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWvvHc" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWvvIb" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWvvHe" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWvvHf" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWvydR" role="1SL9yI">
+      <property role="TrG5h" value="Omega" />
+      <node concept="3cqZAl" id="6EwjVjWvydS" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWvydT" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWvydU" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWvydV" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWvydW" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWvydX" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWvydY" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWvydZ" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWvyfa" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWvye1" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWvye2" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6EwjVjWvyrW" role="1SL9yI">
+      <property role="TrG5h" value="Y_combinator" />
+      <node concept="3cqZAl" id="6EwjVjWvyrX" role="3clF45" />
+      <node concept="3clFbS" id="6EwjVjWvyrY" role="3clF47">
+        <node concept="2Hmddi" id="6EwjVjWvyrZ" role="3cqZAp">
+          <node concept="2YIFZM" id="6EwjVjWvys0" role="2Hmdds">
+            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
+            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+            <node concept="2OqwBi" id="6EwjVjWvys1" role="37wK5m">
+              <node concept="2WthIp" id="6EwjVjWvys2" role="2Oq$k0" />
+              <node concept="2XshWL" id="6EwjVjWvys3" role="2OqNvi">
+                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                <node concept="2tJFMh" id="6EwjVjWvys4" role="2XxRq1">
+                  <node concept="ZC_QK" id="6EwjVjWvytr" role="2tJFKM">
+                    <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1jxXqW" id="6EwjVjWvys6" role="37wK5m" />
+            <node concept="3clFbT" id="6EwjVjWvys7" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2XrIbr" id="35YJGAJTxCf" role="1qtyYc">
+      <property role="TrG5h" value="resolve" />
+      <node concept="37vLTG" id="35YJGAJTxCF" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="2sp9CU" id="35YJGAJTxCR" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="35YJGAJTxCp" role="3clF45">
+        <ref role="ehGHo" to="8tt8:7_8aRkgDGQC" resolve="Doc" />
+      </node>
+      <node concept="3clFbS" id="35YJGAJTxCh" role="3clF47">
+        <node concept="3cpWs8" id="35YJGAJT$34" role="3cqZAp">
+          <node concept="3cpWsn" id="35YJGAJT$35" role="3cpWs9">
+            <property role="TrG5h" value="cls" />
+            <node concept="3Tqbb2" id="35YJGAJT$2Z" role="1tU5fm">
+              <ref role="ehGHo" to="8tt8:7_8aRkgDGQC" resolve="Doc" />
+            </node>
+          </node>
+        </node>
+        <node concept="1QHqEK" id="35YJGAJTxLm" role="3cqZAp">
+          <node concept="1QHqEC" id="35YJGAJTxLn" role="1QHqEI">
+            <node concept="3clFbS" id="35YJGAJTxLo" role="1bW5cS">
+              <node concept="3clFbF" id="35YJGAJT$eE" role="3cqZAp">
+                <node concept="37vLTI" id="35YJGAJT$eG" role="3clFbG">
+                  <node concept="1PxgMI" id="35YJGAJT$36" role="37vLTx">
+                    <node concept="chp4Y" id="6EwjVjWv0_k" role="3oSUPX">
+                      <ref role="cht4Q" to="8tt8:7_8aRkgDGQC" resolve="Doc" />
+                    </node>
+                    <node concept="2OqwBi" id="35YJGAJT$38" role="1m5AlR">
+                      <node concept="37vLTw" id="35YJGAJT$39" role="2Oq$k0">
+                        <ref role="3cqZAo" node="35YJGAJTxCF" resolve="ref" />
+                      </node>
+                      <node concept="Vyspw" id="35YJGAJT$3a" role="2OqNvi">
+                        <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
+                          <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
+                          <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="35YJGAJT$eK" role="37vLTJ">
+                    <ref role="3cqZAo" node="35YJGAJT$35" resolve="cls" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
+            <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
+            <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="35YJGAJTyJo" role="3cqZAp">
+          <node concept="37vLTw" id="35YJGAJT$3e" role="3clFbG">
+            <ref role="3cqZAo" node="35YJGAJT$35" resolve="cls" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="35YJGAJTxCl" role="1B3o_S" />
+    </node>
+  </node>
+</model>
+
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
index 6defabad..80a50f46 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
@@ -6,11 +6,40 @@
     </modelRoot>
   </models>
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
+    <dependency reexport="false">af858d84-85f2-42f4-a854-0b3c6b5cd482(samples.lambdacalc)</dependency>
+  </dependencies>
   <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
     <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:samples.lambdacalc" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="af858d84-85f2-42f4-a854-0b3c6b5cd482(samples.lambdacalc)" version="0" />
     <module reference="05f15741-5274-4aed-a086-84d9a15ab93b(samples.lambdacalc.demo)" version="0" />
   </dependencyVersions>
 </solution>