Skip to content

Commit 41b9438

Browse files
author
Alexander Pann
authored
Merge pull request #1275 from IETS3/merge/mps20232
Merge maintenance/mps20232 into master
2 parents c0e730b + c860a1b commit 41b9438

File tree

64 files changed

+2252
-4840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2252
-4840
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,28 @@ 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 2025
9+
10+
### Fixed
11+
12+
- Number literals in scientific format e.g. 1e10 now require a number before "e". Numbers like "e-5" are not valid anymore because it caused exceptions in other parts of the code base.
13+
14+
## March 2025
15+
16+
### Fixed
17+
18+
- An issue with conflicting rules for overloaded operation types with rational types was fixed.
19+
- The interpreter of the lookup tables was fixed.
20+
- The syntax of optional names in assert statements was improved.
21+
- A stack overflow related to success types was fixed.
22+
- Invalid value and constrained failed test items now show why tests fail.
23+
- An exception related to generator vs interpreter selection for tests was fixed.
24+
25+
### Removed
26+
27+
- The demo language `org.iets3.core.expr.typetags.lib` was removed.
28+
- The unused field `ReferenceableFlag#idMember` was removed.
29+
830
## Feburary 2025
931

1032
### Added

code/languages/org.iets3.opensource/.mps/modules.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl" folder="expr.lang-core" />
7272
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl" folder="expr.tracing" />
7373
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl" folder="expr.lang-advanced" />
74-
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl" folder="expr.lang-advanced" />
7574
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.physunits/org.iets3.core.expr.typetags.physunits.mpl" folder="expr.lang-advanced" />
7675
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl" folder="expr.lang-advanced" />
7776
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl" folder="expr.lang-advanced" />
@@ -142,7 +141,6 @@
142141
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd" folder="expr" />
143142
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd" folder="expr.lang-core" />
144143
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd" folder="expr.tracing" />
145-
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd" folder="expr.lang-advanced" />
146144
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.physunits.documentation/org.iets3.core.expr.typetags.physunits.documentation.msd" folder="expr.lang-advanced" />
147145
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.phyunits.si/org.iets3.core.expr.typetags.phyunits.si.msd" folder="expr.lang-advanced" />
148146
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd" folder="expr.lang-advanced" />

code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.advanced.devkit/org.iets3.core.expr.advanced.devkit.devkit

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<exported-language name="64e79176-30a1-4836-821c-bf62ff6c6091(org.iets3.core.expr.natlang)" />
1111
<exported-language name="4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68(org.iets3.core.expr.temporal)" />
1212
<exported-language name="5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)" />
13-
<exported-language name="2c8e8304-72f7-4e6a-853a-ac0616a47569(org.iets3.core.expr.typetags.lib)" />
1413
<exported-language name="cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)" />
1514
<exported-language name="8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)" />
1615
<exported-language name="cee4aa62-aca9-4f26-9602-75129cd457c9(org.iets3.core.expr.dataflow)" />
@@ -25,7 +24,6 @@
2524
<exported-solution>2bd330e3-1cae-4049-bed7-7d39e93cece4(org.iets3.core.expr.messages.interpreter)</exported-solution>
2625
<exported-solution>efafd749-49c6-482f-8a14-68061c57dd08(org.iets3.core.expr.natlang.interpreter)</exported-solution>
2726
<exported-solution>06aa4a64-087b-49de-99ac-5bfea95ff839(org.iets3.core.expr.temporal.interpreter)</exported-solution>
28-
<exported-solution>b4ec5624-2e67-4a4e-9ece-34bcbf966115(org.iets3.core.expr.typetags.lib.interpreter)</exported-solution>
2927
<exported-solution>1c761cfd-81b1-4794-9999-148fa76881b8(org.iets3.core.expr.typetags.units.si)</exported-solution>
3028
<exported-solution>4289e037-cc03-4bfe-bf89-2db268aec73a(org.iets3.core.expr.util.interpreter)</exported-solution>
3129
<exported-solution>e29ad049-74f8-4f02-9561-62d7477f822a(org.iets3.core.expr.doc.plugin)</exported-solution>

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9290,20 +9290,7 @@
92909290
<property role="TrG5h" value="at" />
92919291
<ref role="1YaFvo" to="hm2y:5BNZGjBtUbJ" resolve="AttemptType" />
92929292
</node>
9293-
<node concept="3clFbS" id="5bEkIpekP3Q" role="2sgrp5">
9294-
<node concept="1ZobV4" id="5bEkIpekPOB" role="3cqZAp">
9295-
<node concept="mw_s8" id="5bEkIpekPQn" role="1ZfhKB">
9296-
<node concept="1YBJjd" id="5bEkIpekPQl" role="mwGJk">
9297-
<ref role="1YBMHb" node="5bEkIpekP6e" resolve="at" />
9298-
</node>
9299-
</node>
9300-
<node concept="mw_s8" id="5bEkIpekPOE" role="1ZfhK$">
9301-
<node concept="1YBJjd" id="5bEkIpekPsF" role="mwGJk">
9302-
<ref role="1YBMHb" node="5bEkIpekP3S" resolve="st" />
9303-
</node>
9304-
</node>
9305-
</node>
9306-
</node>
9293+
<node concept="3clFbS" id="5bEkIpekP3Q" role="2sgrp5" />
93079294
<node concept="1YaCAy" id="5bEkIpekP3S" role="1YuTPh">
93089295
<property role="TrG5h" value="st" />
93099296
<ref role="1YaFvo" to="hm2y:1Ez$z58L7Ek" resolve="SuccessType" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<persistence version="9" />
44
<languages>
55
<use id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda" version="6" />
6-
<use id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes" version="10" />
6+
<use id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes" version="11" />
77
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
88
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
99
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<language slang="l:7b68d745-a7b8-48b9-bd9c-05c0f8725a35:org.iets3.core.base" version="0" />
8686
<language slang="l:cfaa4966-b7d5-4b69-b66a-309a6e1a7290:org.iets3.core.expr.base" version="22" />
8787
<language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="6" />
88-
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="10" />
88+
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="11" />
8989
</languageVersions>
9090
<dependencyVersions>
9191
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<language slang="l:ddeeec5e-aa31-4c44-bc40-319cd452626e:org.iets3.core.expr.genjava.toplevel" version="0" />
4545
<language slang="l:15d858db-2d21-4ae9-90c4-f595086d0bdf:org.iets3.core.expr.genjava.util" version="1" />
4646
<language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="6" />
47-
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="10" />
47+
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="11" />
4848
</languageVersions>
4949
<dependencyVersions>
5050
<module reference="889f307c-31c8-4d64-9e24-a83f15c85f02(org.iets3.core.expr.genjava.stateMachineExample.genplan)" version="0" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
77
<use id="15d858db-2d21-4ae9-90c4-f595086d0bdf" name="org.iets3.core.expr.genjava.util" version="1" />
88
<use id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base" version="22" />
9-
<use id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes" version="10" />
9+
<use id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes" version="11" />
1010
<use id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda" version="6" />
1111
<use id="71934284-d7d1-45ee-a054-8c072591085f" name="org.iets3.core.expr.toplevel" version="6" />
1212
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<language slang="l:15d858db-2d21-4ae9-90c4-f595086d0bdf:org.iets3.core.expr.genjava.util" version="1" />
6565
<language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="6" />
6666
<language slang="l:f3eafff0-30d2-46d6-9150-f0f3b880ce27:org.iets3.core.expr.path" version="0" />
67-
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="10" />
67+
<language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="11" />
6868
<language slang="l:71934284-d7d1-45ee-a054-8c072591085f:org.iets3.core.expr.toplevel" version="6" />
6969
</languageVersions>
7070
<dependencyVersions>

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@
947947
</node>
948948
</node>
949949
<node concept="3ciAk0" id="5mz5Tt_j9Do" role="3he0YX">
950+
<property role="3PlbSO" value="true" />
950951
<node concept="3gn64h" id="5mz5Tt_j9Dp" role="32tDTA">
951952
<ref role="3gnhBz" to="hm2y:4rZeNQ6N6R9" resolve="EqualsExpression" />
952953
</node>
@@ -976,6 +977,7 @@
976977
</node>
977978
</node>
978979
<node concept="3ciAk0" id="1ghGxCiVcXk" role="3he0YX">
980+
<property role="3PlbSO" value="true" />
979981
<node concept="3gn64h" id="1ghGxCiVcXl" role="32tDTA">
980982
<ref role="3gnhBz" to="hm2y:4rZeNQ6N6R9" resolve="EqualsExpression" />
981983
</node>

0 commit comments

Comments
 (0)