Skip to content

Commit 0e82240

Browse files
github-actions[bot]github-actions[bot]
authored
Merge maintenance/mps20241 into merge/mps20241
2 parents c439af7 + 10b99bd commit 0e82240

File tree

10 files changed

+2313
-69
lines changed

10 files changed

+2313
-69
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1111
### Fixed
1212

1313
- Expressions of ShortLambdas are now correctly updated and used for interpretation after they are changed
14+
- API for coverage calculation and restored original functionality. Coverage is now calculated during interpreter execution
15+
- Duplicated colors for PARTIAL and IGNORED
16+
17+
### Added
18+
- CI tests for InterpreterCoverageAssQuery which make use use the calculated coverage data
1419

1520
## June 2025
1621

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26553,27 +26553,27 @@
2655326553
<node concept="1pGfFk" id="7LZDtvhKJOU" role="2ShVmc">
2655426554
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
2655526555
<node concept="3cmrfG" id="7LZDtvhKJOV" role="37wK5m">
26556-
<property role="3cmrfH" value="237" />
26556+
<property role="3cmrfH" value="244" />
2655726557
</node>
2655826558
<node concept="3cmrfG" id="7LZDtvhKJOW" role="37wK5m">
26559-
<property role="3cmrfH" value="134" />
26559+
<property role="3cmrfH" value="244" />
2656026560
</node>
2656126561
<node concept="3cmrfG" id="7LZDtvhKJOX" role="37wK5m">
26562-
<property role="3cmrfH" value="0" />
26562+
<property role="3cmrfH" value="244" />
2656326563
</node>
2656426564
</node>
2656526565
</node>
2656626566
<node concept="2ShNRf" id="7LZDtvhKJOY" role="37wK5m">
2656726567
<node concept="1pGfFk" id="7LZDtvhKJOZ" role="2ShVmc">
2656826568
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
2656926569
<node concept="3cmrfG" id="7LZDtvhKJP0" role="37wK5m">
26570-
<property role="3cmrfH" value="237" />
26570+
<property role="3cmrfH" value="244" />
2657126571
</node>
2657226572
<node concept="3cmrfG" id="7LZDtvhKJP1" role="37wK5m">
26573-
<property role="3cmrfH" value="134" />
26573+
<property role="3cmrfH" value="244" />
2657426574
</node>
2657526575
<node concept="3cmrfG" id="7LZDtvhKJP2" role="37wK5m">
26576-
<property role="3cmrfH" value="0" />
26576+
<property role="3cmrfH" value="244" />
2657726577
</node>
2657826578
</node>
2657926579
</node>
@@ -26676,14 +26676,14 @@
2667626676
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
2667726677
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
2667826678
<node concept="Xl_RD" id="7LZDtvhKJP_" role="37wK5m">
26679-
<property role="Xl_RC" value="#E4FFDB" />
26679+
<property role="Xl_RC" value="#F4F4F4" />
2668026680
</node>
2668126681
</node>
2668226682
<node concept="2YIFZM" id="7LZDtvhKJPA" role="37wK5m">
2668326683
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
2668426684
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
2668526685
<node concept="Xl_RD" id="7LZDtvhKJPB" role="37wK5m">
26686-
<property role="Xl_RC" value="#E4FFDB" />
26686+
<property role="Xl_RC" value="#F4F4F4" />
2668726687
</node>
2668826688
</node>
2668926689
</node>

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

Lines changed: 90 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3975,10 +3975,19 @@
39753975
</node>
39763976
<node concept="3clFbF" id="5af9jCuTGIN" role="3cqZAp">
39773977
<node concept="2OqwBi" id="5af9jCuTHfg" role="3clFbG">
3978-
<node concept="2ShNRf" id="5af9jCuTGIJ" role="2Oq$k0">
3979-
<node concept="HV5vD" id="5af9jCuTHaF" role="2ShVmc">
3980-
<property role="373rjd" value="true" />
3981-
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
3978+
<node concept="2OqwBi" id="RnCcjkcqZZ" role="2Oq$k0">
3979+
<node concept="2ShNRf" id="5af9jCuTGIJ" role="2Oq$k0">
3980+
<node concept="HV5vD" id="5af9jCuTHaF" role="2ShVmc">
3981+
<property role="373rjd" value="true" />
3982+
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
3983+
</node>
3984+
</node>
3985+
<node concept="liA8E" id="RnCcjkcrj8" role="2OqNvi">
3986+
<ref role="37wK5l" to="pbu6:2nydsCfw1oG" resolve="withCoverAnalyzer" />
3987+
<node concept="2YIFZM" id="RnCcjkcrj9" role="37wK5m">
3988+
<ref role="37wK5l" to="pbu6:7LZDtvhWVCM" resolve="newInstance" />
3989+
<ref role="1Pybhc" to="pbu6:7LZDtvhy76p" resolve="IDefaultCoverageAnalyzer" />
3990+
</node>
39823991
</node>
39833992
</node>
39843993
<node concept="liA8E" id="5af9jCuTHpJ" role="2OqNvi">
@@ -4287,16 +4296,25 @@
42874296
<node concept="3clFbS" id="4KZjPKUdF$2" role="3clFbx">
42884297
<node concept="3clFbF" id="5af9jCuTJT3" role="3cqZAp">
42894298
<node concept="2OqwBi" id="5af9jCuTLaw" role="3clFbG">
4290-
<node concept="2OqwBi" id="5af9jCuTMzC" role="2Oq$k0">
4291-
<node concept="2ShNRf" id="5af9jCuTJSZ" role="2Oq$k0">
4292-
<node concept="HV5vD" id="5af9jCuTKGX" role="2ShVmc">
4293-
<property role="373rjd" value="true" />
4294-
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
4299+
<node concept="2OqwBi" id="RnCcjkoFd9" role="2Oq$k0">
4300+
<node concept="2OqwBi" id="5af9jCuTMzC" role="2Oq$k0">
4301+
<node concept="liA8E" id="5af9jCuTN0B" role="2OqNvi">
4302+
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
4303+
<node concept="3clFbT" id="5af9jCuTN0E" role="37wK5m" />
4304+
</node>
4305+
<node concept="2ShNRf" id="5af9jCuTJSZ" role="2Oq$k0">
4306+
<node concept="HV5vD" id="5af9jCuTKGX" role="2ShVmc">
4307+
<property role="373rjd" value="true" />
4308+
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
4309+
</node>
42954310
</node>
42964311
</node>
4297-
<node concept="liA8E" id="5af9jCuTN0B" role="2OqNvi">
4298-
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
4299-
<node concept="3clFbT" id="5af9jCuTN0E" role="37wK5m" />
4312+
<node concept="liA8E" id="RnCcjkoGxr" role="2OqNvi">
4313+
<ref role="37wK5l" to="pbu6:2nydsCfw1oG" resolve="withCoverAnalyzer" />
4314+
<node concept="2YIFZM" id="RnCcjkoGxs" role="37wK5m">
4315+
<ref role="37wK5l" to="pbu6:7LZDtvhWVCM" resolve="newInstance" />
4316+
<ref role="1Pybhc" to="pbu6:7LZDtvhy76p" resolve="IDefaultCoverageAnalyzer" />
4317+
</node>
43004318
</node>
43014319
</node>
43024320
<node concept="liA8E" id="5af9jCuTLD4" role="2OqNvi">
@@ -5967,27 +5985,6 @@
59675985
</node>
59685986
</node>
59695987
<node concept="3clFbH" id="18$bUx5bjkt" role="3cqZAp" />
5970-
<node concept="3clFbF" id="7sHl0myf4J0" role="3cqZAp">
5971-
<node concept="2OqwBi" id="7sHl0myf4Jm" role="3clFbG">
5972-
<node concept="37vLTw" id="2AZbPfMaNf1" role="2Oq$k0">
5973-
<ref role="3cqZAo" node="7sHl0myf4IT" resolve="summaries" />
5974-
</node>
5975-
<node concept="TSZUe" id="7sHl0myf4Js" role="2OqNvi">
5976-
<node concept="BsUDl" id="18$bUx5m9UE" role="25WWJ7">
5977-
<ref role="37wK5l" to="hwgx:7sHl0myfjm0" resolve="createDefaultSummary" />
5978-
<node concept="1PxgMI" id="18$bUx5mbyt" role="37wK5m">
5979-
<node concept="2OqwBi" id="18$bUx5maN8" role="1m5AlR">
5980-
<node concept="13iPFW" id="18$bUx5mayu" role="2Oq$k0" />
5981-
<node concept="1mfA1w" id="18$bUx5mbbG" role="2OqNvi" />
5982-
</node>
5983-
<node concept="chp4Y" id="6b_jefnKzbB" role="3oSUPX">
5984-
<ref role="cht4Q" to="vs0r:K292flwCEW" resolve="Assessment" />
5985-
</node>
5986-
</node>
5987-
</node>
5988-
</node>
5989-
</node>
5990-
</node>
59915988
<node concept="3clFbH" id="RaqQlV9BM7" role="3cqZAp" />
59925989
<node concept="3cpWs8" id="RaqQlV9NYh" role="3cqZAp">
59935990
<node concept="3cpWsn" id="RaqQlV9NYi" role="3cpWs9">
@@ -6134,6 +6131,28 @@
61346131
</node>
61356132
</node>
61366133
</node>
6134+
<node concept="3clFbH" id="3GrH812f3i2" role="3cqZAp" />
6135+
<node concept="3clFbF" id="7sHl0myf4J0" role="3cqZAp">
6136+
<node concept="2OqwBi" id="7sHl0myf4Jm" role="3clFbG">
6137+
<node concept="37vLTw" id="2AZbPfMaNf1" role="2Oq$k0">
6138+
<ref role="3cqZAo" node="7sHl0myf4IT" resolve="summaries" />
6139+
</node>
6140+
<node concept="TSZUe" id="7sHl0myf4Js" role="2OqNvi">
6141+
<node concept="BsUDl" id="18$bUx5m9UE" role="25WWJ7">
6142+
<ref role="37wK5l" to="hwgx:7sHl0myfjm0" resolve="createDefaultSummary" />
6143+
<node concept="1PxgMI" id="18$bUx5mbyt" role="37wK5m">
6144+
<node concept="2OqwBi" id="18$bUx5maN8" role="1m5AlR">
6145+
<node concept="13iPFW" id="18$bUx5mayu" role="2Oq$k0" />
6146+
<node concept="1mfA1w" id="18$bUx5mbbG" role="2OqNvi" />
6147+
</node>
6148+
<node concept="chp4Y" id="6b_jefnKzbB" role="3oSUPX">
6149+
<ref role="cht4Q" to="vs0r:K292flwCEW" resolve="Assessment" />
6150+
</node>
6151+
</node>
6152+
</node>
6153+
</node>
6154+
</node>
6155+
</node>
61376156
<node concept="3clFbF" id="RaqQlV9On0" role="3cqZAp">
61386157
<node concept="2OqwBi" id="RaqQlV9Pyg" role="3clFbG">
61396158
<node concept="37vLTw" id="RaqQlV9OmY" role="2Oq$k0">
@@ -10522,16 +10541,25 @@
1052210541
<ref role="3cqZAo" node="4945UtSiwdl" resolve="actualVal" />
1052310542
</node>
1052410543
<node concept="2OqwBi" id="5af9jCuTXkX" role="37vLTx">
10525-
<node concept="2OqwBi" id="5af9jCuTVYl" role="2Oq$k0">
10526-
<node concept="2ShNRf" id="5af9jCuTUiF" role="2Oq$k0">
10527-
<node concept="HV5vD" id="5af9jCuTVkD" role="2ShVmc">
10528-
<property role="373rjd" value="true" />
10529-
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
10544+
<node concept="2OqwBi" id="RnCcjkcAEU" role="2Oq$k0">
10545+
<node concept="2OqwBi" id="5af9jCuTVYl" role="2Oq$k0">
10546+
<node concept="2ShNRf" id="5af9jCuTUiF" role="2Oq$k0">
10547+
<node concept="HV5vD" id="5af9jCuTVkD" role="2ShVmc">
10548+
<property role="373rjd" value="true" />
10549+
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
10550+
</node>
10551+
</node>
10552+
<node concept="liA8E" id="5af9jCuTWEk" role="2OqNvi">
10553+
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
10554+
<node concept="3clFbT" id="5af9jCuTWEn" role="37wK5m" />
1053010555
</node>
1053110556
</node>
10532-
<node concept="liA8E" id="5af9jCuTWEk" role="2OqNvi">
10533-
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
10534-
<node concept="3clFbT" id="5af9jCuTWEn" role="37wK5m" />
10557+
<node concept="liA8E" id="RnCcjkcFdI" role="2OqNvi">
10558+
<ref role="37wK5l" to="pbu6:2nydsCfw1oG" resolve="withCoverAnalyzer" />
10559+
<node concept="2YIFZM" id="RnCcjkcMM0" role="37wK5m">
10560+
<ref role="37wK5l" to="pbu6:7LZDtvhWVCM" resolve="newInstance" />
10561+
<ref role="1Pybhc" to="pbu6:7LZDtvhy76p" resolve="IDefaultCoverageAnalyzer" />
10562+
</node>
1053510563
</node>
1053610564
</node>
1053710565
<node concept="liA8E" id="5af9jCuTY0S" role="2OqNvi">
@@ -15694,5 +15722,26 @@
1569415722
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
1569515723
</node>
1569615724
</node>
15725+
<node concept="13h7C7" id="3GrH810ODtI">
15726+
<property role="3GE5qa" value="assessment.interpreter" />
15727+
<ref role="13h7C2" to="av4b:18$bUx5b55w" resolve="InterpreterCoverageAssSummary" />
15728+
<node concept="13hLZK" id="3GrH810ODtJ" role="13h7CW">
15729+
<node concept="3clFbS" id="3GrH810ODtK" role="2VODD2">
15730+
<node concept="3clFbF" id="3GrH811yan3" role="3cqZAp">
15731+
<node concept="37vLTI" id="3GrH811ycRf" role="3clFbG">
15732+
<node concept="3cmrfG" id="3GrH811ycRx" role="37vLTx">
15733+
<property role="3cmrfH" value="75" />
15734+
</node>
15735+
<node concept="2OqwBi" id="3GrH811yan5" role="37vLTJ">
15736+
<node concept="13iPFW" id="3GrH811yan6" role="2Oq$k0" />
15737+
<node concept="3TrcHB" id="3GrH811yan7" role="2OqNvi">
15738+
<ref role="3TsBF5" to="av4b:3GrH80ZVmzh" resolve="coverageThreshold" />
15739+
</node>
15740+
</node>
15741+
</node>
15742+
</node>
15743+
</node>
15744+
</node>
15745+
</node>
1569715746
</model>
1569815747

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2255,14 +2255,24 @@
22552255
<node concept="3EZMnI" id="18$bUx5b5aH" role="2wV5jI">
22562256
<node concept="l2Vlx" id="18$bUx5b5aI" role="2iSdaV" />
22572257
<node concept="3F0ifn" id="18$bUx5b5aD" role="3EZMnx">
2258-
<property role="3F0ifm" value="coverage" />
2258+
<property role="3F0ifm" value="ratio" />
22592259
</node>
22602260
<node concept="3F0A7n" id="18$bUx5b5aW" role="3EZMnx">
22612261
<ref role="1NtTu8" to="av4b:18$bUx5b57P" resolve="coverageRatio" />
22622262
</node>
22632263
<node concept="3F0ifn" id="18$bUx5b5b9" role="3EZMnx">
22642264
<property role="3F0ifm" value="%" />
22652265
</node>
2266+
<node concept="3F0ifn" id="3GrH8102FQr" role="3EZMnx" />
2267+
<node concept="3F0ifn" id="3GrH80ZVnsZ" role="3EZMnx">
2268+
<property role="3F0ifm" value="threshold" />
2269+
</node>
2270+
<node concept="3F0A7n" id="3GrH80ZVnwS" role="3EZMnx">
2271+
<ref role="1NtTu8" to="av4b:3GrH80ZVmzh" resolve="coverageThreshold" />
2272+
</node>
2273+
<node concept="3F0ifn" id="3GrH812ZHzP" role="3EZMnx">
2274+
<property role="3F0ifm" value="%" />
2275+
</node>
22662276
</node>
22672277
</node>
22682278
<node concept="24kQdi" id="4XlPKep95D3">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/structure.mps‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,11 @@
427427
<property role="TrG5h" value="coverageRatio" />
428428
<ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
429429
</node>
430+
<node concept="1TJgyi" id="3GrH80ZVmzh" role="1TKVEl">
431+
<property role="IQ2nx" value="4259196335530272977" />
432+
<property role="TrG5h" value="coverageThreshold" />
433+
<ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
434+
</node>
430435
</node>
431436
<node concept="1TIwiD" id="4XlPKep95_T">
432437
<property role="EcuMT" value="5716711712470882681" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,15 +1193,6 @@
11931193
<node concept="m$_yC" id="4G1C74S34LO" role="m$_yJ">
11941194
<ref role="m$_y1" node="5wLtKNeSRRD" resolve="org.iets3.core.os" />
11951195
</node>
1196-
<node concept="m$_yC" id="7yHH$DDpO3f" role="m$_yJ">
1197-
<ref role="m$_y1" to="al5i:3Ol24ijlxoL" resolve="com.mbeddr.mpsutil.editor.displayControl" />
1198-
</node>
1199-
<node concept="m$_yC" id="7yHH$DDpOeo" role="m$_yJ">
1200-
<ref role="m$_y1" to="al5i:3lcj7hzsuXf" resolve="com.mbeddr.mpsutil.logicalChild" />
1201-
</node>
1202-
<node concept="m$_yC" id="7yHH$DDpOn9" role="m$_yJ">
1203-
<ref role="m$_y1" node="7yHH$DDoBdm" resolve="org.iets3.contextfilter" />
1204-
</node>
12051196
<node concept="3_J27D" id="7B3y$vlfXKD" role="m$_yQ">
12061197
<node concept="3Mxwew" id="7B3y$vlfXKE" role="3MwsjC">
12071198
<property role="3MwjfP" value="org.iets3.variability.os" />
@@ -1223,6 +1214,15 @@
12231214
<node concept="m$f5U" id="7yHH$DDpJeL" role="m$_yh">
12241215
<ref role="m$f5T" node="7yHH$DDowpI" resolve="org.iets3.variability.base.devkit" />
12251216
</node>
1217+
<node concept="m$_yC" id="7yHH$DDpO3f" role="m$_yJ">
1218+
<ref role="m$_y1" to="al5i:3Ol24ijlxoL" resolve="com.mbeddr.mpsutil.editor.displayControl" />
1219+
</node>
1220+
<node concept="m$_yC" id="7yHH$DDpOeo" role="m$_yJ">
1221+
<ref role="m$_y1" to="al5i:3lcj7hzsuXf" resolve="com.mbeddr.mpsutil.logicalChild" />
1222+
</node>
1223+
<node concept="m$_yC" id="7yHH$DDpOn9" role="m$_yJ">
1224+
<ref role="m$_y1" node="7yHH$DDoBdm" resolve="org.iets3.contextfilter" />
1225+
</node>
12261226
</node>
12271227
<node concept="2G$12M" id="7B3y$vlfXUD" role="3989C9">
12281228
<property role="TrG5h" value="org.iets3.variability.os" />
@@ -16773,6 +16773,31 @@
1677316773
<ref role="3bR37D" node="4C_RnzfEE1P" resolve="org.iets3.core.expr.base.runtime" />
1677416774
</node>
1677516775
</node>
16776+
<node concept="1SiIV0" id="3GrH80Zd3XV" role="3bR37C">
16777+
<node concept="3bR9La" id="3GrH80Zd3XW" role="1SiIV1">
16778+
<ref role="3bR37D" node="ub9nkyRnyj" resolve="org.iets3.core.expr.tests" />
16779+
</node>
16780+
</node>
16781+
<node concept="1SiIV0" id="3GrH80Zd3XX" role="3bR37C">
16782+
<node concept="3bR9La" id="3GrH80Zd3XY" role="1SiIV1">
16783+
<ref role="3bR37D" node="5a_u3OzLedQ" resolve="org.iets3.core.expr.adt" />
16784+
</node>
16785+
</node>
16786+
<node concept="1SiIV0" id="3GrH80ZB_ri" role="3bR37C">
16787+
<node concept="3bR9La" id="3GrH80ZB_rj" role="1SiIV1">
16788+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
16789+
</node>
16790+
</node>
16791+
<node concept="1SiIV0" id="3GrH80ZB_rk" role="3bR37C">
16792+
<node concept="3bR9La" id="3GrH80ZB_rl" role="1SiIV1">
16793+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
16794+
</node>
16795+
</node>
16796+
<node concept="1SiIV0" id="3GrH80ZB_rm" role="3bR37C">
16797+
<node concept="3bR9La" id="3GrH80ZB_rn" role="1SiIV1">
16798+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
16799+
</node>
16800+
</node>
1677616801
</node>
1677716802
<node concept="1E1JtA" id="7YuIrXB5Sn0" role="3989C9">
1677816803
<property role="BnDLt" value="true" />

0 commit comments

Comments
 (0)