Skip to content

Commit 09200e7

Browse files
alexanderpannalexanderpann
authored
Merge pull request #1320 from IETS3/bugfix/issue_1004
2 parents 96b6c37 + b61c1a0 commit 09200e7

File tree

4 files changed

+640
-348
lines changed

4 files changed

+640
-348
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1010
### Fixed
1111

1212
- A NullPointerException was fixed for cases where a node implementing IValidNamedConcept had no name.
13+
- When calculating the supertype of number types, the precision is now correctly set to infinite when one of the types has an infinite precision.
1314

1415
## April 2025
1516

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

Lines changed: 71 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@
383383
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
384384
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
385385
</concept>
386+
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
386387
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
387388
<child id="1237721435807" name="elementType" index="HW$YZ" />
388389
</concept>
@@ -2948,45 +2949,89 @@
29482949
</node>
29492950
</node>
29502951
</node>
2951-
<node concept="3clFbF" id="1PW6P0ZLhfA" role="3cqZAp">
2952-
<node concept="2OqwBi" id="1PW6P0ZLhfB" role="3clFbG">
2953-
<node concept="37vLTw" id="1PW6P0ZLhfC" role="2Oq$k0">
2954-
<ref role="3cqZAo" node="1PW6P0ZLhep" resolve="res" />
2952+
<node concept="3clFbJ" id="7xgxWxI5AlJ" role="3cqZAp">
2953+
<node concept="3clFbS" id="7xgxWxI5AlL" role="3clFbx">
2954+
<node concept="3clFbF" id="7xgxWxI6Bn9" role="3cqZAp">
2955+
<node concept="2OqwBi" id="7xgxWxI6EVw" role="3clFbG">
2956+
<node concept="37vLTw" id="7xgxWxI6Bn7" role="2Oq$k0">
2957+
<ref role="3cqZAo" node="1PW6P0ZLhep" resolve="res" />
2958+
</node>
2959+
<node concept="2qgKlT" id="7xgxWxI6MjF" role="2OqNvi">
2960+
<ref role="37wK5l" to="b1h1:7Wa2sv3G6bK" resolve="setInfinitePrecision" />
2961+
</node>
2962+
</node>
29552963
</node>
2956-
<node concept="2qgKlT" id="1PW6P0ZLhfD" role="2OqNvi">
2957-
<ref role="37wK5l" to="b1h1:19PglA21KtA" resolve="setPrecision" />
2958-
<node concept="2YIFZM" id="1PW6P0ZLhfE" role="37wK5m">
2959-
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
2960-
<ref role="37wK5l" to="oq0c:2NHHcg2HhuB" resolve="maxInt" />
2961-
<node concept="2OqwBi" id="1PW6P0ZLhfF" role="37wK5m">
2962-
<node concept="37vLTw" id="1PW6P0ZLhfG" role="2Oq$k0">
2963-
<ref role="3cqZAo" node="1PW6P0ZLhfS" resolve="types" />
2964-
</node>
2965-
<node concept="3$u5V9" id="1PW6P0ZLhfH" role="2OqNvi">
2966-
<node concept="1bVj0M" id="1PW6P0ZLhfI" role="23t8la">
2967-
<node concept="3clFbS" id="1PW6P0ZLhfJ" role="1bW5cS">
2968-
<node concept="3clFbF" id="1PW6P0ZLhfK" role="3cqZAp">
2969-
<node concept="2OqwBi" id="1PW6P0ZLhfL" role="3clFbG">
2970-
<node concept="37vLTw" id="1PW6P0ZLhfM" role="2Oq$k0">
2971-
<ref role="3cqZAo" node="4z0AnX817e4" resolve="it" />
2964+
</node>
2965+
<node concept="2OqwBi" id="7xgxWxI5OKp" role="3clFbw">
2966+
<node concept="37vLTw" id="7xgxWxI5EoF" role="2Oq$k0">
2967+
<ref role="3cqZAo" node="1PW6P0ZLhfS" resolve="types" />
2968+
</node>
2969+
<node concept="2HwmR7" id="7xgxWxI5ZN_" role="2OqNvi">
2970+
<node concept="1bVj0M" id="7xgxWxI5ZNB" role="23t8la">
2971+
<node concept="3clFbS" id="7xgxWxI5ZNC" role="1bW5cS">
2972+
<node concept="3clFbF" id="7xgxWxI6dWG" role="3cqZAp">
2973+
<node concept="2OqwBi" id="7xgxWxI6hk7" role="3clFbG">
2974+
<node concept="37vLTw" id="7xgxWxI6dWF" role="2Oq$k0">
2975+
<ref role="3cqZAo" node="7xgxWxI5ZND" resolve="it" />
2976+
</node>
2977+
<node concept="2qgKlT" id="7xgxWxI6lDP" role="2OqNvi">
2978+
<ref role="37wK5l" to="b1h1:7Wa2sv3Gi_T" resolve="isInfinitePrecision" />
2979+
</node>
2980+
</node>
2981+
</node>
2982+
</node>
2983+
<node concept="gl6BB" id="7xgxWxI5ZND" role="1bW2Oz">
2984+
<property role="TrG5h" value="it" />
2985+
<node concept="2jxLKc" id="7xgxWxI5ZNE" role="1tU5fm" />
2986+
</node>
2987+
</node>
2988+
</node>
2989+
</node>
2990+
<node concept="9aQIb" id="7xgxWxI6Qa0" role="9aQIa">
2991+
<node concept="3clFbS" id="7xgxWxI6Qa1" role="9aQI4">
2992+
<node concept="3clFbF" id="1PW6P0ZLhfA" role="3cqZAp">
2993+
<node concept="2OqwBi" id="1PW6P0ZLhfB" role="3clFbG">
2994+
<node concept="37vLTw" id="1PW6P0ZLhfC" role="2Oq$k0">
2995+
<ref role="3cqZAo" node="1PW6P0ZLhep" resolve="res" />
2996+
</node>
2997+
<node concept="2qgKlT" id="1PW6P0ZLhfD" role="2OqNvi">
2998+
<ref role="37wK5l" to="b1h1:19PglA21KtA" resolve="setPrecision" />
2999+
<node concept="2YIFZM" id="1PW6P0ZLhfE" role="37wK5m">
3000+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
3001+
<ref role="37wK5l" to="oq0c:2NHHcg2HhuB" resolve="maxInt" />
3002+
<node concept="2OqwBi" id="1PW6P0ZLhfF" role="37wK5m">
3003+
<node concept="37vLTw" id="1PW6P0ZLhfG" role="2Oq$k0">
3004+
<ref role="3cqZAo" node="1PW6P0ZLhfS" resolve="types" />
3005+
</node>
3006+
<node concept="3$u5V9" id="1PW6P0ZLhfH" role="2OqNvi">
3007+
<node concept="1bVj0M" id="1PW6P0ZLhfI" role="23t8la">
3008+
<node concept="3clFbS" id="1PW6P0ZLhfJ" role="1bW5cS">
3009+
<node concept="3clFbF" id="1PW6P0ZLhfK" role="3cqZAp">
3010+
<node concept="2OqwBi" id="1PW6P0ZLhfL" role="3clFbG">
3011+
<node concept="37vLTw" id="1PW6P0ZLhfM" role="2Oq$k0">
3012+
<ref role="3cqZAo" node="4z0AnX817e4" resolve="it" />
3013+
</node>
3014+
<node concept="2qgKlT" id="1PW6P0ZLhfN" role="2OqNvi">
3015+
<ref role="37wK5l" to="b1h1:19PglA20ASE" resolve="precision" />
3016+
</node>
3017+
</node>
3018+
</node>
29723019
</node>
2973-
<node concept="2qgKlT" id="1PW6P0ZLhfN" role="2OqNvi">
2974-
<ref role="37wK5l" to="b1h1:19PglA20ASE" resolve="precision" />
3020+
<node concept="gl6BB" id="4z0AnX817e4" role="1bW2Oz">
3021+
<property role="TrG5h" value="it" />
3022+
<node concept="2jxLKc" id="4z0AnX817e5" role="1tU5fm" />
29753023
</node>
29763024
</node>
29773025
</node>
29783026
</node>
2979-
<node concept="gl6BB" id="4z0AnX817e4" role="1bW2Oz">
2980-
<property role="TrG5h" value="it" />
2981-
<node concept="2jxLKc" id="4z0AnX817e5" role="1tU5fm" />
2982-
</node>
29833027
</node>
29843028
</node>
29853029
</node>
29863030
</node>
29873031
</node>
29883032
</node>
29893033
</node>
3034+
<node concept="3clFbH" id="7xgxWxI67wE" role="3cqZAp" />
29903035
<node concept="3cpWs6" id="1PW6P0ZLhfQ" role="3cqZAp">
29913036
<node concept="37vLTw" id="1PW6P0ZLhfR" role="3cqZAk">
29923037
<ref role="3cqZAo" node="1PW6P0ZLhep" resolve="res" />

0 commit comments

Comments
 (0)