Skip to content

Commit

Permalink
Merge pull request #776 from IETS3/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@arimer
arimer authored Feb 12, 2024
2 parents a396801 + 2bc3799 commit 4ef94cf
Show file tree
Hide file tree
Showing 28 changed files with 7,022 additions and 764 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## February 2024

### Added

- Enumerations can have an order by declaration, by literal or by value ascociated with the literal

## January 2024

### Changed
Expand All @@ -14,10 +20,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
### Fixed

- Uncatched `DateTimeException` during check DateLiteral.
- IntHelper.equals now correctly deals with the combination of 0.0,-0.0,0 and -0.

### Added

- `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.
- Named based access of result columns of multi decision tables were added. Columns can be referenced by name and coexist with the index based access.

## December 2023

Expand Down Expand Up @@ -98,4 +106,4 @@ The language extends typetags with support for different binding times of values

### Changed

- `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.
- `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.
147 changes: 147 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27370,5 +27370,152 @@
</node>
<node concept="3Tm1VV" id="2nydsCfyYD1" role="1B3o_S" />
</node>
<node concept="13h7C7" id="5r47dOfJ8Us">
<property role="3GE5qa" value="tuples" />
<ref role="13h7C2" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
<node concept="13i0hz" id="5r47dOfJ8UL" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="getMembers" />
<node concept="3Tm1VV" id="5r47dOfJ8UM" role="1B3o_S" />
<node concept="2I9FWS" id="5r47dOfJ9kG" role="3clF45">
<ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
</node>
<node concept="3clFbS" id="5r47dOfJ8UO" role="3clF47" />
</node>
<node concept="13hLZK" id="5r47dOfJ8Ut" role="13h7CW">
<node concept="3clFbS" id="5r47dOfJ8Uu" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5r47dOg5pCc">
<property role="3GE5qa" value="tuples" />
<ref role="13h7C2" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
<node concept="13i0hz" id="5r47dOg5pCn" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="type" />
<node concept="3Tm1VV" id="5r47dOg5pCo" role="1B3o_S" />
<node concept="3Tqbb2" id="5r47dOg5pT$" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
</node>
<node concept="3clFbS" id="5r47dOg5pCq" role="3clF47" />
</node>
<node concept="13hLZK" id="5r47dOg5pCd" role="13h7CW">
<node concept="3clFbS" id="5r47dOg5pCe" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="6GiZkUz7qWV">
<property role="3GE5qa" value="tuples" />
<ref role="13h7C2" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
<node concept="13hLZK" id="6GiZkUz7qWW" role="13h7CW">
<node concept="3clFbS" id="6GiZkUz7qWX" role="2VODD2" />
</node>
<node concept="13i0hz" id="6GiZkUz7qX6" role="13h7CS">
<property role="TrG5h" value="renderReadable" />
<ref role="13i0hy" node="6kR0qIbI2yi" resolve="renderReadable" />
<node concept="3Tm1VV" id="6GiZkUz7qX7" role="1B3o_S" />
<node concept="3clFbS" id="6GiZkUz7qXa" role="3clF47">
<node concept="3clFbF" id="6GiZkUz7Aah" role="3cqZAp">
<node concept="2OqwBi" id="6GiZkUz7AIH" role="3clFbG">
<node concept="2OqwBi" id="6GiZkUz7AkM" role="2Oq$k0">
<node concept="13iPFW" id="6GiZkUz7Aae" role="2Oq$k0" />
<node concept="3TrEf2" id="6GiZkUz7A_H" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:6GiZkUz7r1V" resolve="member" />
</node>
</node>
<node concept="3TrcHB" id="6GiZkUz7ASw" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="17QB3L" id="6GiZkUz7qXb" role="3clF45" />
</node>
<node concept="13i0hz" id="6GiZkUzfnDf" role="13h7CS">
<property role="TrG5h" value="expression" />
<node concept="3Tm1VV" id="6GiZkUzfnDg" role="1B3o_S" />
<node concept="3Tqbb2" id="6GiZkUzfnJ0" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
<node concept="3clFbS" id="6GiZkUzfnDi" role="3clF47">
<node concept="3clFbF" id="6GiZkUzfnJO" role="3cqZAp">
<node concept="2OqwBi" id="6GiZkUzfoIf" role="3clFbG">
<node concept="1PxgMI" id="6GiZkUzfor4" role="2Oq$k0">
<node concept="chp4Y" id="6GiZkUzfos0" role="3oSUPX">
<ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
</node>
<node concept="2OqwBi" id="6GiZkUzfnOJ" role="1m5AlR">
<node concept="13iPFW" id="6GiZkUzfnJN" role="2Oq$k0" />
<node concept="1mfA1w" id="6GiZkUzfnVi" role="2OqNvi" />
</node>
</node>
<node concept="3TrEf2" id="6GiZkUzfpIH" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="6GiZkUzfqE6" role="13h7CS">
<property role="TrG5h" value="type" />
<node concept="3Tm1VV" id="6GiZkUzfqE7" role="1B3o_S" />
<node concept="3Tqbb2" id="6GiZkUzfqRk" role="3clF45">
<ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
</node>
<node concept="3clFbS" id="6GiZkUzfqE9" role="3clF47">
<node concept="3clFbF" id="6GiZkUzfr29" role="3cqZAp">
<node concept="1PxgMI" id="6GiZkUzfsfl" role="3clFbG">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="6GiZkUzfsgz" role="3oSUPX">
<ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
</node>
<node concept="2OqwBi" id="6GiZkUzfrek" role="1m5AlR">
<node concept="BsUDl" id="6GiZkUzfr28" role="2Oq$k0">
<ref role="37wK5l" node="6GiZkUzfnDf" resolve="expression" />
</node>
<node concept="3JvlWi" id="6GiZkUzfrHO" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="1c6hIxyZnje" role="13h7CS">
<property role="TrG5h" value="tupleDeclaration" />
<node concept="3Tm1VV" id="1c6hIxyZnjf" role="1B3o_S" />
<node concept="3Tqbb2" id="1c6hIxyZnyV" role="3clF45">
<ref role="ehGHo" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
</node>
<node concept="3clFbS" id="1c6hIxyZnjh" role="3clF47">
<node concept="3clFbF" id="1c6hIxyZn$Y" role="3cqZAp">
<node concept="2OqwBi" id="1c6hIxyZn_0" role="3clFbG">
<node concept="BsUDl" id="1c6hIxyZn_1" role="2Oq$k0">
<ref role="37wK5l" node="6GiZkUzfqE6" resolve="type" />
</node>
<node concept="3TrEf2" id="1c6hIxyZn_2" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="6GiZkUzfnf3" role="13h7CS">
<property role="TrG5h" value="effectDescriptor" />
<ref role="13i0hy" node="6GySMNjjWfO" resolve="effectDescriptor" />
<node concept="3Tm1VV" id="6GiZkUzfnf4" role="1B3o_S" />
<node concept="3clFbS" id="6GiZkUzfnfd" role="3clF47">
<node concept="3clFbF" id="6GiZkUzfnq7" role="3cqZAp">
<node concept="BsUDl" id="6GiZkUzfnq2" role="3clFbG">
<ref role="37wK5l" node="6KxoTHgL$U0" resolve="deriveFrom" />
<node concept="BsUDl" id="1c6hIxyZnGy" role="37wK5m">
<ref role="37wK5l" node="1c6hIxyZnje" resolve="tupleDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3uibUv" id="6GiZkUzfnfe" role="3clF45">
<ref role="3uigEE" to="oq0c:3ni3WieuV7z" resolve="EffectDescriptor" />
</node>
</node>
</node>
</model>

33 changes: 32 additions & 1 deletion .../languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<model ref="r:9750d418-880f-460d-9880-d67dd111722d(org.iets3.core.expr.base.constraints)">
<persistence version="9" />
<languages>
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports>
Expand Down Expand Up @@ -1097,5 +1097,36 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="6GiZkUz7$Pr">
<property role="3GE5qa" value="tuples" />
<ref role="1M2myG" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
<node concept="9S07l" id="6GiZkUz7$Ps" role="9Vyp8">
<node concept="3clFbS" id="6GiZkUz7$Pt" role="2VODD2">
<node concept="3clFbF" id="6GiZkUz7$X6" role="3cqZAp">
<node concept="2OqwBi" id="7cphKbLweDA" role="3clFbG">
<node concept="2OqwBi" id="7cphKbLwdZw" role="2Oq$k0">
<node concept="2OqwBi" id="7cphKbLwdf4" role="2Oq$k0">
<node concept="1PxgMI" id="7cphKbLwcPC" role="2Oq$k0">
<node concept="chp4Y" id="7cphKbLwcXc" role="3oSUPX">
<ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
</node>
<node concept="nLn13" id="7cphKbLwcfl" role="1m5AlR" />
</node>
<node concept="3TrEf2" id="7cphKbLwd$z" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
</node>
</node>
<node concept="3JvlWi" id="7cphKbLwek1" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="7cphKbLweYP" role="2OqNvi">
<node concept="chp4Y" id="7cphKbLwffF" role="cj9EA">
<ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

Loading

0 comments on commit 4ef94cf

Please sign in to comment.