Skip to content

Commit 12b1c3c

Browse files
mgronovermgronover
authored
Bugfix/nested short lambda expression (#718)
Fixed type of variable "it" in nested short lamba expression #717
1 parent 639f151 commit 12b1c3c

File tree

3 files changed

+281
-125
lines changed

3 files changed

+281
-125
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project are documented in this file.
44

55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
7+
## October 2023
8+
9+
### Fixed
10+
11+
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
712

813
## September 2023
914

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

Lines changed: 76 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -10403,156 +10403,82 @@
1040310403
<property role="DiZV1" value="false" />
1040410404
<property role="od$2w" value="false" />
1040510405
<node concept="3Tm1VV" id="VXV$b4Evoj" role="1B3o_S" />
10406-
<node concept="3uibUv" id="VXV$b4Evok" role="3clF45">
10407-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10408-
<node concept="29HgVG" id="VXV$b4Evol" role="lGtFl">
10409-
<node concept="3NFfHV" id="VXV$b4Evom" role="3NFExx">
10410-
<node concept="3clFbS" id="VXV$b4Evon" role="2VODD2">
10411-
<node concept="3clFbF" id="VXV$b4Evoo" role="3cqZAp">
10412-
<node concept="2OqwBi" id="VXV$b4Evop" role="3clFbG">
10413-
<node concept="1PxgMI" id="VXV$b4Evoq" role="2Oq$k0">
10414-
<node concept="chp4Y" id="VXV$b4Evor" role="3oSUPX">
10415-
<ref role="cht4Q" to="zzzn:6zmBjqUjGYQ" resolve="FunctionType" />
10416-
</node>
10417-
<node concept="2OqwBi" id="VXV$b4Evos" role="1m5AlR">
10418-
<node concept="3JvlWi" id="VXV$b4Evot" role="2OqNvi" />
10419-
<node concept="30H73N" id="VXV$b4Evou" role="2Oq$k0" />
10420-
</node>
10421-
</node>
10422-
<node concept="3TrEf2" id="VXV$b4Evov" role="2OqNvi">
10423-
<ref role="3Tt5mk" to="zzzn:6zmBjqUjGYT" resolve="returnType" />
10424-
</node>
10425-
</node>
10426-
</node>
10427-
</node>
10428-
</node>
10429-
</node>
10430-
</node>
1043110406
<node concept="37vLTG" id="VXV$b4Evow" role="3clF46">
1043210407
<property role="TrG5h" value="param" />
1043310408
<node concept="3uibUv" id="VXV$b5kf0D" role="1tU5fm">
1043410409
<ref role="3uigEE" to="vsv5:VXV$b3eZ23" resolve="ParameterSetWrapper" />
1043510410
</node>
1043610411
</node>
1043710412
<node concept="3clFbS" id="VXV$b4Evoy" role="3clF47">
10438-
<node concept="3cpWs8" id="VXV$b5kjp8" role="3cqZAp">
10439-
<node concept="3cpWsn" id="VXV$b5kjp9" role="3cpWs9">
10413+
<node concept="3cpWs8" id="619_pmkhOnp" role="3cqZAp">
10414+
<node concept="3cpWsn" id="619_pmkh6dX" role="3cpWs9">
1044010415
<property role="TrG5h" value="it" />
10441-
<node concept="3uibUv" id="VXV$b5kjpa" role="1tU5fm">
10442-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10443-
<node concept="29HgVG" id="VXV$b5kqmY" role="lGtFl">
10444-
<node concept="3NFfHV" id="VXV$b5kqmZ" role="3NFExx">
10445-
<node concept="3clFbS" id="VXV$b5kqn0" role="2VODD2">
10446-
<node concept="3clFbF" id="VXV$b5kqn6" role="3cqZAp">
10447-
<node concept="2OqwBi" id="VXV$b5l_dM" role="3clFbG">
10448-
<node concept="2OqwBi" id="VXV$b5lwYw" role="2Oq$k0">
10449-
<node concept="2OqwBi" id="VXV$b5kqn1" role="2Oq$k0">
10450-
<node concept="2Rf3mk" id="VXV$b5lsKD" role="2OqNvi">
10451-
<node concept="1xMEDy" id="VXV$b5lsKF" role="1xVPHs">
10452-
<node concept="chp4Y" id="VXV$b5ltv_" role="ri$Ld">
10453-
<ref role="cht4Q" to="zzzn:6zmBjqUmsuo" resolve="ShortLambdaItExpression" />
10454-
</node>
10455-
</node>
10456-
</node>
10457-
<node concept="30H73N" id="VXV$b5kqn5" role="2Oq$k0" />
10458-
</node>
10459-
<node concept="1yVyf7" id="68fuVwz_k7c" role="2OqNvi" />
10460-
</node>
10461-
<node concept="3JvlWi" id="VXV$b5l_MM" role="2OqNvi" />
10462-
</node>
10463-
</node>
10464-
</node>
10465-
</node>
10466-
</node>
10467-
</node>
10468-
<node concept="10QFUN" id="VXV$b5ko9T" role="33vP2m">
10469-
<node concept="3uibUv" id="VXV$b5kopA" role="10QFUM">
10470-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10471-
<node concept="29HgVG" id="VXV$b5lAvJ" role="lGtFl">
10472-
<node concept="3NFfHV" id="VXV$b5lAvK" role="3NFExx">
10473-
<node concept="3clFbS" id="VXV$b5lAvL" role="2VODD2">
10474-
<node concept="3clFbF" id="VXV$b5lBby" role="3cqZAp">
10475-
<node concept="2OqwBi" id="VXV$b5lBbz" role="3clFbG">
10476-
<node concept="2OqwBi" id="VXV$b5lBb$" role="2Oq$k0">
10477-
<node concept="2OqwBi" id="VXV$b5lBb_" role="2Oq$k0">
10478-
<node concept="2Rf3mk" id="VXV$b5lBbA" role="2OqNvi">
10479-
<node concept="1xMEDy" id="VXV$b5lBbB" role="1xVPHs">
10480-
<node concept="chp4Y" id="VXV$b5lBbC" role="ri$Ld">
10481-
<ref role="cht4Q" to="zzzn:6zmBjqUmsuo" resolve="ShortLambdaItExpression" />
10482-
</node>
10483-
</node>
10484-
</node>
10485-
<node concept="30H73N" id="VXV$b5lBbD" role="2Oq$k0" />
10486-
</node>
10487-
<node concept="1yVyf7" id="68fuVwzLbsH" role="2OqNvi" />
10488-
</node>
10489-
<node concept="3JvlWi" id="VXV$b5lBbF" role="2OqNvi" />
10490-
</node>
10491-
</node>
10492-
</node>
10493-
</node>
10494-
</node>
10495-
</node>
10496-
<node concept="2OqwBi" id="68fuVwyyGXX" role="10QFUP">
10497-
<node concept="2OqwBi" id="68fuVwyyErS" role="2Oq$k0">
10498-
<node concept="37vLTw" id="68fuVwyyAFW" role="2Oq$k0">
10416+
<node concept="10QFUN" id="619_pmkh6dY" role="33vP2m">
10417+
<node concept="2OqwBi" id="619_pmkh6dZ" role="10QFUP">
10418+
<node concept="2OqwBi" id="619_pmkh6e0" role="2Oq$k0">
10419+
<node concept="37vLTw" id="619_pmkh6e1" role="2Oq$k0">
1049910420
<ref role="3cqZAo" node="VXV$b4Evow" resolve="param" />
1050010421
</node>
10501-
<node concept="2OwXpG" id="68fuVwyyFp4" role="2OqNvi">
10422+
<node concept="2OwXpG" id="619_pmkh6e2" role="2OqNvi">
1050210423
<ref role="2Oxat5" to="vsv5:VXV$b3qj39" resolve="parameters" />
1050310424
</node>
1050410425
</node>
10505-
<node concept="liA8E" id="68fuVwyyIWN" role="2OqNvi">
10426+
<node concept="liA8E" id="619_pmkh6e3" role="2OqNvi">
1050610427
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
10507-
<node concept="3cmrfG" id="68fuVwyyK5K" role="37wK5m">
10428+
<node concept="3cmrfG" id="619_pmkh6e4" role="37wK5m">
1050810429
<property role="3cmrfH" value="0" />
1050910430
</node>
1051010431
</node>
1051110432
</node>
10512-
</node>
10513-
</node>
10514-
<node concept="1W57fq" id="68fuVwyCeOM" role="lGtFl">
10515-
<node concept="3IZrLx" id="68fuVwyCeON" role="3IZSJc">
10516-
<node concept="3clFbS" id="68fuVwyCeOO" role="2VODD2">
10517-
<node concept="3clFbF" id="68fuVwyCgch" role="3cqZAp">
10518-
<node concept="2OqwBi" id="68fuVwyClM3" role="3clFbG">
10519-
<node concept="2OqwBi" id="68fuVwyCgxX" role="2Oq$k0">
10520-
<node concept="30H73N" id="68fuVwyCgcg" role="2Oq$k0" />
10521-
<node concept="2Rf3mk" id="68fuVwyCgXO" role="2OqNvi">
10522-
<node concept="1xMEDy" id="68fuVwyCgXQ" role="1xVPHs">
10523-
<node concept="chp4Y" id="68fuVwyChnN" role="ri$Ld">
10524-
<ref role="cht4Q" to="zzzn:6zmBjqUmsuo" resolve="ShortLambdaItExpression" />
10433+
<node concept="3uibUv" id="619_pmkh6e5" role="10QFUM">
10434+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10435+
<node concept="29HgVG" id="619_pmkh6e6" role="lGtFl">
10436+
<node concept="3NFfHV" id="619_pmkh6e7" role="3NFExx">
10437+
<node concept="3clFbS" id="619_pmkh6e8" role="2VODD2">
10438+
<node concept="3clFbF" id="619_pmkspW1" role="3cqZAp">
10439+
<node concept="2OqwBi" id="619_pmkspW3" role="3clFbG">
10440+
<node concept="1PxgMI" id="619_pmkspW4" role="2Oq$k0">
10441+
<node concept="chp4Y" id="619_pmkspW5" role="3oSUPX">
10442+
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
10443+
</node>
10444+
<node concept="2OqwBi" id="619_pmkspW6" role="1m5AlR">
10445+
<node concept="30H73N" id="619_pmkspW7" role="2Oq$k0" />
10446+
<node concept="1mfA1w" id="619_pmkspW8" role="2OqNvi" />
10447+
</node>
10448+
</node>
10449+
<node concept="2qgKlT" id="619_pmkspW9" role="2OqNvi">
10450+
<ref role="37wK5l" to="5s8v:6zmBjqUm7MF" resolve="requiredType" />
1052510451
</node>
1052610452
</node>
1052710453
</node>
10454+
<node concept="3clFbH" id="619_pmksoZ4" role="3cqZAp" />
1052810455
</node>
10529-
<node concept="3GX2aA" id="68fuVwyCp_S" role="2OqNvi" />
1053010456
</node>
1053110457
</node>
1053210458
</node>
1053310459
</node>
10534-
<node concept="gft3U" id="68fuVwyFu27" role="UU_$l">
10535-
<node concept="3cpWs8" id="68fuVwyFzjn" role="gfFT$">
10536-
<node concept="3cpWsn" id="68fuVwyFzvo" role="3cpWs9">
10537-
<property role="TrG5h" value="it" />
10538-
<node concept="3uibUv" id="68fuVwyFz$D" role="1tU5fm">
10539-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10540-
</node>
10541-
<node concept="2OqwBi" id="68fuVwyF_RU" role="33vP2m">
10542-
<node concept="2OqwBi" id="68fuVwyF$Hh" role="2Oq$k0">
10543-
<node concept="37vLTw" id="68fuVwyF$q1" role="2Oq$k0">
10544-
<ref role="3cqZAo" node="VXV$b4Evow" resolve="param" />
10545-
</node>
10546-
<node concept="2OwXpG" id="68fuVwyF$Xx" role="2OqNvi">
10547-
<ref role="2Oxat5" to="vsv5:VXV$b3qj39" resolve="parameters" />
10548-
</node>
10549-
</node>
10550-
<node concept="liA8E" id="68fuVwyFAFM" role="2OqNvi">
10551-
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
10552-
<node concept="3cmrfG" id="68fuVwyFB8Y" role="37wK5m">
10553-
<property role="3cmrfH" value="0" />
10460+
<node concept="3uibUv" id="619_pmkh6eh" role="1tU5fm">
10461+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10462+
<node concept="29HgVG" id="619_pmkh6ei" role="lGtFl">
10463+
<node concept="3NFfHV" id="619_pmkh6ej" role="3NFExx">
10464+
<node concept="3clFbS" id="619_pmkh6ek" role="2VODD2">
10465+
<node concept="3clFbF" id="619_pmkssz3" role="3cqZAp">
10466+
<node concept="2OqwBi" id="619_pmkssz5" role="3clFbG">
10467+
<node concept="1PxgMI" id="619_pmkssz6" role="2Oq$k0">
10468+
<node concept="chp4Y" id="619_pmkssz7" role="3oSUPX">
10469+
<ref role="cht4Q" to="zzzn:6zmBjqUm7Mf" resolve="IShortLambdaContainer" />
10470+
</node>
10471+
<node concept="2OqwBi" id="619_pmkssz8" role="1m5AlR">
10472+
<node concept="30H73N" id="619_pmkssz9" role="2Oq$k0" />
10473+
<node concept="1mfA1w" id="619_pmkssza" role="2OqNvi" />
10474+
</node>
10475+
</node>
10476+
<node concept="2qgKlT" id="619_pmksszb" role="2OqNvi">
10477+
<ref role="37wK5l" to="5s8v:6zmBjqUm7MF" resolve="requiredType" />
10478+
</node>
1055410479
</node>
1055510480
</node>
10481+
<node concept="3clFbH" id="619_pmksrsa" role="3cqZAp" />
1055610482
</node>
1055710483
</node>
1055810484
</node>
@@ -10561,7 +10487,7 @@
1056110487
</node>
1056210488
<node concept="3cpWs6" id="VXV$b4EvoP" role="3cqZAp">
1056310489
<node concept="37vLTw" id="VXV$b4EvoQ" role="3cqZAk">
10564-
<ref role="3cqZAo" node="VXV$b5kjp9" resolve="it" />
10490+
<ref role="3cqZAo" node="619_pmkh6dX" resolve="it" />
1056510491
<node concept="29HgVG" id="VXV$b4EvoR" role="lGtFl">
1056610492
<node concept="3NFfHV" id="VXV$b4EvoS" role="3NFExx">
1056710493
<node concept="3clFbS" id="VXV$b4EvoT" role="2VODD2">
@@ -10579,6 +10505,31 @@
1057910505
</node>
1058010506
</node>
1058110507
</node>
10508+
<node concept="3uibUv" id="VXV$b4Evok" role="3clF45">
10509+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
10510+
<node concept="29HgVG" id="VXV$b4Evol" role="lGtFl">
10511+
<node concept="3NFfHV" id="VXV$b4Evom" role="3NFExx">
10512+
<node concept="3clFbS" id="VXV$b4Evon" role="2VODD2">
10513+
<node concept="3clFbF" id="VXV$b4Evoo" role="3cqZAp">
10514+
<node concept="2OqwBi" id="VXV$b4Evop" role="3clFbG">
10515+
<node concept="1PxgMI" id="VXV$b4Evoq" role="2Oq$k0">
10516+
<node concept="chp4Y" id="VXV$b4Evor" role="3oSUPX">
10517+
<ref role="cht4Q" to="zzzn:6zmBjqUjGYQ" resolve="FunctionType" />
10518+
</node>
10519+
<node concept="2OqwBi" id="VXV$b4Evos" role="1m5AlR">
10520+
<node concept="3JvlWi" id="VXV$b4Evot" role="2OqNvi" />
10521+
<node concept="30H73N" id="VXV$b4Evou" role="2Oq$k0" />
10522+
</node>
10523+
</node>
10524+
<node concept="3TrEf2" id="VXV$b4Evov" role="2OqNvi">
10525+
<ref role="3Tt5mk" to="zzzn:6zmBjqUjGYT" resolve="returnType" />
10526+
</node>
10527+
</node>
10528+
</node>
10529+
</node>
10530+
</node>
10531+
</node>
10532+
</node>
1058210533
</node>
1058310534
<node concept="3uibUv" id="VXV$b5kdSR" role="2Ghqu4">
1058410535
<ref role="3uigEE" to="vsv5:VXV$b3eZ23" resolve="ParameterSetWrapper" />
@@ -18179,7 +18130,7 @@
1817918130
<property role="2aFKle" value="false" />
1818018131
<property role="TrG5h" value="foo" />
1818118132
<node concept="3Tm1VV" id="5RqWvw9lPZQ" role="1B3o_S" />
18182-
<node concept="10Oyi0" id="5rTourxYikT" role="3clF45" />
18133+
<node concept="3cqZAl" id="znKGbFwwYr" role="3clF45" />
1818318134
<node concept="3clFbS" id="5RqWvw9lPZS" role="3clF47">
1818418135
<node concept="9aQIb" id="5RqWvw9lPZT" role="3cqZAp">
1818518136
<node concept="3clFbS" id="5RqWvw9lPZU" role="9aQI4">
@@ -19021,7 +18972,7 @@
1902118972
<property role="2aFKle" value="false" />
1902218973
<property role="TrG5h" value="foo" />
1902318974
<node concept="3Tm1VV" id="6hYPZtxkVIe" role="1B3o_S" />
19024-
<node concept="10Oyi0" id="6hYPZtxkVIf" role="3clF45" />
18975+
<node concept="3cqZAl" id="znKGbFwntN" role="3clF45" />
1902518976
<node concept="3clFbS" id="6hYPZtxkVIg" role="3clF47">
1902618977
<node concept="9aQIb" id="6hYPZtxkVIh" role="3cqZAp">
1902718978
<node concept="3clFbS" id="6hYPZtxkVIi" role="9aQI4">

0 commit comments

Comments
 (0)