Skip to content

Commit 11549f5

Browse files
wsafonovwsafonov
committed
Merge remote-tracking branch 'origin/maintenance/mps20201' into datev-staging
# Conflicts: # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
2 parents a2950e2 + c181fd0 commit 11549f5

File tree

22 files changed

+2553
-385
lines changed

22 files changed

+2553
-385
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.components.core/models/behavior.mps‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3928,7 +3928,7 @@
39283928
<node concept="3clFbF" id="5RkEkmFo1fh" role="3cqZAp">
39293929
<node concept="2OqwBi" id="7Atos1y666w" role="3clFbG">
39303930
<node concept="37vLTw" id="7Atos1y666x" role="2Oq$k0">
3931-
<ref role="3cqZAo" node="5RkEkmFo1c8" />
3931+
<ref role="3cqZAo" node="5RkEkmFo1c8" resolve="allConnectors" />
39323932
</node>
39333933
<node concept="3zZkjj" id="7Atos1y666y" role="2OqNvi">
39343934
<node concept="1bVj0M" id="7Atos1y666z" role="23t8la">
@@ -3949,7 +3949,7 @@
39493949
<ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
39503950
</node>
39513951
<node concept="2qgKlT" id="7Atos1y666G" role="2OqNvi">
3952-
<ref role="37wK5l" node="mIQkxg5ZT6" />
3952+
<ref role="37wK5l" node="mIQkxg5ZT6" resolve="getPorts" />
39533953
</node>
39543954
</node>
39553955
</node>
@@ -3965,7 +3965,7 @@
39653965
<property role="3cmrfH" value="1" />
39663966
</node>
39673967
<node concept="37vLTw" id="4VHfdEqkKQf" role="1LFl5Q">
3968-
<ref role="3cqZAo" node="7Atos1y666A" />
3968+
<ref role="3cqZAo" node="7Atos1y666A" resolve="ports" />
39693969
</node>
39703970
</node>
39713971
<node concept="13iPFW" id="4VHfdEqkKQg" role="3uHU7w" />
@@ -3978,19 +3978,19 @@
39783978
<ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
39793979
</node>
39803980
<node concept="2qgKlT" id="4VHfdEqkKQl" role="2OqNvi">
3981-
<ref role="37wK5l" node="4VHfdEqkeO4" />
3981+
<ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
39823982
<node concept="1LFfDK" id="4VHfdEqkKQm" role="37wK5m">
39833983
<node concept="3cmrfG" id="4VHfdEqkKQn" role="1LF_Uc">
39843984
<property role="3cmrfH" value="1" />
39853985
</node>
39863986
<node concept="37vLTw" id="4VHfdEqkKQo" role="1LFl5Q">
3987-
<ref role="3cqZAo" node="7Atos1y666A" />
3987+
<ref role="3cqZAo" node="7Atos1y666A" resolve="ports" />
39883988
</node>
39893989
</node>
39903990
</node>
39913991
</node>
39923992
<node concept="37vLTw" id="4VHfdEqkKQp" role="3uHU7w">
3993-
<ref role="3cqZAo" node="5RkEkmFo1by" />
3993+
<ref role="3cqZAo" node="5RkEkmFo1by" resolve="instance" />
39943994
</node>
39953995
</node>
39963996
</node>
@@ -4005,19 +4005,19 @@
40054005
<ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
40064006
</node>
40074007
<node concept="2qgKlT" id="4VHfdEqk$Ya" role="2OqNvi">
4008-
<ref role="37wK5l" node="4VHfdEqkeO4" />
4008+
<ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
40094009
<node concept="1LFfDK" id="4VHfdEqkAcQ" role="37wK5m">
40104010
<node concept="3cmrfG" id="4VHfdEqkACK" role="1LF_Uc">
40114011
<property role="3cmrfH" value="0" />
40124012
</node>
40134013
<node concept="37vLTw" id="4VHfdEqk_mi" role="1LFl5Q">
4014-
<ref role="3cqZAo" node="7Atos1y666A" />
4014+
<ref role="3cqZAo" node="7Atos1y666A" resolve="ports" />
40154015
</node>
40164016
</node>
40174017
</node>
40184018
</node>
40194019
<node concept="37vLTw" id="4VHfdEqkCj1" role="3uHU7w">
4020-
<ref role="3cqZAo" node="5RkEkmFo1by" />
4020+
<ref role="3cqZAo" node="5RkEkmFo1by" resolve="instance" />
40214021
</node>
40224022
</node>
40234023
</node>
@@ -4028,7 +4028,7 @@
40284028
<property role="3cmrfH" value="0" />
40294029
</node>
40304030
<node concept="37vLTw" id="4VHfdEqkyRp" role="1LFl5Q">
4031-
<ref role="3cqZAo" node="7Atos1y666A" />
4031+
<ref role="3cqZAo" node="7Atos1y666A" resolve="ports" />
40324032
</node>
40334033
</node>
40344034
<node concept="13iPFW" id="4VHfdEqkyRq" role="3uHU7w" />

‎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/structure.mps‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,6 +2148,13 @@
21482148
<property role="3GE5qa" value="nix" />
21492149
<property role="TrG5h" value="ITargetThatCanDealWithNix" />
21502150
</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>
21512158
<node concept="PlHQZ" id="MNXm1ElbHo">
21522159
<property role="EcuMT" value="915344943735946072" />
21532160
<property role="TrG5h" value="IEmptyLiteral" />
@@ -2158,12 +2165,9 @@
21582165
<property role="t5JxN" value="Marker interface used to mark literals that at runtime evaluate to empty value." />
21592166
</node>
21602167
</node>
2161-
<node concept="1TIwiD" id="3tcv7J0pmjC">
2162-
<property role="EcuMT" value="3984696641266738408" />
2163-
<property role="3GE5qa" value="nix" />
2164-
<property role="TrG5h" value="EmptyType" />
2165-
<property role="34LRSv" value="emptytype" />
2166-
<ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
2168+
<node concept="PlHQZ" id="6xvNSEj6BMb">
2169+
<property role="EcuMT" value="7520958096812440715" />
2170+
<property role="TrG5h" value="IComplexTypeSupportsEquals" />
21672171
</node>
21682172
</model>
21692173

0 commit comments

Comments
 (0)