Skip to content

Commit 2053cd1

Browse files
mhuster23mhuster23
committed
introduce OneArgLambdaCollectionOp
1 parent b7e2dfd commit 2053cd1

File tree

5 files changed

+67
-34
lines changed

5 files changed

+67
-34
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3441,7 +3441,7 @@
34413441
<node concept="2OqwBi" id="7SZA7Uei_Op" role="2Oq$k0">
34423442
<node concept="13iPFW" id="7SZA7Uei_Oq" role="2Oq$k0" />
34433443
<node concept="3TrEf2" id="7SZA7Uei_Or" role="2OqNvi">
3444-
<ref role="3Tt5mk" to="700h:7SZA7UeMt3K" resolve="arg" />
3444+
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" />
34453445
</node>
34463446
</node>
34473447
<node concept="zfrQC" id="7SZA7Uei_Os" role="2OqNvi">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
126126
<concept id="6702802731807420587" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAParent" flags="ig" index="9SLcT" />
127127
<concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
128+
<concept id="4303308395523096213" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childConcept" flags="ng" index="2DD5aU" />
128129
<concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
129130
<reference id="1147467295099" name="applicableProperty" index="EomxK" />
130131
<child id="1147468630220" name="propertyGetter" index="EtsB7" />
@@ -187,6 +188,9 @@
187188
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
188189
</concept>
189190
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
191+
<concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
192+
<child id="1180031783297" name="conceptArgument" index="2Zo12j" />
193+
</concept>
190194
<concept id="2644386474302386080" name="jetbrains.mps.lang.smodel.structure.PropertyIdRefExpression" flags="nn" index="355D3s">
191195
<reference id="2644386474302386081" name="conceptDeclaration" index="355D3t" />
192196
<reference id="2644386474302386082" name="propertyDeclaration" index="355D3u" />
@@ -1743,5 +1747,22 @@
17431747
</node>
17441748
</node>
17451749
</node>
1750+
<node concept="1M2fIO" id="6$cVN8sETWU">
1751+
<ref role="1M2myG" to="700h:6$cVN8sEQ7y" resolve="OneArgLambdaCollectionOp" />
1752+
<node concept="9SLcT" id="6$cVN8sETWV" role="9SGkU">
1753+
<node concept="3clFbS" id="6$cVN8sETWW" role="2VODD2">
1754+
<node concept="3clFbF" id="6$cVN8sEUcg" role="3cqZAp">
1755+
<node concept="2OqwBi" id="6$cVN8ujK$S" role="3clFbG">
1756+
<node concept="2DD5aU" id="6$cVN8ujGDS" role="2Oq$k0" />
1757+
<node concept="2Zo12i" id="6$cVN8ujLgy" role="2OqNvi">
1758+
<node concept="chp4Y" id="6$cVN8ujL_3" role="2Zo12j">
1759+
<ref role="cht4Q" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
1760+
</node>
1761+
</node>
1762+
</node>
1763+
</node>
1764+
</node>
1765+
</node>
1766+
</node>
17461767
</model>
17471768

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
<property role="34LRSv" value="map" />
283283
<property role="EcuMT" value="7554398283340640412" />
284284
<property role="R4oN_" value="create a map from the collection via a map-function" />
285-
<ref role="1TJDcQ" node="6zmBjqUjnKs" resolve="OneArgCollectionOp" />
285+
<ref role="1TJDcQ" node="6$cVN8sEQ7y" resolve="OneArgLambdaCollectionOp" />
286286
<node concept="PrWs8" id="6zmBjqUmg4u" role="PzmwI">
287287
<ref role="PrY4T" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
288288
</node>
@@ -362,7 +362,7 @@
362362
<property role="R5$K2" value="false" />
363363
<property role="EcuMT" value="8872269265515327232" />
364364
<property role="R4oN_" value="a base collection operation for operations with one predicate argument" />
365-
<ref role="1TJDcQ" node="6zmBjqUjnKs" resolve="OneArgCollectionOp" />
365+
<ref role="1TJDcQ" node="6$cVN8sEQ7y" resolve="OneArgLambdaCollectionOp" />
366366
<node concept="PrWs8" id="7SZA7UeV1IM" role="PzmwI">
367367
<ref role="PrY4T" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
368368
</node>
@@ -769,14 +769,7 @@
769769
<property role="34LRSv" value="foreach" />
770770
<property role="EcuMT" value="9097157441620016186" />
771771
<property role="R4oN_" value="perform action for each element" />
772-
<ref role="1TJDcQ" node="6zmBjqUjnKs" resolve="OneArgCollectionOp" />
773-
<node concept="1TJgyj" id="7SZA7UeMt3K" role="1TKVEi">
774-
<property role="IQ2ns" value="9097157441640583408" />
775-
<property role="20lmBu" value="fLJjDmT/aggregation" />
776-
<property role="20kJfa" value="arg" />
777-
<ref role="20lvS9" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
778-
<ref role="20ksaX" node="6zmBjqUjnKt" resolve="arg" />
779-
</node>
772+
<ref role="1TJDcQ" node="6$cVN8sEQ7y" resolve="OneArgLambdaCollectionOp" />
780773
<node concept="PrWs8" id="7SZA7Ud$02w" role="PzmwI">
781774
<ref role="PrY4T" node="6zmBjqUjnPd" resolve="IContextTypedCollOp" />
782775
</node>
@@ -1225,5 +1218,12 @@
12251218
<ref role="PrY4T" node="6zmBjqUiHHJ" resolve="IOrderedCollectionOp" />
12261219
</node>
12271220
</node>
1221+
<node concept="1TIwiD" id="6$cVN8sEQ7y">
1222+
<property role="EcuMT" value="7569688072211358178" />
1223+
<property role="R5$K7" value="true" />
1224+
<property role="TrG5h" value="OneArgLambdaCollectionOp" />
1225+
<property role="R4oN_" value="a base collection operation for operations with one lambda argument" />
1226+
<ref role="1TJDcQ" node="6zmBjqUjnKs" resolve="OneArgCollectionOp" />
1227+
</node>
12281228
</model>
12291229

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,37 +4024,49 @@
40244024
<property role="TrG5h" value="check_ForeachOp" />
40254025
<property role="3GE5qa" value="collection" />
40264026
<node concept="3clFbS" id="7SZA7Ud$032" role="18ibNy">
4027-
<node concept="3clFbJ" id="7SZA7Ud$27L" role="3cqZAp">
4028-
<node concept="3clFbS" id="7SZA7Ud$27N" role="3clFbx">
4029-
<node concept="2MkqsV" id="7SZA7Ud$2Ic" role="3cqZAp">
4030-
<node concept="Xl_RD" id="7SZA7Ud$2IB" role="2MkJ7o">
4031-
<property role="Xl_RC" value="the lambda expression must have an effect" />
4032-
</node>
4033-
<node concept="1YBJjd" id="7SZA7Ud$2Jt" role="1urrMF">
4034-
<ref role="1YBMHb" node="7SZA7Ud$034" resolve="fo" />
4035-
</node>
4027+
<node concept="Jncv_" id="6$cVN8teWrm" role="3cqZAp">
4028+
<ref role="JncvD" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
4029+
<node concept="2OqwBi" id="6$cVN8teWK1" role="JncvB">
4030+
<node concept="1YBJjd" id="6$cVN8teWtu" role="2Oq$k0">
4031+
<ref role="1YBMHb" node="7SZA7Ud$034" resolve="fo" />
4032+
</node>
4033+
<node concept="3TrEf2" id="6$cVN8teXxw" role="2OqNvi">
4034+
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" resolve="arg" />
40364035
</node>
40374036
</node>
4038-
<node concept="3fqX7Q" id="7SZA7Ud$287" role="3clFbw">
4039-
<node concept="2OqwBi" id="6GySMNjYF2A" role="3fr31v">
4040-
<node concept="2OqwBi" id="5vAcs0YtS$f" role="2Oq$k0">
4041-
<node concept="2OqwBi" id="7SZA7Ud$2nl" role="2Oq$k0">
4042-
<node concept="1YBJjd" id="7SZA7Ud$28d" role="2Oq$k0">
4043-
<ref role="1YBMHb" node="7SZA7Ud$034" resolve="fo" />
4037+
<node concept="3clFbS" id="6$cVN8teWrq" role="Jncv$">
4038+
<node concept="3clFbJ" id="6$cVN8teXTd" role="3cqZAp">
4039+
<node concept="3fqX7Q" id="6$cVN8teXTm" role="3clFbw">
4040+
<node concept="2OqwBi" id="6$cVN8teZk$" role="3fr31v">
4041+
<node concept="2OqwBi" id="6$cVN8teYyf" role="2Oq$k0">
4042+
<node concept="Jnkvi" id="6$cVN8teYl3" role="2Oq$k0">
4043+
<ref role="1M0zk5" node="6$cVN8teWrs" resolve="lambdaArg" />
4044+
</node>
4045+
<node concept="2qgKlT" id="6$cVN8teZ5s" role="2OqNvi">
4046+
<ref role="37wK5l" to="5s8v:6NpHfQ5A3Wb" resolve="delayedEffectDescriptor" />
4047+
</node>
40444048
</node>
4045-
<node concept="3TrEf2" id="5vAcs0YtRHG" role="2OqNvi">
4046-
<ref role="3Tt5mk" to="700h:7SZA7UeMt3K" resolve="arg" />
4049+
<node concept="liA8E" id="6$cVN8tf0aH" role="2OqNvi">
4050+
<ref role="37wK5l" to="oq0c:6GySMNjje8w" resolve="modifiesState" />
40474051
</node>
40484052
</node>
4049-
<node concept="2qgKlT" id="5vAcs0YtTGY" role="2OqNvi">
4050-
<ref role="37wK5l" to="5s8v:6NpHfQ5A3Wb" resolve="delayedEffectDescriptor" />
4051-
</node>
40524053
</node>
4053-
<node concept="liA8E" id="6GySMNjYF$H" role="2OqNvi">
4054-
<ref role="37wK5l" to="oq0c:6GySMNjje8w" resolve="modifiesState" />
4054+
<node concept="3clFbS" id="6$cVN8teXTf" role="3clFbx">
4055+
<node concept="2MkqsV" id="7SZA7Ud$2Ic" role="3cqZAp">
4056+
<node concept="Xl_RD" id="7SZA7Ud$2IB" role="2MkJ7o">
4057+
<property role="Xl_RC" value="the lambda expression must have an effect" />
4058+
</node>
4059+
<node concept="1YBJjd" id="7SZA7Ud$2Jt" role="1urrMF">
4060+
<ref role="1YBMHb" node="7SZA7Ud$034" resolve="fo" />
4061+
</node>
4062+
</node>
40554063
</node>
40564064
</node>
40574065
</node>
4066+
<node concept="JncvC" id="6$cVN8teWrs" role="JncvA">
4067+
<property role="TrG5h" value="lambdaArg" />
4068+
<node concept="2jxLKc" id="6$cVN8teWrt" role="1tU5fm" />
4069+
</node>
40584070
</node>
40594071
</node>
40604072
<node concept="1YaCAy" id="7SZA7Ud$034" role="1YuTPh">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@
881881
<property role="TrG5h" value="GroupByOp" />
882882
<property role="34LRSv" value="groupBy" />
883883
<property role="R4oN_" value="group the collection by a condition" />
884-
<ref role="1TJDcQ" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
884+
<ref role="1TJDcQ" to="700h:6$cVN8sEQ7y" resolve="OneArgLambdaCollectionOp" />
885885
<node concept="PrWs8" id="7cphKbKo1Dk" role="PzmwI">
886886
<ref role="PrY4T" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
887887
</node>

0 commit comments

Comments
 (0)