Skip to content

Commit 2baa4fa

Browse files
author
Alexander Pann
committed
Merge branch 'maintenance/mps20203' into bugfix/coverage_20203
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
2 parents 2f85d51 + 40ce14b commit 2baa4fa

File tree

3 files changed

+244
-52
lines changed

3 files changed

+244
-52
lines changed

‎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>

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

Lines changed: 147 additions & 28 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,12 @@
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="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
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" />
181+
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
177182
</language>
178183
</registry>
179184
<node concept="2S6QgY" id="49WTic8ewUk">
@@ -264,19 +269,52 @@
264269
</node>
265270
<node concept="3clFbF" id="49WTic8eIvM" role="3cqZAp">
266271
<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" />
272+
<node concept="2OqwBi" id="8xLOUtapU_" role="2Oq$k0">
273+
<node concept="2OqwBi" id="49WTic8eIGg" role="2Oq$k0">
274+
<node concept="2OqwBi" id="49WTic8eIyr" role="2Oq$k0">
275+
<node concept="3TrEf2" id="49WTic8eIBz" role="2OqNvi">
276+
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
277+
</node>
278+
<node concept="37vLTw" id="49WTic8eIvK" role="2Oq$k0">
279+
<ref role="3cqZAo" node="49WTic8eHNn" resolve="sle" />
280+
</node>
271281
</node>
272-
<node concept="3TrEf2" id="49WTic8eIBz" role="2OqNvi">
273-
<ref role="3Tt5mk" to="zzzn:6zmBjqUm7MR" resolve="expression" />
282+
<node concept="2Rf3mk" id="49WTic8eMt6" role="2OqNvi">
283+
<node concept="1xMEDy" id="49WTic8eMt8" role="1xVPHs">
284+
<node concept="chp4Y" id="49WTic8eMvj" role="ri$Ld">
285+
<ref role="cht4Q" to="zzzn:6zmBjqUkHal" resolve="LambdaArgRef" />
286+
</node>
287+
</node>
274288
</node>
275289
</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" />
290+
<node concept="3zZkjj" id="8xLOUtaswk" role="2OqNvi">
291+
<node concept="1bVj0M" id="8xLOUtaswm" role="23t8la">
292+
<node concept="3clFbS" id="8xLOUtaswn" role="1bW5cS">
293+
<node concept="3clFbF" id="8xLOUtasGo" role="3cqZAp">
294+
<node concept="17R0WA" id="8xLOUtaty7" role="3clFbG">
295+
<node concept="2OqwBi" id="8xLOUtaxSl" role="3uHU7w">
296+
<node concept="2OqwBi" id="8xLOUtau3_" role="2Oq$k0">
297+
<node concept="2Sf5sV" id="8xLOUtatGQ" role="2Oq$k0" />
298+
<node concept="3Tsc0h" id="8xLOUtauHN" role="2OqNvi">
299+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
300+
</node>
301+
</node>
302+
<node concept="1uHKPH" id="8xLOUta$y4" role="2OqNvi" />
303+
</node>
304+
<node concept="2OqwBi" id="8xLOUtasQp" role="3uHU7B">
305+
<node concept="37vLTw" id="8xLOUtasGn" role="2Oq$k0">
306+
<ref role="3cqZAo" node="8xLOUtaswo" resolve="it" />
307+
</node>
308+
<node concept="3TrEf2" id="8xLOUtat2K" role="2OqNvi">
309+
<ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
310+
</node>
311+
</node>
312+
</node>
313+
</node>
314+
</node>
315+
<node concept="Rh6nW" id="8xLOUtaswo" role="1bW2Oz">
316+
<property role="TrG5h" value="it" />
317+
<node concept="2jxLKc" id="8xLOUtaswp" role="1tU5fm" />
280318
</node>
281319
</node>
282320
</node>
@@ -322,29 +360,110 @@
322360
<node concept="2SaL7w" id="49WTic8eHbs" role="2ZfVeh">
323361
<node concept="3clFbS" id="49WTic8eHbt" role="2VODD2">
324362
<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" />
363+
<node concept="1Wc70l" id="8xLOUt08m5" role="3clFbG">
364+
<node concept="1Wc70l" id="49WTic8eIOc" role="3uHU7B">
365+
<node concept="2OqwBi" id="49WTic8eHry" role="3uHU7B">
366+
<node concept="2OqwBi" id="49WTic8eHfC" role="2Oq$k0">
367+
<node concept="2Sf5sV" id="49WTic8eHc$" role="2Oq$k0" />
368+
<node concept="1mfA1w" id="49WTic8eHlo" role="2OqNvi" />
369+
</node>
370+
<node concept="1mIQ4w" id="49WTic8eHCm" role="2OqNvi">
371+
<node concept="chp4Y" id="49WTic8eHEF" role="cj9EA">
372+
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
373+
</node>
374+
</node>
329375
</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" />
376+
<node concept="3clFbC" id="49WTic8eMl9" role="3uHU7w">
377+
<node concept="2OqwBi" id="49WTic8eJO0" role="3uHU7B">
378+
<node concept="2OqwBi" id="49WTic8eIUe" role="2Oq$k0">
379+
<node concept="2Sf5sV" id="49WTic8eIQE" role="2Oq$k0" />
380+
<node concept="3Tsc0h" id="49WTic8eJ0Y" role="2OqNvi">
381+
<ref role="3TtcxE" to="zzzn:6zmBjqUkws7" resolve="args" />
382+
</node>
335383
</node>
384+
<node concept="34oBXx" id="49WTic8eL2b" role="2OqNvi" />
385+
</node>
386+
<node concept="3cmrfG" id="49WTic8eMn0" role="3uHU7w">
387+
<property role="3cmrfH" value="1" />
336388
</node>
337-
<node concept="34oBXx" id="49WTic8eL2b" role="2OqNvi" />
338389
</node>
339390
</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" />
344-
</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" />
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>
406+
</node>
407+
</node>
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" />
465+
</node>
466+
</node>
348467
</node>
349468
</node>
350469
</node>

0 commit comments

Comments
 (0)