Skip to content

Commit cad69d2

Browse files
author
Alexander Pann
committed
Change the TemporalValue equals logic to return two for slices that are null
1 parent 7d43d72 commit cad69d2

File tree

2 files changed

+149
-8
lines changed

2 files changed

+149
-8
lines changed

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3834,19 +3834,34 @@
38343834
<node concept="3clFbS" id="50smQ1Vb0dj" role="3clFbx">
38353835
<node concept="3cpWs6" id="50smQ1Vb5Jh" role="3cqZAp">
38363836
<node concept="3clFbT" id="50smQ1Vb5JR" role="3cqZAk">
3837-
<property role="3clFbU" value="false" />
3837+
<property role="3clFbU" value="true" />
38383838
</node>
38393839
</node>
38403840
</node>
3841-
<node concept="3clFbC" id="7aRvJQF0xrL" role="3clFbw">
3842-
<node concept="10Nm6u" id="7aRvJQF0znC" role="3uHU7w" />
3843-
<node concept="2OqwBi" id="50smQ1VbN8r" role="3uHU7B">
3844-
<node concept="37vLTw" id="4OwGieAyZvU" role="2Oq$k0">
3845-
<ref role="3cqZAo" node="4OwGieAyZvO" resolve="s" />
3841+
<node concept="1Wc70l" id="6ZdYLeANiEQ" role="3clFbw">
3842+
<node concept="1eOMI4" id="6ZdYLeAOltq" role="3uHU7w">
3843+
<node concept="3clFbC" id="6ZdYLeAOrrX" role="1eOMHV">
3844+
<node concept="2OqwBi" id="6ZdYLeANtSa" role="3uHU7B">
3845+
<node concept="37vLTw" id="6ZdYLeANpdy" role="2Oq$k0">
3846+
<ref role="3cqZAo" node="50smQ1VaYe$" resolve="otherSlice" />
3847+
</node>
3848+
<node concept="liA8E" id="6ZdYLeAN$sN" role="2OqNvi">
3849+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3850+
</node>
3851+
</node>
3852+
<node concept="10Nm6u" id="6ZdYLeANR$2" role="3uHU7w" />
38463853
</node>
3847-
<node concept="liA8E" id="50smQ1Vc07i" role="2OqNvi">
3848-
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3854+
</node>
3855+
<node concept="3clFbC" id="7aRvJQF0xrL" role="3uHU7B">
3856+
<node concept="2OqwBi" id="50smQ1VbN8r" role="3uHU7B">
3857+
<node concept="37vLTw" id="4OwGieAyZvU" role="2Oq$k0">
3858+
<ref role="3cqZAo" node="4OwGieAyZvO" resolve="s" />
3859+
</node>
3860+
<node concept="liA8E" id="50smQ1Vc07i" role="2OqNvi">
3861+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3862+
</node>
38493863
</node>
3864+
<node concept="10Nm6u" id="7aRvJQF0znC" role="3uHU7w" />
38503865
</node>
38513866
</node>
38523867
</node>

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
6767
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
6868
</concept>
69+
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
6970
<concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
7071
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
7172
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -425,6 +426,9 @@
425426
<child id="8427750732757990724" name="expected" index="3tpDZB" />
426427
</concept>
427428
<concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
429+
<concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
430+
<child id="1171981057159" name="condition" index="3vwVQn" />
431+
</concept>
428432
<concept id="1171983834376" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertFalse" flags="nn" index="3vFxKo">
429433
<child id="1171983854940" name="condition" index="3vFALc" />
430434
</concept>
@@ -7564,6 +7568,32 @@
75647568
</node>
75657569
</node>
75667570
</node>
7571+
<node concept="312cEg" id="6ZdYLeAPpeq" role="jymVt">
7572+
<property role="TrG5h" value="TT5_null" />
7573+
<node concept="3Tm6S6" id="6ZdYLeAPoLv" role="1B3o_S" />
7574+
<node concept="3uibUv" id="6ZdYLeAPpd0" role="1tU5fm">
7575+
<ref role="3uigEE" to="8rdi:50smQ1V9Ofy" resolve="TemporalValue" />
7576+
</node>
7577+
<node concept="2ShNRf" id="6ZdYLeAPqbC" role="33vP2m">
7578+
<node concept="1pGfFk" id="6ZdYLeAPrqZ" role="2ShVmc">
7579+
<property role="373rjd" value="true" />
7580+
<ref role="37wK5l" to="8rdi:50smQ1V9OlU" resolve="TemporalValue" />
7581+
</node>
7582+
</node>
7583+
</node>
7584+
<node concept="312cEg" id="6ZdYLeAPrsA" role="jymVt">
7585+
<property role="TrG5h" value="TT6_null" />
7586+
<node concept="3Tm6S6" id="6ZdYLeAPrsB" role="1B3o_S" />
7587+
<node concept="3uibUv" id="6ZdYLeAPrsC" role="1tU5fm">
7588+
<ref role="3uigEE" to="8rdi:50smQ1V9Ofy" resolve="TemporalValue" />
7589+
</node>
7590+
<node concept="2ShNRf" id="6ZdYLeAPrsD" role="33vP2m">
7591+
<node concept="1pGfFk" id="6ZdYLeAPrsE" role="2ShVmc">
7592+
<property role="373rjd" value="true" />
7593+
<ref role="37wK5l" to="8rdi:50smQ1V9OlU" resolve="TemporalValue" />
7594+
</node>
7595+
</node>
7596+
</node>
75677597
<node concept="3Tm1VV" id="x6l$anUtwZ" role="1B3o_S" />
75687598
<node concept="3s_gsd" id="x6l$anUtx0" role="3s_ewO">
75697599
<node concept="3s$Bmu" id="x6l$anUtx1" role="3s_gse">
@@ -7701,6 +7731,19 @@
77017731
</node>
77027732
</node>
77037733
</node>
7734+
<node concept="3vwNmj" id="6ZdYLeASeOH" role="3cqZAp">
7735+
<node concept="2OqwBi" id="6ZdYLeAPvjR" role="3vwVQn">
7736+
<node concept="37vLTw" id="6ZdYLeAPvjS" role="2Oq$k0">
7737+
<ref role="3cqZAo" node="6ZdYLeAPpeq" resolve="TT5_null" />
7738+
</node>
7739+
<node concept="liA8E" id="6ZdYLeAPvjT" role="2OqNvi">
7740+
<ref role="37wK5l" to="8rdi:50smQ1Vatfj" resolve="equals" />
7741+
<node concept="37vLTw" id="6ZdYLeAPvjU" role="37wK5m">
7742+
<ref role="3cqZAo" node="6ZdYLeAPrsA" resolve="TT6_null" />
7743+
</node>
7744+
</node>
7745+
</node>
7746+
</node>
77047747
</node>
77057748
</node>
77067749
<node concept="3s$Bmu" id="x6l$anUtxD" role="3s_gse">
@@ -7854,6 +7897,24 @@
78547897
</node>
78557898
</node>
78567899
</node>
7900+
<node concept="3vlDli" id="6ZdYLeASgs6" role="3cqZAp">
7901+
<node concept="2OqwBi" id="6ZdYLeAPx2_" role="3tpDZB">
7902+
<node concept="37vLTw" id="6ZdYLeAPx2A" role="2Oq$k0">
7903+
<ref role="3cqZAo" node="6ZdYLeAPpeq" resolve="TT5_null" />
7904+
</node>
7905+
<node concept="liA8E" id="6ZdYLeAPx2B" role="2OqNvi">
7906+
<ref role="37wK5l" to="8rdi:x6l$amVY8h" resolve="hashCode" />
7907+
</node>
7908+
</node>
7909+
<node concept="2OqwBi" id="6ZdYLeAPx2y" role="3tpDZA">
7910+
<node concept="37vLTw" id="6ZdYLeAPx2z" role="2Oq$k0">
7911+
<ref role="3cqZAo" node="6ZdYLeAPrsA" resolve="TT6_null" />
7912+
</node>
7913+
<node concept="liA8E" id="6ZdYLeAPx2$" role="2OqNvi">
7914+
<ref role="37wK5l" to="8rdi:x6l$amVY8h" resolve="hashCode" />
7915+
</node>
7916+
</node>
7917+
</node>
78577918
</node>
78587919
</node>
78597920
</node>
@@ -8066,6 +8127,71 @@
80668127
</node>
80678128
</node>
80688129
</node>
8130+
<node concept="3clFbH" id="6ZdYLeAPswG" role="3cqZAp" />
8131+
<node concept="3clFbF" id="6ZdYLeAPsQn" role="3cqZAp">
8132+
<node concept="37vLTI" id="6ZdYLeAPtaJ" role="3clFbG">
8133+
<node concept="2OqwBi" id="6ZdYLeAPtxX" role="37vLTx">
8134+
<node concept="37vLTw" id="6ZdYLeAPtsP" role="2Oq$k0">
8135+
<ref role="3cqZAo" node="6ZdYLeAPpeq" resolve="TT5_null" />
8136+
</node>
8137+
<node concept="liA8E" id="6ZdYLeAPuLX" role="2OqNvi">
8138+
<ref role="37wK5l" to="8rdi:3nGzaxUxJqb" resolve="slice" />
8139+
<node concept="2ShNRf" id="6ZdYLeAQXG7" role="37wK5m">
8140+
<node concept="1pGfFk" id="6ZdYLeAQXLP" role="2ShVmc">
8141+
<property role="373rjd" value="true" />
8142+
<ref role="37wK5l" to="8rdi:50smQ1VbaTB" resolve="SliceValue" />
8143+
<node concept="37vLTw" id="6ZdYLeAQWN8" role="37wK5m">
8144+
<ref role="3cqZAo" node="6ZdYLeAPpeq" resolve="TT5_null" />
8145+
</node>
8146+
<node concept="2YIFZM" id="6ZdYLeAQWTw" role="37wK5m">
8147+
<ref role="1Pybhc" to="28m1:~LocalDate" resolve="LocalDate" />
8148+
<ref role="37wK5l" to="28m1:~LocalDate.parse(java.lang.CharSequence)" resolve="parse" />
8149+
<node concept="Xl_RD" id="6ZdYLeAQWTx" role="37wK5m">
8150+
<property role="Xl_RC" value="2000-01-01" />
8151+
</node>
8152+
</node>
8153+
<node concept="10Nm6u" id="6ZdYLeAQYgj" role="37wK5m" />
8154+
</node>
8155+
</node>
8156+
</node>
8157+
</node>
8158+
<node concept="37vLTw" id="6ZdYLeAPsQl" role="37vLTJ">
8159+
<ref role="3cqZAo" node="6ZdYLeAPpeq" resolve="TT5_null" />
8160+
</node>
8161+
</node>
8162+
</node>
8163+
<node concept="3clFbF" id="6ZdYLeAPuTH" role="3cqZAp">
8164+
<node concept="37vLTI" id="6ZdYLeAPuTI" role="3clFbG">
8165+
<node concept="2OqwBi" id="6ZdYLeAPuTJ" role="37vLTx">
8166+
<node concept="37vLTw" id="6ZdYLeAPuTK" role="2Oq$k0">
8167+
<ref role="3cqZAo" node="6ZdYLeAPrsA" resolve="TT6_null" />
8168+
</node>
8169+
<node concept="liA8E" id="6ZdYLeAPuTL" role="2OqNvi">
8170+
<ref role="37wK5l" to="8rdi:3nGzaxUxJqb" resolve="slice" />
8171+
<node concept="2ShNRf" id="6ZdYLeAQYNQ" role="37wK5m">
8172+
<node concept="1pGfFk" id="6ZdYLeAQYNR" role="2ShVmc">
8173+
<property role="373rjd" value="true" />
8174+
<ref role="37wK5l" to="8rdi:50smQ1VbaTB" resolve="SliceValue" />
8175+
<node concept="37vLTw" id="6ZdYLeAQYNS" role="37wK5m">
8176+
<ref role="3cqZAo" node="6ZdYLeAPrsA" resolve="TT6_null" />
8177+
</node>
8178+
<node concept="2YIFZM" id="6ZdYLeAQYNT" role="37wK5m">
8179+
<ref role="37wK5l" to="28m1:~LocalDate.parse(java.lang.CharSequence)" resolve="parse" />
8180+
<ref role="1Pybhc" to="28m1:~LocalDate" resolve="LocalDate" />
8181+
<node concept="Xl_RD" id="6ZdYLeAQYNU" role="37wK5m">
8182+
<property role="Xl_RC" value="2000-01-01" />
8183+
</node>
8184+
</node>
8185+
<node concept="10Nm6u" id="6ZdYLeAQYNV" role="37wK5m" />
8186+
</node>
8187+
</node>
8188+
</node>
8189+
</node>
8190+
<node concept="37vLTw" id="6ZdYLeAPuTN" role="37vLTJ">
8191+
<ref role="3cqZAo" node="6ZdYLeAPrsA" resolve="TT6_null" />
8192+
</node>
8193+
</node>
8194+
</node>
80698195
</node>
80708196
</node>
80718197
</node>

0 commit comments

Comments
 (0)