Skip to content

Commit 1b94925

Browse files
dbinkeledbinkele
committed
Merge branch 'refs/heads/maintenance/mps20241' into bugfix/Fix-Diamond-Problem-&-Refactoring-#1590
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
2 parents a6db99d + bfa2b1a commit 1b94925

File tree

6 files changed

+961
-138
lines changed

6 files changed

+961
-138
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
99

1010
### Fixed
1111

12-
- Physical units: The units `Joule`, `Coulomb` and `Watt` can now have also prefixes with negative metric scaling, e.g., `mW` (Milliwatt). Additionally, some typos have been corrected in the physical units documentation.
13-
12+
- Physical units:
13+
- The units `Joule`, `Coulomb` and `Watt` can now have also prefixes with negative metric scaling, e.g., `mW` (Milliwatt). Additionally, some typos have been corrected in the physical units documentation.
14+
- The precision of number types with prefixed units (e.g. `mW` or `km`) was always set to `infinite` by the typesystem. Now, the precision is as precise as possible.
15+
- Variability: Viewer for skeleton trees has been improved (better error reporting, more stable, does not break on nodes which are string literals).
1416

1517
## December 2025
1618

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
1111
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
1212
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
13+
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
1314
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1415
</languages>
1516
<imports>
@@ -221,6 +222,18 @@
221222
<property id="1200397540847" name="charConstant" index="1XhdNS" />
222223
</concept>
223224
</language>
225+
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
226+
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
227+
<child id="8465538089690331502" name="body" index="TZ5H$" />
228+
</concept>
229+
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
230+
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
231+
<child id="8970989240999019149" name="part" index="1dT_Ay" />
232+
</concept>
233+
<concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
234+
<property id="8970989240999019144" name="text" index="1dT_AB" />
235+
</concept>
236+
</language>
224237
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
225238
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
226239
<reference id="5455284157994012188" name="link" index="2pIpSl" />
@@ -287,6 +300,7 @@
287300
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
288301
</concept>
289302
<concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
303+
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
290304
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
291305
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
292306
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -2613,6 +2627,38 @@
26132627
</node>
26142628
</node>
26152629
</node>
2630+
<node concept="13i0hz" id="5bmRS0nolm$" role="13h7CS">
2631+
<property role="TrG5h" value="getSinglePointRange" />
2632+
<node concept="3Tm1VV" id="5bmRS0nolm_" role="1B3o_S" />
2633+
<node concept="17QB3L" id="5bmRS0norni" role="3clF45" />
2634+
<node concept="3clFbS" id="5bmRS0nolmB" role="3clF47">
2635+
<node concept="3clFbF" id="5bmRS0norEP" role="3cqZAp">
2636+
<node concept="3K4zz7" id="5bmRS0nov0u" role="3clFbG">
2637+
<node concept="10Nm6u" id="5bmRS0novfz" role="3K4E3e" />
2638+
<node concept="2OqwBi" id="5bmRS0nowlw" role="3K4GZi">
2639+
<node concept="2OqwBi" id="5bmRS0novKY" role="2Oq$k0">
2640+
<node concept="13iPFW" id="5bmRS0novuC" role="2Oq$k0" />
2641+
<node concept="3TrEf2" id="5bmRS0now7G" role="2OqNvi">
2642+
<ref role="3Tt5mk" to="5qo5:19PglA20qXS" resolve="range" />
2643+
</node>
2644+
</node>
2645+
<node concept="2qgKlT" id="5bmRS0nowKw" role="2OqNvi">
2646+
<ref role="37wK5l" node="5bmRS0nnZlw" resolve="getSinglePoint" />
2647+
</node>
2648+
</node>
2649+
<node concept="2OqwBi" id="5bmRS0not0i" role="3K4Cdx">
2650+
<node concept="2OqwBi" id="5bmRS0norWG" role="2Oq$k0">
2651+
<node concept="13iPFW" id="5bmRS0norEO" role="2Oq$k0" />
2652+
<node concept="3TrEf2" id="5bmRS0nosmu" role="2OqNvi">
2653+
<ref role="3Tt5mk" to="5qo5:19PglA20qXS" resolve="range" />
2654+
</node>
2655+
</node>
2656+
<node concept="3w_OXm" id="5bmRS0notmh" role="2OqNvi" />
2657+
</node>
2658+
</node>
2659+
</node>
2660+
</node>
2661+
</node>
26162662
<node concept="13i0hz" id="3p6$WoEzKI5" role="13h7CS">
26172663
<property role="TrG5h" value="doubleRange" />
26182664
<node concept="3Tm1VV" id="3p6$WoEzKI6" role="1B3o_S" />
@@ -6136,6 +6182,79 @@
61366182
</node>
61376183
</node>
61386184
</node>
6185+
<node concept="13i0hz" id="5bmRS0nmV1W" role="13h7CS">
6186+
<property role="TrG5h" value="isSinglePoint" />
6187+
<node concept="3Tm1VV" id="5bmRS0nmV1X" role="1B3o_S" />
6188+
<node concept="10P_77" id="5bmRS0nmVIY" role="3clF45" />
6189+
<node concept="3clFbS" id="5bmRS0nmV1Z" role="3clF47">
6190+
<node concept="3clFbF" id="5bmRS0nnS5Y" role="3cqZAp">
6191+
<node concept="1Wc70l" id="5bmRS0nnUgP" role="3clFbG">
6192+
<node concept="17R0WA" id="5bmRS0nnY40" role="3uHU7w">
6193+
<node concept="2OqwBi" id="5bmRS0nnZdZ" role="3uHU7w">
6194+
<node concept="13iPFW" id="5bmRS0nnYMh" role="2Oq$k0" />
6195+
<node concept="3TrcHB" id="5bmRS0nnZi7" role="2OqNvi">
6196+
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
6197+
</node>
6198+
</node>
6199+
<node concept="2OqwBi" id="5bmRS0nnUS_" role="3uHU7B">
6200+
<node concept="13iPFW" id="5bmRS0nnUvi" role="2Oq$k0" />
6201+
<node concept="3TrcHB" id="5bmRS0nnVbE" role="2OqNvi">
6202+
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
6203+
</node>
6204+
</node>
6205+
</node>
6206+
<node concept="1Wc70l" id="5bmRS0nnS60" role="3uHU7B">
6207+
<node concept="2OqwBi" id="2T4l13I8CGo" role="3uHU7B">
6208+
<node concept="2OqwBi" id="2T4l13I8Amy" role="2Oq$k0">
6209+
<node concept="13iPFW" id="2T4l13I8_U5" role="2Oq$k0" />
6210+
<node concept="3TrcHB" id="2T4l13I8AZL" role="2OqNvi">
6211+
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
6212+
</node>
6213+
</node>
6214+
<node concept="17RvpY" id="2T4l13I8DHP" role="2OqNvi" />
6215+
</node>
6216+
<node concept="2OqwBi" id="2T4l13I8GIy" role="3uHU7w">
6217+
<node concept="2OqwBi" id="2T4l13I8EBZ" role="2Oq$k0">
6218+
<node concept="13iPFW" id="2T4l13I8EbJ" role="2Oq$k0" />
6219+
<node concept="3TrcHB" id="2T4l13I8ERn" role="2OqNvi">
6220+
<ref role="3TsBF5" to="5qo5:19PglA20qXK" resolve="max" />
6221+
</node>
6222+
</node>
6223+
<node concept="17RvpY" id="2T4l13I8HJL" role="2OqNvi" />
6224+
</node>
6225+
</node>
6226+
</node>
6227+
</node>
6228+
</node>
6229+
<node concept="P$JXv" id="2T4l13I94XN" role="lGtFl">
6230+
<node concept="TZ5HA" id="2T4l13I94XO" role="TZ5H$">
6231+
<node concept="1dT_AC" id="2T4l13I94XP" role="1dT_Ay">
6232+
<property role="1dT_AB" value="Check if range is an exact point, i.e., min==max and none of them is infinity." />
6233+
</node>
6234+
</node>
6235+
</node>
6236+
</node>
6237+
<node concept="13i0hz" id="5bmRS0nnZlw" role="13h7CS">
6238+
<property role="TrG5h" value="getSinglePoint" />
6239+
<node concept="3Tm1VV" id="5bmRS0nnZlx" role="1B3o_S" />
6240+
<node concept="17QB3L" id="5bmRS0no07s" role="3clF45" />
6241+
<node concept="3clFbS" id="5bmRS0nnZlz" role="3clF47">
6242+
<node concept="3clFbF" id="5bmRS0no0az" role="3cqZAp">
6243+
<node concept="3K4zz7" id="5bmRS0no0aj" role="3clFbG">
6244+
<node concept="BsUDl" id="5bmRS0no0aZ" role="3K4Cdx">
6245+
<ref role="37wK5l" node="5bmRS0nmV1W" resolve="isSinglePoint" />
6246+
</node>
6247+
<node concept="2OqwBi" id="5bmRS0no0kY" role="3K4E3e">
6248+
<node concept="13iPFW" id="5bmRS0no0bI" role="2Oq$k0" />
6249+
<node concept="3TrcHB" id="5bmRS0no0xL" role="2OqNvi">
6250+
<ref role="3TsBF5" to="5qo5:19PglA20qXJ" resolve="min" />
6251+
</node>
6252+
</node>
6253+
<node concept="10Nm6u" id="5bmRS0no0$y" role="3K4GZi" />
6254+
</node>
6255+
</node>
6256+
</node>
6257+
</node>
61396258
</node>
61406259
<node concept="13h7C7" id="5cK3QOe0Mk2">
61416260
<property role="3GE5qa" value="string" />

0 commit comments

Comments
 (0)