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

Rename TypeTerm* to Term*, collect together term-related generator templates, drop obsolete code.

This commit is contained in:
Fedor Isakov 2017-05-04 13:50:58 +02:00
parent 21dbecd386
commit 04397ff0f7
7 changed files with 1284 additions and 2365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1285,7 +1285,7 @@
</node>
<node concept="13h7C7" id="1L74NXEmHzJ">
<property role="3GE5qa" value="term" />
<ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
<ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="Term" />
<node concept="13hLZK" id="1L74NXEmHzK" role="13h7CW">
<node concept="3clFbS" id="1L74NXEmHzL" role="2VODD2" />
</node>
@ -1447,13 +1447,13 @@
</node>
<node concept="13h7C7" id="5UYwY$H7MGb">
<property role="3GE5qa" value="term" />
<ref role="13h7C2" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
<ref role="13h7C2" to="wq2x:1pPth$m5o9D" resolve="TermTemplate" />
<node concept="13i0hz" id="5UYwY$H7MGm" role="13h7CS">
<property role="TrG5h" value="valueFeatures" />
<node concept="3Tm1VV" id="5UYwY$H7MGn" role="1B3o_S" />
<node concept="A3Dl8" id="5UYwY$H7MID" role="3clF45">
<node concept="3Tqbb2" id="5UYwY$H7MIQ" role="A3Ik2">
<ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
</node>
</node>
<node concept="3clFbS" id="5UYwY$H7MGp" role="3clF47">
@ -1476,7 +1476,7 @@
</node>
<node concept="1mIQ4w" id="1GNw78$s22b" role="2OqNvi">
<node concept="chp4Y" id="1GNw78$s22c" role="cj9EA">
<ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
<ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
</node>
</node>
</node>
@ -1486,7 +1486,7 @@
</node>
<node concept="1mIQ4w" id="1GNw78$s22f" role="2OqNvi">
<node concept="chp4Y" id="1GNw78$s22g" role="cj9EA">
<ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
<ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
</node>
</node>
</node>
@ -1508,7 +1508,7 @@
<node concept="3Tm1VV" id="5UYwY$H7TrM" role="1B3o_S" />
<node concept="A3Dl8" id="5UYwY$H7TDk" role="3clF45">
<node concept="3Tqbb2" id="5UYwY$H7TDx" role="A3Ik2">
<ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
</node>
</node>
<node concept="3clFbS" id="5UYwY$H7TrO" role="3clF47">
@ -1531,7 +1531,7 @@
</node>
<node concept="1mIQ4w" id="1GNw78$s22K" role="2OqNvi">
<node concept="chp4Y" id="1GNw78$s22L" role="cj9EA">
<ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
<ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
</node>
</node>
</node>
@ -1541,7 +1541,7 @@
</node>
<node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
<node concept="chp4Y" id="5YVpdhev4Ub" role="cj9EA">
<ref role="cht4Q" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
<ref role="cht4Q" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
</node>
</node>
</node>
@ -1564,7 +1564,7 @@
</node>
<node concept="13h7C7" id="4MEOIDFxxVo">
<property role="3GE5qa" value="term" />
<ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
<node concept="13hLZK" id="4MEOIDFxxVp" role="13h7CW">
<node concept="3clFbS" id="4MEOIDFxxVq" role="2VODD2" />
</node>
@ -1591,7 +1591,7 @@
</node>
<node concept="13h7C7" id="4MEOIDG83_6">
<property role="3GE5qa" value="term" />
<ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
<node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
<property role="TrG5h" value="runtimeClassName" />
<node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
@ -1718,7 +1718,7 @@
<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" />
<ref role="2I9WkF" to="wq2x:4MEOIDFwTxW" resolve="TermDeclarationParameter" />
</node>
<node concept="2OqwBi" id="5hSMZ_ldW$T" role="33vP2m">
<node concept="2OqwBi" id="5hSMZ_ldW$U" role="2Oq$k0">
@ -1727,7 +1727,7 @@
<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" />
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
</node>
</node>
</node>

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

@ -819,7 +819,7 @@
</node>
<node concept="1M2fIO" id="1L74NXFMz8h">
<property role="3GE5qa" value="term" />
<ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
<ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TermFeatureOverride" />
<node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
<ref role="1N5Vy1" to="wq2x:1L74NXFMz74" resolve="feature" />
<node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
@ -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:4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="ehGHo" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
</node>
<node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
<node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
@ -836,7 +836,7 @@
<node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
<node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
<node concept="chp4Y" id="6fXjIfxgfUb" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
</node>
</node>
<node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
@ -938,7 +938,7 @@
</node>
<node concept="1M2fIO" id="4MEOIDFxysn">
<property role="3GE5qa" value="term" />
<ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
<node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
<ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
<node concept="3dgokm" id="6fXjIfxgfXc" role="1N6uqs">
@ -956,7 +956,7 @@
<node concept="2Xjw5R" id="6fXjIfxgfXl" role="2OqNvi">
<node concept="1xMEDy" id="6fXjIfxgfXm" role="1xVPHs">
<node concept="chp4Y" id="6fXjIfxgfXn" role="ri$Ld">
<ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="6fXjIfxgfXo" role="1xVPHs" />
@ -1053,7 +1053,7 @@
<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" />
<ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
</node>
</node>
<node concept="1xIGOp" id="5hSMZ_ldVkT" role="1xVPHs" />

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

@ -3057,7 +3057,7 @@
</node>
<node concept="24kQdi" id="1pPth$m6bZM">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
<ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TermTemplate" />
<node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
<node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
<property role="3F0ifm" value="[" />
@ -3092,17 +3092,17 @@
</node>
<node concept="24kQdi" id="1pPth$m6rC8">
<property role="3GE5qa" value="term.feature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
<node concept="1xolST" id="2N2MQGCLx7i" role="2wV5jI">
<property role="1xolSY" value="&lt;no feature&gt;" />
</node>
</node>
<node concept="24kQdi" id="2N2MQGCKV7Q">
<property role="3GE5qa" value="term.feature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
<node concept="3EZMnI" id="2N2MQGCKV7S" role="2wV5jI">
<node concept="PMmxH" id="1CcQBrPqlWf" role="3EZMnx">
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
</node>
<node concept="3F0ifn" id="2N2MQGCKV7U" role="3EZMnx">
<property role="3F0ifm" value=":" />
@ -3126,10 +3126,10 @@
</node>
<node concept="24kQdi" id="2N2MQGCLx6w">
<property role="3GE5qa" value="term.feature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
<node concept="3EZMnI" id="2N2MQGCLx6y" role="2wV5jI">
<node concept="PMmxH" id="1CcQBrPqlVQ" role="3EZMnx">
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
</node>
<node concept="3F0ifn" id="2N2MQGCLx6$" role="3EZMnx">
<property role="3F0ifm" value=":" />
@ -3149,10 +3149,10 @@
</node>
<node concept="24kQdi" id="2N2MQGCLx6L">
<property role="3GE5qa" value="term.feature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
<node concept="3EZMnI" id="2N2MQGCLx6N" role="2wV5jI">
<node concept="PMmxH" id="1CcQBrPqlW2" role="3EZMnx">
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
</node>
<node concept="3F0ifn" id="2N2MQGCLx6P" role="3EZMnx">
<property role="3F0ifm" value=":" />
@ -3172,10 +3172,10 @@
</node>
<node concept="24kQdi" id="2N2MQGCLx72">
<property role="3GE5qa" value="term.feature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
<ref role="1XX52x" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
<node concept="3EZMnI" id="2N2MQGCLx74" role="2wV5jI">
<node concept="PMmxH" id="1CcQBrPqlW8" role="3EZMnx">
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
<ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
</node>
<node concept="3F0ifn" id="2N2MQGCLx76" role="3EZMnx">
<property role="3F0ifm" value=":" />
@ -4062,7 +4062,7 @@
</node>
<node concept="24kQdi" id="1L74NXElXMi">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
<ref role="1XX52x" to="wq2x:1L74NXElX0R" resolve="Term" />
<node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
<node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
<node concept="1iCGBv" id="1L74NXEmHUe" role="3EZMnx">
@ -4143,7 +4143,7 @@
<property role="VOm3f" value="true" />
</node>
<node concept="A1WHu" id="4hPXq9Jmfb$" role="3vIgyS">
<ref role="A1WHt" node="4hPXq9Jmel2" resolve="TypeTerm_addOverride" />
<ref role="A1WHt" node="4hPXq9Jmel2" resolve="Term_addOverride" />
</node>
</node>
<node concept="3EZMnI" id="1L74NXFNJ0S" role="3EZMnx">
@ -4307,7 +4307,7 @@
</node>
<node concept="24kQdi" id="1L74NXFMBU3">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
<ref role="1XX52x" to="wq2x:1L74NXFMz6j" resolve="TermFeatureOverride" />
<node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
<node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:1L74NXFMz74" resolve="feature" />
@ -4332,6 +4332,7 @@
</node>
</node>
<node concept="24kQdi" id="7LZcKzBrF6I">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:7LZcKzBrEPK" resolve="TermListExpression" />
<node concept="3EZMnI" id="7LZcKzBrF6K" role="2wV5jI">
<node concept="3F0ifn" id="7LZcKzBzqk8" role="3EZMnx">
@ -4616,6 +4617,7 @@
</node>
</node>
<node concept="IW6AY" id="4hPXq9JmejC">
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="wq2x:7IysFe_ZPXH" resolve="TypeInitializerLogicalDeclaration" />
<node concept="1Qtc8_" id="4hPXq9JmejD" role="IW6Ez">
<node concept="3cWJ9i" id="4hPXq9JmejE" role="1Qtc8$">
@ -4772,9 +4774,9 @@
</node>
</node>
<node concept="3ICXOK" id="4hPXq9Jmel2">
<property role="TrG5h" value="TypeTerm_addOverride" />
<property role="TrG5h" value="Term_addOverride" />
<property role="3GE5qa" value="term" />
<ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
<ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="Term" />
<node concept="yp4Wq" id="4hPXq9Jmel3" role="lGtFl">
<property role="yp4Ub" value="ext_1_RTransform" />
</node>
@ -4961,6 +4963,11 @@
<ref role="2kkw0f" node="4hPXq9Jmes_" resolve="TypeDeclaration_parameter" />
</node>
</node>
<node concept="1s_PAr" id="4bWqD4C23I8" role="3ft7WO">
<node concept="2kknPI" id="4bWqD4C23I9" role="1s_PAo">
<ref role="2kkw0f" node="4bWqD4C22Ew" resolve="TermDeclaration_parameter" />
</node>
</node>
<node concept="1s_PAr" id="4hPXq9Jmew6" role="3ft7WO">
<node concept="2kknPI" id="4hPXq9Jmew7" role="1s_PAo">
<ref role="2kkw0f" node="4hPXq9Jmeuj" resolve="Expression_subst_LogicExpressionWrapper" />
@ -4974,6 +4981,7 @@
</node>
<node concept="Q6S24" id="4hPXq9JmepQ">
<property role="TrG5h" value="TypeNode_Expression" />
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3ft6gV" id="4hPXq9JmepS" role="3ft7WO">
<node concept="3ft6gW" id="4hPXq9JmepT" role="3ft5RY">
@ -5072,6 +5080,7 @@
</node>
<node concept="Q6S24" id="4hPXq9JmerR">
<property role="TrG5h" value="TypeLogical_Expression" />
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3ft6gV" id="4hPXq9JmerT" role="3ft7WO">
<node concept="3ft6gW" id="4hPXq9JmerU" role="3ft5RY">
@ -5101,6 +5110,7 @@
</node>
<node concept="Q6S24" id="4hPXq9Jmes_">
<property role="TrG5h" value="TypeDeclaration_parameter" />
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3ft6gV" id="4hPXq9JmesB" role="3ft7WO">
<node concept="3ft6gW" id="4hPXq9JmesC" role="3ft5RY">
@ -5127,31 +5137,6 @@
<ref role="4PJHt" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
</node>
</node>
<node concept="3ft6gV" id="4MEOIDFzaBu" role="3ft7WO">
<node concept="3ft6gW" id="4MEOIDFzaFK" role="3ft5RY">
<node concept="3clFbS" id="4MEOIDFzaFL" role="2VODD2">
<node concept="3clFbF" id="4MEOIDFzaMT" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDFzaMU" role="3clFbG">
<node concept="2OqwBi" id="4MEOIDFzaMV" role="2Oq$k0">
<node concept="3bvxqY" id="4MEOIDFzaMW" role="2Oq$k0" />
<node concept="2Xjw5R" id="4MEOIDFzaMX" role="2OqNvi">
<node concept="1xMEDy" id="4MEOIDFzaMY" role="1xVPHs">
<node concept="chp4Y" id="4MEOIDFzb0R" role="ri$Ld">
<ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="4MEOIDFzaN0" role="1xVPHs" />
</node>
</node>
<node concept="3x8VRR" id="4MEOIDFzaN1" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="3ft5Ry" id="4MEOIDFzaXh" role="3ft5RZ">
<ref role="4PJHt" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
</node>
</node>
</node>
<node concept="3p309x" id="4hPXq9Jmetj">
<property role="TrG5h" value="Statement_Contribution" />
@ -5641,15 +5626,18 @@
</node>
</node>
<node concept="3p36aQ" id="4hPXq9JmeBh">
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="wq2x:7IysFeA99oR" resolve="TypeLogicalExpression" />
</node>
<node concept="3p36aQ" id="4hPXq9JmeBi">
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
</node>
<node concept="3p36aQ" id="4hPXq9JmeBj">
<ref role="aqKnT" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
</node>
<node concept="3p36aQ" id="4hPXq9JmeBl">
<property role="3GE5qa" value="type" />
<ref role="aqKnT" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
</node>
<node concept="3p36aQ" id="4hPXq9JmeBm">
@ -5740,7 +5728,7 @@
</node>
<node concept="24kQdi" id="4MEOIDFttNn">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
<node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
<node concept="3F0ifn" id="4MEOIDFttNw" role="3EZMnx">
<property role="3F0ifm" value="term" />
@ -5775,7 +5763,7 @@
</node>
<node concept="24kQdi" id="4MEOIDFwTyh">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
<ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TermDeclarationParameter" />
<node concept="3EZMnI" id="4MEOIDFwTyj" role="2wV5jI">
<node concept="3F1sOY" id="4MEOIDFwTyq" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:4MEOIDFwTy3" resolve="type" />
@ -5789,7 +5777,7 @@
</node>
<node concept="24kQdi" id="4MEOIDFxyqZ">
<property role="3GE5qa" value="term" />
<ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
<node concept="3EZMnI" id="4MEOIDFxyr4" role="2wV5jI">
<node concept="1iCGBv" id="4MEOIDFxyre" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
@ -5806,7 +5794,7 @@
</node>
<node concept="3p36aQ" id="4MEOIDFxyrS">
<property role="3GE5qa" value="term" />
<ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
</node>
<node concept="24kQdi" id="20Ay2VefOqG">
<property role="3GE5qa" value="rule.clause" />
@ -5901,12 +5889,12 @@
</node>
<node concept="PKFIW" id="1CcQBrPqjQg">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="TypeFeature_final_name" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<property role="TrG5h" value="TermFeature_final_name" />
<ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
<node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
<node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
<property role="3F0ifm" value="final" />
<ref role="1ERwB7" node="1CcQBrPqIC4" resolve="TypeFeature_delete_final" />
<ref role="1ERwB7" node="1CcQBrPqIC4" resolve="TermFeature_delete_final" />
<ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
<node concept="pkWqt" id="1CcQBrPqjRc" role="pqm2j">
<node concept="3clFbS" id="1CcQBrPqjRd" role="2VODD2">
@ -5926,14 +5914,14 @@
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
<ref role="1k5W1q" node="1iWwVK2_Eea" resolve="TypeFeature" />
<node concept="A1WHr" id="1CcQBrPqp6y" role="3vIgyS">
<ref role="2ZyFGn" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<ref role="2ZyFGn" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
</node>
</node>
</node>
</node>
<node concept="IW6AY" id="1CcQBrPqlWO">
<property role="3GE5qa" value="term.feature" />
<ref role="aqKnT" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<ref role="aqKnT" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
<node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
<node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
<node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
@ -5988,8 +5976,8 @@
</node>
<node concept="1h_SRR" id="1CcQBrPqIC4">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="TypeFeature_delete_final" />
<ref role="1h_SK9" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
<property role="TrG5h" value="TermFeature_delete_final" />
<ref role="1h_SK9" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
<node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
<property role="1hAc7j" value="delete_action_id" />
<node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
@ -6498,5 +6486,35 @@
<node concept="l2Vlx" id="5hSMZ_lNwrh" role="2iSdaV" />
</node>
</node>
<node concept="Q6S24" id="4bWqD4C22Ew">
<property role="TrG5h" value="TermDeclaration_parameter" />
<property role="3GE5qa" value="term" />
<ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3ft6gV" id="4bWqD4C22EI" role="3ft7WO">
<node concept="3ft6gW" id="4bWqD4C22EJ" role="3ft5RY">
<node concept="3clFbS" id="4bWqD4C22EK" role="2VODD2">
<node concept="3clFbF" id="4bWqD4C22EL" role="3cqZAp">
<node concept="2OqwBi" id="4bWqD4C22EM" role="3clFbG">
<node concept="2OqwBi" id="4bWqD4C22EN" role="2Oq$k0">
<node concept="3bvxqY" id="4bWqD4C22EO" role="2Oq$k0" />
<node concept="2Xjw5R" id="4bWqD4C22EP" role="2OqNvi">
<node concept="1xMEDy" id="4bWqD4C22EQ" role="1xVPHs">
<node concept="chp4Y" id="4bWqD4C22ER" role="ri$Ld">
<ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="4bWqD4C22ES" role="1xVPHs" />
</node>
</node>
<node concept="3x8VRR" id="4bWqD4C22ET" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="3ft5Ry" id="4bWqD4C22EU" role="3ft5RZ">
<ref role="4PJHt" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
</node>
</node>
</node>
</model>

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

@ -626,7 +626,7 @@
</node>
</node>
<node concept="1TIwiD" id="1pPth$m5o9D">
<property role="TrG5h" value="TypeTermTemplate" />
<property role="TrG5h" value="TermTemplate" />
<property role="3GE5qa" value="term" />
<property role="EcuMT" value="1618328391714701929" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
@ -635,12 +635,12 @@
<property role="20kJfa" value="feature" />
<property role="20lbJX" value="1..n" />
<property role="IQ2ns" value="1618328391714701961" />
<ref role="20lvS9" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="20lvS9" node="1pPth$m5oa5" resolve="TermFeature" />
</node>
</node>
<node concept="1TIwiD" id="1pPth$m5oa5">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="TypeFeature" />
<property role="TrG5h" value="TermFeature" />
<property role="R5$K7" value="true" />
<property role="R5$K2" value="false" />
<property role="EcuMT" value="1618328391714701957" />
@ -656,10 +656,10 @@
</node>
<node concept="1TIwiD" id="1pPth$m5oa6">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="ListTypeFeature" />
<property role="TrG5h" value="ListTermFeature" />
<property role="34LRSv" value="list" />
<property role="EcuMT" value="1618328391714701958" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
<node concept="1TJgyj" id="3AWu6Embo_Z" role="1TKVEi">
<property role="IQ2ns" value="4160332554964928895" />
<property role="20lmBu" value="aggregation" />
@ -669,10 +669,10 @@
</node>
<node concept="1TIwiD" id="1pPth$m5oae">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="StringTypeFeature" />
<property role="TrG5h" value="StringTermFeature" />
<property role="34LRSv" value="string" />
<property role="EcuMT" value="1618328391714701966" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
<node concept="1TJgyj" id="1hX44vMEjQe" role="1TKVEi">
<property role="IQ2ns" value="1476354154047290766" />
<property role="20lmBu" value="aggregation" />
@ -689,10 +689,10 @@
</node>
<node concept="1TIwiD" id="1pPth$m5oaG">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="ReferenceTypeFeature" />
<property role="TrG5h" value="ReferenceTermFeature" />
<property role="34LRSv" value="reference" />
<property role="EcuMT" value="1618328391714701996" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
<node concept="1TJgyj" id="1hX44vNe1iN" role="1TKVEi">
<property role="IQ2ns" value="1476354154056651955" />
<property role="20lmBu" value="aggregation" />
@ -702,10 +702,10 @@
</node>
<node concept="1TIwiD" id="1pPth$m5oaL">
<property role="3GE5qa" value="term.feature" />
<property role="TrG5h" value="ChildTypeFeature" />
<property role="TrG5h" value="ChildTermFeature" />
<property role="34LRSv" value="child" />
<property role="EcuMT" value="1618328391714702001" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
<node concept="1TJgyj" id="2L20jGt8dYg" role="1TKVEi">
<property role="IQ2ns" value="3189112839535124368" />
<property role="20lmBu" value="aggregation" />
@ -740,7 +740,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="termDeclaration" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
<node concept="asaX9" id="5hSMZ_lNwsa" role="lGtFl" />
</node>
<node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
@ -776,7 +776,7 @@
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="termDecl" />
<property role="20lbJX" value="0..1" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
<node concept="asaX9" id="5hSMZ_lMoKM" role="lGtFl" />
</node>
<node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
@ -1082,7 +1082,7 @@
<node concept="1TIwiD" id="1L74NXElX0R">
<property role="EcuMT" value="2037618519496446007" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="TypeTerm" />
<property role="TrG5h" value="Term" />
<ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
<node concept="1TJgyj" id="1L74NXEmI65" role="1TKVEi">
<property role="IQ2ns" value="2037618519496647045" />
@ -1103,7 +1103,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="override" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="1L74NXFMz6j" resolve="TypeFeatureOverride" />
<ref role="20lvS9" node="1L74NXFMz6j" resolve="TermFeatureOverride" />
</node>
<node concept="1TJgyj" id="1L74NXElX1C" role="1TKVEi">
<property role="IQ2ns" value="2037618519496446056" />
@ -1118,7 +1118,7 @@
<property role="IQ2ns" value="6086839168126957156" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="termDecl" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
</node>
<node concept="PrWs8" id="1L74NXEmHzi" role="PzmwI">
<ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
@ -1165,7 +1165,7 @@
<node concept="1TIwiD" id="1L74NXFMz6j">
<property role="EcuMT" value="2037618519520719251" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="TypeFeatureOverride" />
<property role="TrG5h" value="TermFeatureOverride" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1L74NXFMBVS" role="1TKVEi">
<property role="IQ2ns" value="2037618519520739064" />
@ -1180,7 +1180,7 @@
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="feature" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1pPth$m5oa5" resolve="TypeFeature" />
<ref role="20lvS9" node="1pPth$m5oa5" resolve="TermFeature" />
</node>
</node>
<node concept="1TIwiD" id="7LZcKzBrEPK">
@ -1240,7 +1240,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeTerm" />
<property role="20lbJX" value="0..1" />
<ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
<ref role="20lvS9" node="1L74NXElX0R" resolve="Term" />
<node concept="asaX9" id="5hSMZ_lrctE" role="lGtFl" />
</node>
<node concept="PrWs8" id="5hSMZ_ltV78" role="PzmwI">
@ -1250,21 +1250,21 @@
<node concept="1TIwiD" id="4MEOIDFttoe">
<property role="EcuMT" value="5524459797190399502" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="TypeTermDeclaration" />
<property role="TrG5h" value="TermDeclaration" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="4MEOIDFttNi" role="1TKVEi">
<property role="IQ2ns" value="5524459797190401234" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="parameter" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
</node>
<node concept="1TJgyj" id="4MEOIDFttNk" role="1TKVEi">
<property role="IQ2ns" value="5524459797190401236" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="template" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
<ref role="20lvS9" node="1pPth$m5o9D" resolve="TermTemplate" />
</node>
<node concept="PrWs8" id="4MEOIDFttNg" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@ -1273,7 +1273,7 @@
<node concept="1TIwiD" id="4MEOIDFwTxW">
<property role="EcuMT" value="5524459797191301244" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="TypeTermDeclarationParameter" />
<property role="TrG5h" value="TermDeclarationParameter" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="4MEOIDFwTy3" role="1TKVEi">
<property role="IQ2ns" value="5524459797191301251" />
@ -1295,14 +1295,14 @@
<node concept="1TIwiD" id="4MEOIDFxxDM">
<property role="EcuMT" value="5524459797191465586" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="TypeTermDeclarationParameterReference" />
<property role="TrG5h" value="TermDeclarationParameterRef" />
<ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="1TJgyj" id="4MEOIDFxxDY" role="1TKVEi">
<property role="IQ2ns" value="5524459797191465598" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="parameter" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
</node>
<node concept="PrWs8" id="4MEOIDFxxDW" role="PzmwI">
<ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
@ -1411,7 +1411,7 @@
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="parameter" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
<ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
</node>
</node>
<node concept="1TIwiD" id="5hSMZ_lNwqz">
@ -1426,7 +1426,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="termDeclaration" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
</node>
<node concept="PrWs8" id="5hSMZ_lNwqA" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />

4
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
View File

@ -1400,7 +1400,7 @@
</node>
</node>
<node concept="1YbPZF" id="4MEOIDFzuUN">
<property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
<property role="TrG5h" value="typeof_TermDeclarationParameterRef" />
<property role="3GE5qa" value="term" />
<node concept="3clFbS" id="4MEOIDFzuUO" role="18ibNy">
<node concept="1Z5TYs" id="4MEOIDFzv5A" role="3cqZAp">
@ -1430,7 +1430,7 @@
</node>
<node concept="1YaCAy" id="4MEOIDFzuUQ" role="1YuTPh">
<property role="TrG5h" value="ttdpr" />
<ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
</node>
</node>
<node concept="1YbPZF" id="60zk4o7revn">

1106
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
View File

File diff suppressed because it is too large Load Diff