Skip to content

Commit df31849

Browse files
author
Alexander Pann
committed
Fix transform explicit lambdas into short lambdas
1 parent ade8a2e commit df31849

File tree

1 file changed

+159
-27
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models

1 file changed

+159
-27
lines changed

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

Lines changed: 159 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
4444
</concept>
4545
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
46+
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
4647
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
4748
<child id="5680397130376446158" name="type" index="1tU5fm" />
4849
</concept>
@@ -172,8 +173,11 @@
172173
<child id="1204796294226" name="closure" index="23t8la" />
173174
</concept>
174175
<concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
176+
<concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
175177
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
176178
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
179+
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
180+
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
177181
</language>
178182
</registry>
179183
<node concept="2S6QgY" id="49WTic8ewUk">
@@ -264,19 +268,52 @@
264268
</node>
265269
<node concept="3clFbF" id="49WTic8eIvM" role="3cqZAp">
266270
<node concept="2OqwBi" id="49WTic8eMSy" role="3clFbG">
267-
<node concept="2OqwBi" id="49WTic8eIGg" role="2Oq$k0">
268-
<node concept="2OqwBi" id="49WTic8eIyr" role="2Oq$k0">
269-
<node concept="37vLTw" id="49WTic8eIvK" role="2Oq$k0">
270-
<ref role="3cqZAo" node="49WTic8eHNn" resolve="sle" />
271+
<node concept="2OqwBi" id="8xLOUtapU_" role="2Oq$k0">
272+
<node concept="2OqwBi" id="49WTic8eIGg" role="2Oq$k0">
273+
<node concept="2OqwBi" id="49WTic8eIyr" role="2Oq$k0">
274+
<node concept="3TrEf2" id="49WTic8eIBz" role="2OqNvi">
275+
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
276+
</node>
277+
<node concept="37vLTw" id="49WTic8eIvK" role="2Oq$k0">
278+
<ref role="3cqZAo" node="49WTic8eHNn" resolve="sle" />
279+
</node>
271280
</node>
272-
<node concept="3TrEf2" id="49WTic8eIBz" role="2OqNvi">
273-
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
281+
<node concept="2Rf3mk" id="49WTic8eMt6" role="2OqNvi">
282+
<node concept="1xMEDy" id="49WTic8eMt8" role="1xVPHs">
283+
<node concept="chp4Y" id="49WTic8eMvj" role="ri$Ld">
284+
<ref role="cht4Q" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
285+
</node>
286+
</node>
274287
</node>
275288
</node>
276-
<node concept="2Rf3mk" id="49WTic8eMt6" role="2OqNvi">
277-
<node concept="1xMEDy" id="49WTic8eMt8" role="1xVPHs">
278-
<node concept="chp4Y" id="49WTic8eMvj" role="ri$Ld">
279-
<ref role="cht4Q" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
289+
<node concept="3zZkjj" id="8xLOUtaswk" role="2OqNvi">
290+
<node concept="1bVj0M" id="8xLOUtaswm" role="23t8la">
291+
<node concept="3clFbS" id="8xLOUtaswn" role="1bW5cS">
292+
<node concept="3clFbF" id="8xLOUtasGo" role="3cqZAp">
293+
<node concept="17R0WA" id="8xLOUtaty7" role="3clFbG">
294+
<node concept="2OqwBi" id="8xLOUtaxSl" role="3uHU7w">
295+
<node concept="2OqwBi" id="8xLOUtau3_" role="2Oq$k0">
296+
<node concept="2Sf5sV" id="8xLOUtatGQ" role="2Oq$k0" />
297+
<node concept="3Tsc0h" id="8xLOUtauHN" role="2OqNvi">
298+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
299+
</node>
300+
</node>
301+
<node concept="1uHKPH" id="8xLOUta$y4" role="2OqNvi" />
302+
</node>
303+
<node concept="2OqwBi" id="8xLOUtasQp" role="3uHU7B">
304+
<node concept="37vLTw" id="8xLOUtasGn" role="2Oq$k0">
305+
<ref role="3cqZAo" node="8xLOUtaswo" resolve="it" />
306+
</node>
307+
<node concept="3TrEf2" id="8xLOUtat2K" role="2OqNvi">
308+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
309+
</node>
310+
</node>
311+
</node>
312+
</node>
313+
</node>
314+
<node concept="Rh6nW" id="8xLOUtaswo" role="1bW2Oz">
315+
<property role="TrG5h" value="it" />
316+
<node concept="2jxLKc" id="8xLOUtaswp" role="1tU5fm" />
280317
</node>
281318
</node>
282319
</node>
@@ -322,29 +359,124 @@
322359
<node concept="2SaL7w" id="49WTic8eHbs" role="2ZfVeh">
323360
<node concept="3clFbS" id="49WTic8eHbt" role="2VODD2">
324361
<node concept="3clFbF" id="49WTic8eHc_" role="3cqZAp">
325-
<node concept="1Wc70l" id="49WTic8eIOc" role="3clFbG">
326-
<node concept="3clFbC" id="49WTic8eMl9" role="3uHU7w">
327-
<node concept="3cmrfG" id="49WTic8eMn0" role="3uHU7w">
328-
<property role="3cmrfH" value="1" />
362+
<node concept="1Wc70l" id="8xLOUt08m5" role="3clFbG">
363+
<node concept="2OqwBi" id="8xLOUt0vDi" role="3uHU7w">
364+
<node concept="2OqwBi" id="8xLOUt0fWy" role="2Oq$k0">
365+
<node concept="2OqwBi" id="8xLOUt0b5x" role="2Oq$k0">
366+
<node concept="2OqwBi" id="8xLOUt09i1" role="2Oq$k0">
367+
<node concept="2Sf5sV" id="8xLOUt08V_" role="2Oq$k0" />
368+
<node concept="3TrEf2" id="8xLOUt09Sn" role="2OqNvi">
369+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
370+
</node>
371+
</node>
372+
<node concept="2Rf3mk" id="8xLOUt0bwb" role="2OqNvi">
373+
<node concept="1xMEDy" id="8xLOUt0bwd" role="1xVPHs">
374+
<node concept="chp4Y" id="8xLOUt0c0v" role="ri$Ld">
375+
<ref role="cht4Q" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
376+
</node>
377+
</node>
378+
</node>
379+
</node>
380+
<node concept="3zZkjj" id="8xLOUt0j5j" role="2OqNvi">
381+
<node concept="1bVj0M" id="8xLOUt0j5l" role="23t8la">
382+
<node concept="3clFbS" id="8xLOUt0j5m" role="1bW5cS">
383+
<node concept="3clFbF" id="8xLOUt0jnu" role="3cqZAp">
384+
<node concept="17R0WA" id="8xLOUt0lqz" role="3clFbG">
385+
<node concept="2OqwBi" id="8xLOUt0qZD" role="3uHU7w">
386+
<node concept="2OqwBi" id="8xLOUt0mEj" role="2Oq$k0">
387+
<node concept="2Sf5sV" id="8xLOUt0mdg" role="2Oq$k0" />
388+
<node concept="3Tsc0h" id="8xLOUt0no2" role="2OqNvi">
389+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
390+
</node>
391+
</node>
392+
<node concept="1uHKPH" id="8xLOUt0u3b" role="2OqNvi" />
393+
</node>
394+
<node concept="2OqwBi" id="8xLOUt0jLd" role="3uHU7B">
395+
<node concept="37vLTw" id="8xLOUt0jnt" role="2Oq$k0">
396+
<ref role="3cqZAo" node="8xLOUt0j5n" resolve="it" />
397+
</node>
398+
<node concept="3TrEf2" id="8xLOUt0kSb" role="2OqNvi">
399+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
400+
</node>
401+
</node>
402+
</node>
403+
</node>
404+
</node>
405+
<node concept="Rh6nW" id="8xLOUt0j5n" role="1bW2Oz">
406+
<property role="TrG5h" value="it" />
407+
<node concept="2jxLKc" id="8xLOUt0j5o" role="1tU5fm" />
408+
</node>
409+
</node>
410+
</node>
329411
</node>
330-
<node concept="2OqwBi" id="49WTic8eJO0" role="3uHU7B">
331-
<node concept="2OqwBi" id="49WTic8eIUe" role="2Oq$k0">
332-
<node concept="2Sf5sV" id="49WTic8eIQE" role="2Oq$k0" />
333-
<node concept="3Tsc0h" id="49WTic8eJ0Y" role="2OqNvi">
334-
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
412+
<node concept="2HxqBE" id="8xLOUt0w3K" role="2OqNvi">
413+
<node concept="1bVj0M" id="8xLOUt0w3M" role="23t8la">
414+
<node concept="3clFbS" id="8xLOUt0w3N" role="1bW5cS">
415+
<node concept="3clFbF" id="8xLOUt0wVB" role="3cqZAp">
416+
<node concept="17R0WA" id="8xLOUt8Odh" role="3clFbG">
417+
<node concept="2OqwBi" id="8xLOUt8Pfg" role="3uHU7w">
418+
<node concept="37vLTw" id="8xLOUt8P4A" role="2Oq$k0">
419+
<ref role="3cqZAo" node="8xLOUt0w3O" resolve="it" />
420+
</node>
421+
<node concept="2Xjw5R" id="8xLOUt8Qai" role="2OqNvi">
422+
<node concept="1xMEDy" id="8xLOUt8Qak" role="1xVPHs">
423+
<node concept="chp4Y" id="8xLOUt8Qs3" role="ri$Ld">
424+
<ref role="cht4Q" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
425+
</node>
426+
</node>
427+
</node>
428+
</node>
429+
<node concept="2OqwBi" id="8xLOUt0ziz" role="3uHU7B">
430+
<node concept="2OqwBi" id="8xLOUt0xl0" role="2Oq$k0">
431+
<node concept="37vLTw" id="8xLOUt0wVA" role="2Oq$k0">
432+
<ref role="3cqZAo" node="8xLOUt0w3O" resolve="it" />
433+
</node>
434+
<node concept="3TrEf2" id="8xLOUt0xTQ" role="2OqNvi">
435+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
436+
</node>
437+
</node>
438+
<node concept="2Xjw5R" id="8xLOUt8MJf" role="2OqNvi">
439+
<node concept="1xMEDy" id="8xLOUt8MJh" role="1xVPHs">
440+
<node concept="chp4Y" id="8xLOUt8NFL" role="ri$Ld">
441+
<ref role="cht4Q" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
442+
</node>
443+
</node>
444+
</node>
445+
</node>
446+
</node>
447+
</node>
448+
</node>
449+
<node concept="Rh6nW" id="8xLOUt0w3O" role="1bW2Oz">
450+
<property role="TrG5h" value="it" />
451+
<node concept="2jxLKc" id="8xLOUt0w3P" role="1tU5fm" />
335452
</node>
336453
</node>
337-
<node concept="34oBXx" id="49WTic8eL2b" role="2OqNvi" />
338454
</node>
339455
</node>
340-
<node concept="2OqwBi" id="49WTic8eHry" role="3uHU7B">
341-
<node concept="2OqwBi" id="49WTic8eHfC" role="2Oq$k0">
342-
<node concept="2Sf5sV" id="49WTic8eHc$" role="2Oq$k0" />
343-
<node concept="1mfA1w" id="49WTic8eHlo" role="2OqNvi" />
456+
<node concept="1Wc70l" id="49WTic8eIOc" role="3uHU7B">
457+
<node concept="2OqwBi" id="49WTic8eHry" role="3uHU7B">
458+
<node concept="2OqwBi" id="49WTic8eHfC" role="2Oq$k0">
459+
<node concept="2Sf5sV" id="49WTic8eHc$" role="2Oq$k0" />
460+
<node concept="1mfA1w" id="49WTic8eHlo" role="2OqNvi" />
461+
</node>
462+
<node concept="1mIQ4w" id="49WTic8eHCm" role="2OqNvi">
463+
<node concept="chp4Y" id="49WTic8eHEF" role="cj9EA">
464+
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
465+
</node>
466+
</node>
344467
</node>
345-
<node concept="1mIQ4w" id="49WTic8eHCm" role="2OqNvi">
346-
<node concept="chp4Y" id="49WTic8eHEF" role="cj9EA">
347-
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
468+
<node concept="3clFbC" id="49WTic8eMl9" role="3uHU7w">
469+
<node concept="2OqwBi" id="49WTic8eJO0" role="3uHU7B">
470+
<node concept="2OqwBi" id="49WTic8eIUe" role="2Oq$k0">
471+
<node concept="2Sf5sV" id="49WTic8eIQE" role="2Oq$k0" />
472+
<node concept="3Tsc0h" id="49WTic8eJ0Y" role="2OqNvi">
473+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
474+
</node>
475+
</node>
476+
<node concept="34oBXx" id="49WTic8eL2b" role="2OqNvi" />
477+
</node>
478+
<node concept="3cmrfG" id="49WTic8eMn0" role="3uHU7w">
479+
<property role="3cmrfH" value="1" />
348480
</node>
349481
</node>
350482
</node>

0 commit comments

Comments
 (0)