Skip to content

Commit

Permalink
Merge pull request #766 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 6, 2024
2 parents f3902e4 + 0c600b6 commit a396801
Show file tree
Hide file tree
Showing 4 changed files with 515 additions and 81 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
- The PCollections library was updated to version 4.0.1.

### Fixed
- Uncatched `DateTimeException` during check DateLiteral

- Uncatched `DateTimeException` during check DateLiteral.

### Added

- `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.

## December 2023

Expand Down
47 changes: 8 additions & 39 deletions ...java.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@
<concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
<reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
</concept>
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
</concept>
Expand Down Expand Up @@ -4552,46 +4551,16 @@
<node concept="30G5F_" id="uZfDgTL_Y0" role="30HLyM">
<node concept="3clFbS" id="uZfDgTL_Y1" role="2VODD2">
<node concept="3clFbF" id="uZfDgTL_Y2" role="3cqZAp">
<node concept="1Wc70l" id="uZfDgTMf1y" role="3clFbG">
<node concept="3fqX7Q" id="uZfDgTMfeK" role="3uHU7w">
<node concept="1eOMI4" id="uZfDgTMfrO" role="3fr31v">
<node concept="22lmx$" id="uZfDgTMfrP" role="1eOMHV">
<node concept="2OqwBi" id="uZfDgTMfrQ" role="3uHU7w">
<node concept="2OqwBi" id="uZfDgTMfrR" role="2Oq$k0">
<node concept="30H73N" id="uZfDgTMfrS" role="2Oq$k0" />
<node concept="1mfA1w" id="uZfDgTMfrT" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="uZfDgTMfrU" role="2OqNvi">
<node concept="chp4Y" id="uZfDgTMfrV" role="cj9EA">
<ref role="cht4Q" to="hm2y:sflsE7bZ0S" resolve="IBlockLike" />
</node>
</node>
</node>
<node concept="2OqwBi" id="uZfDgTMfrW" role="3uHU7B">
<node concept="2OqwBi" id="uZfDgTMfrX" role="2Oq$k0">
<node concept="30H73N" id="uZfDgTMfrY" role="2Oq$k0" />
<node concept="1mfA1w" id="uZfDgTMfrZ" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="uZfDgTMfs0" role="2OqNvi">
<node concept="chp4Y" id="uZfDgTMfs1" role="cj9EA">
<ref role="cht4Q" to="hm2y:6NJfo6_rQ9E" resolve="IfExpression" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="uZfDgTL_Y3" role="3clFbG">
<node concept="2OqwBi" id="uZfDgTL_Y4" role="2Oq$k0">
<node concept="30H73N" id="uZfDgTL_Y5" role="2Oq$k0" />
<node concept="3TrEf2" id="uZfDgTL_Y6" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
</node>
</node>
<node concept="2OqwBi" id="uZfDgTL_Y3" role="3uHU7B">
<node concept="2OqwBi" id="uZfDgTL_Y4" role="2Oq$k0">
<node concept="30H73N" id="uZfDgTL_Y5" role="2Oq$k0" />
<node concept="3TrEf2" id="uZfDgTL_Y6" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
</node>
</node>
<node concept="1mIQ4w" id="uZfDgTL_Y7" role="2OqNvi">
<node concept="chp4Y" id="uZfDgTL_Y8" role="cj9EA">
<ref role="cht4Q" to="5qo5:5cK3QOdYQ7C" resolve="StringLengthTarget" />
</node>
<node concept="1mIQ4w" id="uZfDgTL_Y7" role="2OqNvi">
<node concept="chp4Y" id="uZfDgTL_Y8" role="cj9EA">
<ref role="cht4Q" to="5qo5:5cK3QOdYQ7C" resolve="StringLengthTarget" />
</node>
</node>
</node>
Expand Down
84 changes: 43 additions & 41 deletions ...guages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
Expand Down Expand Up @@ -786,11 +789,13 @@
</node>
<node concept="17QB3L" id="2ft7KAXZWdI" role="3clF45" />
</node>
<node concept="13i0hz" id="3p6$WoEl3wd" role="13h7CS">
<property role="TrG5h" value="numberOfDecimals" />
<node concept="3Tm1VV" id="3p6$WoEl3we" role="1B3o_S" />
<node concept="10Oyi0" id="3p6$WoEl62_" role="3clF45" />
<node concept="3clFbS" id="3p6$WoEl3wg" role="3clF47">
<node concept="13i0hz" id="6v8$kf$4zsT" role="13h7CS">
<property role="TrG5h" value="toBigDecimal" />
<node concept="3Tm1VV" id="6v8$kf$4zsU" role="1B3o_S" />
<node concept="3uibUv" id="6v8$kf$4$vf" role="3clF45">
<ref role="3uigEE" to="xlxw:~BigDecimal" resolve="BigDecimal" />
</node>
<node concept="3clFbS" id="6v8$kf$4zsW" role="3clF47">
<node concept="3cpWs8" id="54whuzIxDP3" role="3cqZAp">
<node concept="3cpWsn" id="54whuzIxDP6" role="3cpWs9">
<property role="TrG5h" value="parsedValue" />
Expand Down Expand Up @@ -828,8 +833,8 @@
</node>
</node>
<node concept="2YIFZM" id="54whuzIxFNi" role="3clFbw">
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
<ref role="37wK5l" to="xfg9:2oUyrt$QKcQ" resolve="useCommaInsteadOfDotForDecimals" />
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
</node>
</node>
<node concept="3SKdUt" id="54whuzIxVFn" role="3cqZAp">
Expand All @@ -840,64 +845,61 @@
<node concept="3oM_SD" id="54whuzIxVIF" role="1PaTwD">
<property role="3oM_SC" value="scientific" />
</node>
<node concept="3oM_SD" id="54whuzIxVII" role="1PaTwD">
<node concept="3oM_SD" id="6v8$kf$7q$T" role="1PaTwD">
<property role="3oM_SC" value="notation" />
</node>
<node concept="3oM_SD" id="54whuzIygWw" role="1PaTwD">
<property role="3oM_SC" value="+" />
</node>
<node concept="3oM_SD" id="54whuzIygWP" role="1PaTwD">
<property role="3oM_SC" value="convert" />
</node>
<node concept="3oM_SD" id="54whuzIygX3" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="54whuzIygXa" role="1PaTwD">
<property role="3oM_SC" value="positive" />
</node>
<node concept="3oM_SD" id="54whuzIygXE" role="1PaTwD">
<property role="3oM_SC" value="value" />
</node>
</node>
</node>
<node concept="3cpWs8" id="54whuzIxRVv" role="3cqZAp">
<node concept="3cpWsn" id="54whuzIxRVw" role="3cpWs9">
<property role="TrG5h" value="parsedAbsoluteValue" />
<node concept="17QB3L" id="54whuzIxU9$" role="1tU5fm" />
<node concept="2OqwBi" id="54whuzIxTMF" role="33vP2m">
<node concept="2OqwBi" id="54whuzIxTcl" role="2Oq$k0">
<node concept="2ShNRf" id="54whuzIxSmJ" role="2Oq$k0">
<node concept="1pGfFk" id="54whuzIxSuf" role="2ShVmc">
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="37vLTw" id="54whuzIxSw5" role="37wK5m">
<ref role="3cqZAo" node="54whuzIxDP6" resolve="parsedValue" />
</node>
<node concept="2ShNRf" id="54whuzIxSmJ" role="2Oq$k0">
<node concept="1pGfFk" id="54whuzIxSuf" role="2ShVmc">
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="37vLTw" id="54whuzIxSw5" role="37wK5m">
<ref role="3cqZAo" node="54whuzIxDP6" resolve="parsedValue" />
</node>
</node>
<node concept="liA8E" id="54whuzIxTKp" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.abs()" resolve="abs" />
</node>
</node>
<node concept="liA8E" id="54whuzIxTR0" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="54whuzIxVIM" role="3cqZAp" />
<node concept="3cpWs6" id="54whuzIxUO8" role="3cqZAp">
<node concept="2OqwBi" id="54whuzIxWR$" role="3cqZAk">
<node concept="2ShNRf" id="54whuzIxUOD" role="2Oq$k0">
<node concept="1pGfFk" id="54whuzIxVdI" role="2ShVmc">
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="37vLTw" id="54whuzIxW6f" role="37wK5m">
<ref role="3cqZAo" node="54whuzIxRVw" resolve="parsedAbsoluteValue" />
</node>
<node concept="3clFbF" id="6v8$kf$4Ax3" role="3cqZAp">
<node concept="2ShNRf" id="6v8$kf$4AwZ" role="3clFbG">
<node concept="1pGfFk" id="6v8$kf$4C9_" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="37vLTw" id="6v8$kf$4CAe" role="37wK5m">
<ref role="3cqZAo" node="54whuzIxRVw" resolve="parsedAbsoluteValue" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="3p6$WoEl3wd" role="13h7CS">
<property role="TrG5h" value="numberOfDecimals" />
<node concept="3Tm1VV" id="3p6$WoEl3we" role="1B3o_S" />
<node concept="10Oyi0" id="3p6$WoEl62_" role="3clF45" />
<node concept="3clFbS" id="3p6$WoEl3wg" role="3clF47">
<node concept="3cpWs6" id="54whuzIxUO8" role="3cqZAp">
<node concept="2OqwBi" id="54whuzIxWR$" role="3cqZAk">
<node concept="liA8E" id="54whuzIxXs$" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.scale()" resolve="scale" />
</node>
<node concept="2OqwBi" id="6v8$kf$7qHM" role="2Oq$k0">
<node concept="BsUDl" id="6v8$kf$4DTR" role="2Oq$k0">
<ref role="37wK5l" node="6v8$kf$4zsT" resolve="toBigDecimal" />
</node>
<node concept="liA8E" id="6v8$kf$7qK_" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.abs()" resolve="abs" />
</node>
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit a396801

Please sign in to comment.