Skip to content

Commit 4cfa2d2

Browse files
alexanderpannalexanderpann
authored
Merge pull request #738 from IETS3/feature/cascade_20211_20213_1211
2 parents e9a0b66 + 88e372c commit 4cfa2d2

File tree

54 files changed

+8451
-1080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8451
-1080
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8-
## Dezember 2023
8+
## December 2023
99

1010
### Fixed
1111

@@ -29,22 +29,23 @@ The project does _not_ follow Semantic Versioning and the changes are documented
2929

3030
## Oktober 2023
3131

32-
## Fixed
33-
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.
36-
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
37-
3832
## September 2023
3933

4034
### Added
4135

4236
- Temporal Literal shows an error if two slices use the same point in time. The check can handle date literals and (nested) references to constants with a date literal. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
4337
- Temporal Literal shows a warning if the point in time of a slice cannot be unwrapped to a date literal, rendering the duplicates-check mentioned above ineffective. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
4438

39+
### New language org.iets3.core.expr.typetags.bindingtime
40+
41+
The language extends typetags with support for different binding times of values. Consistency checks ensure that information is passed on at appropriate levels.
42+
4543
### Fixed
4644

4745
- Unit comparisons for the **same** unit defined in **different** packages now lead to an error message for compatibility
46+
- `SliceValue` can now correctly be checked for equality: `SliceValue.equals()` and `SliceValue.hashCode()` are overwritten.
47+
- `TemporalValue.hashCode()` was overwritten, thus `equals` and `hashCode()` are in sync now.
48+
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
4849

4950
### Removed
5051

@@ -66,4 +67,4 @@ The project does _not_ follow Semantic Versioning and the changes are documented
6667

6768
### Changed
6869

69-
- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.
70+
- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ apply plugin: 'download-jbr'
3939

4040
// configure jbr download
4141
downloadJbr {
42-
jbrVersion = '11_0_11-b1341.60'
42+
jbrVersion = '11_0_14_1-b1751.46'
4343
}
4444

4545
// detect if we are in a CI build
@@ -56,7 +56,7 @@ def major = "2021"
5656
def minor = "3"
5757

5858
// Dependency versions
59-
ext.mpsVersion = '2021.3.3'
59+
ext.mpsVersion = '2021.3.5'
6060

6161
def mbeddrVersion = "2021.3+"
6262

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl" folder="expr.lang-core" />
6161
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl" folder="expr.lang-core" />
6262
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl" folder="expr.lang-core" />
63+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl" folder="expr.lang-advanced" />
6364
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl" folder="expr.lang-advanced" />
6465
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl" folder="expr.lang-advanced" />
6566
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl" folder="expr.lang-advanced" />

‎code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.advanced.devkit/org.iets3.core.expr.advanced.devkit.devkit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<exported-language name="cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)" />
1515
<exported-language name="8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)" />
1616
<exported-language name="cee4aa62-aca9-4f26-9602-75129cd457c9(org.iets3.core.expr.dataflow)" />
17+
<exported-language name="9c3cc6fb-ae5e-46d1-ace2-1e08bb47d03d(org.iets3.core.expr.typetags.bindingtime)" />
1718
<exported-solutions>
1819
<exported-solution>79d5345e-e919-477c-b448-d9d5f36e2f92(org.iets3.core.expr.adt.interpreter)</exported-solution>
1920
<exported-solution>3a79aca0-f4b1-40f1-a3e9-259162afa77b(org.iets3.core.expr.dataflow.interpreter)</exported-solution>

‎code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11943,7 +11943,7 @@
1194311943
</node>
1194411944
<node concept="OXEIz" id="yfp7edvEmW" role="P5bDN">
1194511945
<node concept="UkePV" id="yfp7edvEmX" role="OY2wv">
11946-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
11946+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
1194711947
</node>
1194811948
</node>
1194911949
</node>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@
22172217
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
22182218
<node concept="OXEIz" id="yfp7edvEmw" role="P5bDN">
22192219
<node concept="UkePV" id="yfp7edvEmx" role="OY2wv">
2220-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2220+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
22212221
</node>
22222222
</node>
22232223
</node>
@@ -2330,7 +2330,7 @@
23302330
<property role="3F0ifm" value="success" />
23312331
<node concept="OXEIz" id="yfp7edvEmy" role="P5bDN">
23322332
<node concept="UkePV" id="yfp7edvEmz" role="OY2wv">
2333-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2333+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
23342334
</node>
23352335
</node>
23362336
</node>
@@ -2371,7 +2371,7 @@
23712371
<property role="3F0ifm" value="error" />
23722372
<node concept="OXEIz" id="yfp7edvEm$" role="P5bDN">
23732373
<node concept="UkePV" id="yfp7edvEm_" role="OY2wv">
2374-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2374+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
23752375
</node>
23762376
</node>
23772377
</node>
@@ -4427,7 +4427,7 @@
44274427
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
44284428
<node concept="OXEIz" id="yfp7edvEmA" role="P5bDN">
44294429
<node concept="UkePV" id="yfp7edvEmB" role="OY2wv">
4430-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
4430+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
44314431
</node>
44324432
</node>
44334433
</node>
@@ -4474,7 +4474,7 @@
44744474
<property role="3F0ifm" value="join" />
44754475
<node concept="OXEIz" id="yfp7edvEmC" role="P5bDN">
44764476
<node concept="UkePV" id="yfp7edvEmD" role="OY2wv">
4477-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
4477+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
44784478
</node>
44794479
</node>
44804480
</node>
@@ -6836,9 +6836,6 @@
68366836
<node concept="2iRfu4" id="3nVyItrZBNH" role="2iSdaV" />
68376837
<node concept="3F0ifn" id="3nVyItrZBND" role="3EZMnx">
68386838
<property role="3F0ifm" value="empty" />
6839-
<node concept="11LMrY" id="3tcv7J0_Tob" role="3F10Kt">
6840-
<property role="VOm3f" value="true" />
6841-
</node>
68426839
<node concept="3CIbrd" id="1kEzTWVBIaM" role="3F10Kt">
68436840
<property role="VOm3f" value="true" />
68446841
</node>
@@ -6847,6 +6844,9 @@
68476844
<node concept="3EZMnI" id="3tcv7J0yv9A" role="_tjki">
68486845
<node concept="3F0ifn" id="3nVyItrZBO4" role="3EZMnx">
68496846
<property role="3F0ifm" value="&lt;" />
6847+
<node concept="11L4FC" id="3jp1EC0Z6K$" role="3F10Kt">
6848+
<property role="VOm3f" value="true" />
6849+
</node>
68506850
<node concept="11LMrY" id="3nVyItrZBOf" role="3F10Kt">
68516851
<property role="VOm3f" value="true" />
68526852
</node>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@
687687
<node concept="37vLTG" id="4TtBy4czRUV" role="3clF46">
688688
<property role="TrG5h" value="object" />
689689
<node concept="3uibUv" id="4TtBy4czRUX" role="1tU5fm">
690-
<ref role="3uigEE" to="wyt6:~Object" />
690+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
691691
</node>
692692
</node>
693693
<node concept="3clFbS" id="4TtBy4czRUY" role="3clF47">
@@ -735,7 +735,7 @@
735735
</node>
736736
</node>
737737
<node concept="2AHcQZ" id="4TtBy4czRUZ" role="2AJF6D">
738-
<ref role="2AI5Lk" to="wyt6:~Override" />
738+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
739739
</node>
740740
</node>
741741
<node concept="2tJIrI" id="29KNCeybCV7" role="jymVt" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
</node>
252252
<node concept="OXEIz" id="yfp7edvEmE" role="P5bDN">
253253
<node concept="UkePV" id="yfp7edvEmF" role="OY2wv">
254-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
254+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
255255
</node>
256256
</node>
257257
</node>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11232,7 +11232,7 @@
1123211232
</node>
1123311233
</node>
1123411234
<node concept="2AHcQZ" id="3sWKo0E5b_C" role="2AJF6D">
11235-
<ref role="2AI5Lk" to="wyt6:~Override" />
11235+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
1123611236
</node>
1123711237
</node>
1123811238
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@
12261226
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
12271227
<node concept="OXEIz" id="yfp7edvEmO" role="P5bDN">
12281228
<node concept="UkePV" id="yfp7edvEmP" role="OY2wv">
1229-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
1229+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
12301230
</node>
12311231
</node>
12321232
</node>

0 commit comments

Comments
 (0)