Skip to content

Commit 979ac16

Browse files
alexanderpannalexanderpann
authored
Merge pull request #716 from IETS3/bugfix/missing-hashcode-in-temporalvalue
2 parents e4b55f1 + ab7fa9c commit 979ac16

File tree

13 files changed

+3295
-1874
lines changed

13 files changed

+3295
-1874
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@ The project does _not_ follow Semantic Versioning and the changes are documented
2424
- 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
2525
- Option: Sorting removes all `none` values since the underlying data structure of collections doesn't support null values.
2626

27+
## November 2023
28+
29+
## Changed
30+
31+
- 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.
32+
33+
## Oktober 2023
34+
35+
## Fixed
36+
37+
- `SliceValue` can now correctly be checked for equality: `SliceValue.equals()` and `SliceValue.hashCode()` are overwritten.
38+
- `TemporalValue.hashCode()` was overwritten, thus `equals` and `hashCode()` are in sync now.
39+
2740
## September 2023
2841

2942
### Added

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,13 +1959,13 @@
19591959
<node concept="1bVj0M" id="7kKHzWbERkB" role="37wK5m">
19601960
<node concept="3clFbS" id="7kKHzWbERkC" role="1bW5cS">
19611961
<node concept="3cpWs6" id="7kKHzWbERkD" role="3cqZAp">
1962-
<node concept="2YIFZM" id="7jAOwAVPIop" role="3cqZAk">
1963-
<ref role="37wK5l" to="dj6k:VFjlN6eX4Y" resolve="ne" />
1964-
<ref role="1Pybhc" to="dj6k:VFjlN6eQjY" resolve="ComparisonHelper" />
1965-
<node concept="37vLTw" id="7kKHzWbETTW" role="37wK5m">
1962+
<node concept="2YIFZM" id="5s2FNgbzWiQ" role="3cqZAk">
1963+
<ref role="37wK5l" to="dj6k:1EZBwZ4muEF" resolve="notEquals" />
1964+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
1965+
<node concept="37vLTw" id="5s2FNgbzWiR" role="37wK5m">
19661966
<ref role="3cqZAo" node="7kKHzWbERkH" resolve="l" />
19671967
</node>
1968-
<node concept="37vLTw" id="7kKHzWbETTX" role="37wK5m">
1968+
<node concept="37vLTw" id="5s2FNgbzWiS" role="37wK5m">
19691969
<ref role="3cqZAo" node="7kKHzWbERkJ" resolve="r" />
19701970
</node>
19711971
</node>
@@ -2036,13 +2036,13 @@
20362036
<node concept="1bVj0M" id="7kKHzWbF2T6" role="37wK5m">
20372037
<node concept="3clFbS" id="7kKHzWbF2T7" role="1bW5cS">
20382038
<node concept="3cpWs6" id="7kKHzWbF2T8" role="3cqZAp">
2039-
<node concept="2YIFZM" id="7jAOwAVPIom" role="3cqZAk">
2040-
<ref role="37wK5l" to="dj6k:VFjlN6eV5u" resolve="eq" />
2041-
<ref role="1Pybhc" to="dj6k:VFjlN6eQjY" resolve="ComparisonHelper" />
2042-
<node concept="37vLTw" id="7kKHzWbF3Nk" role="37wK5m">
2039+
<node concept="2YIFZM" id="5s2FNgbzxvZ" role="3cqZAk">
2040+
<ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
2041+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
2042+
<node concept="37vLTw" id="5s2FNgbzxw0" role="37wK5m">
20432043
<ref role="3cqZAo" node="7kKHzWbF2Tc" resolve="l" />
20442044
</node>
2045-
<node concept="37vLTw" id="7kKHzWbF3Nl" role="37wK5m">
2045+
<node concept="37vLTw" id="5s2FNgbzxw1" role="37wK5m">
20462046
<ref role="3cqZAo" node="7kKHzWbF2Te" resolve="r" />
20472047
</node>
20482048
</node>

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

Lines changed: 7 additions & 1232 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
162162
<dependency reexport="false">cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)</dependency>
163163
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
164+
<dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
164165
</dependencies>
165166
<languageVersions>
166167
<language slang="l:f3b3dc28-fee3-49e1-a46e-685e96389094:com.mbeddr.mpsutil.bldoc" version="0" />
@@ -288,6 +289,7 @@
288289
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
289290
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
290291
<module reference="cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)" version="0" />
292+
<module reference="52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)" version="0" />
291293
<module reference="2022a471-10ba-4431-ba5d-622df898f3c6(org.iets3.core.expr.testExecution)" version="0" />
292294
<module reference="d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)" version="0" />
293295
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -508,25 +508,25 @@
508508
<node concept="1bVj0M" id="stdmzxqE6p" role="23t8la">
509509
<node concept="3clFbS" id="stdmzxqE6q" role="1bW5cS">
510510
<node concept="3clFbF" id="stdmzxqE6r" role="3cqZAp">
511-
<node concept="2YIFZM" id="stdmzxqE6s" role="3clFbG">
512-
<ref role="37wK5l" to="dj6k:VFjlN6eV5u" resolve="eq" />
513-
<ref role="1Pybhc" to="dj6k:VFjlN6eQjY" resolve="ComparisonHelper" />
514-
<node concept="qpA2v" id="stdmzxqE6t" role="37wK5m">
515-
<node concept="2OqwBi" id="stdmzxqE6u" role="3SLO0q">
516-
<node concept="1LFfDK" id="stdmzxqE6v" role="2Oq$k0">
517-
<node concept="3cmrfG" id="stdmzxqE6w" role="1LF_Uc">
511+
<node concept="2YIFZM" id="5s2FNgbz1ni" role="3clFbG">
512+
<ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
513+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
514+
<node concept="qpA2v" id="5s2FNgbz1nj" role="37wK5m">
515+
<node concept="2OqwBi" id="5s2FNgbz1nk" role="3SLO0q">
516+
<node concept="1LFfDK" id="5s2FNgbz1nl" role="2Oq$k0">
517+
<node concept="3cmrfG" id="5s2FNgbz1nm" role="1LF_Uc">
518518
<property role="3cmrfH" value="1" />
519519
</node>
520-
<node concept="37vLTw" id="stdmzxqE6x" role="1LFl5Q">
520+
<node concept="37vLTw" id="5s2FNgbz1nn" role="1LFl5Q">
521521
<ref role="3cqZAo" node="stdmzxqE6$" resolve="it" />
522522
</node>
523523
</node>
524-
<node concept="3TrEf2" id="stdmzxqE6y" role="2OqNvi">
524+
<node concept="3TrEf2" id="5s2FNgbz1no" role="2OqNvi">
525525
<ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
526526
</node>
527527
</node>
528528
</node>
529-
<node concept="37vLTw" id="stdmzxqE6z" role="37wK5m">
529+
<node concept="37vLTw" id="5s2FNgbz1np" role="37wK5m">
530530
<ref role="3cqZAo" node="stdmzxpVy1" resolve="searchValue" />
531531
</node>
532532
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3226,13 +3226,13 @@
32263226
</node>
32273227
</node>
32283228
<node concept="3cpWs6" id="26cjRACIbgC" role="3cqZAp">
3229-
<node concept="2YIFZM" id="26cjRACIbgD" role="3cqZAk">
3230-
<ref role="1Pybhc" to="dj6k:VFjlN6eQjY" resolve="ComparisonHelper" />
3231-
<ref role="37wK5l" to="dj6k:VFjlN6eV5u" resolve="eq" />
3232-
<node concept="37vLTw" id="26cjRACIbgE" role="37wK5m">
3229+
<node concept="2YIFZM" id="5s2FNgbzGIJ" role="3cqZAk">
3230+
<ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
3231+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
3232+
<node concept="37vLTw" id="5s2FNgbzGIK" role="37wK5m">
32333233
<ref role="3cqZAo" node="26cjRACI9sm" resolve="l" />
32343234
</node>
3235-
<node concept="37vLTw" id="26cjRACIbgF" role="37wK5m">
3235+
<node concept="37vLTw" id="5s2FNgbzGIL" role="37wK5m">
32363236
<ref role="3cqZAo" node="26cjRACIbg_" resolve="r" />
32373237
</node>
32383238
</node>
@@ -3475,13 +3475,13 @@
34753475
</node>
34763476
</node>
34773477
<node concept="3cpWs6" id="26cjRACI82c" role="3cqZAp">
3478-
<node concept="2YIFZM" id="26cjRACI82d" role="3cqZAk">
3479-
<ref role="1Pybhc" to="dj6k:VFjlN6eQjY" resolve="ComparisonHelper" />
3480-
<ref role="37wK5l" to="dj6k:VFjlN6eX4Y" resolve="ne" />
3481-
<node concept="37vLTw" id="26cjRACI82e" role="37wK5m">
3478+
<node concept="2YIFZM" id="5s2FNgbzXgK" role="3cqZAk">
3479+
<ref role="37wK5l" to="dj6k:1EZBwZ4muEF" resolve="notEquals" />
3480+
<ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
3481+
<node concept="37vLTw" id="5s2FNgbzXgL" role="37wK5m">
34823482
<ref role="3cqZAo" node="26cjRACI811" resolve="l" />
34833483
</node>
3484-
<node concept="37vLTw" id="26cjRACI82f" role="37wK5m">
3484+
<node concept="37vLTw" id="5s2FNgbzXgM" role="37wK5m">
34853485
<ref role="3cqZAo" node="26cjRACI826" resolve="r" />
34863486
</node>
34873487
</node>

0 commit comments

Comments
 (0)