Skip to content

Commit ea87b85

Browse files
author
Alexander Pann
authored
Merge pull request #1158 from IETS3/bugfix/backport_pr_1113
2 parents a0566c7 + 209937a commit ea87b85

File tree

11 files changed

+13377
-1657
lines changed

11 files changed

+13377
-1657
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
150150
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
151151
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
152+
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />
152153
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
153154
</projectModules>
154155
</component>

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

Lines changed: 1235 additions & 821 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5419,7 +5419,7 @@
54195419
<node concept="3clFbF" id="1$_c28zsMuD" role="3cqZAp">
54205420
<node concept="37vLTI" id="1$_c28zsNh$" role="3clFbG">
54215421
<node concept="2YIFZM" id="1$_c28zsOTd" role="37vLTx">
5422-
<ref role="37wK5l" to="oq0c:3f3yNhCMb1G" resolve="add" />
5422+
<ref role="37wK5l" to="oq0c:1t_lOkRFKY1" resolve="add" />
54235423
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
54245424
<node concept="2OqwBi" id="1$_c28zsP0R" role="37wK5m">
54255425
<node concept="2OqwBi" id="1$_c28zsP0S" role="2Oq$k0">
@@ -5447,7 +5447,6 @@
54475447
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
54485448
</node>
54495449
</node>
5450-
<node concept="3clFbT" id="1$_c28zsR6Y" role="37wK5m" />
54515450
</node>
54525451
<node concept="2OqwBi" id="1$_c28zsMGw" role="37vLTJ">
54535452
<node concept="2OqwBi" id="1$_c28zsMyH" role="2Oq$k0">

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

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<property id="1176718929932" name="isFinal" index="3TUv4t" />
119119
<child id="1068431790190" name="initializer" index="33vP2m" />
120120
</concept>
121-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
121+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
122122
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
123123
</concept>
124124
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -181,7 +181,7 @@
181181
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
182182
<child id="1081516765348" name="expression" index="3fr31v" />
183183
</concept>
184-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
184+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
185185
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
186186
<child id="1068499141038" name="actualArgument" index="37wK5m" />
187187
</concept>
@@ -198,7 +198,7 @@
198198
<child id="8276990574895933172" name="throwable" index="1zc67B" />
199199
</concept>
200200
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
201-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
201+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
202202
<child id="1178549979242" name="visibility" index="1B3o_S" />
203203
</concept>
204204
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -316,7 +316,7 @@
316316
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
317317
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
318318
</concept>
319-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
319+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
320320
<property id="1169194664001" name="name" index="TrG5h" />
321321
</concept>
322322
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -364,7 +364,7 @@
364364
<property id="1174558315290" name="start" index="1T8p8b" />
365365
<property id="1174558317822" name="end" index="1T8pRJ" />
366366
</concept>
367-
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
367+
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
368368
<child id="1174653387388" name="regexp" index="1YN4dH" />
369369
</concept>
370370
</language>
@@ -6002,24 +6002,24 @@
60026002
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
60036003
</node>
60046004
</node>
6005-
<node concept="2OqwBi" id="ijdpu3j8Dk" role="37vLTx">
6006-
<node concept="2OqwBi" id="ijdpu3j86E" role="2Oq$k0">
6005+
<node concept="2YIFZM" id="5CKJX639W2d" role="37vLTx">
6006+
<ref role="37wK5l" to="oq0c:1t_lOkS0tRA" resolve="toPlainString" />
6007+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
6008+
<node concept="2OqwBi" id="ijdpu3j86E" role="37wK5m">
60076009
<node concept="2OqwBi" id="ijdpu3iMyn" role="2Oq$k0">
60086010
<node concept="liA8E" id="ijdpu3iN3s" role="2OqNvi">
60096011
<ref role="37wK5l" to="xlxw:~BigDecimal.multiply(java.math.BigDecimal)" resolve="multiply" />
60106012
<node concept="37vLTw" id="57Dr2jFHtj7" role="37wK5m">
60116013
<ref role="3cqZAo" node="ijdpu3aPss" resolve="value" />
60126014
</node>
60136015
</node>
6014-
<node concept="2ShNRf" id="ijdpu3jihm" role="2Oq$k0">
6015-
<node concept="1pGfFk" id="ijdpu3jjnB" role="2ShVmc">
6016-
<property role="373rjd" value="true" />
6017-
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
6018-
<node concept="2OqwBi" id="ijdpu3jk8f" role="37wK5m">
6019-
<node concept="13iPFW" id="ijdpu3jjtO" role="2Oq$k0" />
6020-
<node concept="3TrcHB" id="ijdpu3jkqb" role="2OqNvi">
6021-
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
6022-
</node>
6016+
<node concept="2YIFZM" id="5CKJX63a4XU" role="2Oq$k0">
6017+
<ref role="37wK5l" to="oq0c:1t_lOkRf4yU" resolve="asBigDecimal" />
6018+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
6019+
<node concept="2OqwBi" id="5CKJX63a4XV" role="37wK5m">
6020+
<node concept="13iPFW" id="5CKJX63a4XW" role="2Oq$k0" />
6021+
<node concept="3TrcHB" id="5CKJX63a4XX" role="2OqNvi">
6022+
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
60236023
</node>
60246024
</node>
60256025
</node>
@@ -6028,9 +6028,6 @@
60286028
<ref role="37wK5l" to="xlxw:~BigDecimal.stripTrailingZeros()" resolve="stripTrailingZeros" />
60296029
</node>
60306030
</node>
6031-
<node concept="liA8E" id="ijdpu3j8P0" role="2OqNvi">
6032-
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
6033-
</node>
60346031
</node>
60356032
</node>
60366033
</node>
@@ -6059,35 +6056,32 @@
60596056
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
60606057
</node>
60616058
</node>
6062-
<node concept="2OqwBi" id="ijdpu3j93S" role="37vLTx">
6063-
<node concept="2OqwBi" id="ijdpu3j93T" role="2Oq$k0">
6064-
<node concept="2OqwBi" id="ijdpu3j93U" role="2Oq$k0">
6065-
<node concept="liA8E" id="ijdpu3j93Z" role="2OqNvi">
6059+
<node concept="2YIFZM" id="5CKJX639Ycp" role="37vLTx">
6060+
<ref role="37wK5l" to="oq0c:1t_lOkS0tRA" resolve="toPlainString" />
6061+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
6062+
<node concept="2OqwBi" id="5CKJX639Ycq" role="37wK5m">
6063+
<node concept="2OqwBi" id="5CKJX639Ycr" role="2Oq$k0">
6064+
<node concept="liA8E" id="5CKJX639Ycs" role="2OqNvi">
60666065
<ref role="37wK5l" to="xlxw:~BigDecimal.multiply(java.math.BigDecimal)" resolve="multiply" />
6067-
<node concept="37vLTw" id="57Dr2jFHtuQ" role="37wK5m">
6066+
<node concept="37vLTw" id="5CKJX639Yct" role="37wK5m">
60686067
<ref role="3cqZAo" node="ijdpu3aPss" resolve="value" />
60696068
</node>
60706069
</node>
6071-
<node concept="2ShNRf" id="ijdpu3jl8U" role="2Oq$k0">
6072-
<node concept="1pGfFk" id="ijdpu3jl8V" role="2ShVmc">
6073-
<property role="373rjd" value="true" />
6074-
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
6075-
<node concept="2OqwBi" id="ijdpu3jl8W" role="37wK5m">
6076-
<node concept="13iPFW" id="ijdpu3jl8X" role="2Oq$k0" />
6077-
<node concept="3TrcHB" id="ijdpu3jl8Y" role="2OqNvi">
6078-
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
6079-
</node>
6070+
<node concept="2YIFZM" id="5CKJX63a6RR" role="2Oq$k0">
6071+
<ref role="37wK5l" to="oq0c:1t_lOkRf4yU" resolve="asBigDecimal" />
6072+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
6073+
<node concept="2OqwBi" id="5CKJX63a6RS" role="37wK5m">
6074+
<node concept="13iPFW" id="5CKJX63a6RT" role="2Oq$k0" />
6075+
<node concept="3TrcHB" id="5CKJX63a6RU" role="2OqNvi">
6076+
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
60806077
</node>
60816078
</node>
60826079
</node>
60836080
</node>
6084-
<node concept="liA8E" id="ijdpu3j942" role="2OqNvi">
6081+
<node concept="liA8E" id="5CKJX639Ycz" role="2OqNvi">
60856082
<ref role="37wK5l" to="xlxw:~BigDecimal.stripTrailingZeros()" resolve="stripTrailingZeros" />
60866083
</node>
60876084
</node>
6088-
<node concept="liA8E" id="ijdpu3j943" role="2OqNvi">
6089-
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
6090-
</node>
60916085
</node>
60926086
</node>
60936087
</node>

0 commit comments

Comments
 (0)