Skip to content

Commit 9eb9745

Browse files
wsafonovwsafonov
committed
Merge remote-tracking branch 'origin/maintenance/mps20201' into maintenance/mps20202
# Conflicts: # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
2 parents 5e4f467 + 2ba0a1b commit 9eb9745

File tree

39 files changed

+3880
-1000
lines changed

39 files changed

+3880
-1000
lines changed

‎code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</registry>
2121
<node concept="3ZOQsN" id="6pNCASbHXH8">
2222
<property role="TrG5h" value="KernelFTestExecution" />
23-
<node concept="3ZOXxk" id="4Uid4MjWPro" role="3ZOXzE" />
23+
<node concept="3ZOXxk" id="5FFsEXIfo19" role="3ZOXzE" />
2424
</node>
2525
</model>
2626

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26316,5 +26316,26 @@
2631626316
<node concept="3clFbS" id="3nVyItrZCNQ" role="2VODD2" />
2631726317
</node>
2631826318
</node>
26319+
<node concept="13h7C7" id="6xvNSEj6BMA">
26320+
<ref role="13h7C2" to="hm2y:6xvNSEj6BMb" resolve="IComplexTypeSupportsEquals" />
26321+
<node concept="13i0hz" id="6xvNSEj6BML" role="13h7CS">
26322+
<property role="13i0it" value="true" />
26323+
<property role="TrG5h" value="isComparableTo" />
26324+
<node concept="3Tm1VV" id="6xvNSEj6BMM" role="1B3o_S" />
26325+
<node concept="10P_77" id="6xvNSEj6Gcz" role="3clF45" />
26326+
<node concept="3clFbS" id="6xvNSEj6BMO" role="3clF47">
26327+
<node concept="3clFbF" id="6xvNSEj6GeW" role="3cqZAp">
26328+
<node concept="3clFbT" id="6xvNSEj6GeV" role="3clFbG" />
26329+
</node>
26330+
</node>
26331+
<node concept="37vLTG" id="6xvNSEj6Gdf" role="3clF46">
26332+
<property role="TrG5h" value="other" />
26333+
<node concept="3Tqbb2" id="6xvNSEj6Gde" role="1tU5fm" />
26334+
</node>
26335+
</node>
26336+
<node concept="13hLZK" id="6xvNSEj6BMB" role="13h7CW">
26337+
<node concept="3clFbS" id="6xvNSEj6BMC" role="2VODD2" />
26338+
</node>
26339+
</node>
2631926340
</model>
2632026341

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

Lines changed: 250 additions & 29 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2137,14 +2137,37 @@
21372137
<property role="IQ2ns" value="3889855429450038474" />
21382138
<property role="20lmBu" value="fLJjDmT/aggregation" />
21392139
<property role="20kJfa" value="type" />
2140-
<property role="20lbJX" value="fLJekj4/_1" />
21412140
<ref role="20lvS9" node="6sdnDbSlaok" resolve="Type" />
21422141
</node>
2142+
<node concept="PrWs8" id="MNXm1ElbHt" role="PzmwI">
2143+
<ref role="PrY4T" node="MNXm1ElbHo" resolve="IEmptyLiteral" />
2144+
</node>
21432145
</node>
21442146
<node concept="PlHQZ" id="26cjRADipGQ">
21452147
<property role="EcuMT" value="2417394483940924214" />
21462148
<property role="3GE5qa" value="nix" />
21472149
<property role="TrG5h" value="ITargetThatCanDealWithNix" />
21482150
</node>
2151+
<node concept="1TIwiD" id="3tcv7J0pmjC">
2152+
<property role="EcuMT" value="3984696641266738408" />
2153+
<property role="3GE5qa" value="nix" />
2154+
<property role="TrG5h" value="EmptyType" />
2155+
<property role="34LRSv" value="emptytype" />
2156+
<ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
2157+
</node>
2158+
<node concept="PlHQZ" id="MNXm1ElbHo">
2159+
<property role="EcuMT" value="915344943735946072" />
2160+
<property role="TrG5h" value="IEmptyLiteral" />
2161+
<node concept="PrWs8" id="MNXm1ElbHp" role="PrDN$">
2162+
<ref role="PrY4T" node="6JZACDWQJu4" resolve="ILiteral" />
2163+
</node>
2164+
<node concept="t5JxF" id="MNXm1ElbHr" role="lGtFl">
2165+
<property role="t5JxN" value="Marker interface used to mark literals that at runtime evaluate to empty value." />
2166+
</node>
2167+
</node>
2168+
<node concept="PlHQZ" id="6xvNSEj6BMb">
2169+
<property role="EcuMT" value="7520958096812440715" />
2170+
<property role="TrG5h" value="IComplexTypeSupportsEquals" />
2171+
</node>
21492172
</model>
21502173

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

Lines changed: 514 additions & 254 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@
935935
</node>
936936
</node>
937937
<node concept="VechU" id="6_rxy3GUPdE" role="3F10Kt">
938-
<property role="Vb096" value="fLJRk5A/lightGray" />
938+
<property role="Vb096" value="fLJRk5_/gray" />
939939
</node>
940940
</node>
941941
</node>

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

Lines changed: 238 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,16 @@
158158
</node>
159159
</node>
160160
</node>
161-
<node concept="3F0A7n" id="3nGzaxURa4S" role="3EZMnx">
162-
<ref role="1NtTu8" to="mi3w:3nGzaxURa4m" resolve="yyyy" />
163-
<node concept="VechU" id="6C0OSEaGBcc" role="3F10Kt">
164-
<node concept="3ZlJ5R" id="6C0OSEaGBcd" role="VblUZ">
165-
<node concept="3clFbS" id="6C0OSEaGBce" role="2VODD2">
166-
<node concept="3clFbF" id="6C0OSEaGBcf" role="3cqZAp">
167-
<node concept="2YIFZM" id="6C0OSEaGBcg" role="3clFbG">
161+
<node concept="3F0A7n" id="3nGzaxURa54" role="3EZMnx">
162+
<ref role="1NtTu8" to="mi3w:3nGzaxURa4k" resolve="dd" />
163+
<node concept="VechU" id="6C0OSEaGBuF" role="3F10Kt">
164+
<node concept="3ZlJ5R" id="6C0OSEaGBuG" role="VblUZ">
165+
<node concept="3clFbS" id="6C0OSEaGBuH" role="2VODD2">
166+
<node concept="3clFbF" id="6C0OSEaGBuI" role="3cqZAp">
167+
<node concept="2YIFZM" id="6C0OSEaGBuJ" role="3clFbG">
168168
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
169169
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
170-
<node concept="Xl_RD" id="6C0OSEaGBch" role="37wK5m">
170+
<node concept="Xl_RD" id="6C0OSEaGBuK" role="37wK5m">
171171
<property role="Xl_RC" value="#822100" />
172172
</node>
173173
</node>
@@ -194,16 +194,16 @@
194194
</node>
195195
</node>
196196
</node>
197-
<node concept="3F0A7n" id="3nGzaxURa54" role="3EZMnx">
198-
<ref role="1NtTu8" to="mi3w:3nGzaxURa4k" resolve="dd" />
199-
<node concept="VechU" id="6C0OSEaGBuF" role="3F10Kt">
200-
<node concept="3ZlJ5R" id="6C0OSEaGBuG" role="VblUZ">
201-
<node concept="3clFbS" id="6C0OSEaGBuH" role="2VODD2">
202-
<node concept="3clFbF" id="6C0OSEaGBuI" role="3cqZAp">
203-
<node concept="2YIFZM" id="6C0OSEaGBuJ" role="3clFbG">
197+
<node concept="3F0A7n" id="3nGzaxURa4S" role="3EZMnx">
198+
<ref role="1NtTu8" to="mi3w:3nGzaxURa4m" resolve="yyyy" />
199+
<node concept="VechU" id="6C0OSEaGBcc" role="3F10Kt">
200+
<node concept="3ZlJ5R" id="6C0OSEaGBcd" role="VblUZ">
201+
<node concept="3clFbS" id="6C0OSEaGBce" role="2VODD2">
202+
<node concept="3clFbF" id="6C0OSEaGBcf" role="3cqZAp">
203+
<node concept="2YIFZM" id="6C0OSEaGBcg" role="3clFbG">
204204
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
205205
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
206-
<node concept="Xl_RD" id="6C0OSEaGBuK" role="37wK5m">
206+
<node concept="Xl_RD" id="6C0OSEaGBch" role="37wK5m">
207207
<property role="Xl_RC" value="#822100" />
208208
</node>
209209
</node>
@@ -361,11 +361,8 @@
361361
<ref role="1XX52x" to="mi3w:7khFtBHlNKe" resolve="MakeDate" />
362362
<node concept="3EZMnI" id="7khFtBHlNKQ" role="2wV5jI">
363363
<node concept="2iRfu4" id="7khFtBHlNKR" role="2iSdaV" />
364-
<node concept="3F0ifn" id="7khFtBHlNKN" role="3EZMnx">
365-
<property role="3F0ifm" value="make" />
366-
<node concept="11LMrY" id="7khFtBHlV0$" role="3F10Kt">
367-
<property role="VOm3f" value="true" />
368-
</node>
364+
<node concept="PMmxH" id="4MwjAOTSmU5" role="3EZMnx">
365+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
369366
</node>
370367
<node concept="3F0ifn" id="7khFtBHlNKZ" role="3EZMnx">
371368
<property role="3F0ifm" value="/" />
@@ -391,14 +388,14 @@
391388
</node>
392389
</node>
393390
</node>
394-
<node concept="3F1sOY" id="7khFtBHlNLh" role="3EZMnx">
395-
<ref role="1NtTu8" to="mi3w:7khFtBHlNKf" resolve="year" />
391+
<node concept="3F1sOY" id="7khFtBHlNLF" role="3EZMnx">
392+
<ref role="1NtTu8" to="mi3w:7khFtBHlNKk" resolve="dayExpr" />
396393
</node>
397394
<node concept="3F1sOY" id="7khFtBHlNLt" role="3EZMnx">
398-
<ref role="1NtTu8" to="mi3w:7khFtBHlNKh" resolve="month" />
395+
<ref role="1NtTu8" to="mi3w:7khFtBHlNKh" resolve="monthExpr" />
399396
</node>
400-
<node concept="3F1sOY" id="7khFtBHlNLF" role="3EZMnx">
401-
<ref role="1NtTu8" to="mi3w:7khFtBHlNKk" resolve="day" />
397+
<node concept="3F1sOY" id="7khFtBHlNLh" role="3EZMnx">
398+
<ref role="1NtTu8" to="mi3w:7khFtBHlNKf" resolve="yearExpr" />
402399
</node>
403400
<node concept="3F0ifn" id="7khFtBHlNL7" role="3EZMnx">
404401
<property role="3F0ifm" value="/" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,26 +384,26 @@
384384
<property role="EcuMT" value="8435714728543075342" />
385385
<property role="3GE5qa" value="date" />
386386
<property role="TrG5h" value="MakeDate" />
387-
<property role="34LRSv" value="make/" />
387+
<property role="34LRSv" value="makeDate" />
388388
<ref role="1TJDcQ" to="hm2y:6sdnDbSla17" resolve="Expression" />
389389
<node concept="1TJgyj" id="7khFtBHlNKf" role="1TKVEi">
390390
<property role="IQ2ns" value="8435714728543075343" />
391391
<property role="20lmBu" value="fLJjDmT/aggregation" />
392-
<property role="20kJfa" value="year" />
392+
<property role="20kJfa" value="yearExpr" />
393393
<property role="20lbJX" value="fLJekj4/_1" />
394394
<ref role="20lvS9" to="hm2y:6sdnDbSla17" resolve="Expression" />
395395
</node>
396396
<node concept="1TJgyj" id="7khFtBHlNKh" role="1TKVEi">
397397
<property role="IQ2ns" value="8435714728543075345" />
398398
<property role="20lmBu" value="fLJjDmT/aggregation" />
399-
<property role="20kJfa" value="month" />
399+
<property role="20kJfa" value="monthExpr" />
400400
<property role="20lbJX" value="fLJekj4/_1" />
401401
<ref role="20lvS9" to="hm2y:6sdnDbSla17" resolve="Expression" />
402402
</node>
403403
<node concept="1TJgyj" id="7khFtBHlNKk" role="1TKVEi">
404404
<property role="IQ2ns" value="8435714728543075348" />
405405
<property role="20lmBu" value="fLJjDmT/aggregation" />
406-
<property role="20kJfa" value="day" />
406+
<property role="20kJfa" value="dayExpr" />
407407
<property role="20lbJX" value="fLJekj4/_1" />
408408
<ref role="20lvS9" to="hm2y:6sdnDbSla17" resolve="Expression" />
409409
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/typesystem.mps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@
16171617
<ref role="1YBMHb" node="7khFtBHlVv1" resolve="makeDate" />
16181618
</node>
16191619
<node concept="3TrEf2" id="7khFtBHnE1k" role="2OqNvi">
1620-
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKf" resolve="year" />
1620+
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKf" resolve="yearExpr" />
16211621
</node>
16221622
</node>
16231623
</node>
@@ -1637,7 +1637,7 @@
16371637
<ref role="1YBMHb" node="7khFtBHlVv1" resolve="makeDate" />
16381638
</node>
16391639
<node concept="3TrEf2" id="7khFtBHnE7t" role="2OqNvi">
1640-
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKh" resolve="month" />
1640+
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKh" resolve="monthExpr" />
16411641
</node>
16421642
</node>
16431643
</node>
@@ -1657,7 +1657,7 @@
16571657
<ref role="1YBMHb" node="7khFtBHlVv1" resolve="makeDate" />
16581658
</node>
16591659
<node concept="3TrEf2" id="7khFtBHnEdA" role="2OqNvi">
1660-
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKk" resolve="day" />
1660+
<ref role="3Tt5mk" to="mi3w:7khFtBHlNKk" resolve="dayExpr" />
16611661
</node>
16621662
</node>
16631663
</node>

0 commit comments

Comments
 (0)