Skip to content

Merge maintenance/mps20232 into master #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arimer merged 19 commits into from
Mar 31, 2025
Merged

Merge maintenance/mps20232 into master #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cfb8eee
register a dummy migrate and remigrate task
Mar 26, 2025
ce6ff8f
Merge pull request #1256 from IETS3/feature/dummy_migrations
kbirken Mar 26, 2025
a6a78f7
Merge branch 'maintenance/mps20222' into merge/mps20213
kbirken Mar 26, 2025
9875f18
Merge pull request #1257 from IETS3/merge/mps20213
kbirken Mar 26, 2025
9c4ac0e
Merge maintenance/mps20223 into merge/mps20222
github-actions[bot] Mar 26, 2025
e1e02ad
Merge pull request #1258 from IETS3/merge/mps20222
kbirken Mar 26, 2025
6148d25
Merge maintenance/mps20232 into merge/mps20223
github-actions[bot] Mar 26, 2025
346d312
activate migration checking
Mar 26, 2025
6031412
run all pending migrations
Mar 26, 2025
d4fd4ba
build: fix project location for modelcheck
sergej-koscejev Mar 27, 2025
3e8d8c3
deactivate the modelcheck task
Mar 27, 2025
97c4b90
Merge remote-tracking branch 'origin/merge/mps20223' into merge/mps20223
Mar 27, 2025
b729d25
Merge pull request #1259 from IETS3/merge/mps20223
Mar 27, 2025
f1b5dca
toplevel.rt.rt: introduced hashCode() and equals for projection results.
mgronover Mar 27, 2025
7d7b98b
cleanups by "./gradlew build migrate remigrate"
mgronover Mar 28, 2025
acc42a8
Merge pull request #1266 from IETS3/bugfix/1264
mgronover Mar 31, 2025
f94b99d
Merge branch 'master' into merge/mps20232
arimer Mar 31, 2025
06e1d3b
gradle: cleanup after merge
arimer Mar 31, 2025
e67baea
project: remigrated via gradle
arimer Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
maven {
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
}

mavenCentral()
}

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

modelcheck {
projectLocation = new File("$projectDir/code")
projectLocation = new File("$projectDir/code/languages/org.iets3.opensource")
mpsLocation = new File("$buildDir/mps")
plugins = pluginsList
mpsConfig = configurations.mps
Expand All @@ -316,6 +316,7 @@ afterEvaluate { project ->
*/
}


checkmodels {
dependsOn(resolveMps)
}
Expand Down
34 changes: 17 additions & 17 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,17 +4817,17 @@
<node concept="l2Vlx" id="4Pi6J8BVsYS" role="2iSdaV" />
<node concept="PMmxH" id="4Pi6J8BU$Pe" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="OXEIz" id="1znK7yZex79" role="P5bDN">
<node concept="UkePV" id="1znK7yZex9b" role="OY2wv">
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
<node concept="VechU" id="4Pi6J8BU_R8" role="3F10Kt">
<property role="Vb096" value="fLwANPn/red" />
</node>
<node concept="Vb9p2" id="4Pi6J8BU_Re" role="3F10Kt">
<property role="Vbekb" value="g1_kEg4/ITALIC" />
</node>
<node concept="OXEIz" id="1znK7yZex79" role="P5bDN">
<node concept="UkePV" id="1znK7yZex9b" role="OY2wv">
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
<node concept="3F0ifn" id="4Pi6J8BVsZ6" role="3EZMnx">
<property role="3F0ifm" value="[" />
Expand Down Expand Up @@ -7847,6 +7847,18 @@
<ref role="aqKnT" to="hm2y:5Ys_ngSnA9h" resolve="HexValue" />
<node concept="22hDWj" id="68wLGjptylj" role="22hAXT" />
</node>
<node concept="PKFIW" id="1znK7yZ9Z0K">
<property role="TrG5h" value="ExpressionAlias" />
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
<node concept="PMmxH" id="1znK7yZ9ZkW" role="2wV5jI">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="OXEIz" id="1znK7yZ9X8g" role="P5bDN">
<node concept="UkePV" id="1znK7yZ9X8h" role="OY2wv">
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
</node>
<node concept="PKFIW" id="1znK7yZhztN">
<property role="TrG5h" value="ExpressionKeywordAlias" />
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
Expand All @@ -7873,17 +7885,5 @@
</node>
</node>
</node>
<node concept="PKFIW" id="1znK7yZ9Z0K">
<property role="TrG5h" value="ExpressionAlias" />
<ref role="1XX52x" to="hm2y:6sdnDbSla17" resolve="Expression" />
<node concept="PMmxH" id="1znK7yZ9ZkW" role="2wV5jI">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="OXEIz" id="1znK7yZ9X8g" role="P5bDN">
<node concept="UkePV" id="1znK7yZ9X8h" role="OY2wv">
<ref role="Ul1FP" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
</node>
</model>

88 changes: 88 additions & 0 deletions ...pr.genjava.toplevel/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
<import index="qt06" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.builder(org.apache.commons/)" />
<import index="hnhi" ref="r:d354209e-0bea-497f-b905-d66f72900fa8(org.iets3.analysis.base.plugin)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" implicit="true" />
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
Expand Down Expand Up @@ -9795,6 +9797,92 @@
<node concept="3cqZAl" id="6XE8Bc$gE1B" role="3clF45" />
</node>
<node concept="2tJIrI" id="6XE8Bc$gE2n" role="jymVt" />
<node concept="3clFb_" id="2Ccm6Yq_2Qr" role="jymVt">
<property role="TrG5h" value="hashCode" />
<node concept="3clFbS" id="2Ccm6Yq_2Qu" role="3clF47">
<node concept="3cpWs8" id="2Ccm6YqAETf" role="3cqZAp">
<node concept="3cpWsn" id="2Ccm6YqAETg" role="3cpWs9">
<property role="TrG5h" value="builder" />
<node concept="3uibUv" id="2Ccm6YqA$dE" role="1tU5fm">
<ref role="3uigEE" to="qt06:~HashCodeBuilder" resolve="HashCodeBuilder" />
</node>
<node concept="2ShNRf" id="2Ccm6YqAETh" role="33vP2m">
<node concept="1pGfFk" id="2Ccm6YqAETi" role="2ShVmc">
<ref role="37wK5l" to="qt06:~HashCodeBuilder.&lt;init&gt;(int,int)" resolve="HashCodeBuilder" />
<node concept="3cmrfG" id="2Ccm6YqAETj" role="37wK5m">
<property role="3cmrfH" value="17" />
</node>
<node concept="3cmrfG" id="2Ccm6YqAETk" role="37wK5m">
<property role="3cmrfH" value="37" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2Ccm6YqFlk$" role="3cqZAp">
<node concept="2OqwBi" id="2Ccm6YqFyjP" role="3clFbG">
<node concept="37vLTw" id="2Ccm6YqFlky" role="2Oq$k0">
<ref role="3cqZAo" node="2Ccm6YqAETg" resolve="builder" />
</node>
<node concept="liA8E" id="2Ccm6YqFEIS" role="2OqNvi">
<ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
<node concept="2OqwBi" id="6c9kQIS96Rz" role="37wK5m">
<node concept="Xjq3P" id="6c9kQIS96R$" role="2Oq$k0" />
<node concept="2OwXpG" id="6c9kQIS96R_" role="2OqNvi">
<ref role="2Oxat5" node="6XE8Bc$gDWa" resolve="i" />
<node concept="1ZhdrF" id="6c9kQIS96RA" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
<property role="2qtEX8" value="fieldDeclaration" />
<node concept="3$xsQk" id="6c9kQIS96RB" role="3$ytzL">
<node concept="3clFbS" id="6c9kQIS96RC" role="2VODD2">
<node concept="3clFbF" id="6c9kQIS96RD" role="3cqZAp">
<node concept="2OqwBi" id="6c9kQIS96RE" role="3clFbG">
<node concept="30H73N" id="6c9kQIS96RF" role="2Oq$k0" />
<node concept="3TrcHB" id="6c9kQIS96RG" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1WS0z7" id="2Ccm6YqGuIY" role="lGtFl">
<node concept="3JmXsc" id="2Ccm6YqGuIZ" role="3Jn$fo">
<node concept="3clFbS" id="2Ccm6YqGuJ0" role="2VODD2">
<node concept="3clFbF" id="6c9kQIS69tf" role="3cqZAp">
<node concept="2OqwBi" id="6c9kQIS6iFJ" role="3clFbG">
<node concept="30H73N" id="6c9kQIS69te" role="2Oq$k0" />
<node concept="2qgKlT" id="6c9kQIS6z7P" role="2OqNvi">
<ref role="37wK5l" to="nu60:58eyHuUgYVm" resolve="nonEmptyMembers" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="6c9kQISfwrN" role="3cqZAp">
<node concept="2OqwBi" id="6c9kQIS9_pX" role="3cqZAk">
<node concept="37vLTw" id="6c9kQIS9tjo" role="2Oq$k0">
<ref role="3cqZAo" node="2Ccm6YqAETg" resolve="builder" />
</node>
<node concept="liA8E" id="6c9kQIS9I6o" role="2OqNvi">
<ref role="37wK5l" to="qt06:~HashCodeBuilder.hashCode()" resolve="hashCode" />
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="2Ccm6Yq$F6D" role="1B3o_S" />
<node concept="10Oyi0" id="2Ccm6Yq$RB5" role="3clF45" />
<node concept="2AHcQZ" id="6c9kQIS9Q1S" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="2Ccm6Yq$jPR" role="jymVt" />
<node concept="3clFb_" id="6XE8Bc$gE2o" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="equals" />
Expand Down
2 changes: 2 additions & 0 deletions ...e/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<dependency reexport="false">b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</dependency>
<dependency reexport="false">2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)</dependency>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -96,6 +97,7 @@
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="20" />
Expand Down
4 changes: 2 additions & 2 deletions ...guages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.actions.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
<node concept="2pJxcG" id="1ikTdkW7bH5" role="2pJxcM">
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
<node concept="WxPPo" id="1IVt4400eGC" role="28ntcv">
<node concept="WxPPo" id="65GPZhBZf1o" role="28ntcv">
<node concept="2OqwBi" id="1ikTdkW6RBA" role="WxPPp">
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
Expand Down Expand Up @@ -476,7 +476,7 @@
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
<node concept="2pJxcG" id="1ikTdkW73vp" role="2pJxcM">
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
<node concept="WxPPo" id="1IVt4400eGD" role="28ntcv">
<node concept="WxPPo" id="65GPZhBZf1p" role="28ntcv">
<node concept="2OqwBi" id="1ikTdkW6REe" role="WxPPp">
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
Expand Down
25 changes: 24 additions & 1 deletion ...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" implicit="true" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -879,6 +879,29 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="5_6o5C8$zvB" role="jymVt" />
<node concept="3clFb_" id="5qf1oe$zfpT" role="jymVt">
<property role="TrG5h" value="hashCode" />
<node concept="3Tm1VV" id="5qf1oe$zfpU" role="1B3o_S" />
<node concept="10Oyi0" id="5qf1oe$zfpX" role="3clF45" />
<node concept="3clFbS" id="5qf1oe$zfpY" role="3clF47">
<node concept="3clFbF" id="5qf1oe$zktQ" role="3cqZAp">
<node concept="2YIFZM" id="5qf1oe$zlvV" role="3clFbG">
<ref role="37wK5l" to="33ny:~Objects.hash(java.lang.Object...)" resolve="hash" />
<ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
<node concept="37vLTw" id="5qf1oe$zpPq" role="37wK5m">
<ref role="3cqZAo" node="7D7uZV2szuN" resolve="memberData" />
</node>
<node concept="37vLTw" id="5qf1oe$zscK" role="37wK5m">
<ref role="3cqZAo" node="7$ajNzjzZzN" resolve="recordDeclaration" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="5qf1oe$zfpZ" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7D7uZV2szl_" role="jymVt" />
<node concept="3Tm1VV" id="7D7uZV2szlm" role="1B3o_S" />
<node concept="3uibUv" id="7D7uZV2yaTX" role="EKbjA">
Expand Down
38 changes: 6 additions & 32 deletions ....iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8176,39 +8176,13 @@
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
</node>
</node>
<node concept="3cpWs8" id="v9lBEVhxag" role="3cqZAp">
<node concept="3cpWsn" id="v9lBEVhxah" role="3cpWs9">
<property role="TrG5h" value="res" />
<node concept="3uibUv" id="6bG6MAFDJ_z" role="1tU5fm">
<ref role="3uigEE" to="j10v:~PSet" resolve="PSet" />
</node>
<node concept="2YIFZM" id="6bG6MAFDJB$" role="33vP2m">
<ref role="37wK5l" to="j10v:~Empty.set()" resolve="set" />
<ref role="1Pybhc" to="j10v:~Empty" resolve="Empty" />
</node>
</node>
</node>
<node concept="3clFbF" id="v9lBEVhxak" role="3cqZAp">
<node concept="37vLTI" id="v9lBEVhxal" role="3clFbG">
<node concept="2OqwBi" id="v9lBEVhxam" role="37vLTx">
<node concept="37vLTw" id="v9lBEVhxan" role="2Oq$k0">
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
</node>
<node concept="liA8E" id="v9lBEVhxao" role="2OqNvi">
<ref role="37wK5l" to="j10v:~PSet.plusAll(java.util.Collection)" resolve="plusAll" />
<node concept="37vLTw" id="v9lBEVhxap" role="37wK5m">
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
</node>
</node>
</node>
<node concept="37vLTw" id="v9lBEVhxaq" role="37vLTJ">
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
</node>
</node>
</node>
<node concept="3cpWs6" id="v9lBEVhxar" role="3cqZAp">
<node concept="37vLTw" id="v9lBEVhxas" role="3cqZAk">
<ref role="3cqZAo" node="v9lBEVhxah" resolve="res" />
<node concept="2YIFZM" id="5_6o5C8HOWP" role="3cqZAk">
<ref role="37wK5l" to="j10v:~HashTreePSet.from(java.util.Collection)" resolve="from" />
<ref role="1Pybhc" to="j10v:~HashTreePSet" resolve="HashTreePSet" />
<node concept="37vLTw" id="5_6o5C8HOWQ" role="37wK5m">
<ref role="3cqZAo" node="v9lBEVhxa7" resolve="l" />
</node>
</node>
</node>
</node>
Expand Down
Loading