Skip to content

Commit 1a7b12d

Browse files
author
Alexander Pann
committed
Only restrict short lambda expressions that refer to the outer lambda expression argument
1 parent b6dee38 commit 1a7b12d

File tree

1 file changed

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

1 file changed

+74
-12
lines changed

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

Lines changed: 74 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,12 @@
173173
<child id="1204796294226" name="closure" index="23t8la" />
174174
</concept>
175175
<concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
176+
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
176177
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
177178
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
178179
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
179-
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
180180
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
181+
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
181182
</language>
182183
</registry>
183184
<node concept="2S6QgY" id="49WTic8ewUk">
@@ -387,23 +388,84 @@
387388
</node>
388389
</node>
389390
</node>
390-
<node concept="2OqwBi" id="1iunvDRYEnM" role="3uHU7w">
391-
<node concept="2OqwBi" id="1iunvDRY_qH" role="2Oq$k0">
392-
<node concept="2OqwBi" id="1iunvDRYznp" role="2Oq$k0">
393-
<node concept="2Sf5sV" id="1iunvDRYyX6" role="2Oq$k0" />
394-
<node concept="3TrEf2" id="1iunvDRY$$F" role="2OqNvi">
395-
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
391+
<node concept="3fqX7Q" id="4hUtPTIY8QE" role="3uHU7w">
392+
<node concept="2OqwBi" id="4hUtPTIY8QG" role="3fr31v">
393+
<node concept="2OqwBi" id="4hUtPTIY8QH" role="2Oq$k0">
394+
<node concept="2OqwBi" id="4hUtPTIY8QI" role="2Oq$k0">
395+
<node concept="2Sf5sV" id="4hUtPTIY8QJ" role="2Oq$k0" />
396+
<node concept="3TrEf2" id="4hUtPTIY8QK" role="2OqNvi">
397+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkwH3" resolve="expression" />
398+
</node>
399+
</node>
400+
<node concept="2Rf3mk" id="4hUtPTIY8QL" role="2OqNvi">
401+
<node concept="1xMEDy" id="4hUtPTIY8QM" role="1xVPHs">
402+
<node concept="chp4Y" id="4hUtPTIY8QN" role="ri$Ld">
403+
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
404+
</node>
405+
</node>
396406
</node>
397407
</node>
398-
<node concept="2Rf3mk" id="1iunvDRY_Rf" role="2OqNvi">
399-
<node concept="1xMEDy" id="1iunvDRY_Rh" role="1xVPHs">
400-
<node concept="chp4Y" id="1iunvDRYAw3" role="ri$Ld">
401-
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
408+
<node concept="2HwmR7" id="4hUtPTIY8QO" role="2OqNvi">
409+
<node concept="1bVj0M" id="4hUtPTIY8QP" role="23t8la">
410+
<node concept="3clFbS" id="4hUtPTIY8QQ" role="1bW5cS">
411+
<node concept="3clFbF" id="4hUtPTIY8QR" role="3cqZAp">
412+
<node concept="2OqwBi" id="4hUtPTIY8QS" role="3clFbG">
413+
<node concept="2OqwBi" id="4hUtPTIY8QT" role="2Oq$k0">
414+
<node concept="2OqwBi" id="4hUtPTIY8QU" role="2Oq$k0">
415+
<node concept="37vLTw" id="4hUtPTIY8QV" role="2Oq$k0">
416+
<ref role="3cqZAo" node="4hUtPTIY8Rf" resolve="shortLambda" />
417+
</node>
418+
<node concept="2Rf3mk" id="4hUtPTIY8QW" role="2OqNvi">
419+
<node concept="1xMEDy" id="4hUtPTIY8QX" role="1xVPHs">
420+
<node concept="chp4Y" id="4hUtPTIY8QY" role="ri$Ld">
421+
<ref role="cht4Q" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
422+
</node>
423+
</node>
424+
</node>
425+
</node>
426+
<node concept="3zZkjj" id="4hUtPTIY8QZ" role="2OqNvi">
427+
<node concept="1bVj0M" id="4hUtPTIY8R0" role="23t8la">
428+
<node concept="3clFbS" id="4hUtPTIY8R1" role="1bW5cS">
429+
<node concept="3clFbF" id="4hUtPTIY8R2" role="3cqZAp">
430+
<node concept="17R0WA" id="4hUtPTIY8R3" role="3clFbG">
431+
<node concept="2OqwBi" id="4hUtPTIY8R4" role="3uHU7w">
432+
<node concept="2OqwBi" id="4hUtPTIY8R5" role="2Oq$k0">
433+
<node concept="2Sf5sV" id="4hUtPTIY8R6" role="2Oq$k0" />
434+
<node concept="3Tsc0h" id="4hUtPTIY8R7" role="2OqNvi">
435+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
436+
</node>
437+
</node>
438+
<node concept="1uHKPH" id="4hUtPTIY8R8" role="2OqNvi" />
439+
</node>
440+
<node concept="2OqwBi" id="4hUtPTIY8R9" role="3uHU7B">
441+
<node concept="37vLTw" id="4hUtPTIY8Ra" role="2Oq$k0">
442+
<ref role="3cqZAo" node="4hUtPTIY8Rc" resolve="it" />
443+
</node>
444+
<node concept="3TrEf2" id="4hUtPTIY8Rb" role="2OqNvi">
445+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
446+
</node>
447+
</node>
448+
</node>
449+
</node>
450+
</node>
451+
<node concept="Rh6nW" id="4hUtPTIY8Rc" role="1bW2Oz">
452+
<property role="TrG5h" value="it" />
453+
<node concept="2jxLKc" id="4hUtPTIY8Rd" role="1tU5fm" />
454+
</node>
455+
</node>
456+
</node>
457+
</node>
458+
<node concept="3GX2aA" id="4hUtPTIY9W1" role="2OqNvi" />
459+
</node>
460+
</node>
461+
</node>
462+
<node concept="Rh6nW" id="4hUtPTIY8Rf" role="1bW2Oz">
463+
<property role="TrG5h" value="shortLambda" />
464+
<node concept="2jxLKc" id="4hUtPTIY8Rg" role="1tU5fm" />
402465
</node>
403466
</node>
404467
</node>
405468
</node>
406-
<node concept="1v1jN8" id="1iunvDRYHq3" role="2OqNvi" />
407469
</node>
408470
</node>
409471
</node>

0 commit comments

Comments
 (0)