Skip to content

Commit 7c32f7b

Browse files
enikaoenikao
authored
Merge pull request #1187 from IETS3/bugfix/npe-in-CollectionTypeHelper
fixed NPE in CollectionTypeHelper
2 parents db4c887 + 4c0c8f7 commit 7c32f7b

File tree

2 files changed

+734
-69
lines changed

2 files changed

+734
-69
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps‎

Lines changed: 151 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@
365365
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
366366
<child id="540871147943773366" name="argument" index="25WWJ7" />
367367
</concept>
368+
<concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
369+
<child id="1172658456740" name="elementsToSkip" index="7T0AP" />
370+
</concept>
368371
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
369372
<child id="1153944400369" name="variable" index="2Gsz3X" />
370373
<child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -7097,111 +7100,191 @@
70977100
<node concept="2GrKxI" id="5S6DjSR_oMi" role="2Gsz3X">
70987101
<property role="TrG5h" value="type" />
70997102
</node>
7100-
<node concept="2OqwBi" id="5S6DjSR_oMj" role="2GsD0m">
7101-
<node concept="37vLTw" id="5S6DjSR_oMk" role="2Oq$k0">
7102-
<ref role="3cqZAo" node="5S6DjSRKnf3" resolve="types" />
7103+
<node concept="2OqwBi" id="uDbnF3N0p9" role="2GsD0m">
7104+
<node concept="2OqwBi" id="5S6DjSR_oMj" role="2Oq$k0">
7105+
<node concept="37vLTw" id="5S6DjSR_oMk" role="2Oq$k0">
7106+
<ref role="3cqZAo" node="5S6DjSRKnf3" resolve="types" />
7107+
</node>
7108+
<node concept="v3k3i" id="5S6DjSR_oMl" role="2OqNvi">
7109+
<node concept="chp4Y" id="5S6DjSR_oMm" role="v3oSu">
7110+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
7111+
</node>
7112+
</node>
71037113
</node>
7104-
<node concept="v3k3i" id="5S6DjSR_oMl" role="2OqNvi">
7105-
<node concept="chp4Y" id="5S6DjSR_oMm" role="v3oSu">
7106-
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
7114+
<node concept="7r0gD" id="uDbnF3N1HY" role="2OqNvi">
7115+
<node concept="3cmrfG" id="uDbnF3N1VY" role="7T0AP">
7116+
<property role="3cmrfH" value="1" />
71077117
</node>
71087118
</node>
71097119
</node>
71107120
<node concept="3clFbS" id="5S6DjSR_oMn" role="2LFqv$">
7111-
<node concept="3clFbF" id="5S6DjSR_oMo" role="3cqZAp">
7112-
<node concept="37vLTI" id="5S6DjSR_oMp" role="3clFbG">
7113-
<node concept="2YIFZM" id="5S6DjSR_oMq" role="37vLTx">
7114-
<ref role="37wK5l" to="oq0c:2NHHcg2FFpw" resolve="min" />
7115-
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
7116-
<node concept="2OqwBi" id="5S6DjSR_oMr" role="37wK5m">
7117-
<node concept="2OqwBi" id="5S6DjSR_oMs" role="2Oq$k0">
7118-
<node concept="37vLTw" id="5S6DjSRKol_" role="2Oq$k0">
7119-
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
7120-
</node>
7121-
<node concept="3TrEf2" id="5S6DjSR_oMu" role="2OqNvi">
7122-
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7123-
</node>
7121+
<node concept="3cpWs8" id="uDbnF3HEPV" role="3cqZAp">
7122+
<node concept="3cpWsn" id="uDbnF3HEPW" role="3cpWs9">
7123+
<property role="TrG5h" value="leftMin" />
7124+
<node concept="17QB3L" id="uDbnF3HEKn" role="1tU5fm" />
7125+
<node concept="2OqwBi" id="uDbnF3HEPX" role="33vP2m">
7126+
<node concept="2OqwBi" id="uDbnF3HEPY" role="2Oq$k0">
7127+
<node concept="37vLTw" id="uDbnF3HEPZ" role="2Oq$k0">
7128+
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
71247129
</node>
7125-
<node concept="3TrcHB" id="5S6DjSR_oMv" role="2OqNvi">
7126-
<ref role="3TsBF5" to="700h:19PglA20qXJ" resolve="min" />
7130+
<node concept="3TrEf2" id="uDbnF3HEQ0" role="2OqNvi">
7131+
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
71277132
</node>
71287133
</node>
7129-
<node concept="2OqwBi" id="5S6DjSR_oMw" role="37wK5m">
7130-
<node concept="2OqwBi" id="5S6DjSR_oMx" role="2Oq$k0">
7131-
<node concept="2GrUjf" id="5S6DjSR_oMy" role="2Oq$k0">
7132-
<ref role="2Gs0qQ" node="5S6DjSR_oMi" resolve="type" />
7133-
</node>
7134-
<node concept="3TrEf2" id="5S6DjSR_oMz" role="2OqNvi">
7135-
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7136-
</node>
7137-
</node>
7138-
<node concept="3TrcHB" id="5S6DjSR_oM$" role="2OqNvi">
7139-
<ref role="3TsBF5" to="700h:19PglA20qXJ" resolve="min" />
7140-
</node>
7134+
<node concept="3TrcHB" id="uDbnF3HEQ1" role="2OqNvi">
7135+
<ref role="3TsBF5" to="700h:19PglA20qXJ" resolve="min" />
71417136
</node>
71427137
</node>
7143-
<node concept="2OqwBi" id="5S6DjSR_oM_" role="37vLTJ">
7144-
<node concept="2OqwBi" id="5S6DjSR_oMA" role="2Oq$k0">
7145-
<node concept="37vLTw" id="5S6DjSR_ECC" role="2Oq$k0">
7146-
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
7138+
</node>
7139+
</node>
7140+
<node concept="3cpWs8" id="uDbnF3HFrj" role="3cqZAp">
7141+
<node concept="3cpWsn" id="uDbnF3HFrk" role="3cpWs9">
7142+
<property role="TrG5h" value="rightMin" />
7143+
<node concept="17QB3L" id="uDbnF3HFnl" role="1tU5fm" />
7144+
<node concept="2OqwBi" id="uDbnF3HFrl" role="33vP2m">
7145+
<node concept="2OqwBi" id="uDbnF3HFrm" role="2Oq$k0">
7146+
<node concept="2GrUjf" id="uDbnF3HFrn" role="2Oq$k0">
7147+
<ref role="2Gs0qQ" node="5S6DjSR_oMi" resolve="type" />
71477148
</node>
7148-
<node concept="3TrEf2" id="5S6DjSR_oMC" role="2OqNvi">
7149+
<node concept="3TrEf2" id="uDbnF3HFro" role="2OqNvi">
71497150
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
71507151
</node>
71517152
</node>
7152-
<node concept="3TrcHB" id="5S6DjSR_oMD" role="2OqNvi">
7153+
<node concept="3TrcHB" id="uDbnF3HFrp" role="2OqNvi">
71537154
<ref role="3TsBF5" to="700h:19PglA20qXJ" resolve="min" />
71547155
</node>
71557156
</node>
71567157
</node>
71577158
</node>
7158-
<node concept="3clFbF" id="5S6DjSR_oME" role="3cqZAp">
7159-
<node concept="37vLTI" id="5S6DjSR_oMF" role="3clFbG">
7160-
<node concept="2YIFZM" id="5S6DjSR_oMG" role="37vLTx">
7161-
<ref role="37wK5l" to="oq0c:2NHHcg2FPgZ" resolve="max" />
7162-
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
7163-
<node concept="2OqwBi" id="5S6DjSR_oMH" role="37wK5m">
7164-
<node concept="2OqwBi" id="5S6DjSR_oMI" role="2Oq$k0">
7165-
<node concept="37vLTw" id="5S6DjSRKpjM" role="2Oq$k0">
7166-
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
7159+
<node concept="3clFbJ" id="uDbnF3HEA3" role="3cqZAp">
7160+
<node concept="3clFbS" id="uDbnF3HEA5" role="3clFbx">
7161+
<node concept="3clFbF" id="5S6DjSR_oMo" role="3cqZAp">
7162+
<node concept="37vLTI" id="5S6DjSR_oMp" role="3clFbG">
7163+
<node concept="2YIFZM" id="5S6DjSR_oMq" role="37vLTx">
7164+
<ref role="37wK5l" to="oq0c:2NHHcg2FFpw" resolve="min" />
7165+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
7166+
<node concept="37vLTw" id="uDbnF3HEQ2" role="37wK5m">
7167+
<ref role="3cqZAo" node="uDbnF3HEPW" resolve="leftMin" />
71677168
</node>
7168-
<node concept="3TrEf2" id="5S6DjSR_oMK" role="2OqNvi">
7169-
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7169+
<node concept="37vLTw" id="uDbnF3HFrq" role="37wK5m">
7170+
<ref role="3cqZAo" node="uDbnF3HFrk" resolve="rightMin" />
71707171
</node>
71717172
</node>
7172-
<node concept="3TrcHB" id="5S6DjSR_oML" role="2OqNvi">
7173-
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
7174-
</node>
7175-
</node>
7176-
<node concept="2OqwBi" id="5S6DjSR_oMM" role="37wK5m">
7177-
<node concept="2OqwBi" id="5S6DjSR_oMN" role="2Oq$k0">
7178-
<node concept="2GrUjf" id="5S6DjSR_oMO" role="2Oq$k0">
7179-
<ref role="2Gs0qQ" node="5S6DjSR_oMi" resolve="type" />
7173+
<node concept="2OqwBi" id="uDbnF3HM52" role="37vLTJ">
7174+
<node concept="2OqwBi" id="uDbnF3HM53" role="2Oq$k0">
7175+
<node concept="37vLTw" id="uDbnF3HM54" role="2Oq$k0">
7176+
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
7177+
</node>
7178+
<node concept="3TrEf2" id="uDbnF3HM55" role="2OqNvi">
7179+
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7180+
</node>
71807181
</node>
7181-
<node concept="3TrEf2" id="5S6DjSR_oMP" role="2OqNvi">
7182-
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7182+
<node concept="3TrcHB" id="uDbnF3HM56" role="2OqNvi">
7183+
<ref role="3TsBF5" to="700h:19PglA20qXJ" resolve="min" />
71837184
</node>
71847185
</node>
7185-
<node concept="3TrcHB" id="5S6DjSR_oMQ" role="2OqNvi">
7186-
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
7187-
</node>
71887186
</node>
71897187
</node>
7190-
<node concept="2OqwBi" id="5S6DjSR_oMR" role="37vLTJ">
7191-
<node concept="2OqwBi" id="5S6DjSR_oMS" role="2Oq$k0">
7192-
<node concept="37vLTw" id="5S6DjSRKoP1" role="2Oq$k0">
7188+
</node>
7189+
<node concept="1Wc70l" id="uDbnF3HLgc" role="3clFbw">
7190+
<node concept="2OqwBi" id="uDbnF3HLy3" role="3uHU7w">
7191+
<node concept="37vLTw" id="uDbnF3HLqk" role="2Oq$k0">
7192+
<ref role="3cqZAo" node="uDbnF3HFrk" resolve="rightMin" />
7193+
</node>
7194+
<node concept="17RvpY" id="uDbnF3HLIF" role="2OqNvi" />
7195+
</node>
7196+
<node concept="2OqwBi" id="uDbnF3HII0" role="3uHU7B">
7197+
<node concept="37vLTw" id="uDbnF3HGc1" role="2Oq$k0">
7198+
<ref role="3cqZAo" node="uDbnF3HEPW" resolve="leftMin" />
7199+
</node>
7200+
<node concept="17RvpY" id="uDbnF3HK6V" role="2OqNvi" />
7201+
</node>
7202+
</node>
7203+
</node>
7204+
<node concept="3clFbH" id="uDbnF3HM$T" role="3cqZAp" />
7205+
<node concept="3cpWs8" id="uDbnF3HMH1" role="3cqZAp">
7206+
<node concept="3cpWsn" id="uDbnF3HMH2" role="3cpWs9">
7207+
<property role="TrG5h" value="leftMax" />
7208+
<node concept="17QB3L" id="uDbnF3HMB2" role="1tU5fm" />
7209+
<node concept="2OqwBi" id="uDbnF3HMH3" role="33vP2m">
7210+
<node concept="2OqwBi" id="uDbnF3HMH4" role="2Oq$k0">
7211+
<node concept="37vLTw" id="uDbnF3HMH5" role="2Oq$k0">
71937212
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
71947213
</node>
7195-
<node concept="3TrEf2" id="5S6DjSR_oMU" role="2OqNvi">
7214+
<node concept="3TrEf2" id="uDbnF3HMH6" role="2OqNvi">
71967215
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
71977216
</node>
71987217
</node>
7199-
<node concept="3TrcHB" id="5S6DjSR_oMV" role="2OqNvi">
7218+
<node concept="3TrcHB" id="uDbnF3HMH7" role="2OqNvi">
72007219
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
72017220
</node>
72027221
</node>
72037222
</node>
72047223
</node>
7224+
<node concept="3cpWs8" id="uDbnF3HMWC" role="3cqZAp">
7225+
<node concept="3cpWsn" id="uDbnF3HMWD" role="3cpWs9">
7226+
<property role="TrG5h" value="rightMax" />
7227+
<node concept="17QB3L" id="uDbnF3HMSh" role="1tU5fm" />
7228+
<node concept="2OqwBi" id="uDbnF3HMWE" role="33vP2m">
7229+
<node concept="2OqwBi" id="uDbnF3HMWF" role="2Oq$k0">
7230+
<node concept="2GrUjf" id="uDbnF3HMWG" role="2Oq$k0">
7231+
<ref role="2Gs0qQ" node="5S6DjSR_oMi" resolve="type" />
7232+
</node>
7233+
<node concept="3TrEf2" id="uDbnF3HMWH" role="2OqNvi">
7234+
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7235+
</node>
7236+
</node>
7237+
<node concept="3TrcHB" id="uDbnF3HMWI" role="2OqNvi">
7238+
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
7239+
</node>
7240+
</node>
7241+
</node>
7242+
</node>
7243+
<node concept="3clFbJ" id="uDbnF3HNy8" role="3cqZAp">
7244+
<node concept="3clFbS" id="uDbnF3HNya" role="3clFbx">
7245+
<node concept="3clFbF" id="5S6DjSR_oME" role="3cqZAp">
7246+
<node concept="37vLTI" id="5S6DjSR_oMF" role="3clFbG">
7247+
<node concept="2YIFZM" id="5S6DjSR_oMG" role="37vLTx">
7248+
<ref role="37wK5l" to="oq0c:2NHHcg2FPgZ" resolve="max" />
7249+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
7250+
<node concept="37vLTw" id="uDbnF3HMH8" role="37wK5m">
7251+
<ref role="3cqZAo" node="uDbnF3HMH2" resolve="leftMax" />
7252+
</node>
7253+
<node concept="37vLTw" id="uDbnF3HMWJ" role="37wK5m">
7254+
<ref role="3cqZAo" node="uDbnF3HMWD" resolve="rightMax" />
7255+
</node>
7256+
</node>
7257+
<node concept="2OqwBi" id="5S6DjSR_oMR" role="37vLTJ">
7258+
<node concept="2OqwBi" id="5S6DjSR_oMS" role="2Oq$k0">
7259+
<node concept="37vLTw" id="5S6DjSRKoP1" role="2Oq$k0">
7260+
<ref role="3cqZAo" node="5S6DjSR_ou7" resolve="collectionType" />
7261+
</node>
7262+
<node concept="3TrEf2" id="5S6DjSR_oMU" role="2OqNvi">
7263+
<ref role="3Tt5mk" to="700h:3tudP__pYOT" resolve="sizeConstraint" />
7264+
</node>
7265+
</node>
7266+
<node concept="3TrcHB" id="5S6DjSR_oMV" role="2OqNvi">
7267+
<ref role="3TsBF5" to="700h:19PglA20qXK" resolve="max" />
7268+
</node>
7269+
</node>
7270+
</node>
7271+
</node>
7272+
</node>
7273+
<node concept="1Wc70l" id="uDbnF3HSPN" role="3clFbw">
7274+
<node concept="2OqwBi" id="uDbnF3HTsk" role="3uHU7w">
7275+
<node concept="37vLTw" id="uDbnF3HT1x" role="2Oq$k0">
7276+
<ref role="3cqZAo" node="uDbnF3HMWD" resolve="rightMax" />
7277+
</node>
7278+
<node concept="17RvpY" id="uDbnF3HTED" role="2OqNvi" />
7279+
</node>
7280+
<node concept="2OqwBi" id="uDbnF3HPgR" role="3uHU7B">
7281+
<node concept="37vLTw" id="uDbnF3HNGA" role="2Oq$k0">
7282+
<ref role="3cqZAo" node="uDbnF3HMH2" resolve="leftMax" />
7283+
</node>
7284+
<node concept="17RvpY" id="uDbnF3HRGe" role="2OqNvi" />
7285+
</node>
7286+
</node>
7287+
</node>
72057288
</node>
72067289
</node>
72077290
</node>

0 commit comments

Comments
 (0)