Skip to content

Commit e2d14ff

Browse files
wsafonovwsafonov
committed
Merge remote-tracking branch 'origin/master' into refactor/shared-base-runtime
# Conflicts: # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
2 parents dd2368c + 1d6a129 commit e2d14ff

File tree

18 files changed

+2831
-614
lines changed

18 files changed

+2831
-614
lines changed

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

Lines changed: 219 additions & 43 deletions
Large diffs are not rendered by default.

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

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
3333
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
3434
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
35+
<concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
3536
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
3637
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
3738
<child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -73,6 +74,9 @@
7374
<property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
7475
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
7576
</concept>
77+
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
78+
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
79+
</concept>
7680
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
7781
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
7882
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -95,6 +99,12 @@
9599
<concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
96100
<child id="1225900141900" name="modelAccessor" index="1HlULh" />
97101
</concept>
102+
<concept id="1088612959204" name="jetbrains.mps.lang.editor.structure.CellModel_Alternation" flags="sg" stub="8104358048506729361" index="1QoScp">
103+
<property id="1088613081987" name="vertical" index="1QpmdY" />
104+
<child id="1145918517974" name="alternationCondition" index="3e4ffs" />
105+
<child id="1088612958265" name="ifTrueCellModel" index="1QoS34" />
106+
<child id="1088612973955" name="ifFalseCellModel" index="1QoVPY" />
107+
</concept>
98108
<concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
99109
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
100110
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -148,6 +158,7 @@
148158
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
149159
</concept>
150160
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
161+
<concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
151162
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
152163
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
153164
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -331,6 +342,7 @@
331342
</concept>
332343
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
333344
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
345+
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
334346
</language>
335347
</registry>
336348
<node concept="24kQdi" id="cPLa7FpdIL">
@@ -981,8 +993,34 @@
981993
<ref role="1XX52x" to="e9k1:3y6PJwOpPmR" resolve="DataIsInTarget" />
982994
<node concept="3EZMnI" id="6WstIz8MK6C" role="2wV5jI">
983995
<node concept="l2Vlx" id="6WstIz8MK6D" role="2iSdaV" />
984-
<node concept="3F0ifn" id="6WstIz8MK6E" role="3EZMnx">
985-
<property role="3F0ifm" value="isIn" />
996+
<node concept="1QoScp" id="3MDtzBr9V7" role="3EZMnx">
997+
<property role="1QpmdY" value="true" />
998+
<node concept="3F0ifn" id="3MDtzBr9V9" role="1QoS34">
999+
<property role="3F0ifm" value="isIn" />
1000+
</node>
1001+
<node concept="pkWqt" id="3MDtzBr9Va" role="3e4ffs">
1002+
<node concept="3clFbS" id="3MDtzBr9Vc" role="2VODD2">
1003+
<node concept="3clFbF" id="3MDtzBrefN" role="3cqZAp">
1004+
<node concept="3eOSWO" id="3MDtzBrm6t" role="3clFbG">
1005+
<node concept="3cmrfG" id="3MDtzBrm6x" role="3uHU7w">
1006+
<property role="3cmrfH" value="1" />
1007+
</node>
1008+
<node concept="2OqwBi" id="3MDtzBrmMr" role="3uHU7B">
1009+
<node concept="2OqwBi" id="3MDtzBrev5" role="2Oq$k0">
1010+
<node concept="pncrf" id="3MDtzBrefM" role="2Oq$k0" />
1011+
<node concept="3Tsc0h" id="3MDtzBreNV" role="2OqNvi">
1012+
<ref role="3TtcxE" to="e9k1:3y6PJwOpPmU" resolve="selectors" />
1013+
</node>
1014+
</node>
1015+
<node concept="34oBXx" id="3MDtzBrpVo" role="2OqNvi" />
1016+
</node>
1017+
</node>
1018+
</node>
1019+
</node>
1020+
</node>
1021+
<node concept="3F0ifn" id="3MDtzBrqex" role="1QoVPY">
1022+
<property role="3F0ifm" value="is" />
1023+
</node>
9861024
</node>
9871025
<node concept="3F0ifn" id="6WstIz8MK6F" role="3EZMnx">
9881026
<property role="3F0ifm" value="(" />
@@ -1036,6 +1074,21 @@
10361074
</node>
10371075
</node>
10381076
</node>
1077+
<node concept="pkWqt" id="3MDtzBsETN" role="pqm2j">
1078+
<node concept="3clFbS" id="3MDtzBsETO" role="2VODD2">
1079+
<node concept="3clFbF" id="3MDtzBsEUX" role="3cqZAp">
1080+
<node concept="2OqwBi" id="3MDtzBsH9B" role="3clFbG">
1081+
<node concept="2OqwBi" id="3MDtzBsFaf" role="2Oq$k0">
1082+
<node concept="pncrf" id="3MDtzBsEUW" role="2Oq$k0" />
1083+
<node concept="3Tsc0h" id="3MDtzBsFvp" role="2OqNvi">
1084+
<ref role="3TtcxE" to="e9k1:3y6PJwOpPmU" resolve="selectors" />
1085+
</node>
1086+
</node>
1087+
<node concept="3GX2aA" id="3MDtzBsKyA" role="2OqNvi" />
1088+
</node>
1089+
</node>
1090+
</node>
1091+
</node>
10391092
</node>
10401093
</node>
10411094
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@
245245
<node concept="1TIwiD" id="3y6PJwOpPmR">
246246
<property role="EcuMT" value="4073179274522613175" />
247247
<property role="TrG5h" value="DataIsInTarget" />
248-
<property role="34LRSv" value="isIn" />
248+
<property role="34LRSv" value="is" />
249249
<property role="3GE5qa" value="expr" />
250-
<property role="R4oN_" value="check data element against several rows" />
250+
<property role="R4oN_" value="check data element against one or several rows" />
251251
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
252252
<node concept="PrWs8" id="3y6PJwOpPmS" role="PzmwI">
253253
<ref role="PrY4T" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
@@ -256,7 +256,7 @@
256256
<property role="IQ2ns" value="4073179274522613178" />
257257
<property role="20lmBu" value="fLJjDmT/aggregation" />
258258
<property role="20kJfa" value="selectors" />
259-
<property role="20lbJX" value="fLJekj5/_0__n" />
259+
<property role="20lbJX" value="fLJekj6/_1__n" />
260260
<ref role="20lvS9" node="3y6PJwOpPmW" resolve="DataRowSelector" />
261261
</node>
262262
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/generator/template/[email protected]‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,12 @@
880880
<node concept="3NFfHV" id="4NM7IHyGJR9" role="3NFExx">
881881
<node concept="3clFbS" id="4NM7IHyGJRa" role="2VODD2">
882882
<node concept="3clFbF" id="4NM7IHyGJRg" role="3cqZAp">
883-
<node concept="30H73N" id="4NM7IHyGJRf" role="3clFbG" />
883+
<node concept="2OqwBi" id="2K3xA62ZtU2" role="3clFbG">
884+
<node concept="30H73N" id="4NM7IHyGJRf" role="2Oq$k0" />
885+
<node concept="3TrEf2" id="2K3xA62ZucK" role="2OqNvi">
886+
<ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
887+
</node>
888+
</node>
884889
</node>
885890
</node>
886891
</node>

0 commit comments

Comments
 (0)