Skip to content

Commit d996164

Browse files
author
Alexander Pann
committed
Merge remote-tracking branch 'origin/maintenance/mps20211' into feature/cascade_20211_20213_1211
# Conflicts: # CHANGELOG.md # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps # code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
2 parents e9a0b66 + d468f81 commit d996164

File tree

23 files changed

+8221
-853
lines changed

23 files changed

+8221
-853
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.

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.core.expr.base/models/editor.mps

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:e29995f1-0908-4db9-8861-3a47c61ae9e0(org.iets3.core.expr.typetags.bindingtime.generator.templates@generator)">
3+
<persistence version="9" />
4+
<languages>
5+
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
6+
</languages>
7+
<imports>
8+
<import index="n0mj" ref="r:8218afdf-a485-4479-86a0-78900b96a4dd(org.iets3.core.expr.typetags.bindingtime.structure)" />
9+
</imports>
10+
<registry>
11+
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
12+
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
13+
</language>
14+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
15+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
16+
<property id="1169194664001" name="name" index="TrG5h" />
17+
</concept>
18+
</language>
19+
</registry>
20+
<node concept="bUwia" id="2tub4U54Jj0">
21+
<property role="TrG5h" value="main" />
22+
</node>
23+
</model>
24+

0 commit comments

Comments
 (0)