Skip to content

Commit 45fedad

Browse files
arimerarimer
authored
Merge pull request #1263 from IETS3/merge/mps20232
Merge maintenance/mps20232 into master
2 parents 2f24521 + e67baea commit 45fedad

File tree

12 files changed

+602
-161
lines changed

12 files changed

+602
-161
lines changed

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
maven {
2121
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
2222
}
23-
23+
2424
mavenCentral()
2525
}
2626

@@ -295,7 +295,7 @@ File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
295295
def pluginsList = []
296296

297297
modelcheck {
298-
projectLocation = new File("$projectDir/code")
298+
projectLocation = new File("$projectDir/code/languages/org.iets3.opensource")
299299
mpsLocation = new File("$buildDir/mps")
300300
plugins = pluginsList
301301
mpsConfig = configurations.mps
@@ -316,6 +316,7 @@ afterEvaluate { project ->
316316
*/
317317
}
318318

319+
319320
checkmodels {
320321
dependsOn(resolveMps)
321322
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4817,17 +4817,17 @@
48174817
<node concept="l2Vlx" id="4Pi6J8BVsYS" role="2iSdaV" />
48184818
<node concept="PMmxH" id="4Pi6J8BU$Pe" role="3EZMnx">
48194819
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
4820+
<node concept="OXEIz" id="1znK7yZex79" role="P5bDN">
4821+
<node concept="UkePV" id="1znK7yZex9b" role="OY2wv">
4822+
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
4823+
</node>
4824+
</node>
48204825
<node concept="VechU" id="4Pi6J8BU_R8" role="3F10Kt">
48214826
<property role="Vb096" value="fLwANPn/red" />
48224827
</node>
48234828
<node concept="Vb9p2" id="4Pi6J8BU_Re" role="3F10Kt">
48244829
<property role="Vbekb" value="g1_kEg4/ITALIC" />
48254830
</node>
4826-
<node concept="OXEIz" id="1znK7yZex79" role="P5bDN">
4827-
<node concept="UkePV" id="1znK7yZex9b" role="OY2wv">
4828-
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
4829-
</node>
4830-
</node>
48314831
</node>
48324832
<node concept="3F0ifn" id="4Pi6J8BVsZ6" role="3EZMnx">
48334833
<property role="3F0ifm" value="[" />
@@ -7847,6 +7847,18 @@
78477847
<ref role="aqKnT" to="hm2y:5Ys_ngSnA9h" resolve="HexValue" />
78487848
<node concept="22hDWj" id="68wLGjptylj" role="22hAXT" />
78497849
</node>
7850+
<node concept="PKFIW" id="1znK7yZ9Z0K">
7851+
<property role="TrG5h" value="ExpressionAlias" />
7852+
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
7853+
<node concept="PMmxH" id="1znK7yZ9ZkW" role="2wV5jI">
7854+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
7855+
<node concept="OXEIz" id="1znK7yZ9X8g" role="P5bDN">
7856+
<node concept="UkePV" id="1znK7yZ9X8h" role="OY2wv">
7857+
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
7858+
</node>
7859+
</node>
7860+
</node>
7861+
</node>
78507862
<node concept="PKFIW" id="1znK7yZhztN">
78517863
<property role="TrG5h" value="ExpressionKeywordAlias" />
78527864
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
@@ -7873,17 +7885,5 @@
78737885
</node>
78747886
</node>
78757887
</node>
7876-
<node concept="PKFIW" id="1znK7yZ9Z0K">
7877-
<property role="TrG5h" value="ExpressionAlias" />
7878-
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
7879-
<node concept="PMmxH" id="1znK7yZ9ZkW" role="2wV5jI">
7880-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
7881-
<node concept="OXEIz" id="1znK7yZ9X8g" role="P5bDN">
7882-
<node concept="UkePV" id="1znK7yZ9X8h" role="OY2wv">
7883-
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
7884-
</node>
7885-
</node>
7886-
</node>
7887-
</node>
78887888
</model>
78897889

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

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
3232
<import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
3333
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
34+
<import index="qt06" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.builder(org.apache.commons/)" />
35+
<import index="hnhi" ref="r:d354209e-0bea-497f-b905-d66f72900fa8(org.iets3.analysis.base.plugin)" />
3436
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
3537
<import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" implicit="true" />
3638
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
@@ -9795,6 +9797,92 @@
97959797
<node concept="3cqZAl" id="6XE8Bc$gE1B" role="3clF45" />
97969798
</node>
97979799
<node concept="2tJIrI" id="6XE8Bc$gE2n" role="jymVt" />
9800+
<node concept="3clFb_" id="2Ccm6Yq_2Qr" role="jymVt">
9801+
<property role="TrG5h" value="hashCode" />
9802+
<node concept="3clFbS" id="2Ccm6Yq_2Qu" role="3clF47">
9803+
<node concept="3cpWs8" id="2Ccm6YqAETf" role="3cqZAp">
9804+
<node concept="3cpWsn" id="2Ccm6YqAETg" role="3cpWs9">
9805+
<property role="TrG5h" value="builder" />
9806+
<node concept="3uibUv" id="2Ccm6YqA$dE" role="1tU5fm">
9807+
<ref role="3uigEE" to="qt06:~HashCodeBuilder" resolve="HashCodeBuilder" />
9808+
</node>
9809+
<node concept="2ShNRf" id="2Ccm6YqAETh" role="33vP2m">
9810+
<node concept="1pGfFk" id="2Ccm6YqAETi" role="2ShVmc">
9811+
<ref role="37wK5l" to="qt06:~HashCodeBuilder.&lt;init&gt;(int,int)" resolve="HashCodeBuilder" />
9812+
<node concept="3cmrfG" id="2Ccm6YqAETj" role="37wK5m">
9813+
<property role="3cmrfH" value="17" />
9814+
</node>
9815+
<node concept="3cmrfG" id="2Ccm6YqAETk" role="37wK5m">
9816+
<property role="3cmrfH" value="37" />
9817+
</node>
9818+
</node>
9819+
</node>
9820+
</node>
9821+
</node>
9822+
<node concept="3clFbF" id="2Ccm6YqFlk$" role="3cqZAp">
9823+
<node concept="2OqwBi" id="2Ccm6YqFyjP" role="3clFbG">
9824+
<node concept="37vLTw" id="2Ccm6YqFlky" role="2Oq$k0">
9825+
<ref role="3cqZAo" node="2Ccm6YqAETg" resolve="builder" />
9826+
</node>
9827+
<node concept="liA8E" id="2Ccm6YqFEIS" role="2OqNvi">
9828+
<ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
9829+
<node concept="2OqwBi" id="6c9kQIS96Rz" role="37wK5m">
9830+
<node concept="Xjq3P" id="6c9kQIS96R$" role="2Oq$k0" />
9831+
<node concept="2OwXpG" id="6c9kQIS96R_" role="2OqNvi">
9832+
<ref role="2Oxat5" node="6XE8Bc$gDWa" resolve="i" />
9833+
<node concept="1ZhdrF" id="6c9kQIS96RA" role="lGtFl">
9834+
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
9835+
<property role="2qtEX8" value="fieldDeclaration" />
9836+
<node concept="3$xsQk" id="6c9kQIS96RB" role="3$ytzL">
9837+
<node concept="3clFbS" id="6c9kQIS96RC" role="2VODD2">
9838+
<node concept="3clFbF" id="6c9kQIS96RD" role="3cqZAp">
9839+
<node concept="2OqwBi" id="6c9kQIS96RE" role="3clFbG">
9840+
<node concept="30H73N" id="6c9kQIS96RF" role="2Oq$k0" />
9841+
<node concept="3TrcHB" id="6c9kQIS96RG" role="2OqNvi">
9842+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
9843+
</node>
9844+
</node>
9845+
</node>
9846+
</node>
9847+
</node>
9848+
</node>
9849+
</node>
9850+
</node>
9851+
</node>
9852+
</node>
9853+
<node concept="1WS0z7" id="2Ccm6YqGuIY" role="lGtFl">
9854+
<node concept="3JmXsc" id="2Ccm6YqGuIZ" role="3Jn$fo">
9855+
<node concept="3clFbS" id="2Ccm6YqGuJ0" role="2VODD2">
9856+
<node concept="3clFbF" id="6c9kQIS69tf" role="3cqZAp">
9857+
<node concept="2OqwBi" id="6c9kQIS6iFJ" role="3clFbG">
9858+
<node concept="30H73N" id="6c9kQIS69te" role="2Oq$k0" />
9859+
<node concept="2qgKlT" id="6c9kQIS6z7P" role="2OqNvi">
9860+
<ref role="37wK5l" to="nu60:58eyHuUgYVm" resolve="nonEmptyMembers" />
9861+
</node>
9862+
</node>
9863+
</node>
9864+
</node>
9865+
</node>
9866+
</node>
9867+
</node>
9868+
<node concept="3cpWs6" id="6c9kQISfwrN" role="3cqZAp">
9869+
<node concept="2OqwBi" id="6c9kQIS9_pX" role="3cqZAk">
9870+
<node concept="37vLTw" id="6c9kQIS9tjo" role="2Oq$k0">
9871+
<ref role="3cqZAo" node="2Ccm6YqAETg" resolve="builder" />
9872+
</node>
9873+
<node concept="liA8E" id="6c9kQIS9I6o" role="2OqNvi">
9874+
<ref role="37wK5l" to="qt06:~HashCodeBuilder.hashCode()" resolve="hashCode" />
9875+
</node>
9876+
</node>
9877+
</node>
9878+
</node>
9879+
<node concept="3Tm1VV" id="2Ccm6Yq$F6D" role="1B3o_S" />
9880+
<node concept="10Oyi0" id="2Ccm6Yq$RB5" role="3clF45" />
9881+
<node concept="2AHcQZ" id="6c9kQIS9Q1S" role="2AJF6D">
9882+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
9883+
</node>
9884+
</node>
9885+
<node concept="2tJIrI" id="2Ccm6Yq$jPR" role="jymVt" />
97989886
<node concept="3clFb_" id="6XE8Bc$gE2o" role="jymVt">
97999887
<property role="1EzhhJ" value="false" />
98009888
<property role="TrG5h" value="equals" />

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<dependency reexport="false">b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</dependency>
3838
<dependency reexport="false">2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)</dependency>
3939
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
40+
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
4041
</dependencies>
4142
<languageVersions>
4243
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -96,6 +97,7 @@
9697
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
9798
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
9899
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
100+
<module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
99101
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
100102
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
101103
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="20" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.actions.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
433433
<node concept="2pJxcG" id="1ikTdkW7bH5" role="2pJxcM">
434434
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
435-
<node concept="WxPPo" id="1IVt4400eGC" role="28ntcv">
435+
<node concept="WxPPo" id="65GPZhBZf1o" role="28ntcv">
436436
<node concept="2OqwBi" id="1ikTdkW6RBA" role="WxPPp">
437437
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
438438
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
@@ -476,7 +476,7 @@
476476
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
477477
<node concept="2pJxcG" id="1ikTdkW73vp" role="2pJxcM">
478478
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
479-
<node concept="WxPPo" id="1IVt4400eGD" role="28ntcv">
479+
<node concept="WxPPo" id="65GPZhBZf1p" role="28ntcv">
480480
<node concept="2OqwBi" id="1ikTdkW6REe" role="WxPPp">
481481
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
482482
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
2222
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
2323
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
24+
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
2425
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
2526
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" implicit="true" />
2627
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
27-
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
2828
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
2929
</imports>
3030
<registry>
@@ -879,6 +879,29 @@
879879
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
880880
</node>
881881
</node>
882+
<node concept="2tJIrI" id="5_6o5C8$zvB" role="jymVt" />
883+
<node concept="3clFb_" id="5qf1oe$zfpT" role="jymVt">
884+
<property role="TrG5h" value="hashCode" />
885+
<node concept="3Tm1VV" id="5qf1oe$zfpU" role="1B3o_S" />
886+
<node concept="10Oyi0" id="5qf1oe$zfpX" role="3clF45" />
887+
<node concept="3clFbS" id="5qf1oe$zfpY" role="3clF47">
888+
<node concept="3clFbF" id="5qf1oe$zktQ" role="3cqZAp">
889+
<node concept="2YIFZM" id="5qf1oe$zlvV" role="3clFbG">
890+
<ref role="37wK5l" to="33ny:~Objects.hash(java.lang.Object...)" resolve="hash" />
891+
<ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
892+
<node concept="37vLTw" id="5qf1oe$zpPq" role="37wK5m">
893+
<ref role="3cqZAo" node="7D7uZV2szuN" resolve="memberData" />
894+
</node>
895+
<node concept="37vLTw" id="5qf1oe$zscK" role="37wK5m">
896+
<ref role="3cqZAo" node="7$ajNzjzZzN" resolve="recordDeclaration" />
897+
</node>
898+
</node>
899+
</node>
900+
</node>
901+
<node concept="2AHcQZ" id="5qf1oe$zfpZ" role="2AJF6D">
902+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
903+
</node>
904+
</node>
882905
<node concept="2tJIrI" id="7D7uZV2szl_" role="jymVt" />
883906
<node concept="3Tm1VV" id="7D7uZV2szlm" role="1B3o_S" />
884907
<node concept="3uibUv" id="7D7uZV2yaTX" role="EKbjA">

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

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8176,39 +8176,13 @@
81768176
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
81778177
</node>
81788178
</node>
8179-
<node concept="3cpWs8" id="v9lBEVhxag" role="3cqZAp">
8180-
<node concept="3cpWsn" id="v9lBEVhxah" role="3cpWs9">
8181-
<property role="TrG5h" value="res" />
8182-
<node concept="3uibUv" id="6bG6MAFDJ_z" role="1tU5fm">
8183-
<ref role="3uigEE" to="j10v:~PSet" resolve="PSet" />
8184-
</node>
8185-
<node concept="2YIFZM" id="6bG6MAFDJB$" role="33vP2m">
8186-
<ref role="37wK5l" to="j10v:~Empty.set()" resolve="set" />
8187-
<ref role="1Pybhc" to="j10v:~Empty" resolve="Empty" />
8188-
</node>
8189-
</node>
8190-
</node>
8191-
<node concept="3clFbF" id="v9lBEVhxak" role="3cqZAp">
8192-
<node concept="37vLTI" id="v9lBEVhxal" role="3clFbG">
8193-
<node concept="2OqwBi" id="v9lBEVhxam" role="37vLTx">
8194-
<node concept="37vLTw" id="v9lBEVhxan" role="2Oq$k0">
8195-
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
8196-
</node>
8197-
<node concept="liA8E" id="v9lBEVhxao" role="2OqNvi">
8198-
<ref role="37wK5l" to="j10v:~PSet.plusAll(java.util.Collection)" resolve="plusAll" />
8199-
<node concept="37vLTw" id="v9lBEVhxap" role="37wK5m">
8200-
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
8201-
</node>
8202-
</node>
8203-
</node>
8204-
<node concept="37vLTw" id="v9lBEVhxaq" role="37vLTJ">
8205-
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
8206-
</node>
8207-
</node>
8208-
</node>
82098179
<node concept="3cpWs6" id="v9lBEVhxar" role="3cqZAp">
8210-
<node concept="37vLTw" id="v9lBEVhxas" role="3cqZAk">
8211-
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
8180+
<node concept="2YIFZM" id="5_6o5C8HOWP" role="3cqZAk">
8181+
<ref role="37wK5l" to="j10v:~HashTreePSet.from(java.util.Collection)" resolve="from" />
8182+
<ref role="1Pybhc" to="j10v:~HashTreePSet" resolve="HashTreePSet" />
8183+
<node concept="37vLTw" id="5_6o5C8HOWQ" role="37wK5m">
8184+
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
8185+
</node>
82128186
</node>
82138187
</node>
82148188
</node>

0 commit comments

Comments
 (0)