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

Refactoring: moving the TypeTerm out of NewType, making the two constructs independent.

This commit is contained in:
Fedor Isakov 2017-05-03 13:50:11 +02:00
parent 49b7407581
commit 2b49f4e1c8
5 changed files with 950 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1232
typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
View File

File diff suppressed because it is too large Load Diff

162
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
View File

@ -1706,5 +1706,167 @@
<node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5hSMZ_ldW$B">
<property role="3GE5qa" value="type.term" />
<ref role="13h7C2" to="wq2x:5hSMZ_ldReM" resolve="TermArgumentList" />
<node concept="13i0hz" id="5hSMZ_ldW$M" role="13h7CS">
<property role="TrG5h" value="getArguments" />
<node concept="3Tm1VV" id="5hSMZ_ldW$N" role="1B3o_S" />
<node concept="2I9FWS" id="5hSMZ_ldW$O" role="3clF45" />
<node concept="3clFbS" id="5hSMZ_ldW$P" role="3clF47">
<node concept="3cpWs8" id="5hSMZ_ldW$Q" role="3cqZAp">
<node concept="3cpWsn" id="5hSMZ_ldW$R" role="3cpWs9">
<property role="TrG5h" value="params" />
<node concept="2I9FWS" id="5hSMZ_ldW$S" role="1tU5fm">
<ref role="2I9WkF" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
</node>
<node concept="2OqwBi" id="5hSMZ_ldW$T" role="33vP2m">
<node concept="2OqwBi" id="5hSMZ_ldW$U" role="2Oq$k0">
<node concept="2OqwBi" id="5hSMZ_ldW$V" role="2Oq$k0">
<node concept="13iPFW" id="5hSMZ_ldW$W" role="2Oq$k0" />
<node concept="2Xjw5R" id="5hSMZ_ldW$X" role="2OqNvi">
<node concept="1xMEDy" id="5hSMZ_ldW$Y" role="1xVPHs">
<node concept="chp4Y" id="5hSMZ_ldZ4J" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
</node>
</node>
</node>
</node>
<node concept="3TrEf2" id="5hSMZ_le0HE" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
</node>
</node>
<node concept="3Tsc0h" id="5hSMZ_le1Cy" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5hSMZ_ldW_2" role="3cqZAp">
<node concept="3cpWsn" id="5hSMZ_ldW_3" role="3cpWs9">
<property role="TrG5h" value="args" />
<node concept="2I9FWS" id="5hSMZ_ldW_4" role="1tU5fm">
<ref role="2I9WkF" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
</node>
<node concept="2OqwBi" id="5hSMZ_ldW_5" role="33vP2m">
<node concept="3Tsc0h" id="5hSMZ_ldW_6" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
</node>
<node concept="13iPFW" id="5hSMZ_ldW_7" role="2Oq$k0" />
</node>
</node>
</node>
<node concept="3clFbF" id="5hSMZ_ldW_8" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_ldW_9" role="3clFbG">
<node concept="2OqwBi" id="5hSMZ_ldW_a" role="2Oq$k0">
<node concept="37vLTw" id="5hSMZ_ldW_b" role="2Oq$k0">
<ref role="3cqZAo" node="5hSMZ_ldW$R" resolve="params" />
</node>
<node concept="3$u5V9" id="5hSMZ_ldW_c" role="2OqNvi">
<node concept="1bVj0M" id="5hSMZ_ldW_d" role="23t8la">
<node concept="3clFbS" id="5hSMZ_ldW_e" role="1bW5cS">
<node concept="3cpWs8" id="5hSMZ_ldW_f" role="3cqZAp">
<node concept="3cpWsn" id="5hSMZ_ldW_g" role="3cpWs9">
<property role="TrG5h" value="b" />
<node concept="3Tqbb2" id="5hSMZ_ldW_h" role="1tU5fm">
<ref role="ehGHo" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
</node>
<node concept="2OqwBi" id="5hSMZ_ldW_i" role="33vP2m">
<node concept="37vLTw" id="5hSMZ_ldW_j" role="2Oq$k0">
<ref role="3cqZAo" node="5hSMZ_ldW_3" resolve="args" />
</node>
<node concept="1z4cxt" id="5hSMZ_ldW_k" role="2OqNvi">
<node concept="1bVj0M" id="5hSMZ_ldW_l" role="23t8la">
<node concept="3clFbS" id="5hSMZ_ldW_m" role="1bW5cS">
<node concept="3clFbF" id="5hSMZ_ldW_n" role="3cqZAp">
<node concept="3clFbC" id="5hSMZ_ldW_o" role="3clFbG">
<node concept="37vLTw" id="5hSMZ_ldW_p" role="3uHU7w">
<ref role="3cqZAo" node="5hSMZ_ldW_D" resolve="p" />
</node>
<node concept="2OqwBi" id="5hSMZ_ldW_q" role="3uHU7B">
<node concept="37vLTw" id="5hSMZ_ldW_r" role="2Oq$k0">
<ref role="3cqZAo" node="5hSMZ_ldW_t" resolve="it" />
</node>
<node concept="3TrEf2" id="5hSMZ_le2Gl" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="5hSMZ_ldW_t" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="5hSMZ_ldW_u" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5hSMZ_ldW_v" role="3cqZAp">
<node concept="3K4zz7" id="5hSMZ_ldW_w" role="3clFbG">
<node concept="2OqwBi" id="5hSMZ_ldW_x" role="3K4E3e">
<node concept="37vLTw" id="5hSMZ_ldW_y" role="2Oq$k0">
<ref role="3cqZAo" node="5hSMZ_ldW_g" resolve="b" />
</node>
<node concept="3TrEf2" id="5hSMZ_ldW_z" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
</node>
</node>
<node concept="2c44tf" id="5hSMZ_ldW_$" role="3K4GZi">
<node concept="10Nm6u" id="5hSMZ_ldW__" role="2c44tc" />
</node>
<node concept="3y3z36" id="5hSMZ_ldW_A" role="3K4Cdx">
<node concept="10Nm6u" id="5hSMZ_ldW_B" role="3uHU7w" />
<node concept="37vLTw" id="5hSMZ_ldW_C" role="3uHU7B">
<ref role="3cqZAo" node="5hSMZ_ldW_g" resolve="b" />
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="5hSMZ_ldW_D" role="1bW2Oz">
<property role="TrG5h" value="p" />
<node concept="2jxLKc" id="5hSMZ_ldW_E" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="5hSMZ_ldW_F" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="13hLZK" id="5hSMZ_ldW$C" role="13h7CW">
<node concept="3clFbS" id="5hSMZ_ldW$D" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5hSMZ_ltVxm">
<property role="3GE5qa" value="constraint.typespecific" />
<ref role="13h7C2" to="wq2x:4MEOIDFfpSk" resolve="NewTypePseudoConstraint" />
<node concept="13hLZK" id="5hSMZ_ltVxn" role="13h7CW">
<node concept="3clFbS" id="5hSMZ_ltVxo" role="2VODD2" />
</node>
<node concept="13i0hz" id="5hSMZ_ltVxx" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="13i0it" value="false" />
<property role="TrG5h" value="getTypeDeclaration" />
<ref role="13i0hy" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
<node concept="3Tm1VV" id="5hSMZ_ltVxy" role="1B3o_S" />
<node concept="3clFbS" id="5hSMZ_ltVx_" role="3clF47">
<node concept="3clFbF" id="5hSMZ_ltVzJ" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_ltVID" role="3clFbG">
<node concept="13iPFW" id="5hSMZ_ltVzI" role="2Oq$k0" />
<node concept="3TrEf2" id="5hSMZ_ltVS$" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="typeDecl" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="5hSMZ_ltVxA" role="3clF45">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
</model>

87
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
View File

@ -828,7 +828,7 @@
<node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
<property role="TrG5h" value="td" />
<node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
<ref role="ehGHo" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
<node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
<node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
@ -842,8 +842,8 @@
<node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
</node>
</node>
<node concept="3TrEf2" id="6fXjIfxgfUd" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
<node concept="3TrEf2" id="5hSMZ_ln0D$" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
</node>
</node>
</node>
@ -857,13 +857,8 @@
<ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
<node concept="2OqwBi" id="6fXjIfxgfUi" role="37wK5m">
<node concept="2OqwBi" id="6fXjIfxgfUj" role="2Oq$k0">
<node concept="2OqwBi" id="6fXjIfxgfUk" role="2Oq$k0">
<node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
<ref role="3cqZAo" node="6fXjIfxgfU4" resolve="td" />
</node>
<node concept="3TrEf2" id="6fXjIfxgfUm" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
</node>
<node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
<ref role="3cqZAo" node="6fXjIfxgfU4" resolve="td" />
</node>
<node concept="3TrEf2" id="6fXjIfxgfUn" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
@ -1008,5 +1003,77 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="5hSMZ_ldVhx">
<property role="3GE5qa" value="type.term" />
<ref role="1M2myG" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
<node concept="1N5Pfh" id="5hSMZ_ldVhy" role="1Mr941">
<ref role="1N5Vy1" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
<node concept="3dgokm" id="5hSMZ_ldVhA" role="1N6uqs">
<node concept="3clFbS" id="5hSMZ_ldVhC" role="2VODD2">
<node concept="3clFbF" id="5hSMZ_ldVkx" role="3cqZAp">
<node concept="2ShNRf" id="5hSMZ_ldVky" role="3clFbG">
<node concept="YeOm9" id="5hSMZ_ldVkz" role="2ShVmc">
<node concept="1Y3b0j" id="5hSMZ_ldVk$" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
<node concept="3Tm1VV" id="5hSMZ_ldVk_" role="1B3o_S" />
<node concept="3clFb_" id="5hSMZ_ldVkA" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="getName" />
<node concept="17QB3L" id="5hSMZ_ldVkB" role="3clF45" />
<node concept="3Tm1VV" id="5hSMZ_ldVkC" role="1B3o_S" />
<node concept="37vLTG" id="5hSMZ_ldVkD" role="3clF46">
<property role="TrG5h" value="child" />
<node concept="3Tqbb2" id="5hSMZ_ldVkE" role="1tU5fm" />
</node>
<node concept="3clFbS" id="5hSMZ_ldVkF" role="3clF47">
<node concept="3clFbF" id="5hSMZ_ldVkG" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_ldVkH" role="3clFbG">
<node concept="1PxgMI" id="5hSMZ_ldVkI" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="37vLTw" id="5hSMZ_ldVkJ" role="1m5AlR">
<ref role="3cqZAo" node="5hSMZ_ldVkD" resolve="child" />
</node>
<node concept="chp4Y" id="5hSMZ_ldVkK" role="3oSUPX">
<ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
<node concept="3TrcHB" id="5hSMZ_ldVkL" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5hSMZ_ldVkM" role="37wK5m">
<node concept="2OqwBi" id="5hSMZ_ldVkN" role="2Oq$k0">
<node concept="2OqwBi" id="5hSMZ_ldVkO" role="2Oq$k0">
<node concept="2rP1CM" id="5hSMZ_ldVkP" role="2Oq$k0" />
<node concept="2Xjw5R" id="5hSMZ_ldVkQ" role="2OqNvi">
<node concept="1xMEDy" id="5hSMZ_ldVkR" role="1xVPHs">
<node concept="chp4Y" id="5hSMZ_lxKJf" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
</node>
</node>
<node concept="1xIGOp" id="5hSMZ_ldVkT" role="1xVPHs" />
</node>
</node>
<node concept="3TrEf2" id="5hSMZ_lxLgI" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
</node>
</node>
<node concept="3Tsc0h" id="5hSMZ_lxLAA" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

155
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
View File

@ -4044,6 +4044,33 @@
<ref role="1k5W1q" node="7km57Pk7sC0" resolve="TypeTerm" />
</node>
</node>
<node concept="3nxI2P" id="5hSMZ_l94mK" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pkWqt" id="5hSMZ_ld88_" role="pqm2j">
<node concept="3clFbS" id="5hSMZ_ld88A" role="2VODD2">
<node concept="3clFbF" id="5hSMZ_ld8fN" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_ld9yE" role="3clFbG">
<node concept="2OqwBi" id="5hSMZ_ld8ty" role="2Oq$k0">
<node concept="pncrf" id="5hSMZ_ld8fM" role="2Oq$k0" />
<node concept="3TrEf2" id="5hSMZ_ld99e" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
</node>
</node>
<node concept="3x8VRR" id="5hSMZ_lda95" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="1iCGBv" id="5hSMZ_l942J" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
<node concept="1sVBvm" id="5hSMZ_l942L" role="1sWHZn">
<node concept="3F0A7n" id="5hSMZ_l94mH" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="3F0ifn" id="1L74NXFOwvI" role="3EZMnx">
<property role="3F0ifm" value="(" />
@ -4057,6 +4084,27 @@
</node>
<node concept="3F1sOY" id="1L74NXEmI68" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:1L74NXEmI65" resolve="argument" />
<node concept="3nxI2P" id="5hSMZ_le38Y" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pkWqt" id="5hSMZ_lvfdP" role="pqm2j">
<node concept="3clFbS" id="5hSMZ_lvfdQ" role="2VODD2">
<node concept="3clFbF" id="5hSMZ_lvfl3" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_lvg_c" role="3clFbG">
<node concept="2OqwBi" id="5hSMZ_lvfyM" role="2Oq$k0">
<node concept="pncrf" id="5hSMZ_lvfl2" role="2Oq$k0" />
<node concept="3TrEf2" id="5hSMZ_lvgeS" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
</node>
</node>
<node concept="3x8VRR" id="5hSMZ_lvh07" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="3F1sOY" id="5hSMZ_le4li" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
</node>
<node concept="3F0ifn" id="1L74NXEn_ul" role="3EZMnx">
<property role="3F0ifm" value=")" />
@ -5607,8 +5655,55 @@
<property role="3F0ifm" value="newType" />
<ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
</node>
<node concept="1iCGBv" id="5hSMZ_lpX5n" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_lpUoi" resolve="typeDecl" />
<node concept="1sVBvm" id="5hSMZ_lpX5p" role="1sWHZn">
<node concept="3F0A7n" id="5hSMZ_lpX5$" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="3F0ifn" id="5hSMZ_lrdys" role="3EZMnx">
<property role="3F0ifm" value="(" />
<ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
<node concept="11L4FC" id="5hSMZ_lrdyt" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="5hSMZ_lrdyu" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="5hSMZ_lrdyv" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_lrcKO" resolve="typeArgument" />
<node concept="3nxI2P" id="5hSMZ_lrdyw" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="5hSMZ_lrdyy" role="3EZMnx">
<property role="3F0ifm" value=")" />
<ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
<node concept="11L4FC" id="5hSMZ_lrdyz" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="4MEOIDFfpTJ" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
<node concept="pkWqt" id="5hSMZ_lxkX9" role="pqm2j">
<node concept="3clFbS" id="5hSMZ_lxkXa" role="2VODD2">
<node concept="3clFbF" id="5hSMZ_lxl4n" role="3cqZAp">
<node concept="2OqwBi" id="5hSMZ_lxm2F" role="3clFbG">
<node concept="2OqwBi" id="5hSMZ_lxliS" role="2Oq$k0">
<node concept="pncrf" id="5hSMZ_lxl4m" role="2Oq$k0" />
<node concept="3TrEf2" id="5hSMZ_lxlDq" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
</node>
</node>
<node concept="3x8VRR" id="5hSMZ_lxmzu" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="l2Vlx" id="4MEOIDFfpTj" role="2iSdaV" />
</node>
@ -6265,5 +6360,65 @@
</node>
</node>
</node>
<node concept="24kQdi" id="5hSMZ_ldV91">
<property role="3GE5qa" value="type.term" />
<ref role="1XX52x" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
<node concept="3EZMnI" id="5hSMZ_ldV93" role="2wV5jI">
<node concept="3EZMnI" id="5hSMZ_ldV94" role="3EZMnx">
<node concept="VPM3Z" id="5hSMZ_ldV95" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
<node concept="3vyZuw" id="5hSMZ_ldV96" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
<node concept="1Bsynf" id="5hSMZ_ldV97" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="1Bt7hp" id="5hSMZ_ldV98" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="1iCGBv" id="5hSMZ_ldV99" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
<node concept="1sVBvm" id="5hSMZ_ldV9a" role="1sWHZn">
<node concept="3F0A7n" id="5hSMZ_ldV9b" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
<ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
</node>
</node>
</node>
<node concept="3F0ifn" id="5hSMZ_ldV9c" role="3EZMnx">
<property role="3F0ifm" value="=" />
<node concept="11L4FC" id="5hSMZ_ldV9d" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="5hSMZ_ldV9e" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="5hSMZ_ldV9f" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:5hSMZ_ldV8_" resolve="code" />
</node>
<node concept="l2Vlx" id="5hSMZ_ldV9g" role="2iSdaV" />
</node>
<node concept="l2Vlx" id="5hSMZ_ldV9h" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="5hSMZ_ldWzO">
<property role="3GE5qa" value="type.term" />
<ref role="1XX52x" to="wq2x:5hSMZ_ldReM" resolve="TermArgumentList" />
<node concept="3EZMnI" id="5hSMZ_ldWzQ" role="2wV5jI">
<node concept="3F2HdR" id="5hSMZ_ldWzR" role="3EZMnx">
<property role="2czwfO" value="," />
<property role="Q2I2d" value="punctuation" />
<ref role="1NtTu8" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
<node concept="l2Vlx" id="5hSMZ_ldWzS" role="2czzBx" />
<node concept="3F0ifn" id="5hSMZ_ldWzT" role="2czzBI">
<property role="3F0ifm" value="" />
</node>
</node>
<node concept="l2Vlx" id="5hSMZ_ldWzU" role="2iSdaV" />
</node>
</node>
</model>

70
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
View File

@ -1086,8 +1086,15 @@
<property role="IQ2ns" value="2037618519496647045" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="argument" />
<property role="20lbJX" value="1" />
<property role="20lbJX" value="0..1" />
<ref role="20lvS9" node="1L74NXEmFJU" resolve="TypeArgumentList" />
<node concept="asaX9" id="5hSMZ_lg0sM" role="lGtFl" />
</node>
<node concept="1TJgyj" id="5hSMZ_ldQTd" role="1TKVEi">
<property role="IQ2ns" value="6086839168128216653" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="termArgument" />
<ref role="20lvS9" node="5hSMZ_ldReM" resolve="TermArgumentList" />
</node>
<node concept="1TJgyj" id="1L74NXFNj2L" role="1TKVEi">
<property role="IQ2ns" value="2037618519520915633" />
@ -1100,9 +1107,16 @@
<property role="IQ2ns" value="2037618519496446056" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="declaration" />
<property role="20lbJX" value="1" />
<property role="20lbJX" value="0..1" />
<property role="TrG5h" value="declaration" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
<node concept="asaX9" id="5hSMZ_ldQ_C" role="lGtFl" />
</node>
<node concept="1TJgyj" id="5hSMZ_l93p$" role="1TKVEi">
<property role="IQ2ns" value="6086839168126957156" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="termDecl" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
<node concept="PrWs8" id="1L74NXEmHzi" role="PzmwI">
<ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
@ -1199,6 +1213,13 @@
<property role="TrG5h" value="NewTypePseudoConstraint" />
<property role="34LRSv" value="new type" />
<ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
<node concept="1TJgyj" id="5hSMZ_lpUoi" role="1TKVEi">
<property role="IQ2ns" value="6086839168131376658" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="typeDecl" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
<property role="IQ2ns" value="5524459797186715209" />
<property role="20lmBu" value="aggregation" />
@ -1206,12 +1227,22 @@
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
</node>
<node concept="1TJgyj" id="5hSMZ_lrcKO" role="1TKVEi">
<property role="IQ2ns" value="6086839168131714100" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeArgument" />
<ref role="20lvS9" node="1L74NXEmFJU" resolve="TypeArgumentList" />
</node>
<node concept="1TJgyj" id="4MEOIDFfpTb" role="1TKVEi">
<property role="IQ2ns" value="5524459797186715211" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeTerm" />
<property role="20lbJX" value="1" />
<property role="20lbJX" value="0..1" />
<ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
<node concept="asaX9" id="5hSMZ_lrctE" role="lGtFl" />
</node>
<node concept="PrWs8" id="5hSMZ_ltV78" role="PzmwI">
<ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
</node>
</node>
<node concept="1TIwiD" id="4MEOIDFttoe">
@ -1348,5 +1379,38 @@
<property role="34LRSv" value="logicalContext" />
<ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
</node>
<node concept="1TIwiD" id="5hSMZ_ldReM">
<property role="EcuMT" value="6086839168128218034" />
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TermArgumentList" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="5hSMZ_ldWzp" role="1TKVEi">
<property role="IQ2ns" value="6086839168128239833" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="binding" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="5hSMZ_ldReN" resolve="TermParameterBinding" />
</node>
</node>
<node concept="1TIwiD" id="5hSMZ_ldReN">
<property role="EcuMT" value="6086839168128218035" />
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TermParameterBinding" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="5hSMZ_ldV8_" role="1TKVEi">
<property role="IQ2ns" value="6086839168128234021" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="code" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
</node>
<node concept="1TJgyj" id="5hSMZ_ldReO" role="1TKVEi">
<property role="IQ2ns" value="6086839168128218036" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="parameter" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
</node>
</node>
</model>