Merge remote-tracking branch 'origin/master' into feature/437-sm-javagen-example

# Conflicts:
#	code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

Author: wsafonov

code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.genjava.core.devkit/org.iets3.core.expr.genjava.core.devkit.devkit

@@ -15,6 +15,7 @@
     <exported-solution>72f3ce09-f244-46a5-88ca-7b98cd2dfb22(org.iets3.core.expr.genjava.core.genplan)</exported-solution>
     <exported-solution>dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</exported-solution>
     <exported-solution>b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</exported-solution>
+    <exported-solution>52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</exported-solution>
   </exported-solutions>
   <generation-plan model="r:44582398-dfcf-40ad-bb09-b88bb3cc5de2(org.iets3.core.expr.genjava.core.genplan.genplan)" />
 </dev-kit>

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps

@@ -19,6 +19,7 @@
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.libs)</dependency>
+    <dependency reexport="false">b0c65e49-9d83-43ce-9e81-46c4fb70be71(de.q60.mps.shadowmodels.modelcheck.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -98,7 +99,11 @@
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="95085166-3236-4dd7-bd8e-e753c8d20885(de.q60.mps.incremental.runtime)" version="0" />
     <module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.libs)" version="0" />
+    <module reference="18463265-6d45-4514-82f1-cf7eb1222492(de.q60.mps.polymorphicfunctions.runtime)" version="0" />
+    <module reference="b0c65e49-9d83-43ce-9e81-46c4fb70be71(de.q60.mps.shadowmodels.modelcheck.runtime)" version="0" />
+    <module reference="e52a4835-844d-46a1-99f8-c06129db796f(de.q60.mps.shadowmodels.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl

@@ -32,6 +32,7 @@
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -73,6 +74,9 @@
         <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
+      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
+      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -95,6 +99,12 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
+      <concept id="1088612959204" name="jetbrains.mps.lang.editor.structure.CellModel_Alternation" flags="sg" stub="8104358048506729361" index="1QoScp">
+        <property id="1088613081987" name="vertical" index="1QpmdY" />
+        <child id="1145918517974" name="alternationCondition" index="3e4ffs" />
+        <child id="1088612958265" name="ifTrueCellModel" index="1QoS34" />
+        <child id="1088612973955" name="ifFalseCellModel" index="1QoVPY" />
+      </concept>
       <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -148,6 +158,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <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" />
@@ -331,6 +342,7 @@
       </concept>
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="24kQdi" id="cPLa7FpdIL">
@@ -981,8 +993,34 @@
     <ref role="1XX52x" to="e9k1:3y6PJwOpPmR" resolve="DataIsInTarget" />
     <node concept="3EZMnI" id="6WstIz8MK6C" role="2wV5jI">
       <node concept="l2Vlx" id="6WstIz8MK6D" role="2iSdaV" />
-      <node concept="3F0ifn" id="6WstIz8MK6E" role="3EZMnx">
-        <property role="3F0ifm" value="isIn" />
+      <node concept="1QoScp" id="3MDtzBr9V7" role="3EZMnx">
+        <property role="1QpmdY" value="true" />
+        <node concept="3F0ifn" id="3MDtzBr9V9" role="1QoS34">
+          <property role="3F0ifm" value="isIn" />
+        </node>
+        <node concept="pkWqt" id="3MDtzBr9Va" role="3e4ffs">
+          <node concept="3clFbS" id="3MDtzBr9Vc" role="2VODD2">
+            <node concept="3clFbF" id="3MDtzBrefN" role="3cqZAp">
+              <node concept="3eOSWO" id="3MDtzBrm6t" role="3clFbG">
+                <node concept="3cmrfG" id="3MDtzBrm6x" role="3uHU7w">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="2OqwBi" id="3MDtzBrmMr" role="3uHU7B">
+                  <node concept="2OqwBi" id="3MDtzBrev5" role="2Oq$k0">
+                    <node concept="pncrf" id="3MDtzBrefM" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="3MDtzBreNV" role="2OqNvi">
+                      <ref role="3TtcxE" to="e9k1:3y6PJwOpPmU" resolve="selectors" />
+                    </node>
+                  </node>
+                  <node concept="34oBXx" id="3MDtzBrpVo" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3F0ifn" id="3MDtzBrqex" role="1QoVPY">
+          <property role="3F0ifm" value="is" />
+        </node>
       </node>
       <node concept="3F0ifn" id="6WstIz8MK6F" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -1036,6 +1074,21 @@
             </node>
           </node>
         </node>
+        <node concept="pkWqt" id="3MDtzBsETN" role="pqm2j">
+          <node concept="3clFbS" id="3MDtzBsETO" role="2VODD2">
+            <node concept="3clFbF" id="3MDtzBsEUX" role="3cqZAp">
+              <node concept="2OqwBi" id="3MDtzBsH9B" role="3clFbG">
+                <node concept="2OqwBi" id="3MDtzBsFaf" role="2Oq$k0">
+                  <node concept="pncrf" id="3MDtzBsEUW" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3MDtzBsFvp" role="2OqNvi">
+                    <ref role="3TtcxE" to="e9k1:3y6PJwOpPmU" resolve="selectors" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="3MDtzBsKyA" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps

@@ -245,9 +245,9 @@
   <node concept="1TIwiD" id="3y6PJwOpPmR">
     <property role="EcuMT" value="4073179274522613175" />
     <property role="TrG5h" value="DataIsInTarget" />
-    <property role="34LRSv" value="isIn" />
+    <property role="34LRSv" value="is" />
     <property role="3GE5qa" value="expr" />
-    <property role="R4oN_" value="check data element against several rows" />
+    <property role="R4oN_" value="check data element against one or several rows" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3y6PJwOpPmS" role="PzmwI">
       <ref role="PrY4T" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
@@ -256,7 +256,7 @@
       <property role="IQ2ns" value="4073179274522613178" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="selectors" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="fLJekj6/_1__n" />
       <ref role="20lvS9" node="3y6PJwOpPmW" resolve="DataRowSelector" />
     </node>
   </node>