natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typechecking for vararg param decls: treat them as arrays.

This commit is contained in:
Grigorii Kirgizov 2020-05-18 16:31:54 +03:00
parent 9bbcf6ecef
commit 3047926ce4
2 changed files with 155 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -16401,7 +16401,7 @@
<node concept="ns1u0" id="JOGAOsVtaG" role="3A8w4Q">
<ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
<node concept="nsMwS" id="JOGAOsVtaH" role="ns1xD">
<ref role="nsMwP" node="58JqeLuPe7r" resolve="parameter" />
<ref role="nsMwP" node="39Sam6Zio_N" resolve="parameter" />
<node concept="1nq8_$" id="49obaclfijs" role="nsMwV">
<node concept="37jhX" id="5itBwMayPpO" role="1nq8_t">
<node concept="1nq8_$" id="5itBwMayPpN" role="37jj2">
@ -25204,6 +25204,105 @@
</node>
</node>
</node>
<node concept="1nLNMY" id="12QmIo_7sfH" role="1nK1Vg">
<property role="TrG5h" value="recover_variableArityType" />
<node concept="3clFbS" id="12QmIo_7sfI" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sfJ" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sfK" role="1nLNNK">
<node concept="3Aq93q" id="euG2bFds2k" role="1nLNMb">
<property role="3ArMco" value="false" />
<node concept="3I6sU6" id="euG2bFds2p" role="3Ip0Jz">
<node concept="3I6s7M" id="euG2bFds2s" role="3I6sU7">
<node concept="3Aqt3T" id="euG2bFds2t" role="3I6s78">
<ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
<node concept="a7P8L" id="euG2bFds2u" role="3AunhB">
<ref role="a7OzE" node="euG2bFds2m" resolve="Node" />
</node>
<node concept="1HFMs5" id="1mdVbTSaq3j" role="3AunhB">
<node concept="ns1u0" id="JOGAOsVtb$" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
<node concept="nsMwS" id="JOGAOsVtb_" role="ns1xD">
<ref role="nsMwP" node="39Sam6Zio_N" resolve="parameter" />
<node concept="1nq8_$" id="49obaclfiiQ" role="nsMwV">
<node concept="a7P8L" id="euG2bFeRAj" role="1nq8_t">
<ref role="a7OzE" node="euG2bFds2o" resolve="ElementType" />
</node>
</node>
</node>
</node>
<node concept="a7P8L" id="euG2bFds2w" role="1uarlU">
<ref role="a7OzE" node="euG2bFds2n" resolve="Type" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="euG2bFds1V" role="0Rg$4">
<node concept="aZer4" id="euG2bFds1W" role="3XD1gS">
<property role="TrG5h" value="ElementNode" />
</node>
<node concept="3Tqbb2" id="5f6wxQ3mXXK" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5f6wxQ33WHl" role="0Rg$4">
<node concept="aZer4" id="euG2bFds2m" role="3XD1gS">
<property role="TrG5h" value="Node" />
</node>
<node concept="3Tqbb2" id="5f6wxQ33WYC" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="euG2bFds2l" role="0Rg$4">
<node concept="aZer4" id="euG2bFds2n" role="3XD1gS">
<property role="TrG5h" value="Type" />
</node>
<node concept="aZer4" id="euG2bFds2o" role="3XD1gS">
<property role="TrG5h" value="ElementType" />
</node>
<node concept="32pEOW" id="24ciDNzxNEY" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdikj" role="3xSepv">
<node concept="3Aq9E8" id="euG2bFds1U" role="3xSepj">
<node concept="3I6sU6" id="euG2bFds1X" role="3Ip0Jz">
<node concept="3I6s7M" id="5WBVN_MAmUQ" role="3I6sU7">
<node concept="3Aqt3T" id="euG2bFid17" role="3I6s78">
<ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
<node concept="a7P8L" id="euG2bFid18" role="3AunhB">
<ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
</node>
<node concept="a7P8L" id="euG2bFid19" role="3AunhB">
<ref role="a7OzE" node="euG2bFds2o" resolve="ElementType" />
</node>
</node>
</node>
<node concept="3I6s7M" id="5WBVN_MAntK" role="3I6sU7">
<node concept="3A8Hvi" id="5TfjU0xvr71" role="3I6s78">
<node concept="a7P8L" id="5WBVN_MAnCc" role="3A8wtg">
<ref role="a7OzE" node="euG2bFds2m" resolve="Node" />
</node>
<node concept="HKQnh" id="1fZtLFT0QsX" role="3A8w4Q">
<node concept="2c44tf" id="5WBVN_MAnCp" role="HKQng">
<node concept="8X2XB" id="5WBVN_MAnCq" role="2c44tc">
<node concept="3uibUv" id="5WBVN_MAnCr" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="2c44te" id="5WBVN_MAnCs" role="lGtFl">
<node concept="1Ft4W6" id="7zIaaskbYIl" role="2c44t1">
<node concept="a7P8L" id="49obaclIRS9" role="1FtiSR">
<ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1nLNMY" id="12QmIo_7sfD" role="1nK1Vg">
<property role="TrG5h" value="recover_arrayType" />
<node concept="3clFbS" id="12QmIo_7sfE" role="1nLNMH">
@ -25303,105 +25402,6 @@
</node>
</node>
</node>
<node concept="1nLNMY" id="12QmIo_7sfH" role="1nK1Vg">
<property role="TrG5h" value="recover_variableArityType" />
<node concept="3clFbS" id="12QmIo_7sfI" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sfJ" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sfK" role="1nLNNK">
<node concept="3Aq93q" id="euG2bFds2k" role="1nLNMb">
<property role="3ArMco" value="false" />
<node concept="3I6sU6" id="euG2bFds2p" role="3Ip0Jz">
<node concept="3I6s7M" id="euG2bFds2s" role="3I6sU7">
<node concept="3Aqt3T" id="euG2bFds2t" role="3I6s78">
<ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
<node concept="a7P8L" id="euG2bFds2u" role="3AunhB">
<ref role="a7OzE" node="euG2bFds2m" resolve="Node" />
</node>
<node concept="1HFMs5" id="1mdVbTSaq3j" role="3AunhB">
<node concept="ns1u0" id="JOGAOsVtb$" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
<node concept="nsMwS" id="JOGAOsVtb_" role="ns1xD">
<ref role="nsMwP" node="58JqeLuPe7r" resolve="parameter" />
<node concept="1nq8_$" id="49obaclfiiQ" role="nsMwV">
<node concept="a7P8L" id="euG2bFeRAj" role="1nq8_t">
<ref role="a7OzE" node="euG2bFds2o" resolve="ElementType" />
</node>
</node>
</node>
</node>
<node concept="a7P8L" id="euG2bFds2w" role="1uarlU">
<ref role="a7OzE" node="euG2bFds2n" resolve="Type" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="euG2bFds1V" role="0Rg$4">
<node concept="aZer4" id="euG2bFds1W" role="3XD1gS">
<property role="TrG5h" value="ElementNode" />
</node>
<node concept="3Tqbb2" id="5f6wxQ3mXXK" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5f6wxQ33WHl" role="0Rg$4">
<node concept="aZer4" id="euG2bFds2m" role="3XD1gS">
<property role="TrG5h" value="Node" />
</node>
<node concept="3Tqbb2" id="5f6wxQ33WYC" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="euG2bFds2l" role="0Rg$4">
<node concept="aZer4" id="euG2bFds2n" role="3XD1gS">
<property role="TrG5h" value="Type" />
</node>
<node concept="aZer4" id="euG2bFds2o" role="3XD1gS">
<property role="TrG5h" value="ElementType" />
</node>
<node concept="32pEOW" id="24ciDNzxNEY" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdikj" role="3xSepv">
<node concept="3Aq9E8" id="euG2bFds1U" role="3xSepj">
<node concept="3I6sU6" id="euG2bFds1X" role="3Ip0Jz">
<node concept="3I6s7M" id="5WBVN_MAmUQ" role="3I6sU7">
<node concept="3Aqt3T" id="euG2bFid17" role="3I6s78">
<ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
<node concept="a7P8L" id="euG2bFid18" role="3AunhB">
<ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
</node>
<node concept="a7P8L" id="euG2bFid19" role="3AunhB">
<ref role="a7OzE" node="euG2bFds2o" resolve="ElementType" />
</node>
</node>
</node>
<node concept="3I6s7M" id="5WBVN_MAntK" role="3I6sU7">
<node concept="3A8Hvi" id="5TfjU0xvr71" role="3I6s78">
<node concept="a7P8L" id="5WBVN_MAnCc" role="3A8wtg">
<ref role="a7OzE" node="euG2bFds2m" resolve="Node" />
</node>
<node concept="HKQnh" id="1fZtLFT0QsX" role="3A8w4Q">
<node concept="2c44tf" id="5WBVN_MAnCp" role="HKQng">
<node concept="8X2XB" id="5WBVN_MAnCq" role="2c44tc">
<node concept="3uibUv" id="5WBVN_MAnCr" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="2c44te" id="5WBVN_MAnCs" role="lGtFl">
<node concept="1Ft4W6" id="7zIaaskbYIl" role="2c44t1">
<node concept="a7P8L" id="49obaclIRS9" role="1FtiSR">
<ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1nLNMY" id="12QmIo_7sfL" role="1nK1Vg">
<property role="TrG5h" value="recover_upperBoundType" />
<node concept="3clFbS" id="12QmIo_7sfM" role="1nLNMH">
@ -47077,6 +47077,7 @@
</node>
<node concept="ns1x$" id="JOGAOsVt2o" role="ns1xc">
<property role="TrG5h" value="array" />
<property role="3uGXoX" value="true" />
<ref role="ns1xW" node="4lCLOtwq2MF" resolve="type" />
<node concept="nspSf" id="JOGAOsVt2p" role="ns1xx">
<node concept="nstbe" id="39Sam6Zio_N" role="nspSe">
@ -47086,12 +47087,8 @@
</node>
<node concept="ns1x$" id="JOGAOsVt2r" role="ns1xc">
<property role="TrG5h" value="variableArity" />
<ref role="ns1xW" node="4lCLOtwq2MF" resolve="type" />
<node concept="nspSf" id="JOGAOsVt2s" role="ns1xx">
<node concept="nstbe" id="58JqeLuPe7r" role="nspSe">
<property role="TrG5h" value="parameter" />
</node>
</node>
<ref role="ns1xW" node="JOGAOsVt2o" resolve="array" />
<node concept="nspSf" id="JOGAOsVt2s" role="ns1xx" />
</node>
<node concept="ns1x$" id="JOGAOsVt2u" role="ns1xc">
<property role="TrG5h" value="upperBound" />
@ -48916,7 +48913,7 @@
<node concept="ns1u0" id="5JguS01jdEv" role="3sNhsz">
<ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
<node concept="nsMwS" id="5JguS01jdEC" role="ns1xD">
<ref role="nsMwP" node="58JqeLuPe7r" resolve="parameter" />
<ref role="nsMwP" node="39Sam6Zio_N" resolve="parameter" />
<node concept="1nq8_$" id="5JguS01jdEQ" role="nsMwV">
<node concept="a7P8L" id="5JguS01jdEO" role="1nq8_t">
<ref role="a7OzE" node="1yt2T3Thlfn" resolve="P" />

52
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
View File

@ -98,6 +98,7 @@
<concept id="5205855332950442198" name="jetbrains.mps.baseLanguage.structure.ArrayCloneOperation" flags="nn" index="2SEQ$1" />
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
<concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
<concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
@ -9798,10 +9799,59 @@
<node concept="312cEu" id="1yt2T3T4FOh">
<property role="TrG5h" value="Varargs" />
<node concept="2tJIrI" id="1yt2T3T4G2w" role="jymVt" />
<node concept="3clFbW" id="554EtBIorhP" role="jymVt">
<node concept="3cqZAl" id="554EtBIorhQ" role="3clF45" />
<node concept="3clFbS" id="554EtBIorhS" role="3clF47">
<node concept="XkiVB" id="554EtBIorky" role="3cqZAp">
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
</node>
</node>
<node concept="3Tm1VV" id="554EtBIorfz" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="1yt2T3T4Gyg" role="jymVt" />
<node concept="2YIFZL" id="1yt2T3T4Kjm" role="jymVt">
<property role="TrG5h" value="foo" />
<node concept="3clFbS" id="1yt2T3T4Kjr" role="3clF47" />
<node concept="3clFbS" id="1yt2T3T4Kjr" role="3clF47">
<node concept="3cpWs8" id="554EtBIcYRp" role="3cqZAp">
<node concept="3cpWsn" id="554EtBIcYRs" role="3cpWs9">
<property role="TrG5h" value="i1" />
<node concept="10Oyi0" id="554EtBIcYRo" role="1tU5fm" />
<node concept="AH0OO" id="554EtBIcYXH" role="33vP2m">
<node concept="3cmrfG" id="554EtBIcZ2o" role="AHEQo">
<property role="3cmrfH" value="0" />
</node>
<node concept="37vLTw" id="554EtBIcYSk" role="AHHXb">
<ref role="3cqZAo" node="1yt2T3T4Kjo" resolve="args" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="554EtBIfZP5" role="3cqZAp">
<node concept="3cpWsn" id="554EtBIfZPb" role="3cpWs9">
<property role="TrG5h" value="ints" />
<node concept="10Q1$e" id="554EtBIfZPd" role="1tU5fm">
<node concept="3uibUv" id="554EtBIfZPf" role="10Q1$1">
<ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
</node>
</node>
<node concept="37vLTw" id="554EtBIfZRj" role="33vP2m">
<ref role="3cqZAo" node="1yt2T3T4Kjo" resolve="args" />
</node>
</node>
</node>
<node concept="3cpWs8" id="554EtBIcZ6Q" role="3cqZAp">
<node concept="3cpWsn" id="554EtBIcZ6T" role="3cpWs9">
<property role="TrG5h" value="sz" />
<node concept="10Oyi0" id="554EtBIcZ6O" role="1tU5fm" />
<node concept="2OqwBi" id="554EtBIcZiA" role="33vP2m">
<node concept="37vLTw" id="554EtBIcZQV" role="2Oq$k0">
<ref role="3cqZAo" node="1yt2T3T4Kjo" resolve="args" />
</node>
<node concept="1Rwk04" id="554EtBIcZDP" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="3cqZAl" id="1yt2T3T4Kjt" role="3clF45" />
<node concept="37vLTG" id="1yt2T3T4Kjo" role="3clF46">
<property role="TrG5h" value="args" />