Skip to content

Commit a247ca4

Browse files
arimerarimer
committed
Merge branch 'maintenance/mps20213' into feature/flexibleTupleAccess__2021.3
2 parents bc395c8 + 77dbac2 commit a247ca4

File tree

6 files changed

+1463
-96
lines changed

6 files changed

+1463
-96
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1212
- The PCollections library was updated to version 4.0.1.
1313

1414
### Fixed
15-
- Uncatched `DateTimeException` during check DateLiteral
15+
16+
- Uncatched `DateTimeException` during check DateLiteral.
17+
- IntHelper.equals now correctly deals with the combination of 0.0,-0.0,0 and -0.
18+
19+
### Added
20+
21+
- `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.
1622

1723
## December 2023
1824

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

100755100644
Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5033,15 +5033,52 @@
50335033
</node>
50345034
</node>
50355035
</node>
5036-
<node concept="3cpWs6" id="29BBztTV4Jd" role="3cqZAp">
5037-
<node concept="2OqwBi" id="29BBztTV5d7" role="3cqZAk">
5038-
<node concept="37vLTw" id="29BBztTV4PD" role="2Oq$k0">
5039-
<ref role="3cqZAo" node="29BBztTV3kj" resolve="l" />
5036+
<node concept="3J1_TO" id="4dMN4HhUXWP" role="3cqZAp">
5037+
<node concept="3uVAMA" id="4dMN4HhUXWQ" role="1zxBo5">
5038+
<node concept="XOnhg" id="4dMN4HhUXWR" role="1zc67B">
5039+
<property role="3TUv4t" value="false" />
5040+
<property role="TrG5h" value="ex" />
5041+
<node concept="nSUau" id="4dMN4HhUXWS" role="1tU5fm">
5042+
<node concept="3uibUv" id="4dMN4HhUXWT" role="nSUat">
5043+
<ref role="3uigEE" to="wyt6:~NumberFormatException" resolve="NumberFormatException" />
5044+
</node>
5045+
</node>
50405046
</node>
5041-
<node concept="liA8E" id="29BBztTV63H" role="2OqNvi">
5042-
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
5043-
<node concept="37vLTw" id="29BBztTV66e" role="37wK5m">
5044-
<ref role="3cqZAo" node="29BBztTV3kl" resolve="r" />
5047+
<node concept="3clFbS" id="4dMN4HhUXWU" role="1zc67A">
5048+
<node concept="3cpWs6" id="4dMN4HhUXWV" role="3cqZAp">
5049+
<node concept="3clFbT" id="4dMN4HhUXWW" role="3cqZAk">
5050+
<property role="3clFbU" value="false" />
5051+
</node>
5052+
</node>
5053+
</node>
5054+
</node>
5055+
<node concept="3clFbS" id="4dMN4HhUXWX" role="1zxBo7">
5056+
<node concept="3cpWs6" id="4dMN4HhUXWY" role="3cqZAp">
5057+
<node concept="3clFbC" id="1aGchTf48xf" role="3cqZAk">
5058+
<node concept="2OqwBi" id="4dMN4HhUXX0" role="3uHU7B">
5059+
<node concept="2ShNRf" id="4dMN4HhUXX1" role="2Oq$k0">
5060+
<node concept="1pGfFk" id="4dMN4HhUXX2" role="2ShVmc">
5061+
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
5062+
<node concept="37vLTw" id="4dMN4HhUXX3" role="37wK5m">
5063+
<ref role="3cqZAo" node="29BBztTV3kj" resolve="l" />
5064+
</node>
5065+
</node>
5066+
</node>
5067+
<node concept="liA8E" id="4dMN4HhUXX4" role="2OqNvi">
5068+
<ref role="37wK5l" to="xlxw:~BigDecimal.compareTo(java.math.BigDecimal)" resolve="compareTo" />
5069+
<node concept="2ShNRf" id="4dMN4HhUXX5" role="37wK5m">
5070+
<node concept="1pGfFk" id="4dMN4HhUXX6" role="2ShVmc">
5071+
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
5072+
<node concept="37vLTw" id="4dMN4HhUXX7" role="37wK5m">
5073+
<ref role="3cqZAo" node="29BBztTV3kl" resolve="r" />
5074+
</node>
5075+
</node>
5076+
</node>
5077+
</node>
5078+
</node>
5079+
<node concept="3cmrfG" id="4dMN4HhUXX8" role="3uHU7w">
5080+
<property role="3cmrfH" value="0" />
5081+
</node>
50455082
</node>
50465083
</node>
50475084
</node>

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

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@
304304
<concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
305305
<reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
306306
</concept>
307-
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
308307
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
309308
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
310309
</concept>
@@ -4552,46 +4551,16 @@
45524551
<node concept="30G5F_" id="uZfDgTL_Y0" role="30HLyM">
45534552
<node concept="3clFbS" id="uZfDgTL_Y1" role="2VODD2">
45544553
<node concept="3clFbF" id="uZfDgTL_Y2" role="3cqZAp">
4555-
<node concept="1Wc70l" id="uZfDgTMf1y" role="3clFbG">
4556-
<node concept="3fqX7Q" id="uZfDgTMfeK" role="3uHU7w">
4557-
<node concept="1eOMI4" id="uZfDgTMfrO" role="3fr31v">
4558-
<node concept="22lmx$" id="uZfDgTMfrP" role="1eOMHV">
4559-
<node concept="2OqwBi" id="uZfDgTMfrQ" role="3uHU7w">
4560-
<node concept="2OqwBi" id="uZfDgTMfrR" role="2Oq$k0">
4561-
<node concept="30H73N" id="uZfDgTMfrS" role="2Oq$k0" />
4562-
<node concept="1mfA1w" id="uZfDgTMfrT" role="2OqNvi" />
4563-
</node>
4564-
<node concept="1mIQ4w" id="uZfDgTMfrU" role="2OqNvi">
4565-
<node concept="chp4Y" id="uZfDgTMfrV" role="cj9EA">
4566-
<ref role="cht4Q" to="hm2y:sflsE7bZ0S" resolve="IBlockLike" />
4567-
</node>
4568-
</node>
4569-
</node>
4570-
<node concept="2OqwBi" id="uZfDgTMfrW" role="3uHU7B">
4571-
<node concept="2OqwBi" id="uZfDgTMfrX" role="2Oq$k0">
4572-
<node concept="30H73N" id="uZfDgTMfrY" role="2Oq$k0" />
4573-
<node concept="1mfA1w" id="uZfDgTMfrZ" role="2OqNvi" />
4574-
</node>
4575-
<node concept="1mIQ4w" id="uZfDgTMfs0" role="2OqNvi">
4576-
<node concept="chp4Y" id="uZfDgTMfs1" role="cj9EA">
4577-
<ref role="cht4Q" to="hm2y:6NJfo6_rQ9E" resolve="IfExpression" />
4578-
</node>
4579-
</node>
4580-
</node>
4581-
</node>
4554+
<node concept="2OqwBi" id="uZfDgTL_Y3" role="3clFbG">
4555+
<node concept="2OqwBi" id="uZfDgTL_Y4" role="2Oq$k0">
4556+
<node concept="30H73N" id="uZfDgTL_Y5" role="2Oq$k0" />
4557+
<node concept="3TrEf2" id="uZfDgTL_Y6" role="2OqNvi">
4558+
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
45824559
</node>
45834560
</node>
4584-
<node concept="2OqwBi" id="uZfDgTL_Y3" role="3uHU7B">
4585-
<node concept="2OqwBi" id="uZfDgTL_Y4" role="2Oq$k0">
4586-
<node concept="30H73N" id="uZfDgTL_Y5" role="2Oq$k0" />
4587-
<node concept="3TrEf2" id="uZfDgTL_Y6" role="2OqNvi">
4588-
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4589-
</node>
4590-
</node>
4591-
<node concept="1mIQ4w" id="uZfDgTL_Y7" role="2OqNvi">
4592-
<node concept="chp4Y" id="uZfDgTL_Y8" role="cj9EA">
4593-
<ref role="cht4Q" to="5qo5:5cK3QOdYQ7C" resolve="StringLengthTarget" />
4594-
</node>
4561+
<node concept="1mIQ4w" id="uZfDgTL_Y7" role="2OqNvi">
4562+
<node concept="chp4Y" id="uZfDgTL_Y8" role="cj9EA">
4563+
<ref role="cht4Q" to="5qo5:5cK3QOdYQ7C" resolve="StringLengthTarget" />
45954564
</node>
45964565
</node>
45974566
</node>

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

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
<property id="1176718929932" name="isFinal" index="3TUv4t" />
115115
<child id="1068431790190" name="initializer" index="33vP2m" />
116116
</concept>
117+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
118+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
119+
</concept>
117120
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
118121
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
119122
</concept>
@@ -786,11 +789,13 @@
786789
</node>
787790
<node concept="17QB3L" id="2ft7KAXZWdI" role="3clF45" />
788791
</node>
789-
<node concept="13i0hz" id="3p6$WoEl3wd" role="13h7CS">
790-
<property role="TrG5h" value="numberOfDecimals" />
791-
<node concept="3Tm1VV" id="3p6$WoEl3we" role="1B3o_S" />
792-
<node concept="10Oyi0" id="3p6$WoEl62_" role="3clF45" />
793-
<node concept="3clFbS" id="3p6$WoEl3wg" role="3clF47">
792+
<node concept="13i0hz" id="6v8$kf$4zsT" role="13h7CS">
793+
<property role="TrG5h" value="toBigDecimal" />
794+
<node concept="3Tm1VV" id="6v8$kf$4zsU" role="1B3o_S" />
795+
<node concept="3uibUv" id="6v8$kf$4$vf" role="3clF45">
796+
<ref role="3uigEE" to="xlxw:~BigDecimal" resolve="BigDecimal" />
797+
</node>
798+
<node concept="3clFbS" id="6v8$kf$4zsW" role="3clF47">
794799
<node concept="3cpWs8" id="54whuzIxDP3" role="3cqZAp">
795800
<node concept="3cpWsn" id="54whuzIxDP6" role="3cpWs9">
796801
<property role="TrG5h" value="parsedValue" />
@@ -828,8 +833,8 @@
828833
</node>
829834
</node>
830835
<node concept="2YIFZM" id="54whuzIxFNi" role="3clFbw">
831-
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
832836
<ref role="37wK5l" to="xfg9:2oUyrt$QKcQ" resolve="useCommaInsteadOfDotForDecimals" />
837+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
833838
</node>
834839
</node>
835840
<node concept="3SKdUt" id="54whuzIxVFn" role="3cqZAp">
@@ -840,64 +845,61 @@
840845
<node concept="3oM_SD" id="54whuzIxVIF" role="1PaTwD">
841846
<property role="3oM_SC" value="scientific" />
842847
</node>
843-
<node concept="3oM_SD" id="54whuzIxVII" role="1PaTwD">
848+
<node concept="3oM_SD" id="6v8$kf$7q$T" role="1PaTwD">
844849
<property role="3oM_SC" value="notation" />
845850
</node>
846-
<node concept="3oM_SD" id="54whuzIygWw" role="1PaTwD">
847-
<property role="3oM_SC" value="+" />
848-
</node>
849-
<node concept="3oM_SD" id="54whuzIygWP" role="1PaTwD">
850-
<property role="3oM_SC" value="convert" />
851-
</node>
852-
<node concept="3oM_SD" id="54whuzIygX3" role="1PaTwD">
853-
<property role="3oM_SC" value="to" />
854-
</node>
855-
<node concept="3oM_SD" id="54whuzIygXa" role="1PaTwD">
856-
<property role="3oM_SC" value="positive" />
857-
</node>
858-
<node concept="3oM_SD" id="54whuzIygXE" role="1PaTwD">
859-
<property role="3oM_SC" value="value" />
860-
</node>
861851
</node>
862852
</node>
863853
<node concept="3cpWs8" id="54whuzIxRVv" role="3cqZAp">
864854
<node concept="3cpWsn" id="54whuzIxRVw" role="3cpWs9">
865855
<property role="TrG5h" value="parsedAbsoluteValue" />
866856
<node concept="17QB3L" id="54whuzIxU9$" role="1tU5fm" />
867857
<node concept="2OqwBi" id="54whuzIxTMF" role="33vP2m">
868-
<node concept="2OqwBi" id="54whuzIxTcl" role="2Oq$k0">
869-
<node concept="2ShNRf" id="54whuzIxSmJ" role="2Oq$k0">
870-
<node concept="1pGfFk" id="54whuzIxSuf" role="2ShVmc">
871-
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
872-
<node concept="37vLTw" id="54whuzIxSw5" role="37wK5m">
873-
<ref role="3cqZAo" node="54whuzIxDP6" resolve="parsedValue" />
874-
</node>
858+
<node concept="2ShNRf" id="54whuzIxSmJ" role="2Oq$k0">
859+
<node concept="1pGfFk" id="54whuzIxSuf" role="2ShVmc">
860+
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
861+
<node concept="37vLTw" id="54whuzIxSw5" role="37wK5m">
862+
<ref role="3cqZAo" node="54whuzIxDP6" resolve="parsedValue" />
875863
</node>
876864
</node>
877-
<node concept="liA8E" id="54whuzIxTKp" role="2OqNvi">
878-
<ref role="37wK5l" to="xlxw:~BigDecimal.abs()" resolve="abs" />
879-
</node>
880865
</node>
881866
<node concept="liA8E" id="54whuzIxTR0" role="2OqNvi">
882867
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
883868
</node>
884869
</node>
885870
</node>
886871
</node>
887-
<node concept="3clFbH" id="54whuzIxVIM" role="3cqZAp" />
888-
<node concept="3cpWs6" id="54whuzIxUO8" role="3cqZAp">
889-
<node concept="2OqwBi" id="54whuzIxWR$" role="3cqZAk">
890-
<node concept="2ShNRf" id="54whuzIxUOD" role="2Oq$k0">
891-
<node concept="1pGfFk" id="54whuzIxVdI" role="2ShVmc">
892-
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
893-
<node concept="37vLTw" id="54whuzIxW6f" role="37wK5m">
894-
<ref role="3cqZAo" node="54whuzIxRVw" resolve="parsedAbsoluteValue" />
895-
</node>
872+
<node concept="3clFbF" id="6v8$kf$4Ax3" role="3cqZAp">
873+
<node concept="2ShNRf" id="6v8$kf$4AwZ" role="3clFbG">
874+
<node concept="1pGfFk" id="6v8$kf$4C9_" role="2ShVmc">
875+
<property role="373rjd" value="true" />
876+
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
877+
<node concept="37vLTw" id="6v8$kf$4CAe" role="37wK5m">
878+
<ref role="3cqZAo" node="54whuzIxRVw" resolve="parsedAbsoluteValue" />
896879
</node>
897880
</node>
881+
</node>
882+
</node>
883+
</node>
884+
</node>
885+
<node concept="13i0hz" id="3p6$WoEl3wd" role="13h7CS">
886+
<property role="TrG5h" value="numberOfDecimals" />
887+
<node concept="3Tm1VV" id="3p6$WoEl3we" role="1B3o_S" />
888+
<node concept="10Oyi0" id="3p6$WoEl62_" role="3clF45" />
889+
<node concept="3clFbS" id="3p6$WoEl3wg" role="3clF47">
890+
<node concept="3cpWs6" id="54whuzIxUO8" role="3cqZAp">
891+
<node concept="2OqwBi" id="54whuzIxWR$" role="3cqZAk">
898892
<node concept="liA8E" id="54whuzIxXs$" role="2OqNvi">
899893
<ref role="37wK5l" to="xlxw:~BigDecimal.scale()" resolve="scale" />
900894
</node>
895+
<node concept="2OqwBi" id="6v8$kf$7qHM" role="2Oq$k0">
896+
<node concept="BsUDl" id="6v8$kf$4DTR" role="2Oq$k0">
897+
<ref role="37wK5l" node="6v8$kf$4zsT" resolve="toBigDecimal" />
898+
</node>
899+
<node concept="liA8E" id="6v8$kf$7qK_" role="2OqNvi">
900+
<ref role="37wK5l" to="xlxw:~BigDecimal.abs()" resolve="abs" />
901+
</node>
902+
</node>
901903
</node>
902904
</node>
903905
</node>

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

100755100644
File mode changed.

0 commit comments

Comments
 (0)