Skip to content

Commit

Permalink
Merge pull request #1158 from IETS3/bugfix/backport_pr_1113
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Dec 4, 2024
2 parents a0566c7 + 209937a commit ea87b85
Show file tree
Hide file tree
Showing 11 changed files with 13,377 additions and 1,657 deletions.
1 change: 1 addition & 0 deletions code/languages/org.iets3.opensource/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
</projectModules>
</component>
Expand Down
2,056 changes: 1,235 additions & 821 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions ...ages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5419,7 +5419,7 @@
<node concept="3clFbF" id="1$_c28zsMuD" role="3cqZAp">
<node concept="37vLTI" id="1$_c28zsNh$" role="3clFbG">
<node concept="2YIFZM" id="1$_c28zsOTd" role="37vLTx">
<ref role="37wK5l" to="oq0c:3f3yNhCMb1G" resolve="add" />
<ref role="37wK5l" to="oq0c:1t_lOkRFKY1" resolve="add" />
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
<node concept="2OqwBi" id="1$_c28zsP0R" role="37wK5m">
<node concept="2OqwBi" id="1$_c28zsP0S" role="2Oq$k0">
Expand Down Expand Up @@ -5447,7 +5447,6 @@
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
</node>
</node>
<node concept="3clFbT" id="1$_c28zsR6Y" role="37wK5m" />
</node>
<node concept="2OqwBi" id="1$_c28zsMGw" role="37vLTJ">
<node concept="2OqwBi" id="1$_c28zsMyH" role="2Oq$k0">
Expand Down
68 changes: 31 additions & 37 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 @@ -118,7 +118,7 @@
<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">
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
Expand Down Expand Up @@ -181,7 +181,7 @@
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
<child id="1081516765348" name="expression" index="3fr31v" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand All @@ -198,7 +198,7 @@
<child id="8276990574895933172" name="throwable" index="1zc67B" />
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
Expand Down Expand Up @@ -316,7 +316,7 @@
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
Expand Down Expand Up @@ -364,7 +364,7 @@
<property id="1174558315290" name="start" index="1T8p8b" />
<property id="1174558317822" name="end" index="1T8pRJ" />
</concept>
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
<child id="1174653387388" name="regexp" index="1YN4dH" />
</concept>
</language>
Expand Down Expand Up @@ -6002,24 +6002,24 @@
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
</node>
</node>
<node concept="2OqwBi" id="ijdpu3j8Dk" role="37vLTx">
<node concept="2OqwBi" id="ijdpu3j86E" role="2Oq$k0">
<node concept="2YIFZM" id="5CKJX639W2d" role="37vLTx">
<ref role="37wK5l" to="oq0c:1t_lOkS0tRA" resolve="toPlainString" />
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
<node concept="2OqwBi" id="ijdpu3j86E" role="37wK5m">
<node concept="2OqwBi" id="ijdpu3iMyn" role="2Oq$k0">
<node concept="liA8E" id="ijdpu3iN3s" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.multiply(java.math.BigDecimal)" resolve="multiply" />
<node concept="37vLTw" id="57Dr2jFHtj7" role="37wK5m">
<ref role="3cqZAo" node="ijdpu3aPss" resolve="value" />
</node>
</node>
<node concept="2ShNRf" id="ijdpu3jihm" role="2Oq$k0">
<node concept="1pGfFk" id="ijdpu3jjnB" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="2OqwBi" id="ijdpu3jk8f" role="37wK5m">
<node concept="13iPFW" id="ijdpu3jjtO" role="2Oq$k0" />
<node concept="3TrcHB" id="ijdpu3jkqb" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
</node>
<node concept="2YIFZM" id="5CKJX63a4XU" role="2Oq$k0">
<ref role="37wK5l" to="oq0c:1t_lOkRf4yU" resolve="asBigDecimal" />
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
<node concept="2OqwBi" id="5CKJX63a4XV" role="37wK5m">
<node concept="13iPFW" id="5CKJX63a4XW" role="2Oq$k0" />
<node concept="3TrcHB" id="5CKJX63a4XX" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
</node>
</node>
</node>
Expand All @@ -6028,9 +6028,6 @@
<ref role="37wK5l" to="xlxw:~BigDecimal.stripTrailingZeros()" resolve="stripTrailingZeros" />
</node>
</node>
<node concept="liA8E" id="ijdpu3j8P0" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -6059,35 +6056,32 @@
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
</node>
</node>
<node concept="2OqwBi" id="ijdpu3j93S" role="37vLTx">
<node concept="2OqwBi" id="ijdpu3j93T" role="2Oq$k0">
<node concept="2OqwBi" id="ijdpu3j93U" role="2Oq$k0">
<node concept="liA8E" id="ijdpu3j93Z" role="2OqNvi">
<node concept="2YIFZM" id="5CKJX639Ycp" role="37vLTx">
<ref role="37wK5l" to="oq0c:1t_lOkS0tRA" resolve="toPlainString" />
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
<node concept="2OqwBi" id="5CKJX639Ycq" role="37wK5m">
<node concept="2OqwBi" id="5CKJX639Ycr" role="2Oq$k0">
<node concept="liA8E" id="5CKJX639Ycs" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.multiply(java.math.BigDecimal)" resolve="multiply" />
<node concept="37vLTw" id="57Dr2jFHtuQ" role="37wK5m">
<node concept="37vLTw" id="5CKJX639Yct" role="37wK5m">
<ref role="3cqZAo" node="ijdpu3aPss" resolve="value" />
</node>
</node>
<node concept="2ShNRf" id="ijdpu3jl8U" role="2Oq$k0">
<node concept="1pGfFk" id="ijdpu3jl8V" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" to="xlxw:~BigDecimal.&lt;init&gt;(java.lang.String)" resolve="BigDecimal" />
<node concept="2OqwBi" id="ijdpu3jl8W" role="37wK5m">
<node concept="13iPFW" id="ijdpu3jl8X" role="2Oq$k0" />
<node concept="3TrcHB" id="ijdpu3jl8Y" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
</node>
<node concept="2YIFZM" id="5CKJX63a6RR" role="2Oq$k0">
<ref role="37wK5l" to="oq0c:1t_lOkRf4yU" resolve="asBigDecimal" />
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
<node concept="2OqwBi" id="5CKJX63a6RS" role="37wK5m">
<node concept="13iPFW" id="5CKJX63a6RT" role="2Oq$k0" />
<node concept="3TrcHB" id="5CKJX63a6RU" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="ijdpu3j942" role="2OqNvi">
<node concept="liA8E" id="5CKJX639Ycz" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.stripTrailingZeros()" resolve="stripTrailingZeros" />
</node>
</node>
<node concept="liA8E" id="ijdpu3j943" role="2OqNvi">
<ref role="37wK5l" to="xlxw:~BigDecimal.toPlainString()" resolve="toPlainString" />
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit ea87b85

Please sign in to comment.