Skip to content

Commit 75affd6

Browse files
arimerarimer
authored
Merge pull request #1403 from IETS3/merge/mps20251
Merge maintenance/mps20251 into master
2 parents d012499 + 125f869 commit 75affd6

File tree

3 files changed

+99
-67
lines changed

3 files changed

+99
-67
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ cell-screenshots/
2929
# -----------------------------------------------------------
3030
.idea
3131
workspace.xml
32+
.ideaconfig
3233

3334
# -----------------------------------------------------------
3435
# JUNIT
@@ -53,6 +54,7 @@ code/languages/*/TEST*.xml
5354
code/languages/org.iets3.core/build/tmp
5455
.mps-caches
5556
*.iml
57+
.mpsconfig
5658

5759
# -----------------------------------------------------------
5860
# GRADLE

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ 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+
9+
## July 2025
10+
11+
### Fixed
12+
13+
- Expressions of ShortLambdas are now correctly updated and used for interpretation after they are changed
14+
815
## June 2025
916

1017
### Added
@@ -25,6 +32,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
2532
An [enhancement script](http://127.0.0.1:63320/node?ref=r%3A531014dc-62ca-45fa-b1c2-cf992369440b%28org.iets3.core.expr.typetags.physunits.scripts%29%2F6252521573649140294)
2633
is provided to replace 'mu' with 'micro sign'.
2734

35+
2836
## May 2025
2937

3038
### Changed

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

Lines changed: 89 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@
150150
<child id="1144231399730" name="condition" index="1Dwp0S" />
151151
<child id="1144231408325" name="iteration" index="1Dwrff" />
152152
</concept>
153+
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
154+
<child id="1163668914799" name="condition" index="3K4Cdx" />
155+
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
156+
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
157+
</concept>
153158
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
154159
<child id="8356039341262087992" name="line" index="1aUNEU" />
155160
</concept>
@@ -236,6 +241,7 @@
236241
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
237242
<reference id="1138056546658" name="link" index="3TtcxE" />
238243
</concept>
244+
<concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
239245
</language>
240246
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
241247
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -2603,92 +2609,108 @@
26032609
</node>
26042610
</node>
26052611
</node>
2606-
<node concept="3clFbJ" id="XbOhLk5BuE" role="3cqZAp">
2607-
<node concept="3clFbS" id="XbOhLk5BuG" role="3clFbx">
2608-
<node concept="3clFbF" id="IFu7oT4tI3" role="3cqZAp">
2609-
<node concept="37vLTI" id="IFu7oT4vAM" role="3clFbG">
2610-
<node concept="37vLTw" id="IFu7oT4tI1" role="37vLTJ">
2612+
<node concept="3clFbH" id="4UqeHkkx1Mj" role="3cqZAp" />
2613+
<node concept="3clFbF" id="4UqeHkkwIjN" role="3cqZAp">
2614+
<node concept="37vLTI" id="4UqeHkkwJKG" role="3clFbG">
2615+
<node concept="3K4zz7" id="4UqeHkkwTui" role="37vLTx">
2616+
<node concept="37vLTw" id="4UqeHkkwXPd" role="3K4GZi">
2617+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2618+
</node>
2619+
<node concept="2OqwBi" id="4UqeHkkwN7c" role="3K4Cdx">
2620+
<node concept="37vLTw" id="4UqeHkkwLjk" role="2Oq$k0">
26112621
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
26122622
</node>
2613-
<node concept="2ShNRf" id="49WTic8ey5E" role="37vLTx">
2614-
<node concept="3zrR0B" id="49WTic8ey5F" role="2ShVmc">
2615-
<node concept="3Tqbb2" id="49WTic8ey5G" role="3zrR0E">
2616-
<ref role="ehGHo" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
2617-
</node>
2623+
<node concept="3w_OXm" id="4UqeHkkwORP" role="2OqNvi" />
2624+
</node>
2625+
<node concept="2ShNRf" id="4UqeHkkwUFf" role="3K4E3e">
2626+
<node concept="3zrR0B" id="4UqeHkkwUFg" role="2ShVmc">
2627+
<node concept="3Tqbb2" id="4UqeHkkwUFh" role="3zrR0E">
2628+
<ref role="ehGHo" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
26182629
</node>
26192630
</node>
26202631
</node>
26212632
</node>
2622-
<node concept="3clFbF" id="3fi3fTlpKub" role="3cqZAp">
2623-
<node concept="37vLTI" id="3fi3fTlpKuc" role="3clFbG">
2624-
<node concept="2OqwBi" id="IFu7oT4AXD" role="37vLTJ">
2625-
<node concept="37vLTw" id="3fi3fTlpKud" role="2Oq$k0">
2626-
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2627-
</node>
2628-
<node concept="3TrEf2" id="IFu7oT4CR$" role="2OqNvi">
2629-
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
2630-
</node>
2631-
</node>
2632-
<node concept="1PxgMI" id="2gng9$EqaKS" role="37vLTx">
2633-
<property role="1BlNFB" value="true" />
2634-
<node concept="chp4Y" id="2gng9$EqdW_" role="3oSUPX">
2635-
<ref role="cht4Q" to="hm2y:6sdnDbSla17" resolve="Expression" />
2636-
</node>
2637-
<node concept="2YIFZM" id="3fi3fTlpKug" role="1m5AlR">
2638-
<ref role="1Pybhc" to="w1kc:~CopyUtil" resolve="CopyUtil" />
2639-
<ref role="37wK5l" to="w1kc:~CopyUtil.copy(org.jetbrains.mps.openapi.model.SNode,java.util.Map,boolean)" resolve="copy" />
2640-
<node concept="2OqwBi" id="IFu7oT4E1e" role="37wK5m">
2641-
<node concept="37vLTw" id="3fi3fTlpKuh" role="2Oq$k0">
2642-
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
2643-
</node>
2644-
<node concept="3TrEf2" id="IFu7oT4HQE" role="2OqNvi">
2645-
<ref role="3Tt5mk" to="hm2y:3G_qVqIw4zp" resolve="expr" />
2646-
</node>
2647-
</node>
2648-
<node concept="37vLTw" id="3fi3fTlpKui" role="37wK5m">
2649-
<ref role="3cqZAo" node="3fi3fTlpKts" resolve="mapping" />
2650-
</node>
2651-
<node concept="3clFbT" id="3fi3fTlpKuj" role="37wK5m">
2652-
<property role="3clFbU" value="true" />
2653-
</node>
2654-
</node>
2655-
</node>
2633+
<node concept="37vLTw" id="4UqeHkkwIjL" role="37vLTJ">
2634+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2635+
</node>
2636+
</node>
2637+
</node>
2638+
<node concept="3clFbF" id="4UqeHkkuOiS" role="3cqZAp">
2639+
<node concept="2OqwBi" id="4UqeHkkuOiT" role="3clFbG">
2640+
<node concept="2OqwBi" id="4UqeHkkuOiU" role="2Oq$k0">
2641+
<node concept="37vLTw" id="4UqeHkkuOiV" role="2Oq$k0">
2642+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2643+
</node>
2644+
<node concept="3TrEf2" id="4UqeHkkuPIH" role="2OqNvi">
2645+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
26562646
</node>
26572647
</node>
2658-
<node concept="3clFbF" id="7cphKbKYWrc" role="3cqZAp">
2659-
<node concept="2OqwBi" id="7cphKbKYZU4" role="3clFbG">
2660-
<node concept="2OqwBi" id="7cphKbKYWXy" role="2Oq$k0">
2661-
<node concept="37vLTw" id="7cphKbKYWHQ" role="2Oq$k0">
2662-
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2648+
<node concept="3YRAZt" id="4UqeHkkuVsF" role="2OqNvi" />
2649+
</node>
2650+
</node>
2651+
<node concept="3clFbF" id="3fi3fTlpKub" role="3cqZAp">
2652+
<node concept="37vLTI" id="3fi3fTlpKuc" role="3clFbG">
2653+
<node concept="2OqwBi" id="IFu7oT4AXD" role="37vLTJ">
2654+
<node concept="37vLTw" id="3fi3fTlpKud" role="2Oq$k0">
2655+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2656+
</node>
2657+
<node concept="3TrEf2" id="IFu7oT4CR$" role="2OqNvi">
2658+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
2659+
</node>
2660+
</node>
2661+
<node concept="1PxgMI" id="2gng9$EqaKS" role="37vLTx">
2662+
<property role="1BlNFB" value="true" />
2663+
<node concept="chp4Y" id="2gng9$EqdW_" role="3oSUPX">
2664+
<ref role="cht4Q" to="hm2y:6sdnDbSla17" resolve="Expression" />
2665+
</node>
2666+
<node concept="2YIFZM" id="3fi3fTlpKug" role="1m5AlR">
2667+
<ref role="1Pybhc" to="w1kc:~CopyUtil" resolve="CopyUtil" />
2668+
<ref role="37wK5l" to="w1kc:~CopyUtil.copy(org.jetbrains.mps.openapi.model.SNode,java.util.Map,boolean)" resolve="copy" />
2669+
<node concept="2OqwBi" id="IFu7oT4E1e" role="37wK5m">
2670+
<node concept="37vLTw" id="3fi3fTlpKuh" role="2Oq$k0">
2671+
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
26632672
</node>
2664-
<node concept="3Tsc0h" id="7cphKbKYXk5" role="2OqNvi">
2665-
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
2673+
<node concept="3TrEf2" id="IFu7oT4HQE" role="2OqNvi">
2674+
<ref role="3Tt5mk" to="hm2y:3G_qVqIw4zp" resolve="expr" />
26662675
</node>
26672676
</node>
2668-
<node concept="2Kehj3" id="7cphKbKZ42m" role="2OqNvi" />
2669-
</node>
2670-
</node>
2671-
<node concept="3clFbF" id="XbOhLk5Pff" role="3cqZAp">
2672-
<node concept="2OqwBi" id="XbOhLk5QDE" role="3clFbG">
2673-
<node concept="37vLTw" id="XbOhLk5Pfd" role="2Oq$k0">
2674-
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
2677+
<node concept="37vLTw" id="3fi3fTlpKui" role="37wK5m">
2678+
<ref role="3cqZAo" node="3fi3fTlpKts" resolve="mapping" />
26752679
</node>
2676-
<node concept="2qgKlT" id="XbOhLk5SI_" role="2OqNvi">
2677-
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLambda" />
2678-
<node concept="37vLTw" id="XbOhLk5TWD" role="37wK5m">
2679-
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2680-
</node>
2680+
<node concept="3clFbT" id="3fi3fTlpKuj" role="37wK5m">
2681+
<property role="3clFbU" value="true" />
26812682
</node>
26822683
</node>
26832684
</node>
26842685
</node>
2685-
<node concept="3clFbC" id="XbOhLk5E3z" role="3clFbw">
2686-
<node concept="10Nm6u" id="XbOhLk5Flg" role="3uHU7w" />
2687-
<node concept="37vLTw" id="XbOhLk5CRJ" role="3uHU7B">
2688-
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2686+
</node>
2687+
<node concept="3clFbF" id="4UqeHkku_4P" role="3cqZAp">
2688+
<node concept="2OqwBi" id="4UqeHkkuI1J" role="3clFbG">
2689+
<node concept="2OqwBi" id="4UqeHkkuAFn" role="2Oq$k0">
2690+
<node concept="37vLTw" id="4UqeHkku_4N" role="2Oq$k0">
2691+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2692+
</node>
2693+
<node concept="3Tsc0h" id="4UqeHkkuCkS" role="2OqNvi">
2694+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
2695+
</node>
2696+
</node>
2697+
<node concept="2Kehj3" id="4UqeHkkv3Mz" role="2OqNvi" />
2698+
</node>
2699+
</node>
2700+
<node concept="3clFbF" id="XbOhLk5Pff" role="3cqZAp">
2701+
<node concept="2OqwBi" id="XbOhLk5QDE" role="3clFbG">
2702+
<node concept="37vLTw" id="XbOhLk5Pfd" role="2Oq$k0">
2703+
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
2704+
</node>
2705+
<node concept="2qgKlT" id="XbOhLk5SI_" role="2OqNvi">
2706+
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLambda" />
2707+
<node concept="37vLTw" id="XbOhLk5TWD" role="37wK5m">
2708+
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
2709+
</node>
26892710
</node>
26902711
</node>
26912712
</node>
2713+
<node concept="3clFbH" id="4UqeHkkv6z7" role="3cqZAp" />
26922714
<node concept="3cpWs8" id="5s__jxCqyey" role="3cqZAp">
26932715
<node concept="3cpWsn" id="5s__jxCqyez" role="3cpWs9">
26942716
<property role="TrG5h" value="lambdaArg" />

0 commit comments

Comments
 (0)