Skip to content

Commit 40ce14b

Browse files
wsafonovwsafonov
authored
Merge pull request #542 from IETS3/bugfix/transformIntoShortDeactivateForNested_20203
Fix transform explicit lambdas into short lambdas
2 parents 9eb67fb + 1a7b12d commit 40ce14b

File tree

3 files changed

+218
-76
lines changed

3 files changed

+218
-76
lines changed

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

Lines changed: 69 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
7171
<child id="1154032183016" name="body" index="2LFqv$" />
7272
</concept>
73+
<concept id="1177666668936" name="jetbrains.mps.baseLanguage.structure.DoWhileStatement" flags="nn" index="MpOyq">
74+
<child id="1177666688034" name="condition" index="MpTkK" />
75+
</concept>
7376
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
7477
<child id="1197027771414" name="operand" index="2Oq$k0" />
7578
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -110,6 +113,7 @@
110113
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
111114
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
112115
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
116+
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
113117
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
114118
<child id="5680397130376446158" name="type" index="1tU5fm" />
115119
</concept>
@@ -276,7 +280,7 @@
276280
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
277281
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
278282
</concept>
279-
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
283+
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
280284
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
281285
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
282286
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -1395,68 +1399,87 @@
13951399
</node>
13961400
</node>
13971401
</node>
1398-
<node concept="3clFbJ" id="7cphKbKZslh" role="3cqZAp">
1399-
<node concept="3clFbS" id="7cphKbKZslj" role="3clFbx">
1400-
<node concept="3clFbF" id="49WTic8eCyZ" role="3cqZAp">
1401-
<node concept="2OqwBi" id="49WTic8eCA1" role="3clFbG">
1402-
<node concept="37vLTw" id="49WTic8eCyY" role="2Oq$k0">
1403-
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1404-
</node>
1405-
<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>
1402+
<node concept="3cpWs8" id="2O0w_v2Ikd2" role="3cqZAp">
1403+
<node concept="3cpWsn" id="2O0w_v2Ikd5" role="3cpWs9">
1404+
<property role="TrG5h" value="currentNode" />
1405+
<node concept="3Tqbb2" id="2O0w_v2Ikd0" role="1tU5fm" />
1406+
<node concept="37vLTw" id="7C7MSq_8OcI" role="33vP2m">
1407+
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1408+
</node>
1409+
</node>
1410+
</node>
1411+
<node concept="MpOyq" id="2O0w_v2InZD" role="3cqZAp">
1412+
<node concept="3clFbS" id="2O0w_v2InZF" role="2LFqv$">
1413+
<node concept="3clFbF" id="2O0w_v2IpWK" role="3cqZAp">
1414+
<node concept="37vLTI" id="2O0w_v2Iq80" role="3clFbG">
1415+
<node concept="2OqwBi" id="2O0w_v2IqnD" role="37vLTx">
1416+
<node concept="37vLTw" id="7C7MSq_8OqX" role="2Oq$k0">
1417+
<ref role="3cqZAo" node="2O0w_v2Ikd5" resolve="currentNode" />
14181418
</node>
1419+
<node concept="1mfA1w" id="2O0w_v2Ir4a" role="2OqNvi" />
1420+
</node>
1421+
<node concept="37vLTw" id="2O0w_v2IpWJ" role="37vLTJ">
1422+
<ref role="3cqZAo" node="2O0w_v2Ikd5" resolve="currentNode" />
14191423
</node>
14201424
</node>
14211425
</node>
1422-
</node>
1423-
<node concept="1Wc70l" id="7cphKbKZQYW" role="3clFbw">
1424-
<node concept="2OqwBi" id="7cphKbKZSbM" role="3uHU7w">
1425-
<node concept="2OqwBi" id="7cphKbKZRrI" role="2Oq$k0">
1426-
<node concept="37vLTw" id="7cphKbKZR93" role="2Oq$k0">
1427-
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1426+
<node concept="3clFbJ" id="2O0w_v2IrGw" role="3cqZAp">
1427+
<node concept="3clFbS" id="2O0w_v2IrGy" role="3clFbx">
1428+
<node concept="3cpWs6" id="2O0w_v2Itvr" role="3cqZAp" />
1429+
</node>
1430+
<node concept="2OqwBi" id="2O0w_v2IsdM" role="3clFbw">
1431+
<node concept="37vLTw" id="2O0w_v2Is2F" role="2Oq$k0">
1432+
<ref role="3cqZAo" node="2O0w_v2Ikd5" resolve="currentNode" />
14281433
</node>
1429-
<node concept="2Xjw5R" id="7cphKbKZRGP" role="2OqNvi">
1430-
<node concept="1xMEDy" id="7cphKbKZRGR" role="1xVPHs">
1431-
<node concept="chp4Y" id="7cphKbKZRRm" role="ri$Ld">
1432-
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
1433-
</node>
1434+
<node concept="1mIQ4w" id="2O0w_v2IsKe" role="2OqNvi">
1435+
<node concept="chp4Y" id="2O0w_v2It1d" role="cj9EA">
1436+
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
14341437
</node>
14351438
</node>
14361439
</node>
1437-
<node concept="3w_OXm" id="7cphKbKZT6H" role="2OqNvi" />
14381440
</node>
1439-
<node concept="3clFbC" id="7cphKbKZDbs" role="3uHU7B">
1440-
<node concept="2OqwBi" id="7cphKbKZyNA" role="3uHU7B">
1441-
<node concept="2OqwBi" id="7cphKbKZsxf" role="2Oq$k0">
1442-
<node concept="37vLTw" id="7cphKbKZslz" role="2Oq$k0">
1443-
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1444-
</node>
1445-
<node concept="z$bX8" id="7cphKbKZt4m" role="2OqNvi">
1446-
<node concept="1xMEDy" id="7cphKbKZvOA" role="1xVPHs">
1447-
<node concept="chp4Y" id="7cphKbKZvRC" role="ri$Ld">
1448-
<ref role="cht4Q" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
1441+
<node concept="3clFbJ" id="2O0w_v2Iu2Q" role="3cqZAp">
1442+
<node concept="3clFbS" id="2O0w_v2Iu2S" role="3clFbx">
1443+
<node concept="3clFbF" id="49WTic8eCyZ" role="3cqZAp">
1444+
<node concept="2OqwBi" id="49WTic8eCA1" role="3clFbG">
1445+
<node concept="37vLTw" id="49WTic8eCyY" role="2Oq$k0">
1446+
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1447+
</node>
1448+
<node concept="1P9Npp" id="49WTic8eCFh" role="2OqNvi">
1449+
<node concept="2pJPEk" id="49WTic8eCHY" role="1P9ThW">
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>
14491461
</node>
14501462
</node>
14511463
</node>
14521464
</node>
1453-
<node concept="1uHKPH" id="7cphKbKZATZ" role="2OqNvi" />
1465+
<node concept="3cpWs6" id="2O0w_v2IxAL" role="3cqZAp" />
14541466
</node>
1455-
<node concept="37vLTw" id="7cphKbKZDbJ" role="3uHU7w">
1456-
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
1467+
<node concept="17R0WA" id="2O0w_v2IvUw" role="3clFbw">
1468+
<node concept="37vLTw" id="2O0w_v2Iwp0" role="3uHU7w">
1469+
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
1470+
</node>
1471+
<node concept="37vLTw" id="2O0w_v2Iurt" role="3uHU7B">
1472+
<ref role="3cqZAo" node="2O0w_v2Ikd5" resolve="currentNode" />
1473+
</node>
14571474
</node>
14581475
</node>
14591476
</node>
1477+
<node concept="2OqwBi" id="2O0w_v2Ioul" role="MpTkK">
1478+
<node concept="37vLTw" id="2O0w_v2Iojr" role="2Oq$k0">
1479+
<ref role="3cqZAo" node="2O0w_v2Ikd5" resolve="currentNode" />
1480+
</node>
1481+
<node concept="3x8VRR" id="2O0w_v2IoX_" role="2OqNvi" />
1482+
</node>
14601483
</node>
14611484
</node>
14621485
<node concept="Rh6nW" id="49WTic8eCwS" role="1bW2Oz">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,8 @@
622622
<node concept="pncrf" id="6vzDuv93rXy" role="2Oq$k0" />
623623
<node concept="2Xjw5R" id="6vzDuv93so5" role="2OqNvi">
624624
<node concept="1xMEDy" id="6vzDuv93so7" role="1xVPHs">
625-
<node concept="chp4Y" id="6vzDuv93sve" role="ri$Ld">
626-
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
625+
<node concept="chp4Y" id="7C7MSq_b4wb" role="ri$Ld">
626+
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
627627
</node>
628628
</node>
629629
</node>

0 commit comments

Comments
 (0)