Skip to content

Commit 1354110

Browse files
alexanderpannalexanderpann
authored
Merge pull request #563 from IETS3/bugfix/genjava_compact_invoke
JavaGen: Invoke generated closure of BlockExpression with compact invoke function expression
2 parents 2e37961 + f099dfc commit 1354110

File tree

1 file changed

+41
-39
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template

1 file changed

+41
-39
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/[email protected]‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,9 @@
343343
</concept>
344344
</language>
345345
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
346+
<concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
347+
<child id="1235746996653" name="function" index="2SgG2M" />
348+
</concept>
346349
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
347350
<child id="1199569906740" name="parameter" index="1bW2Oz" />
348351
<child id="1199569916463" name="body" index="1bW5cS" />
@@ -2785,29 +2788,29 @@
27852788
<property role="36QftV" value="true" />
27862789
<ref role="30HIoZ" to="zzzn:49WTic8ig5D" resolve="BlockExpression" />
27872790
<node concept="gft3U" id="5RqWvw9hgAD" role="1lVwrX">
2788-
<node concept="2OqwBi" id="5RqWvw9hj1E" role="gfFT$">
2789-
<node concept="1bVj0M" id="5RqWvw9hgAJ" role="2Oq$k0">
2790-
<node concept="3clFbS" id="5RqWvw9hgAK" role="1bW5cS">
2791-
<node concept="3cpWs8" id="5RqWvw9hgAL" role="3cqZAp">
2792-
<node concept="3cpWsn" id="5RqWvw9hgAM" role="3cpWs9">
2791+
<node concept="2Sg_IR" id="51$u9xhENVJ" role="gfFT$">
2792+
<node concept="1bVj0M" id="51$u9xhENVK" role="2SgG2M">
2793+
<node concept="3clFbS" id="51$u9xhENVL" role="1bW5cS">
2794+
<node concept="3cpWs8" id="51$u9xhENVM" role="3cqZAp">
2795+
<node concept="3cpWsn" id="51$u9xhENVN" role="3cpWs9">
27932796
<property role="TrG5h" value="x" />
2794-
<node concept="10Oyi0" id="5RqWvw9hgAN" role="1tU5fm" />
2795-
<node concept="3cmrfG" id="5RqWvw9hgAO" role="33vP2m">
2797+
<node concept="10Oyi0" id="51$u9xhENVO" role="1tU5fm" />
2798+
<node concept="3cmrfG" id="51$u9xhENVP" role="33vP2m">
27962799
<property role="3cmrfH" value="5" />
27972800
</node>
27982801
</node>
2799-
<node concept="1ps_y7" id="3pRoIUFZe60" role="lGtFl">
2800-
<node concept="1ps_xZ" id="3pRoIUFZe5Z" role="1ps_xO">
2802+
<node concept="1ps_y7" id="51$u9xhENVQ" role="lGtFl">
2803+
<node concept="1ps_xZ" id="51$u9xhENVR" role="1ps_xO">
28012804
<property role="TrG5h" value="lastEffectiveExpression" />
2802-
<node concept="3Tqbb2" id="44yGPKlnavu" role="1ps_xK">
2805+
<node concept="3Tqbb2" id="51$u9xhENVS" role="1ps_xK">
28032806
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
28042807
</node>
2805-
<node concept="2jfdEK" id="5RqWvw9hgAQ" role="1ps_xN">
2806-
<node concept="3clFbS" id="5RqWvw9hgAR" role="2VODD2">
2807-
<node concept="3cpWs6" id="44yGPKlncxv" role="3cqZAp">
2808-
<node concept="2OqwBi" id="44yGPKlneN2" role="3cqZAk">
2809-
<node concept="30H73N" id="44yGPKlncy1" role="2Oq$k0" />
2810-
<node concept="2qgKlT" id="44yGPKlngF8" role="2OqNvi">
2808+
<node concept="2jfdEK" id="51$u9xhENVT" role="1ps_xN">
2809+
<node concept="3clFbS" id="51$u9xhENVU" role="2VODD2">
2810+
<node concept="3cpWs6" id="51$u9xhENVV" role="3cqZAp">
2811+
<node concept="2OqwBi" id="51$u9xhENVW" role="3cqZAk">
2812+
<node concept="30H73N" id="51$u9xhENVX" role="2Oq$k0" />
2813+
<node concept="2qgKlT" id="51$u9xhENVY" role="2OqNvi">
28112814
<ref role="37wK5l" to="5s8v:44yGPKlm0VG" resolve="getLastEffectiveExpression" />
28122815
</node>
28132816
</node>
@@ -2816,55 +2819,54 @@
28162819
</node>
28172820
</node>
28182821
</node>
2819-
<node concept="1WS0z7" id="5RqWvw9hgBi" role="lGtFl">
2822+
<node concept="1WS0z7" id="51$u9xhENVZ" role="lGtFl">
28202823
<property role="1qytDF" value="" />
2821-
<node concept="3JmXsc" id="5RqWvw9hgBj" role="3Jn$fo">
2822-
<node concept="3clFbS" id="5RqWvw9hgBk" role="2VODD2">
2823-
<node concept="3clFbF" id="5RqWvw9hgBl" role="3cqZAp">
2824-
<node concept="2OqwBi" id="5RqWvw9hgBm" role="3clFbG">
2825-
<node concept="30H73N" id="5RqWvw9hgBn" role="2Oq$k0" />
2826-
<node concept="3Tsc0h" id="5RqWvw9hgBo" role="2OqNvi">
2824+
<node concept="3JmXsc" id="51$u9xhENW0" role="3Jn$fo">
2825+
<node concept="3clFbS" id="51$u9xhENW1" role="2VODD2">
2826+
<node concept="3clFbF" id="51$u9xhENW2" role="3cqZAp">
2827+
<node concept="2OqwBi" id="51$u9xhENW3" role="3clFbG">
2828+
<node concept="30H73N" id="51$u9xhENW4" role="2Oq$k0" />
2829+
<node concept="3Tsc0h" id="51$u9xhENW5" role="2OqNvi">
28272830
<ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
28282831
</node>
28292832
</node>
28302833
</node>
28312834
</node>
28322835
</node>
28332836
</node>
2834-
<node concept="1W57fq" id="5RqWvw9hgBp" role="lGtFl">
2835-
<node concept="3IZrLx" id="5RqWvw9hgBq" role="3IZSJc">
2836-
<node concept="3clFbS" id="5RqWvw9hgBr" role="2VODD2">
2837-
<node concept="3clFbF" id="44yGPKlnlZ5" role="3cqZAp">
2838-
<node concept="3y3z36" id="44yGPKlnmBG" role="3clFbG">
2839-
<node concept="2OqwBi" id="44yGPKlno35" role="3uHU7w">
2840-
<node concept="1iwH7S" id="44yGPKlnnpn" role="2Oq$k0" />
2841-
<node concept="1psM6Z" id="3pRoIUFZe61" role="2OqNvi">
2842-
<ref role="1psM6Y" node="3pRoIUFZe5Z" resolve="lastEffectiveExpression" />
2837+
<node concept="1W57fq" id="51$u9xhENW6" role="lGtFl">
2838+
<node concept="3IZrLx" id="51$u9xhENW7" role="3IZSJc">
2839+
<node concept="3clFbS" id="51$u9xhENW8" role="2VODD2">
2840+
<node concept="3clFbF" id="51$u9xhENW9" role="3cqZAp">
2841+
<node concept="3y3z36" id="51$u9xhENWa" role="3clFbG">
2842+
<node concept="2OqwBi" id="51$u9xhENWb" role="3uHU7w">
2843+
<node concept="1iwH7S" id="51$u9xhENWc" role="2Oq$k0" />
2844+
<node concept="1psM6Z" id="51$u9xhENWd" role="2OqNvi">
2845+
<ref role="1psM6Y" node="51$u9xhENVR" resolve="lastEffectiveExpression" />
28432846
</node>
28442847
</node>
2845-
<node concept="30H73N" id="44yGPKlnlZ3" role="3uHU7B" />
2848+
<node concept="30H73N" id="51$u9xhENWe" role="3uHU7B" />
28462849
</node>
28472850
</node>
28482851
</node>
28492852
</node>
2850-
<node concept="gft3U" id="5RqWvw9hgBV" role="UU_$l">
2851-
<node concept="3cpWs6" id="5RqWvw9hgBW" role="gfFT$">
2852-
<node concept="3cmrfG" id="5RqWvw9hgBX" role="3cqZAk">
2853+
<node concept="gft3U" id="51$u9xhENWf" role="UU_$l">
2854+
<node concept="3cpWs6" id="51$u9xhENWg" role="gfFT$">
2855+
<node concept="3cmrfG" id="51$u9xhENWh" role="3cqZAk">
28532856
<property role="3cmrfH" value="0" />
28542857
</node>
2855-
<node concept="1sPUBX" id="68MLomycYY7" role="lGtFl">
2858+
<node concept="1sPUBX" id="51$u9xhENWi" role="lGtFl">
28562859
<ref role="v9R2y" node="68MLomycj7I" resolve="Expression2ReturnStatement" />
28572860
</node>
28582861
</node>
28592862
</node>
28602863
</node>
2861-
<node concept="1sPUBX" id="68MLomycfGF" role="lGtFl">
2864+
<node concept="1sPUBX" id="51$u9xhENWj" role="lGtFl">
28622865
<ref role="v9R2y" node="68MLomyagFy" resolve="Expression2SideEffectStatement" />
28632866
</node>
28642867
</node>
28652868
</node>
28662869
</node>
2867-
<node concept="1Bd96e" id="5RqWvw9hm5$" role="2OqNvi" />
28682870
</node>
28692871
</node>
28702872
</node>

0 commit comments

Comments
 (0)