Skip to content

Commit c181fd0

Browse files
lhartllhartl
authored
Merge pull request #447 from IETS3/refactor/merge-mps20193-to-mps20201
merge mps20193 to mps20201
2 parents b63e688 + 3a1027c commit c181fd0

File tree

6 files changed

+151
-50
lines changed

6 files changed

+151
-50
lines changed

‎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.typetags.units/models/behavior.mps‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<model ref="r:5d67260e-ef2e-4f51-9a4f-b005e241d989(org.iets3.core.expr.typetags.units.behavior)">
33
<persistence version="9" />
44
<languages>
5-
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
6-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
7-
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
8-
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
5+
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
6+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
7+
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
8+
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
99
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
1010
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
11-
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
12-
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
11+
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
12+
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
1313
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
1414
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
15-
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
15+
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
1616
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
1717
</languages>
1818
<imports>
@@ -1505,29 +1505,34 @@
15051505
<node concept="3Tm1VV" id="76ZhK6XViWp" role="1B3o_S" />
15061506
<node concept="3clFbS" id="76ZhK6XViWu" role="3clF47">
15071507
<node concept="3cpWs6" id="76ZhK6XVjhi" role="3cqZAp">
1508-
<node concept="2OqwBi" id="76ZhK6XVlNx" role="3cqZAk">
1509-
<node concept="1PxgMI" id="76ZhK6XVlxG" role="2Oq$k0">
1510-
<property role="1BlNFB" value="true" />
1511-
<node concept="2OqwBi" id="76ZhK6XVjsp" role="1m5AlR">
1512-
<node concept="3TrEf2" id="76ZhK6XVjEf" role="2OqNvi">
1513-
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1514-
</node>
1515-
<node concept="2OqwBi" id="76ZhK6XZ2Dt" role="2Oq$k0">
1516-
<node concept="2OqwBi" id="76ZhK6XZ2Du" role="2Oq$k0">
1517-
<node concept="13iPFW" id="76ZhK6XZ2Dv" role="2Oq$k0" />
1518-
<node concept="3Tsc0h" id="76ZhK6XZ2Dw" role="2OqNvi">
1519-
<ref role="3TtcxE" to="b0gq:7eOyx9r3qG3" resolve="components" />
1508+
<node concept="2OqwBi" id="6Z6cUqSNnYt" role="3cqZAk">
1509+
<node concept="2OqwBi" id="76ZhK6XVlNx" role="2Oq$k0">
1510+
<node concept="1PxgMI" id="76ZhK6XVlxG" role="2Oq$k0">
1511+
<property role="1BlNFB" value="true" />
1512+
<node concept="2OqwBi" id="76ZhK6XVjsp" role="1m5AlR">
1513+
<node concept="3TrEf2" id="76ZhK6XVjEf" role="2OqNvi">
1514+
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1515+
</node>
1516+
<node concept="2OqwBi" id="76ZhK6XZ2Dt" role="2Oq$k0">
1517+
<node concept="2OqwBi" id="76ZhK6XZ2Du" role="2Oq$k0">
1518+
<node concept="13iPFW" id="76ZhK6XZ2Dv" role="2Oq$k0" />
1519+
<node concept="3Tsc0h" id="76ZhK6XZ2Dw" role="2OqNvi">
1520+
<ref role="3TtcxE" to="b0gq:7eOyx9r3qG3" resolve="components" />
1521+
</node>
15201522
</node>
1523+
<node concept="1uHKPH" id="76ZhK6XZ2Dx" role="2OqNvi" />
15211524
</node>
1522-
<node concept="1uHKPH" id="76ZhK6XZ2Dx" role="2OqNvi" />
1525+
</node>
1526+
<node concept="chp4Y" id="72_xmu9hWoN" role="3oSUPX">
1527+
<ref role="cht4Q" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
15231528
</node>
15241529
</node>
1525-
<node concept="chp4Y" id="72_xmu9hWoN" role="3oSUPX">
1526-
<ref role="cht4Q" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
1530+
<node concept="3TrEf2" id="6Z6cUqSNnFN" role="2OqNvi">
1531+
<ref role="3Tt5mk" to="b0gq:1KUmgSFpwWq" resolve="dimension" />
15271532
</node>
15281533
</node>
1529-
<node concept="3TrcHB" id="76ZhK6XVm7v" role="2OqNvi">
1530-
<ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
1534+
<node concept="3TrcHB" id="6Z6cUqSNoKC" role="2OqNvi">
1535+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
15311536
</node>
15321537
</node>
15331538
</node>

0 commit comments

Comments
 (0)