Skip to content

Commit 774241c

Browse files
kbirkenkbirken
committed
Fix condition for selection root state and correct test models (#1476).
1 parent f6ea657 commit 774241c

File tree

4 files changed

+198
-71
lines changed

4 files changed

+198
-71
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps‎

Lines changed: 148 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@
466466
<reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
467467
</concept>
468468
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
469+
<concept id="1240170042401" name="jetbrains.mps.lang.smodel.structure.SEnumerationMemberType" flags="in" index="2ZThk1">
470+
<reference id="1240170836027" name="enum" index="2ZWj4r" />
471+
</concept>
469472
<concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
470473
<reference id="3562215692195600259" name="link" index="13MTZf" />
471474
</concept>
@@ -6217,49 +6220,165 @@
62176220
<node concept="3Tm1VV" id="7WsNHxjuHgO" role="1B3o_S" />
62186221
<node concept="10P_77" id="7WsNHxjuQ0P" role="3clF45" />
62196222
<node concept="3clFbS" id="7WsNHxjuHgQ" role="3clF47">
6220-
<node concept="3clFbF" id="7WsNHxjvCyk" role="3cqZAp">
6221-
<node concept="22lmx$" id="7WsNHxjvGB2" role="3clFbG">
6222-
<node concept="1eOMI4" id="7WsNHxjvGGw" role="3uHU7w">
6223-
<node concept="22lmx$" id="7WsNHxjvKHX" role="1eOMHV">
6224-
<node concept="2OqwBi" id="7WsNHxjvIUM" role="3uHU7B">
6225-
<node concept="2OqwBi" id="7WsNHxjvH8u" role="2Oq$k0">
6226-
<node concept="13iPFW" id="7WsNHxjvGLT" role="2Oq$k0" />
6227-
<node concept="3TrEf2" id="7WsNHxjvHXi" role="2OqNvi">
6228-
<ref role="3Tt5mk" to="4ndm:4onczE6iX1P" resolve="extendedFMC" />
6229-
</node>
6223+
<node concept="3SKdUt" id="6U83TeHb22t" role="3cqZAp">
6224+
<node concept="1PaTwC" id="6U83TeHb22u" role="1aUNEU">
6225+
<node concept="3oM_SD" id="6U83TeHb22v" role="1PaTwD">
6226+
<property role="3oM_SC" value="this" />
6227+
</node>
6228+
<node concept="3oM_SD" id="6U83TeHb2t7" role="1PaTwD">
6229+
<property role="3oM_SC" value="condition" />
6230+
</node>
6231+
<node concept="3oM_SD" id="6U83TeHb2to" role="1PaTwD">
6232+
<property role="3oM_SC" value="allows" />
6233+
</node>
6234+
<node concept="3oM_SD" id="6U83TeHb2tD" role="1PaTwD">
6235+
<property role="3oM_SC" value="selection" />
6236+
</node>
6237+
<node concept="3oM_SD" id="6U83TeHb2vq" role="1PaTwD">
6238+
<property role="3oM_SC" value="userTrue" />
6239+
</node>
6240+
<node concept="3oM_SD" id="6U83TeHb2vF" role="1PaTwD">
6241+
<property role="3oM_SC" value="also" />
6242+
</node>
6243+
<node concept="3oM_SD" id="6U83TeHb2vW" role="1PaTwD">
6244+
<property role="3oM_SC" value="for" />
6245+
</node>
6246+
<node concept="3oM_SD" id="6U83TeHb2wd" role="1PaTwD">
6247+
<property role="3oM_SC" value="configurations" />
6248+
</node>
6249+
<node concept="3oM_SD" id="6U83TeHb2wI" role="1PaTwD">
6250+
<property role="3oM_SC" value="with" />
6251+
</node>
6252+
<node concept="3oM_SD" id="6U83TeHb2xv" role="1PaTwD">
6253+
<property role="3oM_SC" value="&quot;extends&quot;," />
6254+
</node>
6255+
<node concept="3oM_SD" id="6U83TeHb2yy" role="1PaTwD">
6256+
<property role="3oM_SC" value="because" />
6257+
</node>
6258+
<node concept="3oM_SD" id="6U83TeHb2yN" role="1PaTwD">
6259+
<property role="3oM_SC" value="solver" />
6260+
</node>
6261+
<node concept="3oM_SD" id="6U83TeHb2z4" role="1PaTwD">
6262+
<property role="3oM_SC" value="will" />
6263+
</node>
6264+
<node concept="3oM_SD" id="6U83TeHb2z_" role="1PaTwD">
6265+
<property role="3oM_SC" value="set" />
6266+
</node>
6267+
<node concept="3oM_SD" id="6U83TeHb2zQ" role="1PaTwD">
6268+
<property role="3oM_SC" value="it" />
6269+
</node>
6270+
<node concept="3oM_SD" id="6U83TeHb2$7" role="1PaTwD">
6271+
<property role="3oM_SC" value="to" />
6272+
</node>
6273+
<node concept="3oM_SD" id="6U83TeHb2$U" role="1PaTwD">
6274+
<property role="3oM_SC" value="inheritedTrue" />
6275+
</node>
6276+
<node concept="3oM_SD" id="6U83TeHb2$V" role="1PaTwD">
6277+
<property role="3oM_SC" value="asynchronously" />
6278+
</node>
6279+
<node concept="3oM_SD" id="6U83TeHb2Au" role="1PaTwD">
6280+
<property role="3oM_SC" value="(so" />
6281+
</node>
6282+
<node concept="3oM_SD" id="6U83TeHb2Av" role="1PaTwD">
6283+
<property role="3oM_SC" value="we" />
6284+
</node>
6285+
<node concept="3oM_SD" id="6U83TeHb2Aw" role="1PaTwD">
6286+
<property role="3oM_SC" value="need" />
6287+
</node>
6288+
<node concept="3oM_SD" id="6U83TeHb2AL" role="1PaTwD">
6289+
<property role="3oM_SC" value="a" />
6290+
</node>
6291+
<node concept="3oM_SD" id="6U83TeHb2B2" role="1PaTwD">
6292+
<property role="3oM_SC" value="short" />
6293+
</node>
6294+
<node concept="3oM_SD" id="6U83TeHb2Bj" role="1PaTwD">
6295+
<property role="3oM_SC" value="period" />
6296+
</node>
6297+
<node concept="3oM_SD" id="6U83TeHb2B$" role="1PaTwD">
6298+
<property role="3oM_SC" value="where" />
6299+
</node>
6300+
<node concept="3oM_SD" id="6U83TeHb2CR" role="1PaTwD">
6301+
<property role="3oM_SC" value="userTrue" />
6302+
</node>
6303+
<node concept="3oM_SD" id="6U83TeHb2D8" role="1PaTwD">
6304+
<property role="3oM_SC" value="until" />
6305+
</node>
6306+
<node concept="3oM_SD" id="6U83TeHb2Dp" role="1PaTwD">
6307+
<property role="3oM_SC" value="inheritedTrue" />
6308+
</node>
6309+
<node concept="3oM_SD" id="6U83TeHb2DU" role="1PaTwD">
6310+
<property role="3oM_SC" value="is" />
6311+
</node>
6312+
<node concept="3oM_SD" id="6U83TeHb2DV" role="1PaTwD">
6313+
<property role="3oM_SC" value="set)" />
6314+
</node>
6315+
</node>
6316+
</node>
6317+
<node concept="3cpWs8" id="6U83TeGxkLo" role="3cqZAp">
6318+
<node concept="3cpWsn" id="6U83TeGxkLp" role="3cpWs9">
6319+
<property role="TrG5h" value="s" />
6320+
<node concept="2ZThk1" id="6U83TeGxjQZ" role="1tU5fm">
6321+
<ref role="2ZWj4r" to="s6b7:59FNqAPCJGh" resolve="FeatureSelectionState" />
6322+
</node>
6323+
<node concept="2OqwBi" id="6U83TeGxkLq" role="33vP2m">
6324+
<node concept="13iPFW" id="6U83TeGxkLr" role="2Oq$k0" />
6325+
<node concept="3TrcHB" id="6U83TeGxkLs" role="2OqNvi">
6326+
<ref role="3TsBF5" to="4ndm:59FNqAPCJNr" resolve="selectionState" />
6327+
</node>
6328+
</node>
6329+
</node>
6330+
</node>
6331+
<node concept="3cpWs8" id="6U83TeHaQtt" role="3cqZAp">
6332+
<node concept="3cpWsn" id="6U83TeHaQtu" role="3cpWs9">
6333+
<property role="TrG5h" value="inheriting" />
6334+
<node concept="10P_77" id="6U83TeH9KbB" role="1tU5fm" />
6335+
<node concept="2OqwBi" id="6U83TeHaQtv" role="33vP2m">
6336+
<node concept="2OqwBi" id="6U83TeHaQtw" role="2Oq$k0">
6337+
<node concept="2OqwBi" id="6U83TeHaQtx" role="2Oq$k0">
6338+
<node concept="13iPFW" id="6U83TeHaQty" role="2Oq$k0" />
6339+
<node concept="3TrEf2" id="6U83TeHaQtz" role="2OqNvi">
6340+
<ref role="3Tt5mk" to="4ndm:4onczE6iX1P" resolve="extendedFMC" />
62306341
</node>
6231-
<node concept="3x8VRR" id="7WsNHxjvJwi" role="2OqNvi" />
62326342
</node>
6233-
<node concept="17R0WA" id="7WsNHxjvXjc" role="3uHU7w">
6234-
<node concept="2OqwBi" id="7WsNHxjvXjd" role="3uHU7B">
6235-
<node concept="13iPFW" id="7WsNHxjvXje" role="2Oq$k0" />
6236-
<node concept="3TrcHB" id="7WsNHxjvXjf" role="2OqNvi">
6237-
<ref role="3TsBF5" to="4ndm:59FNqAPCJNr" resolve="selectionState" />
6238-
</node>
6343+
<node concept="3TrEf2" id="6U83TeHaQt$" role="2OqNvi">
6344+
<ref role="3Tt5mk" to="4ndm:4onczE6iX19" resolve="config" />
6345+
</node>
6346+
</node>
6347+
<node concept="3w_OXm" id="6U83TeHaQt_" role="2OqNvi" />
6348+
</node>
6349+
</node>
6350+
</node>
6351+
<node concept="3clFbF" id="6U83TeHaSEe" role="3cqZAp">
6352+
<node concept="22lmx$" id="6U83TeHaURi" role="3clFbG">
6353+
<node concept="1eOMI4" id="6U83TeHaVL0" role="3uHU7w">
6354+
<node concept="1Wc70l" id="6U83TeHaYkR" role="1eOMHV">
6355+
<node concept="37vLTw" id="6U83TeHaWb8" role="3uHU7B">
6356+
<ref role="3cqZAo" node="6U83TeHaQtu" resolve="inheriting" />
6357+
</node>
6358+
<node concept="17R0WA" id="6U83TeHaZdB" role="3uHU7w">
6359+
<node concept="37vLTw" id="6U83TeHaZdC" role="3uHU7B">
6360+
<ref role="3cqZAo" node="6U83TeGxkLp" resolve="s" />
62396361
</node>
6240-
<node concept="2OqwBi" id="7WsNHxjvXjg" role="3uHU7w">
6241-
<node concept="1XH99k" id="7WsNHxjvXjh" role="2Oq$k0">
6362+
<node concept="2OqwBi" id="6U83TeHaZdD" role="3uHU7w">
6363+
<node concept="1XH99k" id="6U83TeHaZdE" role="2Oq$k0">
62426364
<ref role="1XH99l" to="s6b7:59FNqAPCJGh" resolve="FeatureSelectionState" />
62436365
</node>
6244-
<node concept="2ViDtV" id="7WsNHxjvXji" role="2OqNvi">
6366+
<node concept="2ViDtV" id="6U83TeHaZdF" role="2OqNvi">
62456367
<ref role="2ViDtZ" to="s6b7:2wLdcSYDcHT" resolve="inheritedTrue" />
62466368
</node>
62476369
</node>
62486370
</node>
62496371
</node>
62506372
</node>
6251-
<node concept="17R0WA" id="7WsNHxjvCyl" role="3uHU7B">
6252-
<node concept="2OqwBi" id="7WsNHxjvCym" role="3uHU7B">
6253-
<node concept="13iPFW" id="7WsNHxjvCyn" role="2Oq$k0" />
6254-
<node concept="3TrcHB" id="7WsNHxjvCyo" role="2OqNvi">
6255-
<ref role="3TsBF5" to="4ndm:59FNqAPCJNr" resolve="selectionState" />
6256-
</node>
6373+
<node concept="17R0WA" id="6U83TeHaSEg" role="3uHU7B">
6374+
<node concept="37vLTw" id="6U83TeHaSEh" role="3uHU7B">
6375+
<ref role="3cqZAo" node="6U83TeGxkLp" resolve="s" />
62576376
</node>
6258-
<node concept="2OqwBi" id="7WsNHxjvCyp" role="3uHU7w">
6259-
<node concept="1XH99k" id="7WsNHxjvCyq" role="2Oq$k0">
6377+
<node concept="2OqwBi" id="6U83TeHaSEi" role="3uHU7w">
6378+
<node concept="1XH99k" id="6U83TeHaSEj" role="2Oq$k0">
62606379
<ref role="1XH99l" to="s6b7:59FNqAPCJGh" resolve="FeatureSelectionState" />
62616380
</node>
6262-
<node concept="2ViDtV" id="7WsNHxjvCyr" role="2OqNvi">
6381+
<node concept="2ViDtV" id="6U83TeHaSEk" role="2OqNvi">
62636382
<ref role="2ViDtZ" to="s6b7:59FNqAPCJGm" resolve="userTrue" />
62646383
</node>
62656384
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4059,12 +4059,17 @@
40594059
</node>
40604060
</node>
40614061
<node concept="2OqwBi" id="7WsNHxjwanv" role="3clFbw">
4062-
<node concept="2OqwBi" id="7WsNHxjw9vf" role="2Oq$k0">
4063-
<node concept="QwW4i" id="7WsNHxjw99d" role="2Oq$k0">
4064-
<ref role="QwW4h" node="7WsNHxj72OO" resolve="fmc" />
4062+
<node concept="2OqwBi" id="6U83TeH6Urs" role="2Oq$k0">
4063+
<node concept="2OqwBi" id="7WsNHxjw9vf" role="2Oq$k0">
4064+
<node concept="QwW4i" id="7WsNHxjw99d" role="2Oq$k0">
4065+
<ref role="QwW4h" node="7WsNHxj72OO" resolve="fmc" />
4066+
</node>
4067+
<node concept="3TrEf2" id="7WsNHxjwabH" role="2OqNvi">
4068+
<ref role="3Tt5mk" to="4ndm:4onczE6iX1P" resolve="extendedFMC" />
4069+
</node>
40654070
</node>
4066-
<node concept="3TrEf2" id="7WsNHxjwabH" role="2OqNvi">
4067-
<ref role="3Tt5mk" to="4ndm:4onczE6iX1P" resolve="extendedFMC" />
4071+
<node concept="3TrEf2" id="6U83TeH6VKC" role="2OqNvi">
4072+
<ref role="3Tt5mk" to="4ndm:4onczE6iX19" resolve="config" />
40684073
</node>
40694074
</node>
40704075
<node concept="3w_OXm" id="7WsNHxjwpOJ" role="2OqNvi" />

‎code/languages/org.iets3.opensource/tests/test.org.iets3.variability.configuration.base/models/[email protected]‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -717,14 +717,15 @@
717717
<node concept="12i7jc" id="62zdOAOxqSL" role="12i2BX" />
718718
<node concept="12i7jc" id="62zdOAOxqSM" role="12i2BX" />
719719
<node concept="rqKB5" id="62zdOAOxqSN" role="12i2BX">
720-
<property role="bVyBI" value="2010416099" />
720+
<property role="bVyBI" value="434676531" />
721721
<property role="TrG5h" value="CTop2" />
722-
<property role="3BMj5M" value="5QKr2dW9gDW/userTrue" />
723-
<property role="1nQUAq" value="true" />
722+
<property role="3BMj5M" value="2wLdcSYDcHT/inheritedTrue" />
724723
<property role="1n_0Gn" value="true" />
725724
<property role="26YOJW" value="" />
726725
<property role="33ZQ4u" value="true" />
727-
<property role="bROok" value="1163107095" />
726+
<property role="bROok" value="1037421299" />
727+
<property role="0Rz4W" value="-516946923" />
728+
<property role="1nQUAq" value="true" />
728729
<ref role="rqKBe" node="62zdOAOxqSw" resolve="Top" />
729730
<node concept="rqCGG" id="62zdOAOxqSO" role="rqCGo">
730731
<node concept="rqKBd" id="62zdOAOxqSP" role="rqKBa">
@@ -827,14 +828,14 @@
827828
</node>
828829
<node concept="12i7jc" id="62zdOAOZFi2" role="12i2BX" />
829830
<node concept="rqKB5" id="62zdOAOZFi3" role="12i2BX">
830-
<property role="bVyBI" value="-1184969264" />
831+
<property role="bVyBI" value="-1125854901" />
831832
<property role="TrG5h" value="MyCTop" />
832-
<property role="0Rz4W" value="167068680" />
833-
<property role="3BMj5M" value="5QKr2dW9gDW/userTrue" />
834-
<property role="1nQUAq" value="true" />
833+
<property role="0Rz4W" value="910112895" />
834+
<property role="3BMj5M" value="2wLdcSYDcHT/inheritedTrue" />
835835
<property role="1n_0Gn" value="true" />
836836
<property role="26YOJW" value="" />
837-
<property role="bROok" value="1163107095" />
837+
<property role="bROok" value="-1088672237" />
838+
<property role="1nQUAq" value="true" />
838839
<ref role="rqKBe" node="62zdOAOZFhL" resolve="Top" />
839840
<node concept="rqCGG" id="62zdOAOZFi4" role="rqCGo">
840841
<node concept="rqKBd" id="62zdOAOZFi5" role="rqKBa">
@@ -1299,15 +1300,15 @@
12991300
</node>
13001301
<node concept="12i7jc" id="2cYnQcMoGKK" role="12i2BX" />
13011302
<node concept="rqKB5" id="2cYnQcMoGKL" role="12i2BX">
1302-
<property role="bVyBI" value="-827159038" />
1303-
<property role="0Rz4W" value="330443636" />
1303+
<property role="bVyBI" value="-1480904115" />
1304+
<property role="0Rz4W" value="-1127141412" />
13041305
<property role="TrG5h" value="CTop2" />
1305-
<property role="3BMj5M" value="5QKr2dW9gDW/userTrue" />
1306-
<property role="1nQUAq" value="true" />
1306+
<property role="3BMj5M" value="2wLdcSYDcHT/inheritedTrue" />
13071307
<property role="1n_0Gn" value="true" />
13081308
<property role="26YOJW" value="" />
13091309
<property role="33ZQ4u" value="true" />
1310-
<property role="bROok" value="-1124566203" />
1310+
<property role="bROok" value="-1800153838" />
1311+
<property role="1nQUAq" value="true" />
13111312
<ref role="rqKBe" node="2cYnQcMoGK8" resolve="Top" />
13121313
<node concept="rqCGG" id="2cYnQcMoGKM" role="rqCGo">
13131314
<node concept="rqKBd" id="2cYnQcMoGKN" role="rqKBa">
@@ -1368,13 +1369,14 @@
13681369
</node>
13691370
<node concept="12i7jc" id="5oRi7zaYEyg" role="12i2BX" />
13701371
<node concept="rqKB5" id="5oRi7zaYEyi" role="12i2BX">
1371-
<property role="bVyBI" value="950188919" />
1372+
<property role="bVyBI" value="-1439027035" />
13721373
<property role="TrG5h" value="CTop5" />
1373-
<property role="3BMj5M" value="5QKr2dW9gDW/userTrue" />
1374-
<property role="1nQUAq" value="true" />
1374+
<property role="3BMj5M" value="2wLdcSYDcHT/inheritedTrue" />
13751375
<property role="1n_0Gn" value="true" />
13761376
<property role="26YOJW" value="" />
1377-
<property role="bROok" value="-778763778" />
1377+
<property role="bROok" value="-1096951084" />
1378+
<property role="0Rz4W" value="-209280235" />
1379+
<property role="1nQUAq" value="true" />
13781380
<ref role="rqKBe" node="2cYnQcMoGK8" resolve="Top" />
13791381
<node concept="rqCGG" id="5oRi7zaYEyl" role="rqCGo">
13801382
<node concept="rqKBd" id="5oRi7zaYEym" role="rqKBa">
@@ -1423,13 +1425,14 @@
14231425
</node>
14241426
<node concept="12i7jc" id="5oRi7zaYQHI" role="12i2BX" />
14251427
<node concept="rqKB5" id="5oRi7zaYQHK" role="12i2BX">
1426-
<property role="bVyBI" value="-1896450865" />
1428+
<property role="bVyBI" value="-1594308783" />
14271429
<property role="TrG5h" value="CTop7" />
1428-
<property role="3BMj5M" value="5QKr2dW9gDW/userTrue" />
1429-
<property role="1nQUAq" value="true" />
1430+
<property role="3BMj5M" value="2wLdcSYDcHT/inheritedTrue" />
14301431
<property role="1n_0Gn" value="true" />
14311432
<property role="26YOJW" value="" />
1432-
<property role="bROok" value="-1124566203" />
1433+
<property role="bROok" value="-1800153838" />
1434+
<property role="0Rz4W" value="-899589398" />
1435+
<property role="1nQUAq" value="true" />
14331436
<ref role="rqKBe" node="2cYnQcMoGK8" resolve="Top" />
14341437
<node concept="rqCGG" id="5oRi7zaYQHN" role="rqCGo">
14351438
<node concept="rqKBd" id="5oRi7zaYQHO" role="rqKBa">

0 commit comments

Comments
 (0)