Skip to content

Commit ead3248

Browse files
AlexeiQAlexeiQ
committed
KernelF: Change list.first/last, so they return none when list is empty
1 parent 5c84603 commit ead3248

File tree

4 files changed

+142
-225
lines changed

4 files changed

+142
-225
lines changed

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

Lines changed: 117 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
66
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
77
<use id="f2abf2a6-552e-4906-ab58-930f9a79aff4" name="org.iets3.core.expr.genjava.contracts" version="-1" />
8+
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="3" />
89
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
910
</languages>
1011
<imports>
@@ -4152,104 +4153,93 @@
41524153
</node>
41534154
</node>
41544155
</node>
4155-
<node concept="1Koe21" id="4lRNjFWPT4c" role="1lVwrX">
4156-
<node concept="3clFb_" id="4lRNjFWPT4d" role="1Koe22">
4157-
<property role="DiZV1" value="false" />
4158-
<property role="od$2w" value="false" />
4159-
<property role="2aFKle" value="false" />
4160-
<property role="TrG5h" value="foo" />
4161-
<node concept="3Tm1VV" id="4lRNjFWPT4e" role="1B3o_S" />
4162-
<node concept="17QB3L" id="4lRNjFWPT4f" role="3clF45" />
4163-
<node concept="3clFbS" id="4lRNjFWPT4g" role="3clF47">
4164-
<node concept="3cpWs8" id="4lRNjFWPT4h" role="3cqZAp">
4165-
<node concept="3cpWsn" id="4lRNjFWPT4i" role="3cpWs9">
4166-
<property role="TrG5h" value="tpv" />
4167-
<node concept="3uibUv" id="4lRNjFWPT4j" role="1tU5fm">
4168-
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
4169-
<node concept="17QB3L" id="4lRNjFWPT4k" role="11_B2D" />
4170-
</node>
4171-
<node concept="2YIFZM" id="4lRNjFWPT4l" role="33vP2m">
4172-
<ref role="1Pybhc" to="j10v:~TreePVector" resolve="TreePVector" />
4173-
<ref role="37wK5l" to="j10v:~TreePVector.empty()" resolve="empty" />
4174-
</node>
4175-
</node>
4176-
</node>
4177-
<node concept="3cpWs6" id="7hc$_$D9OHe" role="3cqZAp">
4178-
<node concept="1eOMI4" id="7hc$_$D9QjU" role="3cqZAk">
4179-
<node concept="10QFUN" id="7hc$_$D9QjR" role="1eOMHV">
4180-
<node concept="17QB3L" id="7hc$_$D9QjW" role="10QFUM">
4181-
<node concept="29HgVG" id="7hc$_$Da8pv" role="lGtFl">
4182-
<node concept="3NFfHV" id="7hc$_$Da8pw" role="3NFExx">
4183-
<node concept="3clFbS" id="7hc$_$Da8px" role="2VODD2">
4184-
<node concept="3cpWs6" id="3OVxFdtw3HO" role="3cqZAp">
4185-
<node concept="2OqwBi" id="3OVxFdtw5IH" role="3cqZAk">
4186-
<node concept="2OqwBi" id="3OVxFdtw4Cc" role="2Oq$k0">
4187-
<node concept="30H73N" id="3OVxFdtw4dw" role="2Oq$k0" />
4188-
<node concept="3TrEf2" id="3OVxFdtw57i" role="2OqNvi">
4189-
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4156+
<node concept="gft3U" id="2Mag_ybL3DZ" role="1lVwrX">
4157+
<node concept="2OqwBi" id="2Mag_yc3Ru8" role="gfFT$">
4158+
<node concept="1bVj0M" id="2Mag_ybLaLk" role="2Oq$k0">
4159+
<node concept="3clFbS" id="2Mag_ybLaLl" role="1bW5cS">
4160+
<node concept="3cpWs8" id="2Mag_ybLm4j" role="3cqZAp">
4161+
<node concept="3cpWsn" id="2Mag_ybLm4k" role="3cpWs9">
4162+
<property role="TrG5h" value="listResult" />
4163+
<node concept="3uibUv" id="2Mag_ybLm4h" role="1tU5fm">
4164+
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
4165+
<node concept="3uibUv" id="2Mag_ybLp6l" role="11_B2D">
4166+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
4167+
<node concept="29HgVG" id="2Mag_ybLF1V" role="lGtFl">
4168+
<node concept="3NFfHV" id="2Mag_ybLF6I" role="3NFExx">
4169+
<node concept="3clFbS" id="2Mag_ybLF6J" role="2VODD2">
4170+
<node concept="3clFbF" id="2Mag_ybLFdG" role="3cqZAp">
4171+
<node concept="2OqwBi" id="2Mag_ybLOxV" role="3clFbG">
4172+
<node concept="2OqwBi" id="2Mag_ybLFx5" role="2Oq$k0">
4173+
<node concept="30H73N" id="2Mag_ybLFdF" role="2Oq$k0" />
4174+
<node concept="3TrEf2" id="2Mag_ybLN$E" role="2OqNvi">
4175+
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4176+
</node>
41904177
</node>
4178+
<node concept="3JvlWi" id="2Mag_ybLP50" role="2OqNvi" />
41914179
</node>
4192-
<node concept="3JvlWi" id="3OVxFdtw93h" role="2OqNvi" />
41934180
</node>
41944181
</node>
41954182
</node>
41964183
</node>
41974184
</node>
41984185
</node>
4199-
<node concept="2OqwBi" id="7hc$_$D9SNx" role="10QFUP">
4200-
<node concept="37vLTw" id="7hc$_$D9Ra6" role="2Oq$k0">
4201-
<ref role="3cqZAo" node="4lRNjFWPT4i" resolve="tpv" />
4202-
<node concept="29HgVG" id="7hc$_$Da3$W" role="lGtFl">
4203-
<node concept="3NFfHV" id="7hc$_$Da3$X" role="3NFExx">
4204-
<node concept="3clFbS" id="7hc$_$Da3$Y" role="2VODD2">
4205-
<node concept="3clFbF" id="7hc$_$Da3_4" role="3cqZAp">
4206-
<node concept="2OqwBi" id="7hc$_$Da3$Z" role="3clFbG">
4207-
<node concept="3TrEf2" id="7hc$_$Da3_2" role="2OqNvi">
4208-
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
4209-
</node>
4210-
<node concept="30H73N" id="7hc$_$Da3_3" role="2Oq$k0" />
4186+
<node concept="2YIFZM" id="2Mag_ybLC5L" role="33vP2m">
4187+
<ref role="1Pybhc" to="j10v:~TreePVector" resolve="TreePVector" />
4188+
<ref role="37wK5l" to="j10v:~TreePVector.empty()" resolve="empty" />
4189+
<node concept="29HgVG" id="2Mag_ybLPze" role="lGtFl">
4190+
<node concept="3NFfHV" id="2Mag_ybRIcw" role="3NFExx">
4191+
<node concept="3clFbS" id="2Mag_ybRIcx" role="2VODD2">
4192+
<node concept="3clFbF" id="2Mag_ybRI_P" role="3cqZAp">
4193+
<node concept="2OqwBi" id="2Mag_ybRJ5m" role="3clFbG">
4194+
<node concept="30H73N" id="2Mag_ybRI_O" role="2Oq$k0" />
4195+
<node concept="3TrEf2" id="2Mag_ybRJSY" role="2OqNvi">
4196+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
42114197
</node>
42124198
</node>
42134199
</node>
42144200
</node>
42154201
</node>
42164202
</node>
4217-
<node concept="liA8E" id="7hc$_$D9VyC" role="2OqNvi">
4203+
</node>
4204+
</node>
4205+
</node>
4206+
<node concept="3cpWs6" id="2Mag_ybRL9g" role="3cqZAp">
4207+
<node concept="3K4zz7" id="2Mag_ybRQ$M" role="3cqZAk">
4208+
<node concept="10Nm6u" id="2Mag_ybRVGe" role="3K4E3e" />
4209+
<node concept="2OqwBi" id="2Mag_ybRL9i" role="3K4Cdx">
4210+
<node concept="37vLTw" id="2Mag_ybRL9j" role="2Oq$k0">
4211+
<ref role="3cqZAo" node="2Mag_ybLm4k" resolve="listResult" />
4212+
</node>
4213+
<node concept="liA8E" id="2Mag_ybRL9k" role="2OqNvi">
4214+
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
4215+
</node>
4216+
</node>
4217+
<node concept="2OqwBi" id="2Mag_ybRW6r" role="3K4GZi">
4218+
<node concept="37vLTw" id="2Mag_ybRW6s" role="2Oq$k0">
4219+
<ref role="3cqZAo" node="2Mag_ybLm4k" resolve="listResult" />
4220+
</node>
4221+
<node concept="liA8E" id="2Mag_ybRW6$" role="2OqNvi">
42184222
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
4219-
<node concept="3cpWsd" id="7hc$_$Da2f$" role="37wK5m">
4220-
<node concept="3cmrfG" id="7hc$_$Da2fB" role="3uHU7w">
4223+
<node concept="3cpWsd" id="2Mag_ybRW6_" role="37wK5m">
4224+
<node concept="3cmrfG" id="2Mag_ybRW6A" role="3uHU7w">
42214225
<property role="3cmrfH" value="1" />
42224226
</node>
4223-
<node concept="2OqwBi" id="7hc$_$D9YzM" role="3uHU7B">
4224-
<node concept="37vLTw" id="7hc$_$D9Wx7" role="2Oq$k0">
4225-
<ref role="3cqZAo" node="4lRNjFWPT4i" resolve="tpv" />
4226-
<node concept="29HgVG" id="7hc$_$Da6SP" role="lGtFl">
4227-
<node concept="3NFfHV" id="7hc$_$Da6SQ" role="3NFExx">
4228-
<node concept="3clFbS" id="7hc$_$Da6SR" role="2VODD2">
4229-
<node concept="3clFbF" id="7hc$_$Da6SX" role="3cqZAp">
4230-
<node concept="2OqwBi" id="7hc$_$Da6SS" role="3clFbG">
4231-
<node concept="3TrEf2" id="7hc$_$Da6SV" role="2OqNvi">
4232-
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
4233-
</node>
4234-
<node concept="30H73N" id="7hc$_$Da6SW" role="2Oq$k0" />
4235-
</node>
4236-
</node>
4237-
</node>
4238-
</node>
4239-
</node>
4227+
<node concept="2OqwBi" id="2Mag_ybRW6B" role="3uHU7B">
4228+
<node concept="37vLTw" id="2Mag_ybRW6C" role="2Oq$k0">
4229+
<ref role="3cqZAo" node="2Mag_ybLm4k" resolve="listResult" />
42404230
</node>
4241-
<node concept="liA8E" id="7hc$_$Da0sk" role="2OqNvi">
4231+
<node concept="liA8E" id="2Mag_ybRW6K" role="2OqNvi">
42424232
<ref role="37wK5l" to="33ny:~Collection.size()" resolve="size" />
42434233
</node>
42444234
</node>
42454235
</node>
42464236
</node>
42474237
</node>
42484238
</node>
4249-
<node concept="raruj" id="7hc$_$Da60f" role="lGtFl" />
42504239
</node>
42514240
</node>
42524241
</node>
4242+
<node concept="1Bd96e" id="2Mag_yc48C3" role="2OqNvi" />
42534243
</node>
42544244
</node>
42554245
</node>
@@ -4275,90 +4265,83 @@
42754265
</node>
42764266
</node>
42774267
</node>
4278-
<node concept="1Koe21" id="4lRNjFWPTV3" role="1lVwrX">
4279-
<node concept="312cEu" id="1uB4LRi1DB$" role="1Koe22">
4280-
<property role="TrG5h" value="First" />
4281-
<node concept="3clFb_" id="4lRNjFWPTV4" role="jymVt">
4282-
<property role="DiZV1" value="false" />
4283-
<property role="od$2w" value="false" />
4284-
<property role="2aFKle" value="false" />
4285-
<property role="TrG5h" value="foo" />
4286-
<node concept="3Tm1VV" id="4lRNjFWPTV5" role="1B3o_S" />
4287-
<node concept="3uibUv" id="1uB4LRicOnp" role="3clF45">
4288-
<ref role="3uigEE" node="1uB4LRi1DB$" resolve="First" />
4289-
</node>
4290-
<node concept="3clFbS" id="4lRNjFWPTV7" role="3clF47">
4291-
<node concept="3cpWs8" id="4lRNjFWPTV8" role="3cqZAp">
4292-
<node concept="3cpWsn" id="4lRNjFWPTV9" role="3cpWs9">
4293-
<property role="TrG5h" value="tpv" />
4294-
<node concept="3uibUv" id="4lRNjFWPTVa" role="1tU5fm">
4268+
<node concept="gft3U" id="2Mag_yctdMu" role="1lVwrX">
4269+
<node concept="2OqwBi" id="3sY9SE$T9qM" role="gfFT$">
4270+
<node concept="1bVj0M" id="3sY9SE$T9qN" role="2Oq$k0">
4271+
<node concept="3clFbS" id="3sY9SE$T9qO" role="1bW5cS">
4272+
<node concept="3cpWs8" id="2c8McWPcepq" role="3cqZAp">
4273+
<node concept="3cpWsn" id="2c8McWPcepr" role="3cpWs9">
4274+
<property role="TrG5h" value="listResult" />
4275+
<node concept="3uibUv" id="2c8McWPbWmx" role="1tU5fm">
42954276
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
4296-
<node concept="3uibUv" id="1uB4LRi1Rph" role="11_B2D">
4297-
<ref role="3uigEE" node="1uB4LRi1DB$" resolve="First" />
4298-
</node>
4299-
</node>
4300-
<node concept="2YIFZM" id="4lRNjFWPTVc" role="33vP2m">
4301-
<ref role="1Pybhc" to="j10v:~TreePVector" resolve="TreePVector" />
4302-
<ref role="37wK5l" to="j10v:~TreePVector.empty()" resolve="empty" />
4303-
</node>
4304-
</node>
4305-
</node>
4306-
<node concept="3cpWs6" id="4lRNjFWPTVd" role="3cqZAp">
4307-
<node concept="1eOMI4" id="3V3LVuR201V" role="3cqZAk">
4308-
<node concept="10QFUN" id="3V3LVuR201S" role="1eOMHV">
4309-
<node concept="2OqwBi" id="4lRNjFWPTVe" role="10QFUP">
4310-
<node concept="37vLTw" id="4lRNjFWPTVf" role="2Oq$k0">
4311-
<ref role="3cqZAo" node="4lRNjFWPTV9" resolve="tpv" />
4312-
<node concept="29HgVG" id="4lRNjFWQ_LY" role="lGtFl">
4313-
<node concept="3NFfHV" id="4lRNjFWQ_LZ" role="3NFExx">
4314-
<node concept="3clFbS" id="4lRNjFWQ_M0" role="2VODD2">
4315-
<node concept="3clFbF" id="4lRNjFWQ_M6" role="3cqZAp">
4316-
<node concept="2OqwBi" id="4lRNjFWQ_M1" role="3clFbG">
4317-
<node concept="3TrEf2" id="4lRNjFWQ_M4" role="2OqNvi">
4318-
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
4277+
<node concept="3uibUv" id="2c8McWPbWm$" role="11_B2D">
4278+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
4279+
<node concept="29HgVG" id="2c8McWPeBHw" role="lGtFl">
4280+
<node concept="3NFfHV" id="2c8McWPeBHx" role="3NFExx">
4281+
<node concept="3clFbS" id="2c8McWPeBHy" role="2VODD2">
4282+
<node concept="3clFbF" id="2c8McWPeBHC" role="3cqZAp">
4283+
<node concept="2OqwBi" id="2c8McWPeE03" role="3clFbG">
4284+
<node concept="2OqwBi" id="2c8McWPeBHz" role="2Oq$k0">
4285+
<node concept="3TrEf2" id="50BLp7Z72Ij" role="2OqNvi">
4286+
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
43194287
</node>
4320-
<node concept="30H73N" id="4lRNjFWQ_M5" role="2Oq$k0" />
4288+
<node concept="30H73N" id="2c8McWPeBHB" role="2Oq$k0" />
43214289
</node>
4290+
<node concept="3JvlWi" id="2c8McWPeFaQ" role="2OqNvi" />
43224291
</node>
43234292
</node>
43244293
</node>
43254294
</node>
43264295
</node>
4327-
<node concept="liA8E" id="3V3LVuR1YcO" role="2OqNvi">
4328-
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
4329-
<node concept="3cmrfG" id="3V3LVuR1YGd" role="37wK5m">
4330-
<property role="3cmrfH" value="0" />
4331-
</node>
4332-
</node>
43334296
</node>
4334-
<node concept="3uibUv" id="1uB4LRko_de" role="10QFUM">
4335-
<ref role="3uigEE" node="1uB4LRi1DB$" resolve="First" />
4336-
<node concept="29HgVG" id="1uB4LRko_mV" role="lGtFl">
4337-
<node concept="3NFfHV" id="1uB4LRko_mW" role="3NFExx">
4338-
<node concept="3clFbS" id="1uB4LRko_mX" role="2VODD2">
4339-
<node concept="3cpWs6" id="3OVxFdtgynM" role="3cqZAp">
4340-
<node concept="2OqwBi" id="3OVxFdtgAOf" role="3cqZAk">
4341-
<node concept="2OqwBi" id="3OVxFdtgyUt" role="2Oq$k0">
4342-
<node concept="30H73N" id="3OVxFdtgy_a" role="2Oq$k0" />
4343-
<node concept="3TrEf2" id="3OVxFdtgzoX" role="2OqNvi">
4344-
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4345-
</node>
4346-
</node>
4347-
<node concept="3JvlWi" id="3OVxFdtgBb$" role="2OqNvi" />
4297+
</node>
4298+
<node concept="2YIFZM" id="3sY9SE$T9qT" role="33vP2m">
4299+
<ref role="1Pybhc" to="j10v:~TreePVector" resolve="TreePVector" />
4300+
<ref role="37wK5l" to="j10v:~TreePVector.empty()" resolve="empty" />
4301+
<node concept="29HgVG" id="2c8McWPe12i" role="lGtFl">
4302+
<node concept="3NFfHV" id="2c8McWPe12j" role="3NFExx">
4303+
<node concept="3clFbS" id="2c8McWPe12k" role="2VODD2">
4304+
<node concept="3clFbF" id="2c8McWPe12q" role="3cqZAp">
4305+
<node concept="2OqwBi" id="2c8McWPe12l" role="3clFbG">
4306+
<node concept="3TrEf2" id="2c8McWPe12o" role="2OqNvi">
4307+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
43484308
</node>
4309+
<node concept="30H73N" id="2c8McWPe12p" role="2Oq$k0" />
43494310
</node>
43504311
</node>
43514312
</node>
43524313
</node>
43534314
</node>
43544315
</node>
4355-
<node concept="raruj" id="3V3LVuR2YVW" role="lGtFl" />
4316+
</node>
4317+
</node>
4318+
<node concept="3cpWs6" id="50BLp7YZpeV" role="3cqZAp">
4319+
<node concept="3K4zz7" id="50BLp7YZpeX" role="3cqZAk">
4320+
<node concept="10Nm6u" id="50BLp7YZpeY" role="3K4E3e" />
4321+
<node concept="2OqwBi" id="50BLp7YZpeZ" role="3K4Cdx">
4322+
<node concept="37vLTw" id="50BLp7YZpf0" role="2Oq$k0">
4323+
<ref role="3cqZAo" node="2c8McWPcepr" resolve="listResult" />
4324+
</node>
4325+
<node concept="liA8E" id="50BLp7YZpf1" role="2OqNvi">
4326+
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
4327+
</node>
4328+
</node>
4329+
<node concept="2OqwBi" id="50BLp7YZpf2" role="3K4GZi">
4330+
<node concept="37vLTw" id="50BLp7YZpf3" role="2Oq$k0">
4331+
<ref role="3cqZAo" node="2c8McWPcepr" resolve="listResult" />
4332+
</node>
4333+
<node concept="liA8E" id="50BLp7YZpf4" role="2OqNvi">
4334+
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
4335+
<node concept="3cmrfG" id="50BLp7YZpf5" role="37wK5m">
4336+
<property role="3cmrfH" value="0" />
4337+
</node>
4338+
</node>
4339+
</node>
43564340
</node>
43574341
</node>
43584342
</node>
43594343
</node>
4360-
<node concept="2tJIrI" id="1uB4LRi1FN0" role="jymVt" />
4361-
<node concept="3Tm1VV" id="1uB4LRi1DB_" role="1B3o_S" />
4344+
<node concept="1Bd96e" id="3sY9SE$T9rx" role="2OqNvi" />
43624345
</node>
43634346
</node>
43644347
</node>

0 commit comments

Comments
 (0)