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

SModel types: support conversion of SConcept to concept<> type

This commit is contained in:
Fedor Isakov 2020-12-15 13:30:13 +01:00
parent c7dd00bb7e
commit 1acd35baca
2 changed files with 152 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
View File

@ -18171,6 +18171,98 @@
</node>
</node>
</node>
<node concept="1nLNMY" id="2hQbw6I4E44" role="1nK1Vg">
<property role="TrG5h" value="SConcept_convertsTo_concept" />
<node concept="3clFbS" id="2hQbw6I4E45" role="1nLNMH">
<node concept="1nLNNL" id="2hQbw6I4E46" role="3cqZAp">
<node concept="1nLNMm" id="2hQbw6I4E47" role="1nLNNK">
<node concept="3Aq93q" id="2hQbw6I4E48" role="1nLNMb">
<node concept="3I6sU6" id="2hQbw6I4E49" role="3Ip0Jz">
<node concept="3I6s7M" id="2hQbw6I4E4a" role="3I6sU7">
<node concept="3Aqt3T" id="2hQbw6I4E4b" role="3I6s78">
<ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
<node concept="1HFMs5" id="2hQbw6I4E4c" role="3AunhB">
<node concept="a7P8L" id="2hQbw6I4E4d" role="1uarlU">
<ref role="a7OzE" node="2hQbw6I4E4n" resolve="ClsType" />
</node>
<node concept="ns1u0" id="2hQbw6I4E4e" role="1uarlW">
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
</node>
</node>
<node concept="ns1u0" id="2hQbw6I4E4f" role="3AunhB">
<ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
<node concept="nsMwS" id="2hQbw6I4E4g" role="ns1xD">
<ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
<node concept="2OqwBi" id="2hQbw6I4E4h" role="nsMwV">
<node concept="2c44tf" id="2hQbw6I4E4i" role="2Oq$k0">
<node concept="3bZ5Sz" id="2hQbw6I4E4j" role="2c44tc">
<ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
</node>
<node concept="3TrEf2" id="2hQbw6I4E4k" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
</node>
</node>
</node>
</node>
<node concept="a7P8L" id="2hQbw6I4E4l" role="3AunhB">
<ref role="a7OzE" node="2hQbw6I4E4q" resolve="Options" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="2hQbw6I4E4m" role="0Rg$4">
<node concept="aZer4" id="2hQbw6I4E4n" role="3XD1gS">
<property role="TrG5h" value="ClsType" />
</node>
<node concept="32pEOW" id="2hQbw6I4E4o" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="2hQbw6I4E4p" role="0Rg$4">
<node concept="aZer4" id="2hQbw6I4E4q" role="3XD1gS">
<property role="TrG5h" value="Options" />
</node>
<node concept="3uibUv" id="2hQbw6I4E4r" role="3vLBG7">
<ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
</node>
</node>
<node concept="3xSepi" id="2hQbw6I4E4s" role="3xSepv">
<node concept="3Aq9E8" id="2hQbw6I4E4t" role="3xSepj">
<node concept="3I6sU6" id="2hQbw6I4E4u" role="3Ip0Jz">
<node concept="3I6s7M" id="2hQbw6I4E4v" role="3I6sU7">
<node concept="3Aqt3T" id="2hQbw6I4E4w" role="3I6s78">
<ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
<node concept="a7P8L" id="2hQbw6I4E4x" role="3AunhB">
<ref role="a7OzE" node="2hQbw6I4E4n" resolve="ClsType" />
</node>
<node concept="ns1u0" id="2hQbw6I4E4y" role="3AunhB">
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="2hQbw6I4E4z" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2OqwBi" id="2hQbw6I4E4$" role="nsMwV">
<node concept="2c44tf" id="2hQbw6I4E4_" role="2Oq$k0">
<node concept="3uibUv" id="2hQbw6I4E4A" role="2c44tc">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="3TrEf2" id="2hQbw6I4E4B" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
<node concept="a7P8L" id="2hQbw6I4E4C" role="3AunhB">
<ref role="a7OzE" node="2hQbw6I4E4q" resolve="Options" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1nLNMY" id="5cBWTAdNrCE" role="1nK1Vg">
<property role="TrG5h" value="SNodePointer_convertsTo_nodeptr" />
<node concept="3clFbS" id="5cBWTAdNrCF" role="1nLNMH">

72
samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
View File

@ -1894,18 +1894,6 @@
<node concept="2tJIrI" id="6Dg__VJQOHR" role="jymVt" />
<node concept="3clFb_" id="4boCUQtplKX" role="jymVt">
<property role="TrG5h" value="concept_to_classifier" />
<node concept="37vLTG" id="4boCUQtplTX" role="3clF46">
<property role="TrG5h" value="cc" />
<node concept="3bZ5Sz" id="4boCUQtpm0X" role="1tU5fm">
<ref role="3bZ5Sy" to="tpee:fz12cDA" resolve="ClassConcept" />
</node>
</node>
<node concept="37vLTG" id="4boCUQtqoIH" role="3clF46">
<property role="TrG5h" value="inc" />
<node concept="3bZ5Sz" id="4boCUQtqoPn" role="1tU5fm">
<ref role="3bZ5Sy" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
<node concept="3cqZAl" id="4boCUQtplKZ" role="3clF45" />
<node concept="3Tm1VV" id="4boCUQtplL0" role="1B3o_S" />
<node concept="3clFbS" id="4boCUQtplL1" role="3clF47">
@ -1969,6 +1957,66 @@
</node>
</node>
</node>
<node concept="37vLTG" id="4boCUQtplTX" role="3clF46">
<property role="TrG5h" value="cc" />
<node concept="3bZ5Sz" id="4boCUQtpm0X" role="1tU5fm">
<ref role="3bZ5Sy" to="tpee:fz12cDA" resolve="ClassConcept" />
</node>
</node>
<node concept="37vLTG" id="4boCUQtqoIH" role="3clF46">
<property role="TrG5h" value="inc" />
<node concept="3bZ5Sz" id="4boCUQtqoPn" role="1tU5fm">
<ref role="3bZ5Sy" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
</node>
<node concept="2tJIrI" id="2hQbw6I4cUq" role="jymVt" />
<node concept="3clFb_" id="2hQbw6I4eGH" role="jymVt">
<property role="TrG5h" value="classifier_to_concept" />
<node concept="37vLTG" id="2hQbw6I4isV" role="3clF46">
<property role="TrG5h" value="sc" />
<node concept="3uibUv" id="2hQbw6I4BFZ" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="3cqZAl" id="2hQbw6I4eGJ" role="3clF45" />
<node concept="3Tm1VV" id="2hQbw6I4eGK" role="1B3o_S" />
<node concept="3clFbS" id="2hQbw6I4eGL" role="3clF47">
<node concept="3cpWs8" id="2hQbw6I4lcz" role="3cqZAp">
<node concept="3cpWsn" id="2hQbw6I4lcA" role="3cpWs9">
<property role="TrG5h" value="concept" />
<node concept="3bZ5Sz" id="2hQbw6I4lcx" role="1tU5fm" />
<node concept="37vLTw" id="2hQbw6I4lwH" role="33vP2m">
<ref role="3cqZAo" node="2hQbw6I4isV" resolve="sc" />
</node>
</node>
</node>
<node concept="3cpWs8" id="2hQbw6I4nh1" role="3cqZAp">
<node concept="3cpWsn" id="2hQbw6I4nh2" role="3cpWs9">
<property role="TrG5h" value="baseConcept" />
<node concept="3bZ5Sz" id="2hQbw6I4nh3" role="1tU5fm">
<ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
<node concept="37vLTw" id="2hQbw6I4nh4" role="33vP2m">
<ref role="3cqZAo" node="2hQbw6I4isV" resolve="sc" />
</node>
</node>
</node>
<node concept="3cpWs8" id="2hQbw6I4moZ" role="3cqZAp">
<node concept="3cpWsn" id="2hQbw6I4mp2" role="3cpWs9">
<property role="TrG5h" value="inamedConcept" />
<node concept="3bZ5Sz" id="2hQbw6I4moX" role="1tU5fm">
<ref role="3bZ5Sy" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="37vLTw" id="2hQbw6I4p58" role="33vP2m">
<ref role="3cqZAo" node="2hQbw6I4isV" resolve="sc" />
</node>
<node concept="1U20sH" id="2hQbw6I4CxL" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="6Dg__VJQM$u" role="jymVt" />
<node concept="3clFb_" id="6Dg__VJJ_9b" role="jymVt">