Skip to content

Commit ab07980

Browse files
mgronovermgronover
committed
simplified mapping when using lambda expressions
1 parent b995d8f commit ab07980

File tree

3 files changed

+226
-323
lines changed

3 files changed

+226
-323
lines changed

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
66
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
77
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
8+
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
89
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
910
</languages>
1011
<imports>
@@ -31,6 +32,9 @@
3132
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
3233
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
3334
<import index="sxpq" ref="r:51edfe99-0380-475c-a3e9-1d4425eac12f(org.iets3.core.expr.lambda.plugin)" />
35+
<import index="webo" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text.html(JDK/)" />
36+
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
37+
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
3438
</imports>
3539
<registry>
3640
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -90,6 +94,10 @@
9094
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
9195
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
9296
</concept>
97+
<concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
98+
<child id="1081256993305" name="classType" index="2ZW6by" />
99+
<child id="1081256993304" name="leftExpression" index="2ZW6bz" />
100+
</concept>
93101
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
94102
<reference id="1144433057691" name="classifier" index="1PxDUh" />
95103
</concept>
@@ -99,6 +107,10 @@
99107
<concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
100108
<child id="1070534760952" name="componentType" index="10Q1$1" />
101109
</concept>
110+
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
111+
<child id="1070534934091" name="type" index="10QFUM" />
112+
<child id="1070534934092" name="expression" index="10QFUP" />
113+
</concept>
102114
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
103115
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
104116
<property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -611,6 +623,96 @@
611623
</node>
612624
<node concept="17QB3L" id="6NpHfQ5Cb7v" role="3clF45" />
613625
</node>
626+
<node concept="13i0hz" id="3u8VfJfplfS" role="13h7CS">
627+
<property role="TrG5h" value="getNodeMapping" />
628+
<node concept="3Tm1VV" id="3u8VfJfplfT" role="1B3o_S" />
629+
<node concept="3rvAFt" id="3u8VfJfpqwp" role="3clF45">
630+
<node concept="3Tqbb2" id="3u8VfJfpqBG" role="3rvQeY" />
631+
<node concept="3Tqbb2" id="3u8VfJfpqFf" role="3rvSg0" />
632+
</node>
633+
<node concept="3clFbS" id="3u8VfJfplfV" role="3clF47">
634+
<node concept="3clFbJ" id="3u8VfJfpsNd" role="3cqZAp">
635+
<node concept="3clFbS" id="3u8VfJfpsNf" role="3clFbx">
636+
<node concept="3cpWs6" id="3u8VfJfpxjr" role="3cqZAp">
637+
<node concept="10QFUN" id="3u8VfJfpwac" role="3cqZAk">
638+
<node concept="3rvAFt" id="3u8VfJfpwhk" role="10QFUM">
639+
<node concept="3Tqbb2" id="3u8VfJfpwnX" role="3rvQeY" />
640+
<node concept="3Tqbb2" id="3u8VfJfpwwv" role="3rvSg0" />
641+
</node>
642+
<node concept="1eOMI4" id="3u8VfJfpw0_" role="10QFUP">
643+
<node concept="2OqwBi" id="3u8VfJfprtZ" role="1eOMHV">
644+
<node concept="2JrnkZ" id="3u8VfJfpr_H" role="2Oq$k0">
645+
<node concept="13iPFW" id="3u8VfJfpGfx" role="2JrQYb" />
646+
</node>
647+
<node concept="liA8E" id="3u8VfJfprU6" role="2OqNvi">
648+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
649+
<node concept="10M0yZ" id="3u8VfJfps64" role="37wK5m">
650+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
651+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
652+
</node>
653+
</node>
654+
</node>
655+
</node>
656+
</node>
657+
</node>
658+
</node>
659+
<node concept="2ZW3vV" id="3u8VfJfptdT" role="3clFbw">
660+
<node concept="2OqwBi" id="3u8VfJfpsYt" role="2ZW6bz">
661+
<node concept="2JrnkZ" id="3u8VfJfpsYu" role="2Oq$k0">
662+
<node concept="13iPFW" id="3u8VfJfpFOV" role="2JrQYb" />
663+
</node>
664+
<node concept="liA8E" id="3u8VfJfpsYw" role="2OqNvi">
665+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
666+
<node concept="10M0yZ" id="3u8VfJfpsYx" role="37wK5m">
667+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
668+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
669+
</node>
670+
</node>
671+
</node>
672+
<node concept="3uibUv" id="3u8VfJfvFDa" role="2ZW6by">
673+
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
674+
</node>
675+
</node>
676+
</node>
677+
<node concept="3cpWs6" id="3u8VfJfpy7y" role="3cqZAp">
678+
<node concept="10Nm6u" id="3u8VfJfpyjR" role="3cqZAk" />
679+
</node>
680+
</node>
681+
<node concept="2AHcQZ" id="1ZCJf$ekk4l" role="2AJF6D">
682+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
683+
</node>
684+
</node>
685+
<node concept="13i0hz" id="1ZCJf$ej28Z" role="13h7CS">
686+
<property role="TrG5h" value="putNodeMapping" />
687+
<node concept="3Tm1VV" id="1ZCJf$ej290" role="1B3o_S" />
688+
<node concept="3cqZAl" id="1ZCJf$ej58z" role="3clF45" />
689+
<node concept="3clFbS" id="1ZCJf$ej294" role="3clF47">
690+
<node concept="3clFbF" id="1ZCJf$ej4Qg" role="3cqZAp">
691+
<node concept="2OqwBi" id="1ZCJf$ej29d" role="3clFbG">
692+
<node concept="2JrnkZ" id="1ZCJf$ej29e" role="2Oq$k0">
693+
<node concept="13iPFW" id="1ZCJf$ej29f" role="2JrQYb" />
694+
</node>
695+
<node concept="liA8E" id="1ZCJf$ej29g" role="2OqNvi">
696+
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
697+
<node concept="10M0yZ" id="1ZCJf$ej29h" role="37wK5m">
698+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
699+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
700+
</node>
701+
<node concept="37vLTw" id="1ZCJf$ej4xr" role="37wK5m">
702+
<ref role="3cqZAo" node="1ZCJf$ej44i" resolve="map" />
703+
</node>
704+
</node>
705+
</node>
706+
</node>
707+
</node>
708+
<node concept="37vLTG" id="1ZCJf$ej44i" role="3clF46">
709+
<property role="TrG5h" value="map" />
710+
<node concept="3rvAFt" id="1ZCJf$ej44f" role="1tU5fm">
711+
<node concept="3Tqbb2" id="1ZCJf$ej4ay" role="3rvQeY" />
712+
<node concept="3Tqbb2" id="1ZCJf$ej49T" role="3rvSg0" />
713+
</node>
714+
</node>
715+
</node>
614716
</node>
615717
<node concept="13h7C7" id="6zmBjqUkS0K">
616718
<property role="3GE5qa" value="lambda" />

0 commit comments

Comments
 (0)