Skip to content

Commit d2fee47

Browse files
author
Alexander Pann
committed
Coverage: fix ShortLambdaExpression and LambdaExpression
1 parent 6c09a71 commit d2fee47

File tree

3 files changed

+351
-101
lines changed
  • code/languages/org.iets3.opensource

3 files changed

+351
-101
lines changed

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

Lines changed: 111 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
3232
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
3333
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
34+
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
3435
</imports>
3536
<registry>
3637
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -294,7 +295,9 @@
294295
<concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
295296
<child id="1140131861877" name="replacementNode" index="1P9ThW" />
296297
</concept>
297-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
298+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
299+
<property id="1238684351431" name="asCast" index="1BlNFB" />
300+
</concept>
298301
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
299302
<reference id="1138405853777" name="concept" index="ehGHo" />
300303
</concept>
@@ -384,12 +387,24 @@
384387
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
385388
<concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
386389
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
390+
<concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
391+
<child id="1197683466920" name="keyType" index="3rvQeY" />
392+
<child id="1197683475734" name="valueType" index="3rvSg0" />
393+
</concept>
394+
<concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
395+
<child id="1197687026896" name="keyType" index="3rHrn6" />
396+
<child id="1197687035757" name="valueType" index="3rHtpV" />
397+
</concept>
387398
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
388399
<concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
389400
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
390401
<concept id="1225730411176" name="jetbrains.mps.baseLanguage.collections.structure.FindLastOperation" flags="nn" index="1zesIP" />
391402
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
392403
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
404+
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
405+
<child id="1197932505799" name="map" index="3ElQJh" />
406+
<child id="1197932525128" name="key" index="3ElVtu" />
407+
</concept>
393408
<concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
394409
<concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
395410
</language>
@@ -1153,6 +1168,21 @@
11531168
</node>
11541169
<node concept="3Tm1VV" id="$yb$20fCkx" role="1B3o_S" />
11551170
<node concept="3clFbS" id="$yb$20fCky" role="3clF47">
1171+
<node concept="3cpWs8" id="dsAFRk6ftn" role="3cqZAp">
1172+
<node concept="3cpWsn" id="dsAFRk6ftq" role="3cpWs9">
1173+
<property role="TrG5h" value="mapping" />
1174+
<node concept="3rvAFt" id="dsAFRk0Ggb" role="1tU5fm">
1175+
<node concept="3Tqbb2" id="dsAFRk0GwE" role="3rvQeY" />
1176+
<node concept="3Tqbb2" id="dsAFRk0GAX" role="3rvSg0" />
1177+
</node>
1178+
<node concept="2ShNRf" id="dsAFRk6jX7" role="33vP2m">
1179+
<node concept="3rGOSV" id="dsAFRk6lVM" role="2ShVmc">
1180+
<node concept="3Tqbb2" id="dsAFRk6mgu" role="3rHrn6" />
1181+
<node concept="3Tqbb2" id="dsAFRk6mmd" role="3rHtpV" />
1182+
</node>
1183+
</node>
1184+
</node>
1185+
</node>
11561186
<node concept="3cpWs8" id="49WTic8ey5C" role="3cqZAp">
11571187
<node concept="3cpWsn" id="49WTic8ey5D" role="3cpWs9">
11581188
<property role="TrG5h" value="le" />
@@ -1168,22 +1198,35 @@
11681198
</node>
11691199
</node>
11701200
</node>
1171-
<node concept="3clFbF" id="49WTic8eygX" role="3cqZAp">
1172-
<node concept="37vLTI" id="49WTic8eytP" role="3clFbG">
1173-
<node concept="2OqwBi" id="49WTic8eyDZ" role="37vLTx">
1174-
<node concept="2OqwBi" id="49WTic8eywd" role="2Oq$k0">
1175-
<node concept="13iPFW" id="$yb$20fC$K" role="2Oq$k0" />
1176-
<node concept="3TrEf2" id="49WTic8ey_4" role="2OqNvi">
1177-
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
1201+
<node concept="3clFbF" id="dsAFRk6g3s" role="3cqZAp">
1202+
<node concept="37vLTI" id="dsAFRk6hBt" role="3clFbG">
1203+
<node concept="1PxgMI" id="dsAFRk6jEb" role="37vLTx">
1204+
<property role="1BlNFB" value="true" />
1205+
<node concept="chp4Y" id="dsAFRk6jO6" role="3oSUPX">
1206+
<ref role="cht4Q" to="hm2y:6sdnDbSla17" resolve="Expression" />
1207+
</node>
1208+
<node concept="2YIFZM" id="dsAFRk6i15" role="1m5AlR">
1209+
<ref role="1Pybhc" to="w1kc:~CopyUtil" resolve="CopyUtil" />
1210+
<ref role="37wK5l" to="w1kc:~CopyUtil.copy(org.jetbrains.mps.openapi.model.SNode,java.util.Map,boolean)" resolve="copy" />
1211+
<node concept="2OqwBi" id="dsAFRk6irn" role="37wK5m">
1212+
<node concept="13iPFW" id="dsAFRk9tUQ" role="2Oq$k0" />
1213+
<node concept="3TrEf2" id="dsAFRk9uoc" role="2OqNvi">
1214+
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
1215+
</node>
1216+
</node>
1217+
<node concept="37vLTw" id="dsAFRk6j4h" role="37wK5m">
1218+
<ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
1219+
</node>
1220+
<node concept="3clFbT" id="dsAFRk6joF" role="37wK5m">
1221+
<property role="3clFbU" value="true" />
11781222
</node>
11791223
</node>
1180-
<node concept="1$rogu" id="49WTic8eyHc" role="2OqNvi" />
11811224
</node>
1182-
<node concept="2OqwBi" id="49WTic8eyjf" role="37vLTJ">
1183-
<node concept="37vLTw" id="49WTic8eygV" role="2Oq$k0">
1225+
<node concept="2OqwBi" id="dsAFRk6goe" role="37vLTJ">
1226+
<node concept="37vLTw" id="dsAFRk6g3q" role="2Oq$k0">
11841227
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
11851228
</node>
1186-
<node concept="3TrEf2" id="49WTic8eyo9" role="2OqNvi">
1229+
<node concept="3TrEf2" id="dsAFRk6gYQ" role="2OqNvi">
11871230
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
11881231
</node>
11891232
</node>
@@ -1397,24 +1440,50 @@
13971440
</node>
13981441
<node concept="3clFbJ" id="7cphKbKZslh" role="3cqZAp">
13991442
<node concept="3clFbS" id="7cphKbKZslj" role="3clFbx">
1443+
<node concept="3cpWs8" id="dsAFRkcKGy" role="3cqZAp">
1444+
<node concept="3cpWsn" id="dsAFRkcKG_" role="3cpWs9">
1445+
<property role="TrG5h" value="argRef" />
1446+
<node concept="3Tqbb2" id="dsAFRkcKGw" role="1tU5fm">
1447+
<ref role="ehGHo" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
1448+
</node>
1449+
<node concept="2pJPEk" id="49WTic8eCHY" role="33vP2m">
1450+
<node concept="2pJPED" id="49WTic8eCKF" role="2pJPEn">
1451+
<ref role="2pJxaS" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
1452+
<node concept="2pIpSj" id="49WTic8eCQh" role="2pJxcM">
1453+
<ref role="2pIpSl" to="zzzn:6zmBjqUkHam" resolve="arg" />
1454+
<node concept="36biLy" id="49WTic8eDst" role="28nt2d">
1455+
<node concept="37vLTw" id="49WTic8eDuU" role="36biLW">
1456+
<ref role="3cqZAo" node="49WTic8eCUf" resolve="arg" />
1457+
</node>
1458+
</node>
1459+
</node>
1460+
</node>
1461+
</node>
1462+
</node>
1463+
</node>
1464+
<node concept="3clFbF" id="dsAFRkcNEu" role="3cqZAp">
1465+
<node concept="37vLTI" id="dsAFRkcPtk" role="3clFbG">
1466+
<node concept="37vLTw" id="dsAFRkcPM0" role="37vLTx">
1467+
<ref role="3cqZAo" node="dsAFRkcKG_" resolve="argRef" />
1468+
</node>
1469+
<node concept="3EllGN" id="dsAFRkcOWL" role="37vLTJ">
1470+
<node concept="37vLTw" id="dsAFRkcPhO" role="3ElVtu">
1471+
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1472+
</node>
1473+
<node concept="37vLTw" id="dsAFRkcNEs" role="3ElQJh">
1474+
<ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
1475+
</node>
1476+
</node>
1477+
</node>
1478+
</node>
14001479
<node concept="3clFbF" id="49WTic8eCyZ" role="3cqZAp">
14011480
<node concept="2OqwBi" id="49WTic8eCA1" role="3clFbG">
14021481
<node concept="37vLTw" id="49WTic8eCyY" role="2Oq$k0">
14031482
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
14041483
</node>
14051484
<node concept="1P9Npp" id="49WTic8eCFh" role="2OqNvi">
1406-
<node concept="2pJPEk" id="49WTic8eCHY" role="1P9ThW">
1407-
<node concept="2pJPED" id="49WTic8eCKF" role="2pJPEn">
1408-
<ref role="2pJxaS" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
1409-
<node concept="2pIpSj" id="49WTic8eCQh" role="2pJxcM">
1410-
<ref role="2pIpSl" to="zzzn:6zmBjqUkHam" resolve="arg" />
1411-
<node concept="36biLy" id="49WTic8eDst" role="28nt2d">
1412-
<node concept="37vLTw" id="49WTic8eDuU" role="36biLW">
1413-
<ref role="3cqZAo" node="49WTic8eCUf" resolve="arg" />
1414-
</node>
1415-
</node>
1416-
</node>
1417-
</node>
1485+
<node concept="37vLTw" id="dsAFRkcN1G" role="1P9ThW">
1486+
<ref role="3cqZAo" node="dsAFRkcKG_" resolve="argRef" />
14181487
</node>
14191488
</node>
14201489
</node>
@@ -1467,6 +1536,24 @@
14671536
</node>
14681537
</node>
14691538
</node>
1539+
<node concept="3clFbF" id="dsAFRk4u6U" role="3cqZAp">
1540+
<node concept="2OqwBi" id="dsAFRk4vr$" role="3clFbG">
1541+
<node concept="2JrnkZ" id="dsAFRk4vdd" role="2Oq$k0">
1542+
<node concept="37vLTw" id="dsAFRk4u6S" role="2JrQYb">
1543+
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
1544+
</node>
1545+
</node>
1546+
<node concept="liA8E" id="dsAFRk4vCP" role="2OqNvi">
1547+
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
1548+
<node concept="Xl_RD" id="dsAFRk4vDs" role="37wK5m">
1549+
<property role="Xl_RC" value="shortLambdaMapping" />
1550+
</node>
1551+
<node concept="37vLTw" id="dsAFRk6mvt" role="37wK5m">
1552+
<ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
1553+
</node>
1554+
</node>
1555+
</node>
1556+
</node>
14701557
<node concept="3clFbF" id="$yb$20fCDo" role="3cqZAp">
14711558
<node concept="37vLTw" id="$yb$20fCDm" role="3clFbG">
14721559
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />

0 commit comments

Comments
 (0)