Skip to content

Commit b10cc63

Browse files
AlexeiQAlexeiQ
committed
Fix the TemporalValue equals logic to return true for slices that are null
Problem: slices after the equal null-slice in both values are not checked and could be different, though equals() would return true for both TemporalValues
1 parent cad69d2 commit b10cc63

File tree

2 files changed

+355
-51
lines changed

2 files changed

+355
-51
lines changed

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

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3832,65 +3832,64 @@
38323832
</node>
38333833
<node concept="3clFbJ" id="50smQ1Vb0dh" role="3cqZAp">
38343834
<node concept="3clFbS" id="50smQ1Vb0dj" role="3clFbx">
3835-
<node concept="3cpWs6" id="50smQ1Vb5Jh" role="3cqZAp">
3836-
<node concept="3clFbT" id="50smQ1Vb5JR" role="3cqZAk">
3837-
<property role="3clFbU" value="true" />
3838-
</node>
3839-
</node>
3840-
</node>
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" />
3835+
<node concept="3clFbJ" id="7aRvJQF0lZy" role="3cqZAp">
3836+
<node concept="3clFbS" id="7aRvJQF0lZz" role="3clFbx">
3837+
<node concept="3cpWs6" id="7aRvJQF0lZ$" role="3cqZAp">
3838+
<node concept="3clFbT" id="7aRvJQF0lZ_" role="3cqZAk">
3839+
<property role="3clFbU" value="false" />
38503840
</node>
38513841
</node>
3852-
<node concept="10Nm6u" id="6ZdYLeANR$2" role="3uHU7w" />
38533842
</node>
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" />
3843+
<node concept="3fqX7Q" id="7aRvJQF0lZA" role="3clFbw">
3844+
<node concept="2YIFZM" id="5s2FNgbsXcO" role="3fr31v">
3845+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
3846+
<ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
3847+
<node concept="2OqwBi" id="5s2FNgbt34z" role="37wK5m">
3848+
<node concept="37vLTw" id="5s2FNgbt34$" role="2Oq$k0">
3849+
<ref role="3cqZAo" node="4OwGieAyZvO" resolve="s" />
3850+
</node>
3851+
<node concept="liA8E" id="5s2FNgbt34_" role="2OqNvi">
3852+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3853+
</node>
3854+
</node>
3855+
<node concept="2OqwBi" id="5s2FNgbtejY" role="37wK5m">
3856+
<node concept="37vLTw" id="5s2FNgbtejZ" role="2Oq$k0">
3857+
<ref role="3cqZAo" node="50smQ1VaYe$" resolve="otherSlice" />
3858+
</node>
3859+
<node concept="liA8E" id="5s2FNgbtek0" role="2OqNvi">
3860+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3861+
</node>
3862+
</node>
38623863
</node>
38633864
</node>
3864-
<node concept="10Nm6u" id="7aRvJQF0znC" role="3uHU7w" />
38653865
</node>
38663866
</node>
3867-
</node>
3868-
<node concept="3clFbJ" id="7aRvJQF0lZy" role="3cqZAp">
3869-
<node concept="3clFbS" id="7aRvJQF0lZz" role="3clFbx">
3870-
<node concept="3cpWs6" id="7aRvJQF0lZ$" role="3cqZAp">
3871-
<node concept="3clFbT" id="7aRvJQF0lZ_" role="3cqZAk">
3872-
<property role="3clFbU" value="false" />
3873-
</node>
3874-
</node>
3875-
</node>
3876-
<node concept="3fqX7Q" id="7aRvJQF0lZA" role="3clFbw">
3877-
<node concept="2YIFZM" id="5s2FNgbsXcO" role="3fr31v">
3878-
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
3879-
<ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
3880-
<node concept="2OqwBi" id="5s2FNgbt34z" role="37wK5m">
3881-
<node concept="37vLTw" id="5s2FNgbt34$" role="2Oq$k0">
3882-
<ref role="3cqZAo" node="4OwGieAyZvO" resolve="s" />
3883-
</node>
3884-
<node concept="liA8E" id="5s2FNgbt34_" role="2OqNvi">
3885-
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3886-
</node>
3887-
</node>
3888-
<node concept="2OqwBi" id="5s2FNgbtejY" role="37wK5m">
3889-
<node concept="37vLTw" id="5s2FNgbtejZ" role="2Oq$k0">
3890-
<ref role="3cqZAo" node="50smQ1VaYe$" resolve="otherSlice" />
3867+
<node concept="3fqX7Q" id="1nutsCOBx2C" role="3clFbw">
3868+
<node concept="1eOMI4" id="1nutsCOBx2P" role="3fr31v">
3869+
<node concept="1Wc70l" id="6ZdYLeANiEQ" role="1eOMHV">
3870+
<node concept="1eOMI4" id="6ZdYLeAOltq" role="3uHU7w">
3871+
<node concept="3clFbC" id="6ZdYLeAOrrX" role="1eOMHV">
3872+
<node concept="2OqwBi" id="6ZdYLeANtSa" role="3uHU7B">
3873+
<node concept="37vLTw" id="6ZdYLeANpdy" role="2Oq$k0">
3874+
<ref role="3cqZAo" node="50smQ1VaYe$" resolve="otherSlice" />
3875+
</node>
3876+
<node concept="liA8E" id="6ZdYLeAN$sN" role="2OqNvi">
3877+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3878+
</node>
3879+
</node>
3880+
<node concept="10Nm6u" id="6ZdYLeANR$2" role="3uHU7w" />
3881+
</node>
38913882
</node>
3892-
<node concept="liA8E" id="5s2FNgbtek0" role="2OqNvi">
3893-
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3883+
<node concept="3clFbC" id="7aRvJQF0xrL" role="3uHU7B">
3884+
<node concept="2OqwBi" id="50smQ1VbN8r" role="3uHU7B">
3885+
<node concept="37vLTw" id="4OwGieAyZvU" role="2Oq$k0">
3886+
<ref role="3cqZAo" node="4OwGieAyZvO" resolve="s" />
3887+
</node>
3888+
<node concept="liA8E" id="50smQ1Vc07i" role="2OqNvi">
3889+
<ref role="37wK5l" node="50smQ1VbR0B" resolve="value" />
3890+
</node>
3891+
</node>
3892+
<node concept="10Nm6u" id="7aRvJQF0znC" role="3uHU7w" />
38943893
</node>
38953894
</node>
38963895
</node>

0 commit comments

Comments
 (0)