Skip to content

Commit eb1e685

Browse files
arimerarimer
committed
temporal.runtime: TemporalOps.joinSlices can now handle null values
 annotated SliceValue.value as nullable
1 parent ff252ca commit eb1e685

File tree

3 files changed

+103
-89
lines changed

3 files changed

+103
-89
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/models/org.iets3.core.expr.temporal.runtime.mps‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
1515
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
1616
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
17+
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
1718
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
1819
</imports>
1920
<registry>
@@ -230,6 +231,9 @@
230231
<node concept="3uibUv" id="50smQ1Vbb7T" role="1tU5fm">
231232
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
232233
</node>
234+
<node concept="2AHcQZ" id="3BA76Yi63_P" role="2AJF6D">
235+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
236+
</node>
233237
</node>
234238
<node concept="312cEg" id="50smQ1Vbb8P" role="jymVt">
235239
<property role="TrG5h" value="myTime" />
@@ -304,11 +308,12 @@
304308
<node concept="3uibUv" id="50smQ1Vbb6v" role="1tU5fm">
305309
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
306310
</node>
311+
<node concept="2AHcQZ" id="3BA76YhV4GU" role="2AJF6D">
312+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
313+
</node>
307314
</node>
308315
</node>
309316
<node concept="2tJIrI" id="50smQ1VbqzS" role="jymVt" />
310-
<node concept="2tJIrI" id="6GCJsuCKADE" role="jymVt" />
311-
<node concept="2tJIrI" id="3nGzaxUy$bQ" role="jymVt" />
312317
<node concept="3clFb_" id="3nGzaxUy$Sl" role="jymVt">
313318
<property role="TrG5h" value="copy" />
314319
<node concept="3uibUv" id="3nGzaxUyA2k" role="3clF45">
@@ -653,6 +658,9 @@
653658
</node>
654659
</node>
655660
</node>
661+
<node concept="2AHcQZ" id="3BA76YhV97i" role="2AJF6D">
662+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
663+
</node>
656664
</node>
657665
<node concept="2tJIrI" id="50smQ1Vc4DL" role="jymVt" />
658666
<node concept="3clFb_" id="50smQ1Vc4ga" role="jymVt">
@@ -2165,30 +2173,29 @@
21652173
</node>
21662174
</node>
21672175
</node>
2168-
<node concept="3fqX7Q" id="3KgQFIkaiW8" role="3clFbw">
2169-
<node concept="2OqwBi" id="3KgQFIkaiW9" role="3fr31v">
2170-
<node concept="2OqwBi" id="3KgQFIkaiWa" role="2Oq$k0">
2171-
<node concept="2OqwBi" id="3KgQFIkaiWb" role="2Oq$k0">
2172-
<node concept="37vLTw" id="3KgQFIkaiWc" role="2Oq$k0">
2176+
<node concept="3fqX7Q" id="3BA76YhVaDA" role="3clFbw">
2177+
<node concept="2YIFZM" id="3BA76YhVaDC" role="3fr31v">
2178+
<ref role="37wK5l" to="33ny:~Objects.equals(java.lang.Object,java.lang.Object)" resolve="equals" />
2179+
<ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
2180+
<node concept="2OqwBi" id="3BA76YhVaRN" role="37wK5m">
2181+
<node concept="2OqwBi" id="3BA76YhVaRO" role="2Oq$k0">
2182+
<node concept="37vLTw" id="3BA76YhVaRP" role="2Oq$k0">
21732183
<ref role="3cqZAo" node="3KgQFIkaiVq" resolve="res" />
21742184
</node>
2175-
<node concept="liA8E" id="3KgQFIkaiWd" role="2OqNvi">
2185+
<node concept="liA8E" id="3BA76YhVaRQ" role="2OqNvi">
21762186
<ref role="37wK5l" node="1Mp62pP171D" resolve="lastSlice" />
21772187
</node>
21782188
</node>
2179-
<node concept="liA8E" id="3KgQFIkaiWe" role="2OqNvi">
2189+
<node concept="liA8E" id="3BA76YhVaRR" role="2OqNvi">
21802190
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
21812191
</node>
21822192
</node>
2183-
<node concept="liA8E" id="3KgQFIkaiWf" role="2OqNvi">
2184-
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
2185-
<node concept="2OqwBi" id="3KgQFIkaiWg" role="37wK5m">
2186-
<node concept="37vLTw" id="3KgQFIkaiWh" role="2Oq$k0">
2187-
<ref role="3cqZAo" node="3KgQFIkaiVO" resolve="ithSlice" />
2188-
</node>
2189-
<node concept="liA8E" id="3KgQFIkaiWi" role="2OqNvi">
2190-
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
2191-
</node>
2193+
<node concept="2OqwBi" id="3BA76YhVbvO" role="37wK5m">
2194+
<node concept="37vLTw" id="3BA76YhVbvP" role="2Oq$k0">
2195+
<ref role="3cqZAo" node="3KgQFIkaiVO" resolve="ithSlice" />
2196+
</node>
2197+
<node concept="liA8E" id="3BA76YhVbvQ" role="2OqNvi">
2198+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
21922199
</node>
21932200
</node>
21942201
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
<dependency reexport="false">957f018c-4561-4081-9ad3-b8618bf1160d(org.iets3.core.expr.datetime.runtime)</dependency>
1717
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1818
<dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
19+
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
1920
</dependencies>
2021
<languageVersions>
2122
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2223
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
2324
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
2425
</languageVersions>
2526
<dependencyVersions>
27+
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
2628
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
2729
<module reference="957f018c-4561-4081-9ad3-b8618bf1160d(org.iets3.core.expr.datetime.runtime)" version="0" />
2830
<module reference="52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)" version="0" />

0 commit comments

Comments
 (0)