Skip to content

Commit d8083ba

Browse files
author
Alexander Pann
committed
Merge remote-tracking branch 'origin/maintenance/mps20203' into bugfix/coverage_20203
2 parents d2fee47 + 4d13425 commit d8083ba

File tree

11 files changed

+494
-369
lines changed

11 files changed

+494
-369
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,24 @@
12911291
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
12921292
</node>
12931293
</node>
1294+
<node concept="13i0hz" id="1IYzzr$ULqk" role="13h7CS">
1295+
<property role="TrG5h" value="baseType" />
1296+
<ref role="13i0hy" to="pbu6:XhdFKv3UAU" resolve="baseType" />
1297+
<node concept="3Tm1VV" id="1IYzzr$ULql" role="1B3o_S" />
1298+
<node concept="3clFbS" id="1IYzzr$ULqq" role="3clF47">
1299+
<node concept="3clFbF" id="1IYzzr$UMts" role="3cqZAp">
1300+
<node concept="2OqwBi" id="1IYzzr$UNcd" role="3clFbG">
1301+
<node concept="13iPFW" id="1IYzzr$UMZ9" role="2Oq$k0" />
1302+
<node concept="2qgKlT" id="1IYzzr$UNwx" role="2OqNvi">
1303+
<ref role="37wK5l" to="pbu6:3oWFox95OZf" resolve="getBaseType" />
1304+
</node>
1305+
</node>
1306+
</node>
1307+
</node>
1308+
<node concept="3Tqbb2" id="1IYzzr$ULqr" role="3clF45">
1309+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1310+
</node>
1311+
</node>
12941312
<node concept="13i0hz" id="5L2mTKm_pxP" role="13h7CS">
12951313
<property role="TrG5h" value="isSameAs" />
12961314
<property role="13i0it" value="false" />

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

Lines changed: 214 additions & 4 deletions
Large diffs are not rendered by default.

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

Lines changed: 186 additions & 44 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<dependency reexport="false">272bf1ac-d70c-4dac-96a3-976884f641b8(org.iets3.core.expr.genjava.simpleTypes.rt)</dependency>
3434
<dependency reexport="false">2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)</dependency>
3535
<dependency reexport="false">b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</dependency>
36+
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
3637
</dependencies>
3738
<languageVersions>
3839
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,6 @@
425425
<concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
426426
<reference id="1154546997487" name="concept" index="3gnhBz" />
427427
</concept>
428-
<concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
429-
<reference id="1182511038750" name="concept" index="1j9C0d" />
430-
</concept>
431428
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
432429
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
433430
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -7399,8 +7396,10 @@
73997396
<node concept="2OqwBi" id="oj24_oawVk" role="2Oq$k0">
74007397
<node concept="2OqwBi" id="oj24_oau8l" role="2Oq$k0">
74017398
<node concept="1Q6Npb" id="oj24_oau0e" role="2Oq$k0" />
7402-
<node concept="1j9C0f" id="oj24_oaucY" role="2OqNvi">
7403-
<ref role="1j9C0d" to="yv47:15mJ3JeHQzr" resolve="RecordChangeTarget" />
7399+
<node concept="2SmgA7" id="4q5eF0YRWvk" role="2OqNvi">
7400+
<node concept="chp4Y" id="4q5eF0YRWNN" role="1dBWTz">
7401+
<ref role="cht4Q" to="yv47:15mJ3JeHQzr" resolve="RecordChangeTarget" />
7402+
</node>
74047403
</node>
74057404
</node>
74067405
<node concept="3zZkjj" id="oj24_oa$fk" role="2OqNvi">
@@ -7661,8 +7660,10 @@
76617660
<node concept="2OqwBi" id="oj24_oclfv" role="2Oq$k0">
76627661
<node concept="2OqwBi" id="oj24_oclfw" role="2Oq$k0">
76637662
<node concept="1Q6Npb" id="oj24_oclfx" role="2Oq$k0" />
7664-
<node concept="1j9C0f" id="oj24_oclfy" role="2OqNvi">
7665-
<ref role="1j9C0d" to="yv47:15mJ3JeHQzr" resolve="RecordChangeTarget" />
7663+
<node concept="2SmgA7" id="4q5eF0YRXhf" role="2OqNvi">
7664+
<node concept="chp4Y" id="4q5eF0YRXUU" role="1dBWTz">
7665+
<ref role="cht4Q" to="yv47:15mJ3JeHQzr" resolve="RecordChangeTarget" />
7666+
</node>
76667667
</node>
76677668
</node>
76687669
<node concept="3zZkjj" id="oj24_oclfz" role="2OqNvi">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/constraints.mps‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
1616
<import index="aafr" ref="r:fc2b8fcf-559d-4f16-ae65-376838b59be6(org.iets3.core.expr.messages.behavior)" implicit="true" />
1717
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" implicit="true" />
18+
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1819
</imports>
1920
<registry>
2021
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -25,6 +26,9 @@
2526
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
2627
<child id="1137022507850" name="body" index="2VODD2" />
2728
</concept>
29+
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
30+
<property id="1070475926801" name="value" index="Xl_RC" />
31+
</concept>
2832
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
2933
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
3034
</concept>
@@ -51,6 +55,7 @@
5155
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
5256
<property id="1068580123138" name="value" index="3clFbU" />
5357
</concept>
58+
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
5459
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
5560
<child id="1068581517676" name="expression" index="3cqZAk" />
5661
</concept>
@@ -62,18 +67,29 @@
6267
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
6368
<child id="1068499141038" name="actualArgument" index="37wK5m" />
6469
</concept>
70+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
71+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
72+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
73+
</concept>
6574
</language>
6675
<language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
6776
<concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
6877
<concept id="6702802731807420587" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAParent" flags="ig" index="9SLcT" />
6978
<concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
7079
<concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
7180
<concept id="4303308395523096213" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childConcept" flags="ng" index="2DD5aU" />
81+
<concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
82+
<reference id="1147467295099" name="applicableProperty" index="EomxK" />
83+
<child id="1147468630220" name="propertyGetter" index="EtsB7" />
84+
</concept>
85+
<concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
86+
<concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
7287
<concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
7388
<concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
7489
<reference id="1213093996982" name="concept" index="1M2myG" />
7590
<child id="6702802731807532712" name="canBeParent" index="9SGkU" />
7691
<child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
92+
<child id="1213098023997" name="property" index="1MhHOB" />
7793
<child id="1213100494875" name="referent" index="1Mr941" />
7894
</concept>
7995
<concept id="1148687176410" name="jetbrains.mps.lang.constraints.structure.NodeReferentConstraint" flags="ng" index="1N5Pfh">
@@ -85,6 +101,7 @@
85101
<concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
86102
</language>
87103
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
104+
<concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
88105
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
89106
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
90107
</concept>
@@ -612,5 +629,26 @@
612629
</node>
613630
</node>
614631
</node>
632+
<node concept="1M2fIO" id="1IYzzr$Utl4">
633+
<ref role="1M2myG" to="kelk:3vxfdxbcS_H" resolve="EmptyMessageContent" />
634+
<node concept="EnEH3" id="1IYzzr$Utl5" role="1MhHOB">
635+
<ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
636+
<node concept="Eqf_E" id="1IYzzr$UtnD" role="EtsB7">
637+
<node concept="3clFbS" id="1IYzzr$UtnE" role="2VODD2">
638+
<node concept="3clFbF" id="1IYzzr$Uttv" role="3cqZAp">
639+
<node concept="3cpWs3" id="1IYzzr$UtPP" role="3clFbG">
640+
<node concept="2OqwBi" id="1IYzzr$UufF" role="3uHU7w">
641+
<node concept="EsrRn" id="1IYzzr$UtQp" role="2Oq$k0" />
642+
<node concept="2bSWHS" id="1IYzzr$UuEt" role="2OqNvi" />
643+
</node>
644+
<node concept="Xl_RD" id="1IYzzr$Uttu" role="3uHU7B">
645+
<property role="Xl_RC" value="___empty_" />
646+
</node>
647+
</node>
648+
</node>
649+
</node>
650+
</node>
651+
</node>
652+
</node>
615653
</model>
616654

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@
129129
<node concept="PrWs8" id="3vxfdxbcBqs" role="PzmwI">
130130
<ref role="PrY4T" node="3vxfdxbcs9v" resolve="IMessageNamespaceContent" />
131131
</node>
132+
<node concept="PrWs8" id="1IYzzr$T8Xd" role="PzmwI">
133+
<ref role="PrY4T" to="vs0r:3m8H$lmFM60" resolve="IDocumentable" />
134+
</node>
135+
<node concept="PrWs8" id="1IYzzr$T8Xl" role="PzmwI">
136+
<ref role="PrY4T" to="vs0r:65XyadYMMYC" resolve="ICommentable" />
137+
</node>
132138
<node concept="1TJgyj" id="3vxfdxbksau" role="1TKVEi">
133139
<property role="IQ2ns" value="4026566441520186014" />
134140
<property role="20lmBu" value="fLJjDmT/aggregation" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8963,8 +8963,12 @@
89638963
</node>
89648964
<node concept="liA8E" id="3tudP_AP9_O" role="2OqNvi">
89658965
<ref role="37wK5l" to="j10v:~PVector.plus(java.lang.Object)" resolve="plus" />
8966-
<node concept="37vLTw" id="3tudP_AP9G3" role="37wK5m">
8967-
<ref role="3cqZAo" node="3tudP_AP64I" resolve="i" />
8966+
<node concept="2YIFZM" id="1IYzzr$ntj8" role="37wK5m">
8967+
<ref role="37wK5l" to="xlxw:~BigInteger.valueOf(long)" resolve="valueOf" />
8968+
<ref role="1Pybhc" to="xlxw:~BigInteger" resolve="BigInteger" />
8969+
<node concept="37vLTw" id="1IYzzr$ntx3" role="37wK5m">
8970+
<ref role="3cqZAo" node="3tudP_AP64I" resolve="i" />
8971+
</node>
89688972
</node>
89698973
</node>
89708974
</node>
@@ -9016,8 +9020,12 @@
90169020
</node>
90179021
<node concept="liA8E" id="3tudP_AZaM4" role="2OqNvi">
90189022
<ref role="37wK5l" to="j10v:~PVector.plus(java.lang.Object)" resolve="plus" />
9019-
<node concept="37vLTw" id="3tudP_AZaM5" role="37wK5m">
9020-
<ref role="3cqZAo" node="3tudP_AZaM7" resolve="i" />
9023+
<node concept="2YIFZM" id="1IYzzr$nuzM" role="37wK5m">
9024+
<ref role="37wK5l" to="xlxw:~BigInteger.valueOf(long)" resolve="valueOf" />
9025+
<ref role="1Pybhc" to="xlxw:~BigInteger" resolve="BigInteger" />
9026+
<node concept="37vLTw" id="1IYzzr$nuIe" role="37wK5m">
9027+
<ref role="3cqZAo" node="3tudP_AZaM7" resolve="i" />
9028+
</node>
90219029
</node>
90229030
</node>
90239031
</node>
@@ -9067,8 +9075,12 @@
90679075
</node>
90689076
<node concept="liA8E" id="3tudP_B2jIg" role="2OqNvi">
90699077
<ref role="37wK5l" to="j10v:~PVector.plus(java.lang.Object)" resolve="plus" />
9070-
<node concept="37vLTw" id="3tudP_B2jMj" role="37wK5m">
9071-
<ref role="3cqZAo" node="3tudP_AZ2Tw" resolve="lower" />
9078+
<node concept="2YIFZM" id="1IYzzr$nuXv" role="37wK5m">
9079+
<ref role="37wK5l" to="xlxw:~BigInteger.valueOf(long)" resolve="valueOf" />
9080+
<ref role="1Pybhc" to="xlxw:~BigInteger" resolve="BigInteger" />
9081+
<node concept="37vLTw" id="1IYzzr$nv7L" role="37wK5m">
9082+
<ref role="3cqZAo" node="3tudP_AZ2Tw" resolve="lower" />
9083+
</node>
90729084
</node>
90739085
</node>
90749086
</node>

0 commit comments

Comments
 (0)