Skip to content

Commit c450a9c

Browse files
authored
Merge branch 'maintenance/mps20213' into bugfix/888_MethodCallsOnLists
2 parents bbc021c + b7769c9 commit c450a9c

File tree

6 files changed

+87
-445
lines changed

6 files changed

+87
-445
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## April 2024
9+
10+
### Removed
11+
12+
- The unnecessary super types of the tuple type were removed and are not necessary anymore.
13+
814
## March 2024
915

1016
### Added

code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1717
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
1818
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
19-
<dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
19+
<dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)</dependency>
2020
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
2121
</dependencies>
2222
<languageVersions>
@@ -72,10 +72,10 @@
7272
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
7373
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
7474
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
75+
<module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)" version="0" />
7576
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
7677
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
7778
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
78-
<module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)" version="0" />
7979
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
8080
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
8181
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10233,6 +10233,74 @@
1023310233
</node>
1023410234
<node concept="10P_77" id="5L2mTKmB19J" role="3clF45" />
1023510235
</node>
10236+
<node concept="13i0hz" id="6NucLe1SARS" role="13h7CS">
10237+
<property role="TrG5h" value="allSupertypes" />
10238+
<ref role="13i0hy" node="4Q4DxjDsh$t" resolve="allSupertypes" />
10239+
<node concept="3Tm1VV" id="6NucLe1SART" role="1B3o_S" />
10240+
<node concept="3clFbS" id="6NucLe1SBkn" role="3clF47">
10241+
<node concept="3clFbH" id="6NucLe1SLNC" role="3cqZAp" />
10242+
<node concept="3clFbJ" id="5o7Ni5kjgYA" role="3cqZAp">
10243+
<node concept="3eOSWO" id="5o7Ni5kjp6$" role="3clFbw">
10244+
<node concept="3cmrfG" id="5o7Ni5kjp6N" role="3uHU7w">
10245+
<property role="3cmrfH" value="1" />
10246+
</node>
10247+
<node concept="2OqwBi" id="5o7Ni5kjkyx" role="3uHU7B">
10248+
<node concept="2OqwBi" id="5o7Ni5kjhRG" role="2Oq$k0">
10249+
<node concept="13iPFW" id="6NucLe1SLFv" role="2Oq$k0" />
10250+
<node concept="3Tsc0h" id="5o7Ni5kji6u" role="2OqNvi">
10251+
<ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
10252+
</node>
10253+
</node>
10254+
<node concept="34oBXx" id="5o7Ni5kjmlv" role="2OqNvi" />
10255+
</node>
10256+
</node>
10257+
<node concept="3clFbS" id="5o7Ni5kjgYC" role="3clFbx">
10258+
<node concept="3cpWs8" id="6NucLe1SM4d" role="3cqZAp">
10259+
<node concept="3cpWsn" id="6NucLe1SM4g" role="3cpWs9">
10260+
<property role="TrG5h" value="types" />
10261+
<node concept="2I9FWS" id="6NucLe1SM4b" role="1tU5fm">
10262+
<ref role="2I9WkF" to="hm2y:6sdnDbSlaok" resolve="Type" />
10263+
</node>
10264+
<node concept="2ShNRf" id="6NucLe1SMkU" role="33vP2m">
10265+
<node concept="2T8Vx0" id="6NucLe1T3QR" role="2ShVmc">
10266+
<node concept="2I9FWS" id="6NucLe1T3QT" role="2T96Bj">
10267+
<ref role="2I9WkF" to="hm2y:6sdnDbSlaok" resolve="Type" />
10268+
</node>
10269+
</node>
10270+
</node>
10271+
</node>
10272+
</node>
10273+
<node concept="3clFbF" id="6NucLe1T4CG" role="3cqZAp">
10274+
<node concept="2OqwBi" id="6NucLe1T5L$" role="3clFbG">
10275+
<node concept="37vLTw" id="6NucLe1T4CE" role="2Oq$k0">
10276+
<ref role="3cqZAo" node="6NucLe1SM4g" resolve="types" />
10277+
</node>
10278+
<node concept="TSZUe" id="6NucLe1T7aW" role="2OqNvi">
10279+
<node concept="2ShNRf" id="5o7Ni5kjpf_" role="25WWJ7">
10280+
<node concept="3zrR0B" id="5o7Ni5kjqOU" role="2ShVmc">
10281+
<node concept="3Tqbb2" id="5o7Ni5kjqOW" role="3zrR0E">
10282+
<ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
10283+
</node>
10284+
</node>
10285+
</node>
10286+
</node>
10287+
</node>
10288+
</node>
10289+
<node concept="3cpWs6" id="5o7Ni5kjpf1" role="3cqZAp">
10290+
<node concept="37vLTw" id="6NucLe1T46D" role="3cqZAk">
10291+
<ref role="3cqZAo" node="6NucLe1SM4g" resolve="types" />
10292+
</node>
10293+
</node>
10294+
</node>
10295+
</node>
10296+
<node concept="3clFbF" id="5o7Ni5kjqPL" role="3cqZAp">
10297+
<node concept="10Nm6u" id="5o7Ni5kjqPJ" role="3clFbG" />
10298+
</node>
10299+
</node>
10300+
<node concept="2I9FWS" id="6NucLe1SBko" role="3clF45">
10301+
<ref role="2I9WkF" to="hm2y:6sdnDbSlaok" resolve="Type" />
10302+
</node>
10303+
</node>
1023610304
</node>
1023710305
<node concept="13h7C7" id="S$tO8ocQNQ">
1023810306
<property role="3GE5qa" value="tuples" />

0 commit comments

Comments
 (0)