Skip to content

Commit 3b336b7

Browse files
alexanderpannalexanderpann
authored
Merge branch 'maintenance/mps20213' into bugfix/indexExpr_collections_20213
2 parents 91ce864 + 979ac16 commit 3b336b7

File tree

36 files changed

+10059
-2408
lines changed

36 files changed

+10059
-2408
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,26 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1313

1414
## November 2023
1515

16+
### Added
17+
18+
- The `sort` method of collections now supports more types: all primitive types, the option type, all datetime types, the temporal type and the record type
19+
- Records: The sorting order can be added through the intention `Add a Comparison Order`, otherwise, the records are sorted based on the declaration order of the members
20+
- Option: Sorting removes all `none` values since the underlying data structure of collections doesn't support null values.
21+
22+
### Changed
23+
24+
- The comparison helper in org.iets3.core.expr.simpleTypes.runtime and the equals helper in the test language where merged into a new class EqualsHelper inside the first runtime solution to return the same values.
25+
1626
### Fixed
1727

1828
- String validation: A bug in the number detection logic was fixed
1929

20-
## October 2023
30+
## Oktober 2023
2131

22-
### Fixed
32+
## Fixed
2333

34+
- `SliceValue` can now correctly be checked for equality: `SliceValue.equals()` and `SliceValue.hashCode()` are overwritten.
35+
- `TemporalValue.hashCode()` was overwritten, thus `equals` and `hashCode()` are in sync now.
2436
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
2537

2638
## September 2023

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5594,6 +5594,19 @@
55945594
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
55955595
</node>
55965596
</node>
5597+
<node concept="13i0hz" id="4TtBy4cxuTN" role="13h7CS">
5598+
<property role="TrG5h" value="canBeSorted" />
5599+
<ref role="13i0hy" node="7k6A8Wfp3IU" resolve="canBeSorted" />
5600+
<node concept="3Tm1VV" id="4TtBy4cxuTO" role="1B3o_S" />
5601+
<node concept="3clFbS" id="4TtBy4cxuTT" role="3clF47">
5602+
<node concept="3clFbF" id="4TtBy4cxyVC" role="3cqZAp">
5603+
<node concept="3clFbT" id="4TtBy4cxyVB" role="3clFbG">
5604+
<property role="3clFbU" value="true" />
5605+
</node>
5606+
</node>
5607+
</node>
5608+
<node concept="10P_77" id="4TtBy4cxuTU" role="3clF45" />
5609+
</node>
55975610
</node>
55985611
<node concept="13h7C7" id="UN2ftLUxnR">
55995612
<property role="3GE5qa" value="option" />
@@ -6242,6 +6255,17 @@
62426255
</node>
62436256
<node concept="17QB3L" id="1CNpG_h2Db0" role="3clF45" />
62446257
</node>
6258+
<node concept="13i0hz" id="7k6A8Wfp3IU" role="13h7CS">
6259+
<property role="TrG5h" value="canBeSorted" />
6260+
<property role="13i0it" value="true" />
6261+
<node concept="3Tm1VV" id="7k6A8Wfp3IV" role="1B3o_S" />
6262+
<node concept="10P_77" id="7k6A8Wfp7FV" role="3clF45" />
6263+
<node concept="3clFbS" id="7k6A8Wfp3IX" role="3clF47">
6264+
<node concept="3clFbF" id="7k6A8Wfp7GZ" role="3cqZAp">
6265+
<node concept="3clFbT" id="7k6A8Wfp7GY" role="3clFbG" />
6266+
</node>
6267+
</node>
6268+
</node>
62456269
</node>
62466270
<node concept="13h7C7" id="6XENO0rLjw">
62476271
<ref role="13h7C2" to="hm2y:6XENO0rLj7" resolve="IIsSingleSymbol" />
@@ -26433,5 +26457,24 @@
2643326457
<node concept="17QB3L" id="6ngDzsNlH8k" role="3clF45" />
2643426458
</node>
2643526459
</node>
26460+
<node concept="13h7C7" id="7k6A8Wfp7KX">
26461+
<ref role="13h7C2" to="hm2y:6sdnDbSlMSN" resolve="PrimitiveType" />
26462+
<node concept="13hLZK" id="7k6A8Wfp7KY" role="13h7CW">
26463+
<node concept="3clFbS" id="7k6A8Wfp7KZ" role="2VODD2" />
26464+
</node>
26465+
<node concept="13i0hz" id="7k6A8Wfp8Fb" role="13h7CS">
26466+
<property role="TrG5h" value="canBeSorted" />
26467+
<ref role="13i0hy" node="7k6A8Wfp3IU" resolve="canBeSorted" />
26468+
<node concept="3Tm1VV" id="7k6A8Wfp8Fc" role="1B3o_S" />
26469+
<node concept="3clFbS" id="7k6A8Wfp8Fh" role="3clF47">
26470+
<node concept="3clFbF" id="7k6A8Wfp8K$" role="3cqZAp">
26471+
<node concept="3clFbT" id="7k6A8Wfp8Kz" role="3clFbG">
26472+
<property role="3clFbU" value="true" />
26473+
</node>
26474+
</node>
26475+
</node>
26476+
<node concept="10P_77" id="7k6A8Wfp8Fi" role="3clF45" />
26477+
</node>
26478+
</node>
2643626479
</model>
2643726480

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

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
1616
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
1717
<use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
18+
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
1819
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1920
</languages>
2021
<imports>
@@ -29,8 +30,6 @@
2930
<import index="iwsx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.fileEditor(MPS.IDEA/)" />
3031
<import index="7lvn" ref="r:4e6037e6-9135-44f8-9403-04d79fc40f4a(jetbrains.mps.ide.editor.util)" />
3132
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
32-
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
33-
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
3433
<import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
3534
<import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
3635
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -40,16 +39,15 @@
4039
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
4140
<import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
4241
<import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
43-
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
4442
<import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
4543
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
4644
<import index="ppzb" ref="r:5db517a0-f62d-4841-a421-11bb7269799d(org.iets3.core.expr.base.shared.runtime)" />
4745
<import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
48-
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
49-
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
50-
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
51-
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
52-
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
46+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
47+
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
48+
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
49+
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
50+
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
5351
</imports>
5452
<registry>
5553
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -548,6 +546,9 @@
548546
<node concept="3uibUv" id="6MNhNeUh6na" role="EKbjA">
549547
<ref role="3uigEE" to="2ahs:6MNhNeUeM9i" resolve="IStopAndReturn" />
550548
</node>
549+
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
550+
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
551+
</node>
551552
<node concept="3Tm1VV" id="UN2ftLWgA9" role="1B3o_S" />
552553
<node concept="3clFb_" id="UN2ftLXFXP" role="jymVt">
553554
<property role="1EzhhJ" value="false" />
@@ -671,13 +672,73 @@
671672
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
672673
</node>
673674
</node>
675+
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
674676
<node concept="3UR2Jj" id="3iq6R$ZyJbu" role="lGtFl">
675677
<node concept="TZ5HA" id="3iq6R$ZyJbv" role="TZ5H$">
676678
<node concept="1dT_AC" id="3iq6R$ZyJbw" role="1dT_Ay">
677679
<property role="1dT_AB" value="Represents 'none' value of an optional type." />
678680
</node>
679681
</node>
680682
</node>
683+
<node concept="3clFb_" id="4TtBy4czRUR" role="jymVt">
684+
<property role="TrG5h" value="compareTo" />
685+
<node concept="3Tm1VV" id="4TtBy4czRUS" role="1B3o_S" />
686+
<node concept="10Oyi0" id="4TtBy4czRUU" role="3clF45" />
687+
<node concept="37vLTG" id="4TtBy4czRUV" role="3clF46">
688+
<property role="TrG5h" value="object" />
689+
<node concept="3uibUv" id="4TtBy4czRUX" role="1tU5fm">
690+
<ref role="3uigEE" to="wyt6:~Object" />
691+
</node>
692+
</node>
693+
<node concept="3clFbS" id="4TtBy4czRUY" role="3clF47">
694+
<node concept="3SKdUt" id="29KNCeyMCRt" role="3cqZAp">
695+
<node concept="1PaTwC" id="29KNCeyMCRu" role="1aUNEU">
696+
<node concept="3oM_SD" id="29KNCeyMD1j" role="1PaTwD">
697+
<property role="3oM_SC" value="NoneValues" />
698+
</node>
699+
<node concept="3oM_SD" id="29KNCeyMD1F" role="1PaTwD">
700+
<property role="3oM_SC" value="should" />
701+
</node>
702+
<node concept="3oM_SD" id="29KNCeyMD24" role="1PaTwD">
703+
<property role="3oM_SC" value="be" />
704+
</node>
705+
<node concept="3oM_SD" id="29KNCeyMD2u" role="1PaTwD">
706+
<property role="3oM_SC" value="the" />
707+
</node>
708+
<node concept="3oM_SD" id="29KNCeyMD2T" role="1PaTwD">
709+
<property role="3oM_SC" value="lowest" />
710+
</node>
711+
<node concept="3oM_SD" id="29KNCeyMD3l" role="1PaTwD">
712+
<property role="3oM_SC" value="value" />
713+
</node>
714+
<node concept="3oM_SD" id="29KNCeyMD3s" role="1PaTwD">
715+
<property role="3oM_SC" value="or" />
716+
</node>
717+
<node concept="3oM_SD" id="29KNCeyMD3$" role="1PaTwD">
718+
<property role="3oM_SC" value="filtered" />
719+
</node>
720+
<node concept="3oM_SD" id="29KNCeyMD43" role="1PaTwD">
721+
<property role="3oM_SC" value="from" />
722+
</node>
723+
<node concept="3oM_SD" id="29KNCeyMD4z" role="1PaTwD">
724+
<property role="3oM_SC" value="collections" />
725+
</node>
726+
<node concept="3oM_SD" id="29KNCeyMD54" role="1PaTwD">
727+
<property role="3oM_SC" value="anyway" />
728+
</node>
729+
</node>
730+
</node>
731+
<node concept="3clFbF" id="4TtBy4czRV1" role="3cqZAp">
732+
<node concept="3cmrfG" id="4TtBy4czRV0" role="3clFbG">
733+
<property role="3cmrfH" value="-1" />
734+
</node>
735+
</node>
736+
</node>
737+
<node concept="2AHcQZ" id="4TtBy4czRUZ" role="2AJF6D">
738+
<ref role="2AI5Lk" to="wyt6:~Override" />
739+
</node>
740+
</node>
741+
<node concept="2tJIrI" id="29KNCeybCV7" role="jymVt" />
681742
</node>
682743
<node concept="312cEu" id="12WRc298rqY">
683744
<property role="TrG5h" value="SpecificErrorValue" />

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

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -500,49 +500,24 @@
500500
</node>
501501
<node concept="3clFbJ" id="4ptnK4j$WvB" role="3cqZAp">
502502
<node concept="3clFbS" id="4ptnK4j$WvD" role="3clFbx">
503-
<node concept="3cpWs8" id="6b_jefnKxOd" role="3cqZAp">
504-
<node concept="3cpWsn" id="6b_jefnKxOe" role="3cpWs9">
505-
<property role="TrG5h" value="mgr" />
506-
<node concept="3uibUv" id="6b_jefnKxOf" role="1tU5fm">
507-
<ref role="3uigEE" to="u78q:~SubtypingManager" resolve="SubtypingManager" />
508-
</node>
509-
<node concept="2OqwBi" id="6b_jefnKxOg" role="33vP2m">
510-
<node concept="2YIFZM" id="6b_jefnKxOh" role="2Oq$k0">
511-
<ref role="37wK5l" to="u78q:~TypeChecker.getInstance()" resolve="getInstance" />
512-
<ref role="1Pybhc" to="u78q:~TypeChecker" resolve="TypeChecker" />
513-
</node>
514-
<node concept="liA8E" id="6b_jefnKxOi" role="2OqNvi">
515-
<ref role="37wK5l" to="u78q:~TypeChecker.getSubtypingManager()" resolve="getSubtypingManager" />
516-
</node>
517-
</node>
518-
</node>
519-
</node>
520-
<node concept="3cpWs6" id="4ptnK4j_0RZ" role="3cqZAp">
521-
<node concept="2OqwBi" id="4ptnK4j_0S1" role="3cqZAk">
522-
<node concept="37vLTw" id="4ptnK4j_0S2" role="2Oq$k0">
523-
<ref role="3cqZAo" node="6b_jefnKxOe" resolve="mgr" />
524-
</node>
525-
<node concept="liA8E" id="4ptnK4j_0S3" role="2OqNvi">
526-
<ref role="37wK5l" to="u78q:~SubtypingManager.isSubtype(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="isSubtype" />
527-
<node concept="2OqwBi" id="4ptnK4j_0S4" role="37wK5m">
528-
<node concept="1PxgMI" id="4ptnK4j_0S5" role="2Oq$k0">
529-
<node concept="chp4Y" id="4ptnK4j_0S6" role="3oSUPX">
530-
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
531-
</node>
532-
<node concept="37vLTw" id="4ptnK4j_0S7" role="1m5AlR">
533-
<ref role="3cqZAo" node="6b_jefnKxOk" resolve="ct" />
534-
</node>
503+
<node concept="3cpWs6" id="6vUyz1yKO4n" role="3cqZAp">
504+
<node concept="2OqwBi" id="3sWKo0FtNXu" role="3cqZAk">
505+
<node concept="2OqwBi" id="4ptnK4j_0S4" role="2Oq$k0">
506+
<node concept="1PxgMI" id="4ptnK4j_0S5" role="2Oq$k0">
507+
<node concept="chp4Y" id="4ptnK4j_0S6" role="3oSUPX">
508+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
535509
</node>
536-
<node concept="3TrEf2" id="4ptnK4j_0S8" role="2OqNvi">
537-
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
510+
<node concept="37vLTw" id="4ptnK4j_0S7" role="1m5AlR">
511+
<ref role="3cqZAo" node="6b_jefnKxOk" resolve="ct" />
538512
</node>
539513
</node>
540-
<node concept="2YIFZM" id="5wDe8wA6zqT" role="37wK5m">
541-
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
542-
<ref role="37wK5l" to="xfg9:2Qbt$1tTQcM" resolve="createIntegerType" />
543-
<node concept="10Nm6u" id="4ptnK4j_0Sa" role="37wK5m" />
514+
<node concept="3TrEf2" id="4ptnK4j_0S8" role="2OqNvi">
515+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
544516
</node>
545517
</node>
518+
<node concept="2qgKlT" id="3sWKo0FtOlb" role="2OqNvi">
519+
<ref role="37wK5l" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
520+
</node>
546521
</node>
547522
</node>
548523
</node>

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,19 @@
763763
<node concept="13hLZK" id="3nGzaxURzmU" role="13h7CW">
764764
<node concept="3clFbS" id="3nGzaxURzmV" role="2VODD2" />
765765
</node>
766+
<node concept="13i0hz" id="7k6A8WfqMZP" role="13h7CS">
767+
<property role="TrG5h" value="canBeSorted" />
768+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
769+
<node concept="3Tm1VV" id="7k6A8WfqMZQ" role="1B3o_S" />
770+
<node concept="3clFbS" id="7k6A8WfqMZV" role="3clF47">
771+
<node concept="3clFbF" id="7k6A8WfqN5e" role="3cqZAp">
772+
<node concept="3clFbT" id="7k6A8WfqN5d" role="3clFbG">
773+
<property role="3clFbU" value="true" />
774+
</node>
775+
</node>
776+
</node>
777+
<node concept="10P_77" id="7k6A8WfqMZW" role="3clF45" />
778+
</node>
766779
</node>
767780
<node concept="13h7C7" id="3nGzaxUXNjl">
768781
<property role="3GE5qa" value="range.literals" />
@@ -1204,6 +1217,19 @@
12041217
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
12051218
</node>
12061219
</node>
1220+
<node concept="13i0hz" id="7k6A8WfqVB$" role="13h7CS">
1221+
<property role="TrG5h" value="canBeSorted" />
1222+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
1223+
<node concept="3Tm1VV" id="7k6A8WfqVB_" role="1B3o_S" />
1224+
<node concept="3clFbS" id="7k6A8WfqVBE" role="3clF47">
1225+
<node concept="3clFbF" id="7k6A8WfqVHa" role="3cqZAp">
1226+
<node concept="3clFbT" id="7k6A8WfqVH9" role="3clFbG">
1227+
<property role="3clFbU" value="true" />
1228+
</node>
1229+
</node>
1230+
</node>
1231+
<node concept="10P_77" id="7k6A8WfqVBF" role="3clF45" />
1232+
</node>
12071233
</node>
12081234
<node concept="13h7C7" id="7zAZa_vg8oQ">
12091235
<property role="3GE5qa" value="range" />
@@ -1654,5 +1680,25 @@
16541680
<node concept="17QB3L" id="3HiHZeyrUvY" role="3clF45" />
16551681
</node>
16561682
</node>
1683+
<node concept="13h7C7" id="7k6A8WfqVL8">
1684+
<property role="3GE5qa" value="time" />
1685+
<ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
1686+
<node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
1687+
<node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
1688+
</node>
1689+
<node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
1690+
<property role="TrG5h" value="canBeSorted" />
1691+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
1692+
<node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
1693+
<node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
1694+
<node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
1695+
<node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
1696+
<property role="3clFbU" value="true" />
1697+
</node>
1698+
</node>
1699+
</node>
1700+
<node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
1701+
</node>
1702+
</node>
16571703
</model>
16581704

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@
660660
<property role="TrG5h" value="TimeType" />
661661
<property role="34LRSv" value="time" />
662662
<property role="3GE5qa" value="time" />
663-
<property role="R4oN_" value="hours and minutes" />
663+
<property role="R4oN_" value="hours, minutes and seconds" />
664664
<ref role="1TJDcQ" to="hm2y:6sdnDbSlaok" resolve="Type" />
665665
</node>
666666
<node concept="1TIwiD" id="3HiHZey9lU5">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@
476476
<node concept="3clFbS" id="4J4oiBBub$w" role="3clF47">
477477
<node concept="3clFbF" id="4J4oiBBucs0" role="3cqZAp">
478478
<node concept="2ShNRf" id="4J4oiBBucrW" role="3clFbG">
479-
<node concept="HV5vD" id="4J4oiBBudXR" role="2ShVmc">
480-
<ref role="HV5vE" to="2j0k:4O9rw8aCYPg" resolve="EmptyDateRangeValue" />
479+
<node concept="1pGfFk" id="6vUyz1yQn4R" role="2ShVmc">
480+
<ref role="37wK5l" to="2j0k:71iF5NcALUq" resolve="EmptyDateRangeValue" />
481481
</node>
482482
<node concept="raruj" id="4J4oiBBueBP" role="lGtFl" />
483483
</node>

0 commit comments

Comments
 (0)