Skip to content

Commit b725f20

Browse files
AlexeiQAlexeiQ
authored
Merge pull request #484 from IETS3/bugfix/wrong-generation-for-AltOption
Fix wrong generation for AltOption with BlockExpression.
2 parents d30cf58 + 01e7a97 commit b725f20

File tree

2 files changed

+107
-0
lines changed

2 files changed

+107
-0
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,6 +1805,20 @@
18051805
<node concept="3cpWs6" id="7HPYiWeApo9" role="gfFT$">
18061806
<node concept="3cmrfG" id="7HPYiWeApoh" role="3cqZAk">
18071807
<property role="3cmrfH" value="5" />
1808+
<node concept="29HgVG" id="4dTV265Eimf" role="lGtFl">
1809+
<node concept="3NFfHV" id="4dTV265Eim$" role="3NFExx">
1810+
<node concept="3clFbS" id="4dTV265Eim_" role="2VODD2">
1811+
<node concept="3clFbF" id="4dTV265EirD" role="3cqZAp">
1812+
<node concept="2OqwBi" id="4dTV265EiKk" role="3clFbG">
1813+
<node concept="30H73N" id="4dTV265EirC" role="2Oq$k0" />
1814+
<node concept="3TrEf2" id="4dTV265EjJ0" role="2OqNvi">
1815+
<ref role="3Tt5mk" to="hm2y:6UxFDrx4dpK" resolve="then" />
1816+
</node>
1817+
</node>
1818+
</node>
1819+
</node>
1820+
</node>
1821+
</node>
18081822
</node>
18091823
</node>
18101824
</node>

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<concept id="5115872837156687890" name="org.iets3.core.expr.base.structure.LessExpression" flags="ng" index="30d6GJ" />
6363
<concept id="5115872837156687764" name="org.iets3.core.expr.base.structure.GreaterExpression" flags="ng" index="30d7iD" />
6464
<concept id="5115872837156724025" name="org.iets3.core.expr.base.structure.LogicalAndExpression" flags="ng" index="30deo4" />
65+
<concept id="5115872837156578671" name="org.iets3.core.expr.base.structure.MulExpression" flags="ng" index="30dDTi" />
6566
<concept id="5115872837156576277" name="org.iets3.core.expr.base.structure.BinaryExpression" flags="ng" index="30dEsC">
6667
<child id="5115872837156576280" name="right" index="30dEs_" />
6768
<child id="5115872837156576278" name="left" index="30dEsF" />
@@ -133,6 +134,12 @@
133134
<concept id="4790956042240983401" name="org.iets3.core.expr.lambda.structure.BlockExpression" flags="ng" index="1aduha">
134135
<child id="4790956042240983402" name="expressions" index="1aduh9" />
135136
</concept>
137+
<concept id="4790956042241105569" name="org.iets3.core.expr.lambda.structure.ValRef" flags="ng" index="1adzI2">
138+
<reference id="4790956042241106533" name="val" index="1adwt6" />
139+
</concept>
140+
<concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
141+
<child id="4790956042241053105" name="expr" index="1adJij" />
142+
</concept>
136143
<concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
137144
<reference id="4790956042240460422" name="arg" index="1afue_" />
138145
</concept>
@@ -633,6 +640,92 @@
633640
</node>
634641
</node>
635642
</node>
643+
<node concept="_ixoA" id="4dTV265D_6E" role="_iOnB" />
644+
<node concept="_fkuM" id="4dTV265D_fT" role="_iOnB">
645+
<property role="TrG5h" value="alt_withBlockExpression" />
646+
<node concept="_fkuZ" id="70U3EDJbGzf" role="_fkp5">
647+
<node concept="_fku$" id="70U3EDJbGzg" role="_fkur" />
648+
<node concept="2fGnzi" id="70U3EDJbGFb" role="_fkuY">
649+
<node concept="2fGnzd" id="70U3EDJbGFc" role="2fGnxs">
650+
<node concept="30cPrO" id="70U3EDJbGM8" role="2fGnzS">
651+
<node concept="30bXRB" id="70U3EDJbGIE" role="30dEsF">
652+
<property role="30bXRw" value="1" />
653+
</node>
654+
<node concept="30bXRB" id="4dTV265D_x5" role="30dEs_">
655+
<property role="30bXRw" value="1" />
656+
</node>
657+
</node>
658+
<node concept="1aduha" id="4dTV265CMcz" role="2fGnzA">
659+
<node concept="1adJid" id="4dTV265CMgS" role="1aduh9">
660+
<property role="TrG5h" value="v1" />
661+
<node concept="30dDTi" id="4dTV265D$iQ" role="1adJij">
662+
<node concept="30bXRB" id="4dTV265D$l1" role="30dEs_">
663+
<property role="30bXRw" value="2" />
664+
</node>
665+
<node concept="30bXRB" id="4dTV265CMn5" role="30dEsF">
666+
<property role="30bXRw" value="5" />
667+
</node>
668+
</node>
669+
</node>
670+
<node concept="30cPrO" id="4dTV265CMIR" role="1aduh9">
671+
<node concept="1adzI2" id="4dTV265D$x3" role="30dEsF">
672+
<ref role="1adwt6" node="4dTV265CMgS" resolve="v1" />
673+
</node>
674+
<node concept="30bXRB" id="4dTV265CMR5" role="30dEs_">
675+
<property role="30bXRw" value="10" />
676+
</node>
677+
</node>
678+
</node>
679+
</node>
680+
<node concept="2fGnzd" id="70U3EDJbGFd" role="2fGnxs">
681+
<node concept="2fHqz8" id="70U3EDJbGYF" role="2fGnzS" />
682+
<node concept="2vmpn$" id="4dTV265DA0Q" role="2fGnzA" />
683+
</node>
684+
</node>
685+
<node concept="2vmpnb" id="4dTV265DNxB" role="_fkuS" />
686+
</node>
687+
<node concept="_fkuZ" id="4dTV265D_ps" role="_fkp5">
688+
<node concept="_fku$" id="4dTV265D_pt" role="_fkur" />
689+
<node concept="2fGnzi" id="4dTV265D_pu" role="_fkuY">
690+
<node concept="2fGnzd" id="4dTV265D_pv" role="2fGnxs">
691+
<node concept="30cPrO" id="4dTV265D_pw" role="2fGnzS">
692+
<node concept="30bXRB" id="4dTV265D_px" role="30dEs_">
693+
<property role="30bXRw" value="2" />
694+
</node>
695+
<node concept="30bXRB" id="4dTV265D_py" role="30dEsF">
696+
<property role="30bXRw" value="1" />
697+
</node>
698+
</node>
699+
<node concept="2vmpnb" id="4dTV265D_pz" role="2fGnzA" />
700+
</node>
701+
<node concept="2fGnzd" id="4dTV265D_p$" role="2fGnxs">
702+
<node concept="2fHqz8" id="4dTV265D_p_" role="2fGnzS" />
703+
<node concept="1aduha" id="4dTV265D_pA" role="2fGnzA">
704+
<node concept="1adJid" id="4dTV265D_pB" role="1aduh9">
705+
<property role="TrG5h" value="v1" />
706+
<node concept="30dDTi" id="4dTV265D_pC" role="1adJij">
707+
<node concept="30bXRB" id="4dTV265D_pD" role="30dEs_">
708+
<property role="30bXRw" value="2" />
709+
</node>
710+
<node concept="30bXRB" id="4dTV265D_pE" role="30dEsF">
711+
<property role="30bXRw" value="5" />
712+
</node>
713+
</node>
714+
</node>
715+
<node concept="30cPrO" id="4dTV265D_pF" role="1aduh9">
716+
<node concept="1adzI2" id="4dTV265D_pG" role="30dEsF">
717+
<ref role="1adwt6" node="4dTV265D_pB" resolve="v1" />
718+
</node>
719+
<node concept="30bXRB" id="4dTV265D_pH" role="30dEs_">
720+
<property role="30bXRw" value="11" />
721+
</node>
722+
</node>
723+
</node>
724+
</node>
725+
</node>
726+
<node concept="2vmpn$" id="4dTV265D_pI" role="_fkuS" />
727+
</node>
728+
</node>
636729
<node concept="_ixoA" id="38v7GtLshx2" role="_iOnB" />
637730
<node concept="1aga60" id="4qTaF_E4Iwk" role="_iOnB">
638731
<property role="TrG5h" value="f1" />

0 commit comments

Comments
 (0)