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

Refactoring in the type templates: 

- get rid of the dependency on the type concept;
 - explicitly create type terms;
 - no more "alternative block";
 - introduce alternative "new type" pseudo constraint;
 - delete the deprecated constructs;
 - transition to TypeTermDeclaration;
 - separate the term declaration from the type constraints;
 - phasing out obsolete stuff.
This commit is contained in:
Fedor Isakov 2017-01-29 14:22:17 +01:00
parent 44019dca79
commit 0359ff0ccd
13 changed files with 2885 additions and 3567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test.xml
View File

@ -814,6 +814,7 @@
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.devkit" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@ -829,6 +830,7 @@
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />

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

File diff suppressed because it is too large Load Diff

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
View File

@ -31,6 +31,7 @@
</dependencies>
<usedDevKits>
<usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
<usedDevKit>a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)</usedDevKit>
</usedDevKits>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
@ -42,6 +43,7 @@
<language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />

331
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
View File

@ -87,7 +87,6 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
@ -104,7 +103,6 @@
</concept>
</language>
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
<concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
<concept id="1196433923911" name="jetbrains.mps.lang.actions.structure.SideTransform_SimpleString" flags="nn" index="2h1dTh">
<property id="1196433942569" name="text" index="2h1i$Z" />
</concept>
@ -987,138 +985,6 @@
</node>
</node>
</node>
<node concept="3FK_9_" id="2N2MQGCIMbe">
<property role="TrG5h" value="Expression_subst_Type" />
<node concept="1X3_iC" id="4hPXq9JmepN" role="lGtFl">
<property role="3V$3am" value="actionsBuilder" />
<property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
<node concept="3FOIzC" id="2N2MQGCIMbf" role="8Wnug">
<ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="tYCnQ" id="2N2MQGCIMsI" role="tZc4B">
<ref role="uz4UX" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
<node concept="uMFAO" id="2N2MQGCIMsK" role="uz6Si">
<node concept="3Tqbb2" id="2N2MQGCJ4jR" role="uMOYW">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="uSIkt" id="2N2MQGCIMsM" role="uTubQ">
<node concept="3clFbS" id="2N2MQGCIMsN" role="2VODD2">
<node concept="3cpWs8" id="2CEQDIDTvVJ" role="3cqZAp">
<node concept="3cpWsn" id="2CEQDIDTvVK" role="3cpWs9">
<property role="TrG5h" value="term" />
<node concept="3Tqbb2" id="2CEQDIDTvVH" role="1tU5fm">
<ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
</node>
<node concept="2ShNRf" id="2CEQDIDTvVL" role="33vP2m">
<node concept="2fJWfE" id="2CEQDIDTvVM" role="2ShVmc">
<node concept="3Tqbb2" id="2CEQDIDTvVN" role="3zrR0E">
<ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2CEQDIDTuFk" role="3cqZAp">
<node concept="2OqwBi" id="2CEQDIDTwBj" role="3clFbG">
<node concept="2OqwBi" id="2CEQDIDTw3H" role="2Oq$k0">
<node concept="37vLTw" id="2CEQDIDTvVO" role="2Oq$k0">
<ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
</node>
<node concept="3TrEf2" id="2CEQDIDTwfa" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
</node>
</node>
<node concept="2oxUTD" id="2CEQDIDTwWx" role="2OqNvi">
<node concept="uNquD" id="2CEQDIDTwZR" role="2oxUTC" />
</node>
</node>
</node>
<node concept="3clFbF" id="2N2MQGCKo7N" role="3cqZAp">
<node concept="2OqwBi" id="2N2MQGCKoHZ" role="3clFbG">
<node concept="2OqwBi" id="2N2MQGCKoqB" role="2Oq$k0">
<node concept="37vLTw" id="2CEQDIDTx34" role="2Oq$k0">
<ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
</node>
<node concept="3TrEf2" id="2N2MQGCKo$4" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
<node concept="2oxUTD" id="2N2MQGCKoWy" role="2OqNvi">
<node concept="2YIFZM" id="2N2MQGCKnCn" role="2oxUTC">
<ref role="37wK5l" to="hy7p:2N2MQGCJu99" resolve="createFromTemplate" />
<ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
<node concept="2OqwBi" id="2N2MQGCKsEz" role="37wK5m">
<node concept="uNquD" id="2N2MQGCKnGg" role="2Oq$k0" />
<node concept="3TrEf2" id="2N2MQGCKsQ9" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2CEQDIDTxpb" role="3cqZAp">
<node concept="37vLTw" id="2CEQDIDTxp9" role="3clFbG">
<ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
</node>
</node>
</node>
</node>
<node concept="uNCsQ" id="2N2MQGCIMsO" role="uO7ob">
<node concept="3clFbS" id="2N2MQGCIMsP" role="2VODD2">
<node concept="3clFbF" id="2N2MQGCJdfQ" role="3cqZAp">
<node concept="10QFUN" id="2N2MQGCJfFl" role="3clFbG">
<node concept="2OqwBi" id="2N2MQGCJfFd" role="10QFUP">
<node concept="2ShNRf" id="2N2MQGCJfFe" role="2Oq$k0">
<node concept="1pGfFk" id="2N2MQGCJfFf" role="2ShVmc">
<ref role="37wK5l" to="35tq:~ModelPlusImportedScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel,boolean,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="ModelPlusImportedScope" />
<node concept="1Q6Npb" id="2N2MQGCJfFg" role="37wK5m" />
<node concept="3clFbT" id="2N2MQGCJfFh" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
<node concept="35c_gC" id="2N2MQGCJfFi" role="37wK5m">
<ref role="35c_gD" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
<node concept="liA8E" id="2N2MQGCJfFj" role="2OqNvi">
<ref role="37wK5l" to="35tq:~ModelsScope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
<node concept="Xl_RD" id="2N2MQGCJfFk" role="37wK5m">
<property role="Xl_RC" value="" />
</node>
</node>
</node>
<node concept="A3Dl8" id="2N2MQGCJfNn" role="10QFUM">
<node concept="3Tqbb2" id="2N2MQGCJfVa" role="A3Ik2">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="uSjag" id="2N2MQGCJgjn" role="uSyvl">
<node concept="3clFbS" id="2N2MQGCJgjo" role="2VODD2">
<node concept="3clFbF" id="2N2MQGCJgwV" role="3cqZAp">
<node concept="2OqwBi" id="2N2MQGCJg_O" role="3clFbG">
<node concept="uNquD" id="2N2MQGCJgwU" role="2Oq$k0" />
<node concept="3TrcHB" id="2N2MQGCJgNO" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
<node concept="xBawi" id="4hPXq9JmepM" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmenH" />
</node>
</node>
</node>
<node concept="xBawi" id="4hPXq9JmenG" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmenD" resolve="Expression_Contribution" />
</node>
</node>
</node>
</node>
<node concept="3FK_9_" id="1hX44vMLjek">
<property role="3GE5qa" value="type.code" />
<property role="TrG5h" value="TypeNode_Expression" />
@ -1228,203 +1094,6 @@
</node>
</node>
</node>
<node concept="3UOs0u" id="18kNIl0OXSX">
<property role="3GE5qa" value="constraint.typespecific" />
<property role="TrG5h" value="NewTypeConstraint_substitution" />
<node concept="1X3_iC" id="4hPXq9Jmeic" role="lGtFl">
<property role="3V$3am" value="actionsBuilder" />
<property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
<node concept="3UNGvq" id="18kNIl0OXSY" role="8Wnug">
<property role="2uHTBK" value="ext_2_RTransform" />
<ref role="3UNGvu" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
<node concept="3kRJcU" id="18kNIl0OXU_" role="3kShCk">
<node concept="3clFbS" id="18kNIl0OXUA" role="2VODD2">
<node concept="3clFbF" id="18kNIl0OY1J" role="3cqZAp">
<node concept="2OqwBi" id="18kNIl0P01v" role="3clFbG">
<node concept="2OqwBi" id="18kNIl0OYhF" role="2Oq$k0">
<node concept="Cj7Ep" id="18kNIl0OY1I" role="2Oq$k0" />
<node concept="3TrEf2" id="18kNIl0OZB6" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
</node>
</node>
<node concept="3w_OXm" id="18kNIl0P0pj" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="tYCnQ" id="18kNIl0P0_g" role="_1QTJ">
<ref role="uz4UX" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
<node concept="Cmt7Y" id="18kNIl0P0Vs" role="uz6Si">
<node concept="Cnhdc" id="18kNIl0P0Vu" role="Cncma">
<node concept="3clFbS" id="18kNIl0P0Vw" role="2VODD2">
<node concept="3clFbF" id="18kNIl0P0YV" role="3cqZAp">
<node concept="2OqwBi" id="18kNIl0P20F" role="3clFbG">
<node concept="2OqwBi" id="18kNIl0P1hZ" role="2Oq$k0">
<node concept="Cj7Ep" id="18kNIl0P0YU" role="2Oq$k0" />
<node concept="3TrEf2" id="18kNIl0P1A1" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
</node>
</node>
<node concept="2DeJnY" id="18kNIl0P2kI" role="2OqNvi" />
</node>
</node>
<node concept="3clFbF" id="18kNIl0P2yE" role="3cqZAp">
<node concept="Cj7Ep" id="18kNIl0P2yC" role="3clFbG" />
</node>
</node>
</node>
<node concept="2h1dTh" id="18kNIl0P0YQ" role="Cn2iK">
<property role="2h1i$Z" value="[" />
</node>
<node concept="xBawi" id="4hPXq9Jmeib" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmehO" />
</node>
</node>
</node>
<node concept="xBawi" id="4hPXq9JmehD" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmehE" />
</node>
</node>
</node>
</node>
<node concept="3UOs0u" id="18kNIl0PReP">
<property role="3GE5qa" value="constraint.typespecific" />
<property role="TrG5h" value="AsTypeConstraint_substitution" />
<node concept="1X3_iC" id="4hPXq9JmeiT" role="lGtFl">
<property role="3V$3am" value="actionsBuilder" />
<property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
<node concept="3UNGvq" id="18kNIl0PReQ" role="8Wnug">
<ref role="3UNGvu" to="wq2x:18kNIl0jL2T" resolve="AsTypeConstraint" />
<node concept="tYCnQ" id="18kNIl0PT4H" role="_1QTJ">
<ref role="uz4UX" to="wq2x:18kNIl0jL2T" resolve="AsTypeConstraint" />
<node concept="Cmt7Y" id="18kNIl0PTqU" role="uz6Si">
<node concept="Cnhdc" id="18kNIl0PTqW" role="Cncma">
<node concept="3clFbS" id="18kNIl0PTqY" role="2VODD2">
<node concept="3clFbF" id="18kNIl0PTup" role="3cqZAp">
<node concept="2OqwBi" id="18kNIl0PU8m" role="3clFbG">
<node concept="2OqwBi" id="18kNIl0PTCU" role="2Oq$k0">
<node concept="Cj7Ep" id="18kNIl0PTuo" role="2Oq$k0" />
<node concept="3TrEf2" id="18kNIl0PTOL" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
</node>
</node>
<node concept="2DeJnY" id="18kNIl0PUsp" role="2OqNvi" />
</node>
</node>
<node concept="3clFbF" id="18kNIl0PUCG" role="3cqZAp">
<node concept="Cj7Ep" id="18kNIl0PUCE" role="3clFbG" />
</node>
</node>
</node>
<node concept="2h1dTh" id="18kNIl0PTuk" role="Cn2iK">
<property role="2h1i$Z" value="[" />
</node>
<node concept="xBawi" id="4hPXq9JmeiS" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9Jmeix" />
</node>
</node>
</node>
<node concept="3kRJcU" id="18kNIl0PReR" role="3kShCk">
<node concept="3clFbS" id="18kNIl0PReS" role="2VODD2">
<node concept="3clFbF" id="18kNIl0PRm1" role="3cqZAp">
<node concept="2OqwBi" id="18kNIl0PSmz" role="3clFbG">
<node concept="2OqwBi" id="18kNIl0PR_X" role="2Oq$k0">
<node concept="Cj7Ep" id="18kNIl0PRm0" role="2Oq$k0" />
<node concept="3TrEf2" id="18kNIl0PRXN" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
</node>
</node>
<node concept="3w_OXm" id="18kNIl0PSBk" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="xBawi" id="4hPXq9Jmeim" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9Jmein" />
</node>
</node>
</node>
</node>
<node concept="3FK_9_" id="7IysFeA3quv">
<property role="3GE5qa" value="type.decl" />
<property role="TrG5h" value="TypeDeclaration_parameter" />
<node concept="1X3_iC" id="4hPXq9Jmetg" role="lGtFl">
<property role="3V$3am" value="actionsBuilder" />
<property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
<node concept="3FOIzC" id="7IysFeA3quw" role="8Wnug">
<ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3buRE8" id="7IysFeA3qJp" role="3bvWUf">
<node concept="3clFbS" id="7IysFeA3qJq" role="2VODD2">
<node concept="3clFbF" id="7IysFeA3qQz" role="3cqZAp">
<node concept="2OqwBi" id="7IysFeA3s14" role="3clFbG">
<node concept="2OqwBi" id="7IysFeA3r4i" role="2Oq$k0">
<node concept="3bvxqY" id="7IysFeA3qQy" role="2Oq$k0" />
<node concept="2Xjw5R" id="7IysFeA3rk_" role="2OqNvi">
<node concept="1xMEDy" id="7IysFeA3rkB" role="1xVPHs">
<node concept="chp4Y" id="7IysFeA3rtB" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="7IysFeA3rL1" role="1xVPHs" />
</node>
</node>
<node concept="3x8VRR" id="7IysFeA3sqf" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="35xCft" id="7IysFeA3szP" role="tZc4B">
<ref role="35y72J" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
<node concept="xBawi" id="4hPXq9Jmetf" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9Jmete" />
</node>
</node>
<node concept="xBawi" id="4hPXq9JmesA" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmesB" />
</node>
</node>
</node>
</node>
<node concept="3FK_9_" id="7IysFeA80Ug">
<property role="3GE5qa" value="type.code" />
<property role="TrG5h" value="TypeConcept_Expression" />
<node concept="1X3_iC" id="4hPXq9JmeBb" role="lGtFl">
<property role="3V$3am" value="actionsBuilder" />
<property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
<node concept="3FOIzC" id="7IysFeA80Uh" role="8Wnug">
<ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="3buRE8" id="7IysFeA80Uj" role="3bvWUf">
<node concept="3clFbS" id="7IysFeA80Uk" role="2VODD2">
<node concept="3clFbF" id="7IysFeA811t" role="3cqZAp">
<node concept="2OqwBi" id="7IysFeA82bY" role="3clFbG">
<node concept="2OqwBi" id="7IysFeA81fc" role="2Oq$k0">
<node concept="3bvxqY" id="7IysFeA811s" role="2Oq$k0" />
<node concept="2Xjw5R" id="7IysFeA81vv" role="2OqNvi">
<node concept="1xMEDy" id="7IysFeA81vx" role="1xVPHs">
<node concept="chp4Y" id="7IysFeA81Cx" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="7IysFeA81VV" role="1xVPHs" />
</node>
</node>
<node concept="3x8VRR" id="7IysFeA82_6" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="35xCft" id="7IysFeA82J4" role="tZc4B">
<ref role="35y72J" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
<node concept="xBawi" id="4hPXq9JmeBa" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmeB9" />
</node>
</node>
<node concept="xBawi" id="4hPXq9JmeAx" role="lGtFl">
<ref role="xBaxx" to="vxmb:4hPXq9JmeAy" />
</node>
</node>
</node>
</node>
<node concept="3FK_9_" id="7IysFeA99pw">
<property role="3GE5qa" value="type.code" />
<property role="TrG5h" value="TypeLogical_Expression" />

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

@ -20,6 +20,7 @@
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
<import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
@ -115,6 +116,9 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
@ -174,6 +178,7 @@
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
@ -188,9 +193,6 @@
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
<child id="1180636770616" name="createdType" index="3zrR0E" />
</concept>
<concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
<child id="5944356402132808753" name="case" index="1_3QMm" />
<child id="5944356402132808752" name="expression" index="1_3QMn" />
@ -969,9 +971,11 @@
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
</node>
<node concept="3clFbS" id="1hX44vMIPYN" role="3clF47">
<node concept="3clFbF" id="1hX44vMF8LA" role="3cqZAp">
<node concept="2c44tf" id="1hX44vMF8L$" role="3clFbG">
<node concept="17QB3L" id="1hX44vMF8MG" role="2c44tc" />
<node concept="3clFbF" id="4MEOIDFBumR" role="3cqZAp">
<node concept="2c44tf" id="4MEOIDFBumP" role="3clFbG">
<node concept="3uibUv" id="4MEOIDFBupb" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
</node>
@ -1169,35 +1173,6 @@
</node>
</node>
</node>
<node concept="13h7C7" id="7IysFeA9Chl">
<property role="3GE5qa" value="type.code" />
<ref role="13h7C2" to="wq2x:7IysFeA9CgT" resolve="AltBlock" />
<node concept="13hLZK" id="7IysFeA9Chm" role="13h7CW">
<node concept="3clFbS" id="7IysFeA9Chn" role="2VODD2" />
</node>
<node concept="13i0hz" id="7IysFeA9Chw" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="TrG5h" value="getExpectedRetType" />
<property role="13i0it" value="false" />
<ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
<node concept="3Tm1VV" id="7IysFeA9Chx" role="1B3o_S" />
<node concept="2AHcQZ" id="7IysFeA9Ch$" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
</node>
<node concept="3clFbS" id="7IysFeA9ChB" role="3clF47">
<node concept="3clFbF" id="7IysFeA9Ciy" role="3cqZAp">
<node concept="2ShNRf" id="7IysFeA9Ciw" role="3clFbG">
<node concept="3zrR0B" id="7IysFeA9Cq7" role="2ShVmc">
<node concept="3Tqbb2" id="7IysFeA9Cq9" role="3zrR0E">
<ref role="ehGHo" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="7IysFeA9ChC" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="3TnYLtqflZe">
<property role="3GE5qa" value="type.code.with" />
<ref role="13h7C2" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
@ -1303,33 +1278,6 @@
<node concept="3clFbS" id="1L74NXEmFab" role="3clF47" />
</node>
</node>
<node concept="13h7C7" id="1L74NXEmFeh">
<property role="3GE5qa" value="constraint.typespecific" />
<ref role="13h7C2" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
<node concept="13hLZK" id="1L74NXEmFei" role="13h7CW">
<node concept="3clFbS" id="1L74NXEmFej" role="2VODD2" />
</node>
<node concept="13i0hz" id="1L74NXEmFes" 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="1L74NXEmFet" role="1B3o_S" />
<node concept="3clFbS" id="1L74NXEmFew" role="3clF47">
<node concept="3clFbF" id="1L74NXEmFeR" role="3cqZAp">
<node concept="2OqwBi" id="1L74NXEmFnN" role="3clFbG">
<node concept="13iPFW" id="1L74NXEmFeQ" role="2Oq$k0" />
<node concept="3TrEf2" id="1L74NXEmFFe" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="1L74NXEmFex" role="3clF45">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
<node concept="13h7C7" id="1L74NXEmHzJ">
<property role="3GE5qa" value="type.term" />
<ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
@ -1634,5 +1582,176 @@
<node concept="3Tqbb2" id="2V8TwD0$YKe" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="4MEOIDFxxVo">
<property role="3GE5qa" value="type.term" />
<ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<node concept="13hLZK" id="4MEOIDFxxVp" role="13h7CW">
<node concept="3clFbS" id="4MEOIDFxxVq" role="2VODD2" />
</node>
<node concept="13i0hz" id="4MEOIDFxxVz" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="TrG5h" value="getVariable" />
<property role="13i0it" value="false" />
<ref role="13i0hy" to="tpek:SORzhOpB6t" resolve="getVariable" />
<node concept="3Tm1VV" id="4MEOIDFxxV$" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDFxxVB" role="3clF47">
<node concept="3clFbF" id="4MEOIDFxxVT" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDFxy9Z" role="3clFbG">
<node concept="13iPFW" id="4MEOIDFxxVS" role="2Oq$k0" />
<node concept="3TrEf2" id="4MEOIDFxyiL" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="4MEOIDFxxVC" role="3clF45">
<ref role="ehGHo" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
</node>
</node>
</node>
<node concept="13h7C7" id="4MEOIDG83_6">
<property role="3GE5qa" value="type.term" />
<ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
<node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
<property role="TrG5h" value="runtimeClassName" />
<node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
<node concept="17QB3L" id="4MEOIDG83_x" role="3clF45" />
<node concept="3clFbS" id="4MEOIDG83_k" role="3clF47">
<node concept="3clFbF" id="4MEOIDG8lha" role="3cqZAp">
<node concept="3cpWs3" id="4MEOIDG8moh" role="3clFbG">
<node concept="Xl_RD" id="4MEOIDG8mok" role="3uHU7w">
<property role="Xl_RC" value="_Term" />
</node>
<node concept="2OqwBi" id="4MEOIDG8lrk" role="3uHU7B">
<node concept="13iPFW" id="4MEOIDG8lh8" role="2Oq$k0" />
<node concept="3TrcHB" id="4MEOIDG8lzW" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="4MEOIDG8lgz" role="13h7CS">
<property role="TrG5h" value="runtimeClassFqName" />
<node concept="3Tm1VV" id="4MEOIDG8lg$" role="1B3o_S" />
<node concept="17QB3L" id="4MEOIDG8lg_" role="3clF45" />
<node concept="3clFbS" id="4MEOIDG8lgA" role="3clF47">
<node concept="3clFbF" id="4MEOIDG8mMv" role="3cqZAp">
<node concept="3cpWs3" id="4MEOIDG8po4" role="3clFbG">
<node concept="BsUDl" id="4MEOIDG8pxn" role="3uHU7w">
<ref role="37wK5l" node="4MEOIDG83_h" resolve="runtimeClassName" />
</node>
<node concept="3cpWs3" id="4MEOIDG8oGY" role="3uHU7B">
<node concept="2OqwBi" id="4MEOIDG8nA1" role="3uHU7B">
<node concept="2OqwBi" id="4MEOIDG8mWD" role="2Oq$k0">
<node concept="13iPFW" id="4MEOIDG8mMt" role="2Oq$k0" />
<node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
<node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
<node concept="chp4Y" id="4MEOIDG8nri" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="4MEOIDG8nRC" role="2OqNvi">
<ref role="37wK5l" node="4MEOIDG83X7" resolve="runtimeClassFqName" />
</node>
</node>
<node concept="Xl_RD" id="4MEOIDG8oH1" role="3uHU7w">
<property role="Xl_RC" value="." />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13hLZK" id="4MEOIDG83_7" role="13h7CW">
<node concept="3clFbS" id="4MEOIDG83_8" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="4MEOIDG83WW">
<property role="3GE5qa" value="type" />
<ref role="13h7C2" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
<node concept="13i0hz" id="4MEOIDG8goY" role="13h7CS">
<property role="TrG5h" value="runtimeClassName" />
<node concept="3Tm1VV" id="4MEOIDG8goZ" role="1B3o_S" />
<node concept="17QB3L" id="4MEOIDG8g$K" role="3clF45" />
<node concept="3clFbS" id="4MEOIDG8gp1" role="3clF47">
<node concept="3clFbF" id="4MEOIDG8g_k" role="3cqZAp">
<node concept="3cpWs3" id="4MEOIDG8hGp" role="3clFbG">
<node concept="Xl_RD" id="4MEOIDG8hIU" role="3uHU7w">
<property role="Xl_RC" value="_TypeTable" />
</node>
<node concept="2OqwBi" id="4MEOIDG8gJs" role="3uHU7B">
<node concept="13iPFW" id="4MEOIDG8g_j" role="2Oq$k0" />
<node concept="3TrcHB" id="4MEOIDG8gS4" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="4MEOIDG83X7" role="13h7CS">
<property role="TrG5h" value="runtimeClassFqName" />
<node concept="3Tm1VV" id="4MEOIDG83X8" role="1B3o_S" />
<node concept="17QB3L" id="4MEOIDG83Xn" role="3clF45" />
<node concept="3clFbS" id="4MEOIDG83Xa" role="3clF47">
<node concept="3clFbF" id="4MEOIDG83Ye" role="3cqZAp">
<node concept="3cpWs3" id="4MEOIDG86UL" role="3clFbG">
<node concept="3cpWs3" id="4MEOIDG8603" role="3uHU7B">
<node concept="2OqwBi" id="4MEOIDGcdul" role="3uHU7B">
<node concept="2OqwBi" id="4MEOIDG848m" role="2Oq$k0">
<node concept="13iPFW" id="4MEOIDG83Yc" role="2Oq$k0" />
<node concept="I4A8Y" id="4MEOIDG84gY" role="2OqNvi" />
</node>
<node concept="LkI2h" id="4MEOIDGcdB4" role="2OqNvi" />
</node>
<node concept="Xl_RD" id="4MEOIDG8606" role="3uHU7w">
<property role="Xl_RC" value="!" />
</node>
</node>
<node concept="2OqwBi" id="4MEOIDG8iCA" role="3uHU7w">
<node concept="13iPFW" id="4MEOIDG879_" role="2Oq$k0" />
<node concept="2qgKlT" id="4MEOIDG8j4c" role="2OqNvi">
<ref role="37wK5l" node="4MEOIDG8goY" resolve="runtimeClassName" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13hLZK" id="4MEOIDG83WX" role="13h7CW">
<node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="1L74NXEmFeh">
<property role="3GE5qa" value="constraint.typespecific" />
<ref role="13h7C2" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
<node concept="13hLZK" id="1L74NXEmFei" role="13h7CW">
<node concept="3clFbS" id="1L74NXEmFej" role="2VODD2" />
</node>
<node concept="13i0hz" id="1L74NXEmFes" 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="1L74NXEmFet" role="1B3o_S" />
<node concept="3clFbS" id="1L74NXEmFew" role="3clF47">
<node concept="3clFbF" id="1L74NXEmFeR" role="3cqZAp">
<node concept="2OqwBi" id="1L74NXEmFnN" role="3clFbG">
<node concept="13iPFW" id="1L74NXEmFeQ" role="2Oq$k0" />
<node concept="3TrEf2" id="1L74NXEmFFe" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="1L74NXEmFex" role="3clF45">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
</model>

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

@ -925,15 +925,20 @@
<ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
<node concept="2OqwBi" id="1L74NXFMAdz" role="37wK5m">
<node concept="2OqwBi" id="1L74NXFM_uv" role="2Oq$k0">
<node concept="37vLTw" id="1L74NXFM_eO" role="2Oq$k0">
<ref role="3cqZAo" node="1L74NXFM$r4" resolve="td" />
<node concept="2OqwBi" id="4MEOIDFRjcb" role="2Oq$k0">
<node concept="2OqwBi" id="1L74NXFM_uv" role="2Oq$k0">
<node concept="37vLTw" id="1L74NXFM_eO" role="2Oq$k0">
<ref role="3cqZAo" node="1L74NXFM$r4" resolve="td" />
</node>
<node concept="3TrEf2" id="4MEOIDFRiG4" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
</node>
</node>
<node concept="3TrEf2" id="1L74NXFM_Ln" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
<node concept="3TrEf2" id="4MEOIDFRjF4" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
</node>
</node>
<node concept="3Tsc0h" id="1L74NXFMAA_" role="2OqNvi">
<node concept="3Tsc0h" id="4MEOIDFRjYI" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
</node>
</node>
@ -986,23 +991,28 @@
<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="2OqwBi" id="2V8TwD0EcWX" role="37wK5m">
<node concept="2OqwBi" id="2V8TwD0EcWY" role="2Oq$k0">
<node concept="2OqwBi" id="2V8TwD0EcWZ" role="2Oq$k0">
<node concept="2rP1CM" id="2V8TwD0EcX0" role="2Oq$k0" />
<node concept="2Xjw5R" id="2V8TwD0EcX1" role="2OqNvi">
<node concept="1xMEDy" id="2V8TwD0EcX2" role="1xVPHs">
<node concept="chp4Y" id="2V8TwD0EcX3" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
<node concept="2OqwBi" id="4MEOIDFR9my" role="37wK5m">
<node concept="2OqwBi" id="2V8TwD0EcWX" role="2Oq$k0">
<node concept="2OqwBi" id="2V8TwD0EcWY" role="2Oq$k0">
<node concept="2OqwBi" id="2V8TwD0EcWZ" role="2Oq$k0">
<node concept="2rP1CM" id="2V8TwD0EcX0" role="2Oq$k0" />
<node concept="2Xjw5R" id="2V8TwD0EcX1" role="2OqNvi">
<node concept="1xMEDy" id="2V8TwD0EcX2" role="1xVPHs">
<node concept="chp4Y" id="2V8TwD0EcX3" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3TrEf2" id="4MEOIDFR86r" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
</node>
</node>
<node concept="3TrEf2" id="2V8TwD0EcX4" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
<node concept="3TrEf2" id="4MEOIDFR8Uw" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
</node>
</node>
<node concept="3Tsc0h" id="2V8TwD0EcX5" role="2OqNvi">
<node concept="3Tsc0h" id="4MEOIDFR9Mh" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
</node>
</node>
@ -1099,5 +1109,70 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="4MEOIDFxysn">
<property role="3GE5qa" value="type.term" />
<ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
<node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
<ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
<node concept="13QW63" id="4MEOIDFxyEi" role="1N6uqs">
<node concept="3clFbS" id="4MEOIDFxyEj" role="2VODD2">
<node concept="3clFbF" id="4MEOIDFxyEk" role="3cqZAp">
<node concept="2ShNRf" id="4MEOIDFxyEl" role="3clFbG">
<node concept="YeOm9" id="4MEOIDFxyEm" role="2ShVmc">
<node concept="1Y3b0j" id="4MEOIDFxyEn" 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="2OqwBi" id="4MEOIDFxyEo" role="37wK5m">
<node concept="2OqwBi" id="4MEOIDFxyEp" role="2Oq$k0">
<node concept="2rP1CM" id="4MEOIDFxyEq" role="2Oq$k0" />
<node concept="2Xjw5R" id="4MEOIDFxyEr" role="2OqNvi">
<node concept="1xMEDy" id="4MEOIDFxyEs" role="1xVPHs">
<node concept="chp4Y" id="4MEOIDFxz12" role="ri$Ld">
<ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="4MEOIDFxyEu" role="1xVPHs" />
</node>
</node>
<node concept="3Tsc0h" id="4MEOIDFxzkz" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
</node>
</node>
<node concept="3Tm1VV" id="4MEOIDFxyEw" role="1B3o_S" />
<node concept="3clFb_" id="4MEOIDFxyEx" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="getName" />
<node concept="17QB3L" id="4MEOIDFxyEy" role="3clF45" />
<node concept="3Tm1VV" id="4MEOIDFxyEz" role="1B3o_S" />
<node concept="37vLTG" id="4MEOIDFxyE$" role="3clF46">
<property role="TrG5h" value="child" />
<node concept="3Tqbb2" id="4MEOIDFxyE_" role="1tU5fm" />
</node>
<node concept="3clFbS" id="4MEOIDFxyEA" role="3clF47">
<node concept="3clFbF" id="4MEOIDFxyEB" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDFxyEC" role="3clFbG">
<node concept="1PxgMI" id="4MEOIDFxyED" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
<node concept="37vLTw" id="4MEOIDFxyEE" role="1m5AlR">
<ref role="3cqZAo" node="4MEOIDFxyE$" resolve="child" />
</node>
</node>
<node concept="3TrcHB" id="4MEOIDFxyEF" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

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

File diff suppressed because it is too large Load Diff

222
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
View File

@ -17,7 +17,6 @@
<import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
<import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
<import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@ -25,7 +24,6 @@
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
@ -39,13 +37,6 @@
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
<child id="1070534934091" name="type" index="10QFUM" />
<child id="1070534934092" name="expression" index="10QFUP" />
</concept>
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
@ -62,22 +53,10 @@
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
<property id="1068580123138" name="value" index="3clFbU" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
<child id="1079359253376" name="expression" index="1eOMHV" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
@ -97,23 +76,14 @@
<concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
<concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
<concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
<property id="2522969319638091386" name="isAvailableInChildNodes" index="2ZfUl0" />
<reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
<child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
<child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
<child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
</concept>
<concept id="1240316299033" name="jetbrains.mps.lang.intentions.structure.QueryBlock" flags="in" index="38BcoT">
<child id="1240393479918" name="paramType" index="3ddBve" />
</concept>
<concept id="1240322627579" name="jetbrains.mps.lang.intentions.structure.IntentionParameter" flags="nn" index="38Zlrr" />
<concept id="1240395258925" name="jetbrains.mps.lang.intentions.structure.ParameterizedIntentionDeclaration" flags="ig" index="3dkpOd">
<child id="1240395532443" name="queryBlock" index="3dlsAV" />
</concept>
</language>
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
<concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
<concept id="767145758118872828" name="jetbrains.mps.lang.actions.structure.NF_Node_ReplaceWithNewOperation" flags="nn" index="2DeJnW" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -122,18 +92,11 @@
<concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
<child id="1144104376918" name="parameter" index="1xVPHs" />
</concept>
<concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
<child id="1140725362529" name="linkTarget" index="2oxUTC" />
</concept>
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<reference id="6733348108486823428" name="concept" index="1m5ApE" />
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
</concept>
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
</concept>
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@ -146,9 +109,6 @@
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
<child id="1180636770616" name="createdType" index="3zrR0E" />
</concept>
<concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
<reference id="1139867957129" name="concept" index="1_rbq0" />
</concept>
<concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
<reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
</concept>
@ -164,9 +124,6 @@
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
<reference id="1138056395725" name="property" index="3TsBF5" />
</concept>
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
</concept>
@ -180,12 +137,6 @@
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
<child id="1151689745422" name="elementType" index="A3Ik2" />
</concept>
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
</language>
</registry>
<node concept="2S6QgY" id="1CgWc1TyAgc">
<property role="TrG5h" value="AddComment" />
@ -241,179 +192,6 @@
</node>
</node>
</node>
<node concept="3dkpOd" id="2CEQDIE0t1p">
<property role="TrG5h" value="Ast_replaceWith_TypeTerm" />
<property role="2ZfUl0" value="true" />
<ref role="2ZfgGC" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
<node concept="2S6ZIM" id="2CEQDIE0t1q" role="2ZfVej">
<node concept="3clFbS" id="2CEQDIE0t1r" role="2VODD2">
<node concept="3clFbF" id="2CEQDIE0Eqx" role="3cqZAp">
<node concept="3cpWs3" id="2CEQDIE0Fhc" role="3clFbG">
<node concept="2OqwBi" id="2CEQDIE0Ftg" role="3uHU7w">
<node concept="38Zlrr" id="2CEQDIE0Fmp" role="2Oq$k0" />
<node concept="3TrcHB" id="2CEQDIE0FCR" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="Xl_RD" id="2CEQDIE0Eqw" role="3uHU7B">
<property role="Xl_RC" value="Replace with " />
</node>
</node>
</node>
</node>
</node>
<node concept="2Sbjvc" id="2CEQDIE0t1s" role="2ZfgGD">
<node concept="3clFbS" id="2CEQDIE0t1t" role="2VODD2">
<node concept="3cpWs8" id="2CEQDIE0GfW" role="3cqZAp">
<node concept="3cpWsn" id="2CEQDIE0GfX" role="3cpWs9">
<property role="TrG5h" value="ast" />
<node concept="3Tqbb2" id="2CEQDIE0Gf$" role="1tU5fm">
<ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
</node>
<node concept="2Sf5sV" id="2CEQDIE0GfY" role="33vP2m" />
</node>
</node>
<node concept="3cpWs8" id="2CEQDIE2KNK" role="3cqZAp">
<node concept="3cpWsn" id="2CEQDIE2KNL" role="3cpWs9">
<property role="TrG5h" value="cpd" />
<node concept="3Tqbb2" id="2CEQDIE2KNC" role="1tU5fm">
<ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
</node>
<node concept="2YIFZM" id="2CEQDIE2KNM" role="33vP2m">
<ref role="37wK5l" to="hy7p:2CEQDIE2hE2" resolve="createFromTemplateAndPrototype" />
<ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
<node concept="2OqwBi" id="2CEQDIE2KNN" role="37wK5m">
<node concept="38Zlrr" id="2CEQDIE2KNO" role="2Oq$k0" />
<node concept="3TrEf2" id="2CEQDIE2KNP" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
</node>
</node>
<node concept="1PxgMI" id="2CEQDIE2Mno" role="37wK5m">
<ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
<node concept="2OqwBi" id="2CEQDIE2KNQ" role="1m5AlR">
<node concept="37vLTw" id="2CEQDIE2KNR" role="2Oq$k0">
<ref role="3cqZAo" node="2CEQDIE0GfX" resolve="ast" />
</node>
<node concept="3TrEf2" id="2CEQDIE2KNS" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="2CEQDIE0GdA" role="3cqZAp">
<node concept="3cpWsn" id="2CEQDIE0GdB" role="3cpWs9">
<property role="TrG5h" value="tterm" />
<node concept="3Tqbb2" id="2CEQDIE0Gd_" role="1tU5fm">
<ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
</node>
<node concept="2OqwBi" id="2CEQDIE0GdC" role="33vP2m">
<node concept="2Sf5sV" id="2CEQDIE0GdD" role="2Oq$k0" />
<node concept="2DeJnW" id="2CEQDIE0GdE" role="2OqNvi">
<ref role="1_rbq0" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2CEQDIE0FNt" role="3cqZAp">
<node concept="2OqwBi" id="2CEQDIE0GGQ" role="3clFbG">
<node concept="2OqwBi" id="2CEQDIE0Glf" role="2Oq$k0">
<node concept="37vLTw" id="2CEQDIE0GdF" role="2Oq$k0">
<ref role="3cqZAo" node="2CEQDIE0GdB" resolve="tterm" />
</node>
<node concept="3TrEf2" id="2CEQDIE0GvX" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
</node>
</node>
<node concept="2oxUTD" id="2CEQDIE0GZT" role="2OqNvi">
<node concept="38Zlrr" id="2CEQDIE0H0S" role="2oxUTC" />
</node>
</node>
</node>
<node concept="3clFbF" id="2CEQDIE0H3k" role="3cqZAp">
<node concept="2OqwBi" id="2CEQDIE0HEj" role="3clFbG">
<node concept="2OqwBi" id="2CEQDIE0H9O" role="2Oq$k0">
<node concept="37vLTw" id="2CEQDIE0H3i" role="2Oq$k0">
<ref role="3cqZAo" node="2CEQDIE0GdB" resolve="tterm" />
</node>
<node concept="3TrEf2" id="2CEQDIE0HuN" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
<node concept="2oxUTD" id="2CEQDIE0HRa" role="2OqNvi">
<node concept="37vLTw" id="2CEQDIE2MIE" role="2oxUTC">
<ref role="3cqZAo" node="2CEQDIE2KNL" resolve="cpd" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="38BcoT" id="2CEQDIE0tgl" role="3dlsAV">
<node concept="3clFbS" id="2CEQDIE0tgm" role="2VODD2">
<node concept="3clFbF" id="2CEQDIE0v$3" role="3cqZAp">
<node concept="2OqwBi" id="2CEQDIE0zUW" role="3clFbG">
<node concept="1eOMI4" id="2CEQDIE0y0B" role="2Oq$k0">
<node concept="10QFUN" id="2CEQDIE0y0$" role="1eOMHV">
<node concept="A3Dl8" id="2CEQDIE0ytM" role="10QFUM">
<node concept="3Tqbb2" id="2CEQDIE0yUe" role="A3Ik2">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
<node concept="2OqwBi" id="2CEQDIE0y0D" role="10QFUP">
<node concept="2ShNRf" id="2CEQDIE0y0E" role="2Oq$k0">
<node concept="1pGfFk" id="2CEQDIE0y0F" role="2ShVmc">
<ref role="37wK5l" to="35tq:~ModelPlusImportedScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel,boolean,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="ModelPlusImportedScope" />
<node concept="2OqwBi" id="2CEQDIE0_Kw" role="37wK5m">
<node concept="2Sf5sV" id="2CEQDIE0_wx" role="2Oq$k0" />
<node concept="I4A8Y" id="2CEQDIE0A6K" role="2OqNvi" />
</node>
<node concept="3clFbT" id="2CEQDIE0y0H" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
<node concept="35c_gC" id="2CEQDIE0y0I" role="37wK5m">
<ref role="35c_gD" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
</node>
<node concept="liA8E" id="2CEQDIE0y0J" role="2OqNvi">
<ref role="37wK5l" to="35tq:~ModelsScope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
<node concept="Xl_RD" id="2CEQDIE0y0K" role="37wK5m">
<property role="Xl_RC" value="" />
</node>
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="2CEQDIE0$Fa" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3Tqbb2" id="2CEQDIE0tpn" role="3ddBve">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
<node concept="2SaL7w" id="2CEQDIE34ld" role="2ZfVeh">
<node concept="3clFbS" id="2CEQDIE34le" role="2VODD2">
<node concept="3clFbF" id="2CEQDIE34ZN" role="3cqZAp">
<node concept="2OqwBi" id="2CEQDIE35so" role="3clFbG">
<node concept="2OqwBi" id="2CEQDIE354c" role="2Oq$k0">
<node concept="2Sf5sV" id="2CEQDIE34ZM" role="2Oq$k0" />
<node concept="3TrEf2" id="2CEQDIE35ef" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
<node concept="1mIQ4w" id="2CEQDIE35EY" role="2OqNvi">
<node concept="chp4Y" id="2CEQDIE35PP" role="cj9EA">
<ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2S6QgY" id="4sSe4$p4oTF">
<property role="3GE5qa" value="logical" />
<property role="TrG5h" value="LogicalVariable_specifyValue" />

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

@ -92,44 +92,6 @@
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
<node concept="1TIwiD" id="7eGEHDlgPU1">
<property role="TrG5h" value="NewTypeConstraint" />
<property role="3GE5qa" value="constraint.typespecific" />
<property role="34LRSv" value="new type" />
<property role="EcuMT" value="8335224865066016385" />
<ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
<node concept="1TJgyj" id="YGS68N6UU4" role="1TKVEi">
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="typeDeclaration" />
<property role="20lbJX" value="1" />
<property role="IQ2ns" value="1129524318932020868" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeVar" />
<property role="20lbJX" value="1" />
<property role="IQ2ns" value="7368070394768578348" />
<ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
</node>
<node concept="1TJgyj" id="6p0DfM0gSN1" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="argument" />
<property role="20lbJX" value="0..n" />
<property role="IQ2ns" value="7368070394768755905" />
<ref role="20lvS9" node="7IysFeA4qCy" resolve="NewTypeParameterBinding" />
</node>
<node concept="1TJgyj" id="18kNIl0OYEq" role="1TKVEi">
<property role="IQ2ns" value="1302893676247378586" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="substitution" />
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="asaX9" id="1L74NXEmA16" role="lGtFl" />
</node>
<node concept="PrWs8" id="1L74NXEmF9w" role="PzmwI">
<ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
</node>
</node>
<node concept="1TIwiD" id="7eGEHDlgPU4">
<property role="TrG5h" value="Rule" />
<property role="R5$K7" value="false" />
@ -782,6 +744,13 @@
<property role="IQ2ns" value="1618328391714763070" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="1TJgyj" id="4MEOIDFttPg" role="1TKVEi">
<property role="IQ2ns" value="5524459797190401360" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="termDeclaration" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
<node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
</node>
@ -810,12 +779,20 @@
<property role="IQ2ns" value="6677504323281689839" />
<ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
</node>
<node concept="1TJgyj" id="4MEOIDF_kTL" role="1TKVEi">
<property role="IQ2ns" value="5524459797192461937" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="termDecl" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
</node>
<node concept="1TJgyj" id="1pPth$m5BbA" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="term" />
<property role="20lbJX" value="1" />
<property role="20lbJX" value="0..1" />
<property role="IQ2ns" value="1618328391714763494" />
<ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
<node concept="asaX9" id="4MEOIDFRaM8" role="lGtFl" />
</node>
<node concept="1TJgyj" id="2V8TwD0$Z8f" role="1TKVEi">
<property role="IQ2ns" value="3371197252794315279" />
@ -834,22 +811,6 @@
<ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
</node>
</node>
<node concept="1TIwiD" id="2CEQDIDRX6M">
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TypeTermExpression" />
<property role="EcuMT" value="3038481260719624626" />
<ref role="1TJDcQ" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
<node concept="1TJgyj" id="2CEQDIDTdBu" role="1TKVEi">
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="template" />
<property role="20lbJX" value="1" />
<property role="IQ2ns" value="3038481260719954398" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="PrWs8" id="2CEQDIDXzlI" role="PzmwI">
<ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
</node>
</node>
<node concept="1TIwiD" id="6wQEDbCL4Fi">
<property role="3GE5qa" value="rule" />
<property role="TrG5h" value="IncludeFragmentClause" />
@ -942,13 +903,6 @@
<property role="20kJfa" value="origin" />
<ref role="20lvS9" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
</node>
<node concept="1TJgyj" id="18kNIl0PNUA" role="1TKVEi">
<property role="IQ2ns" value="1302893676247596710" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="substitution" />
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="asaX9" id="1L74NXEmA18" role="lGtFl" />
</node>
</node>
<node concept="1TIwiD" id="18kNIl0mxXI">
<property role="EcuMT" value="1302893676239396718" />
@ -984,12 +938,6 @@
<property role="3GE5qa" value="type.decl" />
<property role="TrG5h" value="TypeInitializer" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="7IysFeA9D7k" role="1TKVEi">
<property role="IQ2ns" value="8908809128804520404" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="altBlock" />
<ref role="20lvS9" node="7IysFeA9CgT" resolve="AltBlock" />
</node>
<node concept="1TJgyj" id="7IysFe_ZPXC" role="1TKVEi">
<property role="IQ2ns" value="8908809128801951592" />
<property role="20lmBu" value="aggregation" />
@ -1082,6 +1030,7 @@
<property role="20kJfa" value="parameter" />
<ref role="20lvS9" node="7IysFeA0yb0" resolve="TypeDeclarationParameter" />
</node>
<node concept="asaX9" id="4MEOIDFsyAO" role="lGtFl" />
</node>
<node concept="1TIwiD" id="7IysFeA5Lco">
<property role="EcuMT" value="8908809128803504920" />
@ -1089,16 +1038,6 @@
<property role="TrG5h" value="InitBlock" />
<ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
</node>
<node concept="1TIwiD" id="7IysFeA7WUr">
<property role="EcuMT" value="8908809128804077211" />
<property role="3GE5qa" value="type.code" />
<property role="TrG5h" value="TypeConceptExpression" />
<property role="34LRSv" value="typeConcept" />
<ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="PrWs8" id="7IysFeA7WUs" role="PzmwI">
<ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
</node>
</node>
<node concept="1TIwiD" id="7IysFeA99oR">
<property role="EcuMT" value="8908809128804390455" />
<property role="3GE5qa" value="type.code" />
@ -1109,12 +1048,6 @@
<ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
</node>
</node>
<node concept="1TIwiD" id="7IysFeA9CgT">
<property role="EcuMT" value="8908809128804516921" />
<property role="3GE5qa" value="type.code" />
<property role="TrG5h" value="AltBlock" />
<ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
</node>
<node concept="PlHQZ" id="7IysFeBd3kI">
<property role="EcuMT" value="8908809128822191406" />
<property role="TrG5h" value="ApplicationSessionParticipant" />
@ -1348,5 +1281,119 @@
<ref role="20lvS9" node="6p0DfM0asBO" resolve="ConstraintDeclaration" />
</node>
</node>
<node concept="1TIwiD" id="4MEOIDFfpSk">
<property role="EcuMT" value="5524459797186715156" />
<property role="3GE5qa" value="constraint.typespecific" />
<property role="TrG5h" value="NewTypePseudoConstraint" />
<property role="34LRSv" value="new type" />
<ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
<node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
<property role="IQ2ns" value="5524459797186715209" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeVar" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
</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" />
<ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
</node>
</node>
<node concept="1TIwiD" id="4MEOIDFttoe">
<property role="EcuMT" value="5524459797190399502" />
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TypeTermDeclaration" />
<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" />
</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" />
</node>
<node concept="PrWs8" id="4MEOIDFttNg" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
</node>
</node>
<node concept="1TIwiD" id="4MEOIDFwTxW">
<property role="EcuMT" value="5524459797191301244" />
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TypeTermDeclarationParameter" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="4MEOIDFwTy3" role="1TKVEi">
<property role="IQ2ns" value="5524459797191301251" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="type" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="PrWs8" id="4MEOIDFwTxX" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
</node>
<node concept="PrWs8" id="4MEOIDFwTxY" role="PzmwI">
<ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
</node>
<node concept="PrWs8" id="4MEOIDFwTxZ" role="PzmwI">
<ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
</node>
</node>
<node concept="1TIwiD" id="4MEOIDFxxDM">
<property role="EcuMT" value="5524459797191465586" />
<property role="3GE5qa" value="type.term" />
<property role="TrG5h" value="TypeTermDeclarationParameterReference" />
<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" />
</node>
<node concept="PrWs8" id="4MEOIDFxxDW" role="PzmwI">
<ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
</node>
</node>
<node concept="1TIwiD" id="7eGEHDlgPU1">
<property role="TrG5h" value="NewTypeConstraint" />
<property role="3GE5qa" value="constraint.typespecific" />
<property role="34LRSv" value="new type (deprecated)" />
<property role="EcuMT" value="8335224865066016385" />
<ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
<node concept="1TJgyj" id="YGS68N6UU4" role="1TKVEi">
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="typeDeclaration" />
<property role="20lbJX" value="1" />
<property role="IQ2ns" value="1129524318932020868" />
<ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="typeVar" />
<property role="20lbJX" value="1" />
<property role="IQ2ns" value="7368070394768578348" />
<ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
</node>
<node concept="1TJgyj" id="6p0DfM0gSN1" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="argument" />
<property role="20lbJX" value="0..n" />
<property role="IQ2ns" value="7368070394768755905" />
<ref role="20lvS9" node="7IysFeA4qCy" resolve="NewTypeParameterBinding" />
</node>
<node concept="PrWs8" id="4MEOIDGwNay" role="PzmwI">
<ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
</node>
<node concept="asaX9" id="4MEOIDFfpT7" role="lGtFl" />
</node>
</model>

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

@ -45,10 +45,6 @@
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
@ -81,7 +77,6 @@
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
<property id="1068580320021" name="value" index="3cmrfH" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
@ -184,9 +179,6 @@
</concept>
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
</concept>
<concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
<child id="1154546920563" name="concept" index="3gmYPZ" />
</concept>
@ -202,7 +194,6 @@
<child id="6039268229364358387" name="concept" index="1pnPq6" />
</concept>
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
@ -232,9 +223,6 @@
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
<reference id="1138056546658" name="link" index="3TtcxE" />
</concept>
<concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
<reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@ -1002,129 +990,6 @@
<ref role="1YaFvo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
</node>
</node>
<node concept="18kY7G" id="67SsWaEdTGN">
<property role="TrG5h" value="check_TypeTerm" />
<property role="3GE5qa" value="type.term" />
<node concept="3clFbS" id="67SsWaEdTGO" role="18ibNy">
<node concept="3clFbJ" id="67SsWaEeEwV" role="3cqZAp">
<node concept="3clFbS" id="67SsWaEeEwX" role="3clFbx">
<node concept="2MkqsV" id="67SsWaEeFu9" role="3cqZAp">
<node concept="3cpWs3" id="67SsWaEeGfN" role="2MkJ7o">
<node concept="Xl_RD" id="67SsWaEeGjb" role="3uHU7w">
<property role="Xl_RC" value=" is expected" />
</node>
<node concept="3cpWs3" id="67SsWaEeFEP" role="3uHU7B">
<node concept="Xl_RD" id="67SsWaEeFuo" role="3uHU7B">
<property role="Xl_RC" value="an instance of " />
</node>
<node concept="2OqwBi" id="67SsWaEeFOv" role="3uHU7w">
<node concept="3TUQnm" id="67SsWaEeFF7" role="2Oq$k0">
<ref role="3TV0OU" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
</node>
<node concept="3TrcHB" id="67SsWaEeIeC" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="1YBJjd" id="67SsWaEeGy4" role="2OEOjV">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
</node>
<node concept="3clFbH" id="67SsWaEeGIS" role="3cqZAp" />
</node>
<node concept="3fqX7Q" id="67SsWaEeFqc" role="3clFbw">
<node concept="2OqwBi" id="67SsWaEeFqe" role="3fr31v">
<node concept="2OqwBi" id="67SsWaEeFqf" role="2Oq$k0">
<node concept="1YBJjd" id="67SsWaEeFqg" role="2Oq$k0">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
<node concept="3TrEf2" id="67SsWaEeFqh" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
<node concept="1mIQ4w" id="67SsWaEeFqi" role="2OqNvi">
<node concept="chp4Y" id="67SsWaEeFqj" role="cj9EA">
<ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
</node>
</node>
</node>
</node>
<node concept="3eNFk2" id="67SsWaEeG_m" role="3eNLev">
<node concept="3clFbS" id="67SsWaEeG_o" role="3eOfB_">
<node concept="3cpWs8" id="67SsWaEfmC5" role="3cqZAp">
<node concept="3cpWsn" id="67SsWaEfmC6" role="3cpWs9">
<property role="TrG5h" value="msg" />
<node concept="17QB3L" id="67SsWaEfmC4" role="1tU5fm" />
<node concept="2YIFZM" id="67SsWaEfmC7" role="33vP2m">
<ref role="37wK5l" to="hy7p:67SsWaEdYHz" resolve="validateWithTemplate" />
<ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
<node concept="1PxgMI" id="67SsWaEfmC8" role="37wK5m">
<ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
<node concept="2OqwBi" id="67SsWaEfmC9" role="1m5AlR">
<node concept="1YBJjd" id="67SsWaEfmCa" role="2Oq$k0">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
<node concept="3TrEf2" id="67SsWaEfmCb" role="2OqNvi">
<ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
</node>
</node>
</node>
<node concept="2OqwBi" id="67SsWaEfmCc" role="37wK5m">
<node concept="2OqwBi" id="67SsWaEfmCd" role="2Oq$k0">
<node concept="1YBJjd" id="67SsWaEfmCe" role="2Oq$k0">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
<node concept="3TrEf2" id="67SsWaEfmCf" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
</node>
</node>
<node concept="3TrEf2" id="67SsWaEfmCg" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="67SsWaEeD_k" role="3cqZAp">
<node concept="3clFbS" id="67SsWaEeD_m" role="3clFbx">
<node concept="2MkqsV" id="67SsWaEeIhW" role="3cqZAp">
<node concept="37vLTw" id="67SsWaEfncz" role="2MkJ7o">
<ref role="3cqZAo" node="67SsWaEfmC6" resolve="msg" />
</node>
<node concept="1YBJjd" id="67SsWaEeIyz" role="2OEOjV">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
</node>
<node concept="3clFbH" id="67SsWaEeIzu" role="3cqZAp" />
</node>
<node concept="3y3z36" id="67SsWaEfn77" role="3clFbw">
<node concept="10Nm6u" id="67SsWaEfn7e" role="3uHU7w" />
<node concept="37vLTw" id="67SsWaEfmYo" role="3uHU7B">
<ref role="3cqZAo" node="67SsWaEfmC6" resolve="msg" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="67SsWaEeBK6" role="3eO9$A">
<node concept="2OqwBi" id="67SsWaEeBog" role="2Oq$k0">
<node concept="1YBJjd" id="67SsWaEeBlA" role="2Oq$k0">
<ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
</node>
<node concept="3TrEf2" id="67SsWaEeByV" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
</node>
</node>
<node concept="3x8VRR" id="67SsWaEeC2w" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="1YaCAy" id="67SsWaEdTGQ" role="1YuTPh">
<property role="TrG5h" value="typeTerm" />
<ref role="1YaFvo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
</node>
</node>
<node concept="1YbPZF" id="7feMCq_1rI_">
<property role="TrG5h" value="typeof_CodeBlock" />
<property role="3GE5qa" value="" />
@ -1472,89 +1337,6 @@
<ref role="1YaFvo" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
</node>
</node>
<node concept="1YbPZF" id="7IysFeA7WUT">
<property role="TrG5h" value="typeof_TypeConceptExpression" />
<property role="3GE5qa" value="type.code" />
<node concept="3clFbS" id="7IysFeA7WUU" role="18ibNy">
<node concept="3cpWs8" id="7IysFeA7YtX" role="3cqZAp">
<node concept="3cpWsn" id="7IysFeA7YtY" role="3cpWs9">
<property role="TrG5h" value="tcd" />
<node concept="3Tqbb2" id="7IysFeA7YtT" role="1tU5fm">
<ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
<node concept="2OqwBi" id="7IysFeA7YtZ" role="33vP2m">
<node concept="1YBJjd" id="7IysFeA7Yu0" role="2Oq$k0">
<ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
</node>
<node concept="2Xjw5R" id="7IysFeA7Yu1" role="2OqNvi">
<node concept="1xMEDy" id="7IysFeA7Yu2" role="1xVPHs">
<node concept="chp4Y" id="7IysFeA7Yu3" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
</node>
</node>
<node concept="1xIGOp" id="7IysFeA7Yu4" role="1xVPHs" />
</node>
</node>
</node>
</node>
<node concept="2Mj0R9" id="7IysFeA7Zcb" role="3cqZAp">
<node concept="2OqwBi" id="7IysFeA7ZkQ" role="2MkoU_">
<node concept="37vLTw" id="7IysFeA7Zcv" role="2Oq$k0">
<ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
</node>
<node concept="3x8VRR" id="7IysFeA7Z_I" role="2OqNvi" />
</node>
<node concept="Xl_RD" id="7IysFeA7ZBX" role="2MkJ7o">
<property role="Xl_RC" value="not applicable here" />
</node>
<node concept="1YBJjd" id="7IysFeA7ZEJ" role="2OEOjV">
<ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
</node>
</node>
<node concept="3clFbJ" id="7IysFeA7YwW" role="3cqZAp">
<node concept="3clFbS" id="7IysFeA7YwY" role="3clFbx">
<node concept="1Z5TYs" id="7IysFeA7X6C" role="3cqZAp">
<node concept="mw_s8" id="7IysFeA7X6F" role="1ZfhK$">
<node concept="1Z2H0r" id="7IysFeA7WV6" role="mwGJk">
<node concept="1YBJjd" id="7IysFeA7WWQ" role="1Z2MuG">
<ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
</node>
</node>
</node>
<node concept="mw_s8" id="7IysFeA7XSJ" role="1ZfhKB">
<node concept="2c44tf" id="7IysFeA7XSF" role="mwGJk">
<node concept="3bZ5Sz" id="7IysFeA7XT5" role="2c44tc">
<ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="2c44tb" id="7IysFeA7XUV" role="lGtFl">
<property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/6677504323281689838/6677504323281689839" />
<property role="2qtEX8" value="conceptDeclaraton" />
<node concept="2OqwBi" id="7IysFeA80Fx" role="2c44t1">
<node concept="37vLTw" id="7IysFeA80zR" role="2Oq$k0">
<ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
</node>
<node concept="3TrEf2" id="7IysFeA80Rk" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="7IysFeA7YME" role="3clFbw">
<node concept="37vLTw" id="7IysFeA7Yxt" role="2Oq$k0">
<ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
</node>
<node concept="3x8VRR" id="7IysFeA7Z3s" role="2OqNvi" />
</node>
</node>
</node>
<node concept="1YaCAy" id="7IysFeA7WUW" role="1YuTPh">
<property role="TrG5h" value="tce" />
<ref role="1YaFvo" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
</node>
</node>
<node concept="1YbPZF" id="7IysFeA9bof">
<property role="TrG5h" value="typeof_TypeLogicalExpression" />
<property role="3GE5qa" value="type.code" />
@ -1767,5 +1549,39 @@
<ref role="1YaFvo" to="wq2x:2V8TwD148$8" resolve="RecoverOperation" />
</node>
</node>
<node concept="1YbPZF" id="4MEOIDFzuUN">
<property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
<property role="3GE5qa" value="type.term" />
<node concept="3clFbS" id="4MEOIDFzuUO" role="18ibNy">
<node concept="1Z5TYs" id="4MEOIDFzv5A" role="3cqZAp">
<node concept="mw_s8" id="4MEOIDFzv5S" role="1ZfhKB">
<node concept="2OqwBi" id="4MEOIDFzvH_" role="mwGJk">
<node concept="2OqwBi" id="4MEOIDFzvf3" role="2Oq$k0">
<node concept="1YBJjd" id="4MEOIDFzv5Q" role="2Oq$k0">
<ref role="1YBMHb" node="4MEOIDFzuUQ" resolve="ttdpr" />
</node>
<node concept="3TrEf2" id="4MEOIDFzvoH" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
</node>
</node>
<node concept="3TrEf2" id="4MEOIDFzwap" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
</node>
</node>
</node>
<node concept="mw_s8" id="4MEOIDFzv5D" role="1ZfhK$">
<node concept="1Z2H0r" id="4MEOIDFzuV6" role="mwGJk">
<node concept="1YBJjd" id="4MEOIDFzuWQ" role="1Z2MuG">
<ref role="1YBMHb" node="4MEOIDFzuUQ" resolve="ttdpr" />
</node>
</node>
</node>
</node>
</node>
<node concept="1YaCAy" id="4MEOIDFzuUQ" role="1YuTPh">
<property role="TrG5h" value="ttdpr" />
<ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
</node>
</node>
</model>

424
typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
View File

@ -3018,98 +3018,100 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="1eKXYsjvS86" role="jymVt" />
<node concept="3clFb_" id="7IysFeAaLtH" role="jymVt">
<node concept="2tJIrI" id="4MEOIDFgTKR" role="jymVt" />
<node concept="3clFb_" id="4MEOIDFgV3a" role="jymVt">
<property role="TrG5h" value="newType" />
<node concept="37vLTG" id="7IysFeAaLtI" role="3clF46">
<node concept="37vLTG" id="4MEOIDFgV3b" role="3clF46">
<property role="TrG5h" value="typevar" />
<property role="3TUv4t" value="true" />
<node concept="26uTi9" id="7IysFeAaLtJ" role="1tU5fm" />
<node concept="26uTi9" id="4MEOIDFgV3c" role="1tU5fm" />
</node>
<node concept="37vLTG" id="7IysFeAaLx9" role="3clF46">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="7IysFeAaLxa" role="1tU5fm" />
<node concept="37vLTG" id="4MEOIDFgZnJ" role="3clF46">
<property role="TrG5h" value="typeTplId" />
<node concept="3uibUv" id="4MEOIDFgZnK" role="1tU5fm">
<ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
</node>
<node concept="37vLTG" id="7IysFeAaLxb" role="3clF46">
<node concept="37vLTG" id="4MEOIDFgV3f" role="3clF46">
<property role="TrG5h" value="args" />
<property role="3TUv4t" value="true" />
<node concept="8X2XB" id="7IysFeAaLxc" role="1tU5fm">
<node concept="3uibUv" id="7IysFeAaLxd" role="8Xvag">
<node concept="8X2XB" id="4MEOIDFgV3g" role="1tU5fm">
<node concept="3uibUv" id="4MEOIDFgV3h" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
<node concept="3uibUv" id="4JJCDImUuo7" role="3clF45">
<node concept="3uibUv" id="4MEOIDFgV3i" role="3clF45">
<ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
<node concept="3Tm1VV" id="7IysFeAaLtN" role="1B3o_S" />
<node concept="3clFbS" id="7IysFeAaLtO" role="3clF47">
<node concept="3clFbF" id="1eKXYsjwI5T" role="3cqZAp">
<node concept="1rXfSq" id="1eKXYsjwI5U" role="3clFbG">
<ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
<node concept="37vLTw" id="1eKXYsjwJDF" role="37wK5m">
<ref role="3cqZAo" node="7IysFeAaLx9" resolve="typeConcept" />
<node concept="3Tm1VV" id="4MEOIDFgV3j" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDFgV3k" role="3clF47">
<node concept="3clFbF" id="4MEOIDFgV3l" role="3cqZAp">
<node concept="1rXfSq" id="4MEOIDFgV3m" role="3clFbG">
<ref role="37wK5l" node="4MEOIDEfToN" resolve="withTypeTemplate" />
<node concept="37vLTw" id="4MEOIDFh09X" role="37wK5m">
<ref role="3cqZAo" node="4MEOIDFgZnJ" resolve="typeTplId" />
</node>
<node concept="2ShNRf" id="1eKXYsjwI5Y" role="37wK5m">
<node concept="YeOm9" id="1eKXYsjwI5Z" role="2ShVmc">
<node concept="1Y3b0j" id="1eKXYsjwI60" role="YeSDq">
<node concept="2ShNRf" id="4MEOIDFgV3o" role="37wK5m">
<node concept="YeOm9" id="4MEOIDFgV3p" role="2ShVmc">
<node concept="1Y3b0j" id="4MEOIDFgV3q" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
<node concept="3Tm1VV" id="1eKXYsjwI61" role="1B3o_S" />
<node concept="3clFb_" id="1eKXYsjwI62" role="jymVt">
<node concept="3Tm1VV" id="4MEOIDFgV3r" role="1B3o_S" />
<node concept="3clFb_" id="4MEOIDFgV3s" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="doAction" />
<node concept="37vLTG" id="1eKXYsjwI63" role="3clF46">
<node concept="37vLTG" id="4MEOIDFgV3t" role="3clF46">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="1eKXYsjwI64" role="1tU5fm">
<node concept="3uibUv" id="4MEOIDFgV3u" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="1eKXYsjwI65" role="11_B2D">
<ref role="16sUi3" node="1eKXYsjwI6j" resolve="Cfg" />
<node concept="16syzq" id="4MEOIDFgV3v" role="11_B2D">
<ref role="16sUi3" node="4MEOIDFgV3H" resolve="Cfg" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwI66" role="3clF45">
<node concept="3uibUv" id="4MEOIDFgV3w" role="3clF45">
<ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
<node concept="3Tm1VV" id="1eKXYsjwI67" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjwI68" role="3clF47">
<node concept="3clFbF" id="4KRwoelDUAi" role="3cqZAp">
<node concept="2OqwBi" id="4KRwoelDUAj" role="3clFbG">
<node concept="37vLTw" id="4KRwoelDUAk" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjwI63" resolve="typeTemplate" />
<node concept="3Tm1VV" id="4MEOIDFgV3x" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDFgV3y" role="3clF47">
<node concept="3clFbF" id="4MEOIDFgV3z" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDFgV3$" role="3clFbG">
<node concept="37vLTw" id="4MEOIDFgV3_" role="2Oq$k0">
<ref role="3cqZAo" node="4MEOIDFgV3t" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="4KRwoelDUAl" role="2OqNvi">
<node concept="liA8E" id="4MEOIDFgV3A" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvsWF" resolve="bindType" />
<node concept="2OqwBi" id="4KRwoelDUAm" role="37wK5m">
<node concept="37vLTw" id="4KRwoelDUAn" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjwI63" resolve="typeTemplate" />
<node concept="2OqwBi" id="4MEOIDFgV3B" role="37wK5m">
<node concept="37vLTw" id="4MEOIDFgV3C" role="2Oq$k0">
<ref role="3cqZAo" node="4MEOIDFgV3t" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="4KRwoelDUAo" role="2OqNvi">
<node concept="liA8E" id="4MEOIDFgV3D" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvsWn" resolve="withArgs" />
<node concept="37vLTw" id="4KRwoelDX7G" role="37wK5m">
<ref role="3cqZAo" node="7IysFeAaLxb" resolve="args" />
<node concept="37vLTw" id="4MEOIDFgV3E" role="37wK5m">
<ref role="3cqZAo" node="4MEOIDFgV3f" resolve="args" />
</node>
</node>
</node>
<node concept="37vLTw" id="4KRwoelDUAq" role="37wK5m">
<ref role="3cqZAo" node="7IysFeAaLtI" resolve="typevar" />
<node concept="37vLTw" id="4MEOIDFgV3F" role="37wK5m">
<ref role="3cqZAo" node="4MEOIDFgV3b" resolve="typevar" />
</node>
<node concept="Xjq3P" id="4KRwoelDUAr" role="37wK5m">
<node concept="Xjq3P" id="4MEOIDFgV3G" role="37wK5m">
<ref role="1HBi2w" node="18kNIl1vDPZ" resolve="ApplicationSession" />
</node>
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="1eKXYsjwI6j" role="16eVyc">
<node concept="16euLQ" id="4MEOIDFgV3H" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="1eKXYsjwI6k" role="3ztrMU">
<node concept="3uibUv" id="4MEOIDFgV3I" role="3ztrMU">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwI6l" role="2Ghqu4">
<node concept="3uibUv" id="4MEOIDFgV3J" role="2Ghqu4">
<ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
@ -3120,251 +3122,6 @@
</node>
</node>
<node concept="2tJIrI" id="1L74NXEx6$J" role="jymVt" />
<node concept="3clFb_" id="1L74NXEx75v" role="jymVt">
<property role="TrG5h" value="typeTerm" />
<node concept="37vLTG" id="1L74NXEx75y" role="3clF46">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="1L74NXEx75z" role="1tU5fm" />
</node>
<node concept="37vLTG" id="1L74NXEx75$" role="3clF46">
<property role="TrG5h" value="args" />
<property role="3TUv4t" value="true" />
<node concept="8X2XB" id="1L74NXEx75_" role="1tU5fm">
<node concept="3uibUv" id="1L74NXEx75A" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
<node concept="3uibUv" id="4gW0vesTseu" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1L74NXEx75C" role="1B3o_S" />
<node concept="3clFbS" id="1L74NXEx75D" role="3clF47">
<node concept="3clFbF" id="1eKXYsjwS$a" role="3cqZAp">
<node concept="1rXfSq" id="1eKXYsjwS$b" role="3clFbG">
<ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
<node concept="37vLTw" id="1eKXYsjwS$c" role="37wK5m">
<ref role="3cqZAo" node="1L74NXEx75y" resolve="typeConcept" />
</node>
<node concept="2ShNRf" id="1eKXYsjwS$d" role="37wK5m">
<node concept="YeOm9" id="1eKXYsjwS$e" role="2ShVmc">
<node concept="1Y3b0j" id="1eKXYsjwS$f" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
<node concept="3Tm1VV" id="1eKXYsjwS$g" role="1B3o_S" />
<node concept="3clFb_" id="1eKXYsjwS$h" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="doAction" />
<node concept="37vLTG" id="1eKXYsjwS$i" role="3clF46">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="1eKXYsjwS$j" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="1eKXYsjwS$k" role="11_B2D">
<ref role="16sUi3" node="1eKXYsjwS$y" resolve="Cfg" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwU6m" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1eKXYsjwS$m" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjwS$n" role="3clF47">
<node concept="3clFbF" id="4KRwoelE0VR" role="3cqZAp">
<node concept="2OqwBi" id="4KRwoelE1ck" role="3clFbG">
<node concept="37vLTw" id="4KRwoelE0VP" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjwS$i" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="4KRwoelE1w4" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvsW$" resolve="typeTerm" />
<node concept="2OqwBi" id="4KRwoelE1J1" role="37wK5m">
<node concept="37vLTw" id="4KRwoelE1J2" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjwS$i" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="4KRwoelE1J3" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvsWn" resolve="withArgs" />
<node concept="37vLTw" id="4KRwoelE1J4" role="37wK5m">
<ref role="3cqZAo" node="1L74NXEx75$" resolve="args" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="1eKXYsjwS$y" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="1eKXYsjwS$z" role="3ztrMU">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwT46" role="2Ghqu4">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="1eKXYsjwR_Y" role="jymVt" />
<node concept="3clFb_" id="1L74NXGis3$" role="jymVt">
<property role="TrG5h" value="typeTermOverriding" />
<node concept="37vLTG" id="1L74NXGis3_" role="3clF46">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="1L74NXGis3A" role="1tU5fm" />
</node>
<node concept="37vLTG" id="1L74NXGit9e" role="3clF46">
<property role="TrG5h" value="config" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="1eKXYsjLDox" role="1tU5fm">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
<node concept="3uibUv" id="4gW0vesTEXg" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1L74NXGis3F" role="1B3o_S" />
<node concept="3clFbS" id="1L74NXGis3G" role="3clF47">
<node concept="3clFbF" id="1eKXYsjwXOg" role="3cqZAp">
<node concept="1rXfSq" id="1eKXYsjwXOh" role="3clFbG">
<ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
<node concept="37vLTw" id="1eKXYsjwXOi" role="37wK5m">
<ref role="3cqZAo" node="1L74NXGis3_" resolve="typeConcept" />
</node>
<node concept="2ShNRf" id="1eKXYsjwXOj" role="37wK5m">
<node concept="YeOm9" id="1eKXYsjwXOk" role="2ShVmc">
<node concept="1Y3b0j" id="1eKXYsjwXOl" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
<node concept="3Tm1VV" id="1eKXYsjwXOm" role="1B3o_S" />
<node concept="3clFb_" id="1eKXYsjwXOn" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="doAction" />
<node concept="37vLTG" id="1eKXYsjwXOo" role="3clF46">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="1eKXYsjwXOp" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="1eKXYsjwXOq" role="11_B2D">
<ref role="16sUi3" node="1eKXYsjwXOA" resolve="Cfg" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwXOr" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1eKXYsjwXOs" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjwXOt" role="3clF47">
<node concept="3clFbF" id="4KRwoelGtnV" role="3cqZAp">
<node concept="2OqwBi" id="4KRwoelGtnW" role="3clFbG">
<node concept="37vLTw" id="4KRwoelGtnX" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjwXOo" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="4KRwoelGtnY" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvsW$" resolve="typeTerm" />
<node concept="10QFUN" id="1eKXYsjxhwb" role="37wK5m">
<node concept="16syzq" id="1eKXYsjxh$S" role="10QFUM">
<ref role="16sUi3" node="1eKXYsjwXOA" resolve="Cfg" />
</node>
<node concept="37vLTw" id="4KRwoelGuUy" role="10QFUP">
<ref role="3cqZAo" node="1L74NXGit9e" resolve="config" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="1eKXYsjwXOA" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="1eKXYsjwXOB" role="3ztrMU">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjwXOC" role="2Ghqu4">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="60NbDCXJZ2H" role="jymVt" />
<node concept="3clFb_" id="1L74NXF7OB0" role="jymVt">
<property role="TrG5h" value="typePattern" />
<node concept="37vLTG" id="1L74NXF7OB1" role="3clF46">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="1L74NXF7OB2" role="1tU5fm" />
</node>
<node concept="3uibUv" id="4gW0vesTFpY" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1L74NXF7OB7" role="1B3o_S" />
<node concept="3clFbS" id="1L74NXF7OB8" role="3clF47">
<node concept="3clFbF" id="1eKXYsjxbaz" role="3cqZAp">
<node concept="1rXfSq" id="1eKXYsjxba$" role="3clFbG">
<ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
<node concept="37vLTw" id="1eKXYsjxba_" role="37wK5m">
<ref role="3cqZAo" node="1L74NXF7OB1" resolve="typeConcept" />
</node>
<node concept="2ShNRf" id="1eKXYsjxbaA" role="37wK5m">
<node concept="YeOm9" id="1eKXYsjxbaB" role="2ShVmc">
<node concept="1Y3b0j" id="1eKXYsjxbaC" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
<node concept="3Tm1VV" id="1eKXYsjxbaD" role="1B3o_S" />
<node concept="3clFb_" id="1eKXYsjxbaE" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="doAction" />
<node concept="37vLTG" id="1eKXYsjxbaF" role="3clF46">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="1eKXYsjxbaG" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="1eKXYsjLyJe" role="11_B2D">
<ref role="16sUi3" node="1eKXYsjxbaT" resolve="Cfg" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjxbaI" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1eKXYsjxbaJ" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjxbaK" role="3clF47">
<node concept="3clFbF" id="1eKXYsjLwJX" role="3cqZAp">
<node concept="2OqwBi" id="1eKXYsjLwUb" role="3clFbG">
<node concept="37vLTw" id="1eKXYsjLwJV" role="2Oq$k0">
<ref role="3cqZAo" node="1eKXYsjxbaF" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="1eKXYsjLx5F" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjIChF" resolve="patternTypeTerm" />
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="1eKXYsjxbaT" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="1eKXYsjxbaU" role="3ztrMU">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
</node>
<node concept="3uibUv" id="1eKXYsjxbaV" role="2Ghqu4">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="1L74NXF7OAZ" role="jymVt" />
<node concept="3clFb_" id="3TnYLtqf9a6" role="jymVt">
<property role="TrG5h" value="putParameter" />
<node concept="37vLTG" id="3TnYLtqf9RL" role="3clF46">
@ -3563,6 +3320,89 @@
</node>
<node concept="3Tm6S6" id="Ya9Z$kToDB" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="4MEOIDEfH8j" role="jymVt" />
<node concept="3clFb_" id="4MEOIDEfToN" role="jymVt">
<property role="TrG5h" value="withTypeTemplate" />
<node concept="37vLTG" id="4MEOIDEhFiE" role="3clF46">
<property role="TrG5h" value="typeTplID" />
<node concept="3uibUv" id="4MEOIDEhG7B" role="1tU5fm">
<ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
</node>
<node concept="37vLTG" id="4MEOIDEfYmf" role="3clF46">
<property role="TrG5h" value="action" />
<node concept="3uibUv" id="4MEOIDEfYmg" role="1tU5fm">
<ref role="3uigEE" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
<node concept="16syzq" id="4MEOIDEg1Fm" role="11_B2D">
<ref role="16sUi3" node="4MEOIDEfZxF" resolve="R" />
</node>
</node>
</node>
<node concept="16syzq" id="4MEOIDEfZUq" role="3clF45">
<ref role="16sUi3" node="4MEOIDEfZxF" resolve="R" />
</node>
<node concept="3Tm6S6" id="4MEOIDEfU24" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEfToR" role="3clF47">
<node concept="3SKdUt" id="4MEOIDEhHdh" role="3cqZAp">
<node concept="3SKdUq" id="4MEOIDEhHdi" role="3SKWNk">
<property role="3SKdUp" value="FIXME: load the correct typetable!!!" />
</node>
</node>
<node concept="3cpWs8" id="4MEOIDEhHdj" role="3cqZAp">
<node concept="3cpWsn" id="4MEOIDEhHdk" role="3cpWs9">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="4MEOIDEhHdl" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="4MEOIDEhHdm" role="11_B2D">
<ref role="16sUi3" node="4MEOIDEfWXj" resolve="Cfg" />
</node>
</node>
<node concept="2OqwBi" id="4MEOIDEhHdn" role="33vP2m">
<node concept="2OqwBi" id="4MEOIDEhHdo" role="2Oq$k0">
<node concept="2OqwBi" id="4MEOIDEhHdp" role="2Oq$k0">
<node concept="37vLTw" id="4MEOIDEhHdq" role="2Oq$k0">
<ref role="3cqZAo" node="Ya9Z$kQMM0" resolve="typeTemplates" />
</node>
<node concept="liA8E" id="4MEOIDEhHdr" role="2OqNvi">
<ref role="37wK5l" to="fqlx:4JJCDIn5F0n" resolve="typeTables" />
</node>
</node>
<node concept="1uHKPH" id="4MEOIDEhHds" role="2OqNvi" />
</node>
<node concept="liA8E" id="4MEOIDEhHdt" role="2OqNvi">
<ref role="37wK5l" to="psr6:4MEOIDEgpuf" resolve="typeTemplate" />
<node concept="37vLTw" id="4MEOIDEi5Ck" role="37wK5m">
<ref role="3cqZAo" node="4MEOIDEhFiE" resolve="typeTplID" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="4MEOIDEhHck" role="3cqZAp" />
<node concept="3clFbF" id="4MEOIDEg0wF" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDEg0G3" role="3clFbG">
<node concept="37vLTw" id="4MEOIDEg0wE" role="2Oq$k0">
<ref role="3cqZAo" node="4MEOIDEfYmf" resolve="action" />
</node>
<node concept="liA8E" id="4MEOIDEg0Yc" role="2OqNvi">
<ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
<node concept="37vLTw" id="4MEOIDEhHCs" role="37wK5m">
<ref role="3cqZAo" node="4MEOIDEhHdk" resolve="typeTemplate" />
</node>
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="4MEOIDEfWXj" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="4MEOIDEfXxU" role="3ztrMU">
<ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
<node concept="16euLQ" id="4MEOIDEfZxF" role="16eVyc">
<property role="TrG5h" value="R" />
</node>
</node>
<node concept="2tJIrI" id="3TnYLtqf8Zx" role="jymVt" />
<node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
<node concept="312cEg" id="Ya9Z$kQMM0" role="jymVt">

111
typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
View File

@ -5,6 +5,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
</languages>
<imports>
<import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
@ -107,9 +108,6 @@
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
<child id="1079359253376" name="expression" index="1eOMHV" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@ -186,10 +184,6 @@
</concept>
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
<child id="1197932505799" name="map" index="3ElQJh" />
<child id="1197932525128" name="key" index="3ElVtu" />
</concept>
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
@ -619,9 +613,9 @@
<ref role="3cqZAo" node="4nxCIBqsydV" resolve="typeTable" />
</node>
<node concept="liA8E" id="1eKXYsjJ8_l" role="2OqNvi">
<ref role="37wK5l" to="psr6:4KRwoelAtxl" resolve="typeTemplate" />
<ref role="37wK5l" to="psr6:4MEOIDEgpuf" resolve="typeTemplate" />
<node concept="37vLTw" id="1eKXYsjJ8_m" role="37wK5m">
<ref role="3cqZAo" node="4nxCIBqqpIA" resolve="typeConcept" />
<ref role="3cqZAo" node="4nxCIBqqpIA" resolve="id" />
</node>
</node>
</node>
@ -655,15 +649,17 @@
</node>
</node>
<node concept="3cpWsn" id="4nxCIBqqpIA" role="1Duv9x">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="4nxCIBqqpIE" role="1tU5fm" />
<property role="TrG5h" value="id" />
<node concept="3uibUv" id="4MEOIDEXv7_" role="1tU5fm">
<ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
</node>
<node concept="2OqwBi" id="4nxCIBqqpIF" role="1DdaDG">
<node concept="37vLTw" id="4nxCIBqqpIG" role="2Oq$k0">
<ref role="3cqZAo" node="4nxCIBqsydV" resolve="typeTable" />
</node>
<node concept="liA8E" id="4nxCIBqqpIH" role="2OqNvi">
<ref role="37wK5l" to="psr6:4nxCIBqorn9" resolve="allTypeConcepts" />
<ref role="37wK5l" to="psr6:4MEOIDEWLkY" resolve="allTypeTemplateIds" />
</node>
</node>
</node>
@ -676,97 +672,6 @@
</node>
</node>
<node concept="2tJIrI" id="4JJCDImP6ss" role="jymVt" />
<node concept="3clFb_" id="1hX44vNlSTQ" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="addType" />
<node concept="37vLTG" id="1hX44vNlSTR" role="3clF46">
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="1hX44vNnnG6" role="1tU5fm">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
</node>
</node>
<node concept="3cqZAl" id="1hX44vNlSTT" role="3clF45" />
<node concept="3Tm6S6" id="4nxCIBqoqWH" role="1B3o_S" />
<node concept="3clFbS" id="1hX44vNlSTW" role="3clF47">
<node concept="3cpWs8" id="1hX44vNnkeg" role="3cqZAp">
<node concept="3cpWsn" id="1hX44vNnkeh" role="3cpWs9">
<property role="TrG5h" value="templates" />
<node concept="3vKaQO" id="1hX44vNnkei" role="1tU5fm">
<node concept="3uibUv" id="1hX44vNpejD" role="3O5elw">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
</node>
</node>
<node concept="3EllGN" id="1hX44vNnkek" role="33vP2m">
<node concept="2OqwBi" id="1hX44vNnkel" role="3ElVtu">
<node concept="37vLTw" id="1hX44vNnkvd" role="2Oq$k0">
<ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="1hX44vNnken" role="2OqNvi">
<ref role="37wK5l" to="psr6:1hX44vNnkNu" resolve="typeConcept" />
</node>
</node>
<node concept="37vLTw" id="1hX44vNnkeo" role="3ElQJh">
<ref role="3cqZAo" node="1hX44vNnj_J" resolve="typeTemplates" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="1hX44vNnkep" role="3cqZAp">
<node concept="3clFbS" id="1hX44vNnkeq" role="3clFbx">
<node concept="3clFbF" id="1hX44vNnker" role="3cqZAp">
<node concept="37vLTI" id="1hX44vNnkes" role="3clFbG">
<node concept="1eOMI4" id="1hX44vNnket" role="37vLTx">
<node concept="37vLTI" id="1hX44vNnkeu" role="1eOMHV">
<node concept="2ShNRf" id="1hX44vNnkev" role="37vLTx">
<node concept="Tc6Ow" id="1hX44vNnkew" role="2ShVmc">
<node concept="3uibUv" id="1hX44vNpcBp" role="HW$YZ">
<ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
</node>
</node>
</node>
<node concept="37vLTw" id="1hX44vNpdac" role="37vLTJ">
<ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
</node>
</node>
</node>
<node concept="3EllGN" id="1hX44vNnkez" role="37vLTJ">
<node concept="2OqwBi" id="1hX44vNnke$" role="3ElVtu">
<node concept="37vLTw" id="1hX44vNnoT5" role="2Oq$k0">
<ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
</node>
<node concept="liA8E" id="1hX44vNnkeA" role="2OqNvi">
<ref role="37wK5l" to="psr6:1hX44vNnkNu" resolve="typeConcept" />
</node>
</node>
<node concept="37vLTw" id="1hX44vNnkeB" role="3ElQJh">
<ref role="3cqZAo" node="1hX44vNnj_J" resolve="typeTemplates" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="1hX44vNnkeC" role="3clFbw">
<node concept="10Nm6u" id="1hX44vNnkeD" role="3uHU7w" />
<node concept="37vLTw" id="1hX44vNnkeE" role="3uHU7B">
<ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
</node>
</node>
</node>
<node concept="3clFbF" id="1hX44vNnkeF" role="3cqZAp">
<node concept="2OqwBi" id="1hX44vNnkeG" role="3clFbG">
<node concept="37vLTw" id="1hX44vNnkeH" role="2Oq$k0">
<ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
</node>
<node concept="TSZUe" id="1hX44vNnkeI" role="2OqNvi">
<node concept="37vLTw" id="1hX44vNnp6Z" role="25WWJ7">
<ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="4nxCIBqumqZ" role="jymVt" />
</node>
<node concept="2tJIrI" id="1hX44vNnjF5" role="jymVt" />
<node concept="312cEg" id="4JJCDImRYzW" role="jymVt">

294
typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
View File

@ -14,6 +14,7 @@
<import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
<import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
<import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
<registry>
@ -86,6 +87,7 @@
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
<concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
<property id="4276006055363816570" name="isSynchronized" index="od$2w" />
<property id="1181808852946" name="isFinal" index="DiZV1" />
<child id="1068580123133" name="returnType" index="3clF45" />
<child id="1068580123134" name="parameter" index="3clF46" />
@ -140,6 +142,9 @@
<concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
</language>
@ -906,15 +911,42 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="4nxCIBqordD" role="jymVt" />
<node concept="3clFb_" id="4nxCIBqorn9" role="jymVt">
<property role="TrG5h" value="allTypeConcepts" />
<node concept="2tJIrI" id="4MEOIDEgpw7" role="jymVt" />
<node concept="3clFb_" id="4MEOIDEgpuf" role="jymVt">
<property role="1EzhhJ" value="true" />
<node concept="3vKaQO" id="4nxCIBqorx6" role="3clF45">
<node concept="3bZ5Sz" id="4nxCIBqoryQ" role="3O5elw" />
<property role="TrG5h" value="typeTemplate" />
<node concept="3uibUv" id="4MEOIDEgpug" role="3clF45">
<ref role="3uigEE" node="1hX44vNnjJ$" resolve="TypeTemplate" />
<node concept="16syzq" id="4MEOIDEgpuh" role="11_B2D">
<ref role="16sUi3" node="4MEOIDEgpum" resolve="Cfg" />
</node>
</node>
<node concept="3Tm1VV" id="4nxCIBqornc" role="1B3o_S" />
<node concept="3clFbS" id="4nxCIBqornd" role="3clF47" />
<node concept="3Tm1VV" id="4MEOIDEgpui" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEgpuj" role="3clF47" />
<node concept="16euLQ" id="4MEOIDEgpum" role="16eVyc">
<property role="TrG5h" value="Cfg" />
<node concept="3uibUv" id="4MEOIDEgpun" role="3ztrMU">
<ref role="3uigEE" node="1eKXYsjvsOy" resolve="TypeTemplate.Config" />
</node>
</node>
<node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
<property role="TrG5h" value="typeTplId" />
<node concept="3uibUv" id="4MEOIDEhHGl" role="1tU5fm">
<ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEWLmE" role="jymVt" />
<node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
<property role="TrG5h" value="allTypeTemplateIds" />
<property role="1EzhhJ" value="true" />
<node concept="3vKaQO" id="4MEOIDEWLkZ" role="3clF45">
<node concept="3uibUv" id="4MEOIDEWSWB" role="3O5elw">
<ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
</node>
<node concept="3Tm1VV" id="4MEOIDEWLl1" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEWLl2" role="3clF47" />
</node>
<node concept="2tJIrI" id="4KRwoelAvaR" role="jymVt" />
</node>
@ -996,66 +1028,6 @@
<property role="TrG5h" value="R" />
</node>
</node>
<node concept="2tJIrI" id="1eKXYsjLtzS" role="jymVt" />
<node concept="3clFbW" id="7IysFeAhRJB" role="jymVt">
<node concept="37vLTG" id="7IysFeAhSr3" role="3clF46">
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="7IysFeAhStT" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="7IysFeAhRJD" role="3clF45" />
<node concept="3Tm1VV" id="7IysFeAhRJE" role="1B3o_S" />
<node concept="3clFbS" id="7IysFeAhRJF" role="3clF47">
<node concept="3clFbF" id="7IysFeAhSvh" role="3cqZAp">
<node concept="37vLTI" id="7IysFeAhSvj" role="3clFbG">
<node concept="2OqwBi" id="7IysFeAhUfK" role="37vLTJ">
<node concept="Xjq3P" id="7IysFeAhU5M" role="2Oq$k0" />
<node concept="2OwXpG" id="7IysFeAhUE5" role="2OqNvi">
<ref role="2Oxat5" node="7IysFeAhSvd" resolve="typeConcept" />
</node>
</node>
<node concept="37vLTw" id="7IysFeAhSvn" role="37vLTx">
<ref role="3cqZAo" node="7IysFeAhSr3" resolve="typeConcept" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7IysFeAhR3l" role="jymVt" />
<node concept="3clFb_" id="1hX44vNnkZK" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="1hX44vNnkZL" role="3clF45" />
<node concept="3Tm1VV" id="1hX44vNnkZM" role="1B3o_S" />
<node concept="3clFbS" id="1hX44vNnkZO" role="3clF47">
<node concept="3clFbF" id="7IysFeAhTW2" role="3cqZAp">
<node concept="37vLTw" id="7IysFeAhTW0" role="3clFbG">
<ref role="3cqZAo" node="7IysFeAhSvd" resolve="typeConcept" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="60NbDCXFSw$" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjIYqJ" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="patternTypeTerm" />
<node concept="3uibUv" id="1eKXYsjIYqK" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1eKXYsjIYqL" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjIYqN" role="3clF47">
<node concept="3clFbF" id="1eKXYsjJ2yW" role="3cqZAp">
<node concept="1rXfSq" id="1eKXYsjJ2yV" role="3clFbG">
<ref role="37wK5l" node="1eKXYsjvsW$" resolve="typeTerm" />
<node concept="1rXfSq" id="1eKXYsjJ309" role="37wK5m">
<ref role="37wK5l" node="1eKXYsjvsWv" resolve="asPattern" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="1eKXYsjIYqO" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="60NbDCXFVbR" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjvsWg" role="jymVt">
<property role="TrG5h" value="withNode" />
@ -1070,23 +1042,7 @@
<node concept="3Tmbuc" id="60NbDCXHdjy" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjvsWl" role="3clF47" />
</node>
<node concept="2tJIrI" id="60NbDCXHcPH" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjvsWv" role="jymVt">
<property role="TrG5h" value="asPattern" />
<property role="1EzhhJ" value="true" />
<node concept="16syzq" id="1eKXYsjvtxD" role="3clF45">
<ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
</node>
<node concept="3Tmbuc" id="60NbDCXFT0N" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjvsWy" role="3clF47" />
</node>
<node concept="2tJIrI" id="1eKXYsjJ3o2" role="jymVt" />
<node concept="312cEg" id="7IysFeAhSvd" role="jymVt">
<property role="TrG5h" value="typeConcept" />
<node concept="3Tmbuc" id="1GNw78$TiBT" role="1B3o_S" />
<node concept="3bZ5Sz" id="7IysFeAhSvg" role="1tU5fm" />
</node>
<node concept="2tJIrI" id="1hX44vNnl1G" role="jymVt" />
<node concept="2tJIrI" id="4MEOIDG7xoH" role="jymVt" />
<node concept="3Tm1VV" id="1hX44vNlvEW" role="1B3o_S" />
<node concept="16euLQ" id="1hX44vNlw2n" role="16eVyc">
<property role="TrG5h" value="Cfg" />
@ -1109,15 +1065,135 @@
<property role="TrG5h" value="Config" />
<node concept="3Tm1VV" id="1eKXYsjvsOz" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
<node concept="3clFb_" id="1hX44vNnkNu" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="typeConcept" />
<node concept="3bZ5Sz" id="1hX44vNnkWY" role="3clF45" />
<node concept="3Tm1VV" id="1hX44vNnkNx" role="1B3o_S" />
<node concept="3clFbS" id="1hX44vNnkNy" role="3clF47" />
<node concept="2tJIrI" id="4MEOIDEhyKf" role="jymVt" />
<node concept="312cEu" id="4MEOIDEhyPY" role="jymVt">
<property role="TrG5h" value="ID" />
<node concept="2tJIrI" id="4MEOIDEhz0j" role="jymVt" />
<node concept="2YIFZL" id="4MEOIDEhz4d" role="jymVt">
<property role="TrG5h" value="forReference" />
<node concept="37vLTG" id="4MEOIDEhznZ" role="3clF46">
<property role="TrG5h" value="ref" />
<node concept="3uibUv" id="4MEOIDEipRS" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3uibUv" id="4MEOIDEhzcj" role="3clF45">
<ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
<node concept="3Tm1VV" id="4MEOIDEhz4g" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEhz4h" role="3clF47">
<node concept="3clFbF" id="4MEOIDEhACe" role="3cqZAp">
<node concept="2ShNRf" id="4MEOIDEhACa" role="3clFbG">
<node concept="1pGfFk" id="4MEOIDEhARU" role="2ShVmc">
<ref role="37wK5l" node="4MEOIDEh_LW" resolve="TypeTemplate.ID" />
<node concept="2OqwBi" id="4MEOIDEhAWq" role="37wK5m">
<node concept="37vLTw" id="4MEOIDEhAYV" role="2Oq$k0">
<ref role="3cqZAo" node="4MEOIDEhznZ" resolve="ref" />
</node>
<node concept="liA8E" id="4MEOIDEhAWs" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEh$RD" role="jymVt" />
<node concept="2YIFZL" id="4MEOIDEip_0" role="jymVt">
<property role="TrG5h" value="forNode" />
<node concept="37vLTG" id="4MEOIDEip_1" role="3clF46">
<property role="TrG5h" value="node" />
<node concept="3Tqbb2" id="4MEOIDEip_2" role="1tU5fm" />
</node>
<node concept="3uibUv" id="4MEOIDEip_3" role="3clF45">
<ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
</node>
<node concept="3Tm1VV" id="4MEOIDEip_4" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEip_5" role="3clF47">
<node concept="3clFbF" id="4MEOIDEip_6" role="3cqZAp">
<node concept="2ShNRf" id="4MEOIDEip_7" role="3clFbG">
<node concept="1pGfFk" id="4MEOIDEip_8" role="2ShVmc">
<ref role="37wK5l" node="4MEOIDEh_LW" resolve="TypeTemplate.ID" />
<node concept="2OqwBi" id="4MEOIDEip_9" role="37wK5m">
<node concept="2JrnkZ" id="4MEOIDEip_b" role="2Oq$k0">
<node concept="37vLTw" id="4MEOIDEip_c" role="2JrQYb">
<ref role="3cqZAo" node="4MEOIDEip_1" resolve="node" />
</node>
</node>
<node concept="liA8E" id="4MEOIDEip_e" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEip$Z" role="jymVt" />
<node concept="3clFb_" id="4MEOIDEi5VO" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="toString" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="4MEOIDEi5VP" role="1B3o_S" />
<node concept="3uibUv" id="4MEOIDEi5VR" role="3clF45">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="3clFbS" id="4MEOIDEi5VS" role="3clF47">
<node concept="3clFbF" id="4MEOIDEi6jx" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDEi6qK" role="3clFbG">
<node concept="37vLTw" id="4MEOIDEi6jw" role="2Oq$k0">
<ref role="3cqZAo" node="4MEOIDEh_rV" resolve="nodeId" />
</node>
<node concept="liA8E" id="4MEOIDEi6Bi" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="4MEOIDEi5VT" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEi65J" role="jymVt" />
<node concept="3clFbW" id="4MEOIDEh_LW" role="jymVt">
<node concept="37vLTG" id="4MEOIDEh_Rv" role="3clF46">
<property role="TrG5h" value="nodeId" />
<node concept="3uibUv" id="4MEOIDEh_Tz" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
</node>
</node>
<node concept="3cqZAl" id="4MEOIDEh_LY" role="3clF45" />
<node concept="3Tm6S6" id="4MEOIDEh_Rg" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDEh_M0" role="3clF47">
<node concept="3clFbF" id="4MEOIDEhA70" role="3cqZAp">
<node concept="37vLTI" id="4MEOIDEhAvZ" role="3clFbG">
<node concept="37vLTw" id="4MEOIDEhA$B" role="37vLTx">
<ref role="3cqZAo" node="4MEOIDEh_Rv" resolve="nodeId" />
</node>
<node concept="2OqwBi" id="4MEOIDEhAba" role="37vLTJ">
<node concept="Xjq3P" id="4MEOIDEhA6Z" role="2Oq$k0" />
<node concept="2OwXpG" id="4MEOIDEhAlD" role="2OqNvi">
<ref role="2Oxat5" node="4MEOIDEh_rV" resolve="nodeId" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEh_GM" role="jymVt" />
<node concept="312cEg" id="4MEOIDEh_rV" role="jymVt">
<property role="TrG5h" value="nodeId" />
<node concept="3Tm6S6" id="4MEOIDEh_rW" role="1B3o_S" />
<node concept="3uibUv" id="4MEOIDEh_AW" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
</node>
</node>
<node concept="2tJIrI" id="4MEOIDEhA0P" role="jymVt" />
<node concept="3Tm1VV" id="4MEOIDEhyPZ" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="1hX44vNnkEw" role="jymVt" />
<node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjvsWn" role="jymVt">
<property role="TrG5h" value="withArgs" />
<property role="1EzhhJ" value="true" />
@ -1135,22 +1211,6 @@
<node concept="3Tm1VV" id="1eKXYsjvsWs" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjvsWt" role="3clF47" />
</node>
<node concept="2tJIrI" id="1eKXYsjvsWu" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjvsW$" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="typeTerm" />
<node concept="3uibUv" id="1eKXYsjvsW_" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="1eKXYsjvsWA" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjvsWB" role="3clF47" />
<node concept="37vLTG" id="1eKXYsjvsWC" role="3clF46">
<property role="TrG5h" value="config" />
<node concept="16syzq" id="1eKXYsjFglT" role="1tU5fm">
<ref role="16sUi3" node="1eKXYsjvsL$" resolve="Cfg" />
</node>
</node>
</node>
<node concept="2tJIrI" id="60NbDCXGYuS" role="jymVt" />
<node concept="3clFb_" id="60NbDCXGYgv" role="jymVt">
<property role="1EzhhJ" value="true" />
@ -1175,7 +1235,7 @@
<node concept="3Tm1VV" id="1eKXYsjIChH" role="1B3o_S" />
<node concept="3clFbS" id="1eKXYsjIChI" role="3clF47" />
</node>
<node concept="2tJIrI" id="1eKXYsjvsWE" role="jymVt" />
<node concept="2tJIrI" id="4MEOIDG7Abc" role="jymVt" />
<node concept="3clFb_" id="1eKXYsjvsWF" role="jymVt">
<property role="TrG5h" value="bindType" />
<property role="1EzhhJ" value="true" />
@ -1291,5 +1351,21 @@
<node concept="2tJIrI" id="4nxCIBqhZxH" role="jymVt" />
<node concept="3Tm1VV" id="4nxCIBqhYFy" role="1B3o_S" />
</node>
<node concept="312cEu" id="4MEOIDFA48I">
<property role="TrG5h" value="AbstractTermDeclaration" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="4MEOIDFA4bd" role="jymVt" />
<node concept="3clFb_" id="4MEOIDFA4bP" role="jymVt">
<property role="TrG5h" value="typeTerm" />
<property role="1EzhhJ" value="true" />
<node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
</node>
<node concept="3Tm1VV" id="4MEOIDFA4bS" role="1B3o_S" />
<node concept="3clFbS" id="4MEOIDFA4bT" role="3clF47" />
</node>
<node concept="2tJIrI" id="4MEOIDFA4bf" role="jymVt" />
<node concept="3Tm1VV" id="4MEOIDFA48J" role="1B3o_S" />
</node>
</model>