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

Run migration

This commit is contained in:
Fedor Isakov 2023-10-13 17:57:34 +02:00
parent 20a0bedd81
commit fc8451e63d
72 changed files with 2365 additions and 1430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
View File

@ -2417,7 +2417,7 @@
<node concept="2OqwBi" id="1ufy3d9uGXq" role="37wK5m">
<node concept="2OqwBi" id="1ufy3d9uGXr" role="2Oq$k0">
<node concept="37vLTw" id="1ufy3d9uGXs" role="2Oq$k0">
<ref role="3cqZAo" node="1ufy3d9uGX8" resolve="emc" />
<ref role="3cqZAo" node="1ufy3d9uGX8" resolve="mc" />
</node>
<node concept="3TrEf2" id="1ufy3d9uGXt" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM7LtYS" resolve="template" />

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
View File

@ -2574,7 +2574,7 @@
<node concept="2OqwBi" id="1OAJnGzDOb" role="3clFbG">
<node concept="2OqwBi" id="1OAJnGzBQP" role="2Oq$k0">
<node concept="37vLTw" id="1OAJnGzB0X" role="2Oq$k0">
<ref role="3cqZAo" node="1OAJnGzAO5" resolve="it" />
<ref role="3cqZAo" node="1OAJnGzAO5" resolve="pd" />
</node>
<node concept="3TrEf2" id="1OAJnGzCHG" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1ufy3d9wUy7" resolve="init" />

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
View File

@ -1829,7 +1829,7 @@
<property role="EcuMT" value="1697725338399423179" />
<property role="3GE5qa" value="constraint" />
<property role="TrG5h" value="CallMacroConstraintArgumentBinding" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1ufy3d9uzVX" role="1TKVEi">
<property role="IQ2ns" value="1697725338399424253" />
<property role="20kJfa" value="declaration" />

8
coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
View File

@ -1614,7 +1614,7 @@
<node concept="1Z2H0r" id="1ufy3d9uDEJ" role="mwGJk">
<node concept="2OqwBi" id="1ufy3d9uDEK" role="1Z2MuG">
<node concept="1YBJjd" id="1ufy3d9uDEL" role="2Oq$k0">
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="empd" />
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="cmpd" />
</node>
<node concept="3TrEf2" id="1ufy3d9uDEM" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:1ufy3d9wUy7" resolve="init" />
@ -1625,7 +1625,7 @@
<node concept="mw_s8" id="1ufy3d9uDEN" role="1ZfhKB">
<node concept="2OqwBi" id="1ufy3d9uDEO" role="mwGJk">
<node concept="1YBJjd" id="1ufy3d9uDEP" role="2Oq$k0">
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="empd" />
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="cmpd" />
</node>
<node concept="3TrEf2" id="1ufy3d9uDEQ" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
@ -1637,7 +1637,7 @@
<node concept="mw_s8" id="1ufy3d9uDES" role="1ZfhKB">
<node concept="2OqwBi" id="1ufy3d9uDET" role="mwGJk">
<node concept="1YBJjd" id="1ufy3d9uDEU" role="2Oq$k0">
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="empd" />
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="cmpd" />
</node>
<node concept="3TrEf2" id="1ufy3d9uDEV" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
@ -1647,7 +1647,7 @@
<node concept="mw_s8" id="1ufy3d9uDEW" role="1ZfhK$">
<node concept="1Z2H0r" id="1ufy3d9uDEX" role="mwGJk">
<node concept="1YBJjd" id="1ufy3d9uDEY" role="1Z2MuG">
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="empd" />
<ref role="1YBMHb" node="1ufy3d9uDEA" resolve="cmpd" />
</node>
</node>
</node>

2
coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
View File

@ -8,7 +8,7 @@
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
<use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />

2
coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
View File

@ -39,7 +39,7 @@
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<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:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />

2
coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
View File

@ -28,7 +28,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/jetbrains.mps.typechecking.annotation.types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:7e6a4eaf-f330-4401-ba24-80c1ea4519aa(jetbrains.mps.typechecking.annotation.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="afc17aaf-3a3d-4d69-a38d-db90d5e858c6" name="jetbrains.mps.lang.types" version="0" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<engage id="afc17aaf-3a3d-4d69-a38d-db90d5e858c6" name="jetbrains.mps.lang.types" />

2
coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
View File

@ -75,7 +75,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

40
coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
@ -230,6 +230,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
@ -256,8 +257,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
@ -273,6 +274,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
@ -943,12 +948,15 @@
<node concept="3Aqczg" id="1ALxU7re_y1" role="3cqZAp">
<node concept="3jm4v3" id="1ALxU7re_xZ" role="3Aqpz8">
<ref role="3jm46O" node="1ALxU7rehxC" resolve="typeOfInt" />
<node concept="3j8tct" id="1ALxU7reJ7L" role="3jicU7">
<ref role="3j8tcu" node="1ALxU7rezlo" resolve="intExpr" />
</node>
<node concept="a7P8L" id="1ALxU7reIfW" role="3jm6SO">
<ref role="a7OzE" node="1ALxU7reFCr" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vH1" role="3GayWF">
<ref role="1uXrre" node="1ALxU7reiq$" resolve="intExpr" />
<node concept="3j8tct" id="1ALxU7reJ7L" role="1uXrr8">
<ref role="3j8tcu" node="1ALxU7rezlo" resolve="intExpr" />
</node>
</node>
</node>
</node>
</node>
@ -972,6 +980,7 @@
<node concept="3Tqbb2" id="1ALxU7reiQu" role="3hPmi9">
<ref role="ehGHo" to="qulx:7mB3viLbp2X" resolve="Int" />
</node>
<node concept="10Nm6u" id="1OAJnH6vH4" role="1u322O" />
</node>
<node concept="3clFbS" id="1ALxU7rehxE" role="3hEL4E">
<node concept="3cpWs8" id="1ALxU7reSPP" role="3cqZAp">
@ -1040,6 +1049,7 @@
<node concept="3Tqbb2" id="1ALxU7rfg72" role="3hPmi9">
<ref role="ehGHo" to="qulx:7mB3viLdltS" resolve="StrConst" />
</node>
<node concept="10Nm6u" id="1OAJnH6vH5" role="1u322O" />
</node>
<node concept="3clFbS" id="1ALxU7rf6TA" role="3hEL4E">
<node concept="3cpWs8" id="1ALxU7rfknP" role="3cqZAp">
@ -1122,6 +1132,7 @@
<node concept="3Tqbb2" id="1ALxU7rh2Nh" role="3hPmi9">
<ref role="ehGHo" to="qulx:JfcwnvuueB" resolve="Pair" />
</node>
<node concept="10Nm6u" id="1OAJnH6vH6" role="1u322O" />
</node>
<node concept="3clFbS" id="1ALxU7rgVnA" role="3hEL4E">
<node concept="3SKdUt" id="1ALxU7rhdg9" role="3cqZAp">
@ -1169,12 +1180,15 @@
<node concept="3Aqczg" id="1ALxU7rfsHG" role="3cqZAp">
<node concept="3jm4v3" id="1ALxU7rfsHE" role="3Aqpz8">
<ref role="3jm46O" node="1ALxU7rf6T$" resolve="typeOfString" />
<node concept="3j8tct" id="1ALxU7rfu1s" role="3jicU7">
<ref role="3j8tcu" node="1ALxU7rfpCA" resolve="strConst" />
</node>
<node concept="a7P8L" id="1ALxU7rft9B" role="3jm6SO">
<ref role="a7OzE" node="1ALxU7rfpC$" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vH2" role="3GayWF">
<ref role="1uXrre" node="1ALxU7rfeNs" resolve="str" />
<node concept="3j8tct" id="1ALxU7rfu1s" role="1uXrr8">
<ref role="3j8tcu" node="1ALxU7rfpCA" resolve="strConst" />
</node>
</node>
</node>
</node>
</node>
@ -1197,12 +1211,15 @@
<node concept="3Aqczg" id="1ALxU7rgtb0" role="3cqZAp">
<node concept="3jm4v3" id="1ALxU7rgtaY" role="3Aqpz8">
<ref role="3jm46O" node="1ALxU7rgexY" resolve="liftType" />
<node concept="3j8tct" id="1ALxU7rgu2U" role="3jicU7">
<ref role="3j8tcu" node="1ALxU7rgqXf" resolve="type" />
</node>
<node concept="a7P8L" id="1ALxU7rgtAV" role="3jm6SO">
<ref role="a7OzE" node="1ALxU7rgqXd" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vH3" role="3GayWF">
<ref role="1uXrre" node="1ALxU7rgfrQ" resolve="type" />
<node concept="3j8tct" id="1ALxU7rgu2U" role="1uXrr8">
<ref role="3j8tcu" node="1ALxU7rgqXf" resolve="type" />
</node>
</node>
</node>
</node>
</node>
@ -1226,6 +1243,7 @@
<node concept="3Tqbb2" id="1ALxU7rggjA" role="3hPmi9">
<ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vH7" role="1u322O" />
</node>
<node concept="3clFbS" id="1ALxU7rgey0" role="3hEL4E">
<node concept="3Aqczg" id="7mB3viLggrO" role="3cqZAp">

2
coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
View File

@ -44,7 +44,7 @@
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />

2
coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
View File

@ -12,7 +12,7 @@
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="-1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
</languages>
<imports>

2
samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl
View File

@ -69,7 +69,7 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:a40f7100-fd07-4b1c-98c5-112d92c92128(samples.fitch.firstOrderLogic.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

2
samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
View File

@ -76,7 +76,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(samples.fitch.herbrandLogic.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />

2
samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
View File

@ -77,7 +77,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />

2
samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
View File

@ -75,7 +75,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/fitch/languages/samples.fitch/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />

2
samples/fitch/languages/samples.fitch/samples.fitch.mpl
View File

@ -75,7 +75,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

78
samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(samples.lambdacalc.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="-1" />
<use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
@ -67,6 +67,7 @@
<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="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
@ -434,6 +435,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
@ -461,8 +463,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="3923391191348208850" name="jetbrains.mps.lang.coderules.structure.Substitution" flags="ng" index="1lh$Hi">
<child id="3923391191348208863" name="origin" index="1lh$Hv" />
@ -490,6 +492,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
@ -9999,20 +10005,26 @@
<node concept="3Aqczg" id="5itBwM9xdpl" role="3cqZAp">
<node concept="3jm4v3" id="5itBwM9xdpj" role="3Aqpz8">
<ref role="3jm46O" node="5itBwM9nSFi" resolve="constraint" />
<node concept="2OqwBi" id="5itBwM9xdTm" role="3jicU7">
<node concept="3A2sRY" id="5itBwM9xdKR" role="2Oq$k0">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
<node concept="3TrEf2" id="5itBwM9xekc" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHnL" resolve="typeVar" />
</node>
</node>
<node concept="3A2sRY" id="5itBwM9xeu4" role="3jicU7">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
<node concept="a7P8L" id="5itBwM9xd_u" role="3jm6SO">
<ref role="a7OzE" node="47tET_W4WO4" resolve="Ctr" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHd" role="3GayWF">
<ref role="1uXrre" node="5itBwM9nSMO" resolve="tv" />
<node concept="2OqwBi" id="5itBwM9xdTm" role="1uXrr8">
<node concept="3A2sRY" id="5itBwM9xdKR" role="2Oq$k0">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
<node concept="3TrEf2" id="5itBwM9xekc" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHnL" resolve="typeVar" />
</node>
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHe" role="3GayWF">
<ref role="1uXrre" node="5itBwM9nSMV" resolve="tc" />
<node concept="3A2sRY" id="5itBwM9xeu4" role="1uXrr8">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
</node>
</node>
</node>
<node concept="3Aqczg" id="47tET_WsGNS" role="3cqZAp">
@ -15446,25 +15458,31 @@
<node concept="3Aqczg" id="5itBwM9CwRo" role="3cqZAp">
<node concept="3jm4v3" id="5itBwM9CwRm" role="3Aqpz8">
<ref role="3jm46O" node="5itBwM9nSFi" resolve="constraint" />
<node concept="2OqwBi" id="5itBwM9CxC9" role="3jicU7">
<node concept="3j8tct" id="5itBwM9CxwW" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CykW" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6tFol" resolve="varRef" />
</node>
</node>
<node concept="2OqwBi" id="5itBwM9Cy_A" role="3jicU7">
<node concept="3j8tct" id="5itBwM9Cyuy" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CyI2" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHvj" resolve="typeclass" />
</node>
</node>
<node concept="a7P8L" id="5itBwM9Cxal" role="3jm6SO">
<ref role="a7OzE" node="5itBwM9KVQT" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHf" role="3GayWF">
<ref role="1uXrre" node="5itBwM9nSMO" resolve="tv" />
<node concept="2OqwBi" id="5itBwM9CxC9" role="1uXrr8">
<node concept="3j8tct" id="5itBwM9CxwW" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CykW" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6tFol" resolve="varRef" />
</node>
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHg" role="3GayWF">
<ref role="1uXrre" node="5itBwM9nSMV" resolve="tc" />
<node concept="2OqwBi" id="5itBwM9Cy_A" role="1uXrr8">
<node concept="3j8tct" id="5itBwM9Cyuy" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CyI2" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHvj" resolve="typeclass" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -15482,12 +15500,14 @@
<node concept="3Tqbb2" id="5itBwM9nSMS" role="3hPmi9">
<ref role="ehGHo" to="8tt8:3g9UT2j9I06" resolve="VarType" />
</node>
<node concept="10Nm6u" id="1OAJnH6vHh" role="1u322O" />
</node>
<node concept="3hPv5a" id="5itBwM9nSMV" role="3hP23H">
<property role="TrG5h" value="tc" />
<node concept="3Tqbb2" id="3CulEO1Zy2k" role="3hPmi9">
<ref role="ehGHo" to="8tt8:2O9ahh6mHnA" resolve="Typeclass" />
</node>
<node concept="10Nm6u" id="1OAJnH6vHi" role="1u322O" />
</node>
<node concept="3clFbS" id="5itBwM9nSFk" role="3hEL4E">
<node concept="3Aqczg" id="5itBwM9nSPO" role="3cqZAp">

2
samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
View File

@ -38,7 +38,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
View File

@ -68,7 +68,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
View File

@ -79,7 +79,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
View File

@ -81,7 +81,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

161
samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -472,6 +472,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
@ -495,8 +496,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
<child id="4957570047287138243" name="message" index="1lp$hM" />
@ -522,6 +523,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
@ -588,28 +593,37 @@
<node concept="3Aqczg" id="6$MmqWfmoJu" role="3cqZAp">
<node concept="3jm4v3" id="6$MmqWfmoJs" role="3Aqpz8">
<ref role="3jm46O" to="fa4b:6$MmqWfmo8t" resolve="functionType" />
<node concept="2OqwBi" id="6$MmqWfmoTx" role="3jicU7">
<node concept="3j8tct" id="6$MmqWfmoJG" role="2Oq$k0">
<ref role="3j8tcu" node="6$MmqWfmeMN" resolve="funType" />
</node>
<node concept="3Tsc0h" id="6$MmqWfmp7r" role="2OqNvi">
<ref role="3TtcxE" to="tp2c:htajw4W" resolve="parameterType" />
</node>
</node>
<node concept="2OqwBi" id="6$MmqWfmpjt" role="3jicU7">
<node concept="3j8tct" id="6$MmqWfmpa5" role="2Oq$k0">
<ref role="3j8tcu" node="6$MmqWfmeMN" resolve="funType" />
</node>
<node concept="3TrEf2" id="6$MmqWfmpk6" role="2OqNvi">
<ref role="3Tt5mk" to="tp2c:htajldL" resolve="resultType" />
</node>
</node>
<node concept="1Qq$H8" id="3swcsd2R90r" role="3jicU7">
<ref role="1Qq$GS" node="3swcsd2R90p" resolve="substitution" />
</node>
<node concept="a7P8L" id="6$MmqWfmoJz" role="3jm6SO">
<ref role="a7OzE" node="6$MmqWfmeML" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHk" role="3GayWF">
<ref role="1uXrre" to="fa4b:6$MmqWfmoJc" resolve="paramTypes" />
<node concept="2OqwBi" id="6$MmqWfmoTx" role="1uXrr8">
<node concept="3j8tct" id="6$MmqWfmoJG" role="2Oq$k0">
<ref role="3j8tcu" node="6$MmqWfmeMN" resolve="funType" />
</node>
<node concept="3Tsc0h" id="6$MmqWfmp7r" role="2OqNvi">
<ref role="3TtcxE" to="tp2c:htajw4W" resolve="parameterType" />
</node>
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHl" role="3GayWF">
<ref role="1uXrre" to="fa4b:6$MmqWfmoJj" resolve="resultType" />
<node concept="2OqwBi" id="6$MmqWfmpjt" role="1uXrr8">
<node concept="3j8tct" id="6$MmqWfmpa5" role="2Oq$k0">
<ref role="3j8tcu" node="6$MmqWfmeMN" resolve="funType" />
</node>
<node concept="3TrEf2" id="6$MmqWfmpk6" role="2OqNvi">
<ref role="3Tt5mk" to="tp2c:htajldL" resolve="resultType" />
</node>
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHm" role="3GayWF">
<ref role="1uXrre" to="fa4b:554EtBHzVCE" resolve="subs" />
<node concept="1Qq$H8" id="3swcsd2R90r" role="1uXrr8">
<ref role="1Qq$GS" node="3swcsd2R90p" resolve="substitution" />
</node>
</node>
</node>
</node>
</node>
@ -2746,9 +2760,6 @@
<node concept="3I6s7M" id="4S1mDSNQyrH" role="3I6sU7">
<node concept="3jm4v3" id="4S1mDSNQyrM" role="3I6s78">
<ref role="3jm46O" node="4S1mDSNQjm4" resolve="checkInvoke" />
<node concept="37vLTw" id="4S1mDSNQyrO" role="3jicU7">
<ref role="3cqZAo" node="4S1mDSNQcAy" resolve="args" />
</node>
<node concept="a7P8L" id="5QlJgjTDN5m" role="3jm6SO">
<ref role="a7OzE" node="5QlJgjTDLOq" resolve="RetT" />
</node>
@ -2758,6 +2769,12 @@
<node concept="a7P8L" id="4S1mDSNQyrQ" role="3jm6SO">
<ref role="a7OzE" node="4S1mDSNQcB6" resolve="ArgsT" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHn" role="3GayWF">
<ref role="1uXrre" node="4S1mDSNQjma" resolve="args" />
<node concept="37vLTw" id="4S1mDSNQyrO" role="1uXrr8">
<ref role="3cqZAo" node="4S1mDSNQcAy" resolve="args" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="5QlJgjTDN5D" role="3I6sU7">
@ -3019,19 +3036,22 @@
<node concept="3I6s7M" id="5QlJgjTEhLV" role="3I6sU7">
<node concept="3jm4v3" id="3qUnz9vkVLH" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTVq" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTVr" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTVs" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTVt" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="3qUnz9vkVLM" role="3jm6SO">
<ref role="a7OzE" node="5QlJgjTEhLM" resolve="RetT" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHo" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTVq" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTVr" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTVs" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTVt" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="5QlJgjTEhLR" role="3I6sU7">
@ -3274,9 +3294,6 @@
<node concept="3I6s7M" id="5QlJgjTE4vA" role="3I6sU7">
<node concept="3jm4v3" id="5QlJgjTE4vB" role="3I6s78">
<ref role="3jm46O" node="4S1mDSNQjm4" resolve="checkInvoke" />
<node concept="37vLTw" id="5QlJgjTE4vC" role="3jicU7">
<ref role="3cqZAo" node="5QlJgjTE4sF" resolve="args" />
</node>
<node concept="a7P8L" id="5QlJgjTE4vD" role="3jm6SO">
<ref role="a7OzE" node="5QlJgjTE4vt" resolve="RetT" />
</node>
@ -3286,6 +3303,12 @@
<node concept="a7P8L" id="5QlJgjTE4vF" role="3jm6SO">
<ref role="a7OzE" node="5QlJgjTE4vu" resolve="ArgsT" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHp" role="3GayWF">
<ref role="1uXrre" node="4S1mDSNQjma" resolve="args" />
<node concept="37vLTw" id="5QlJgjTE4vC" role="1uXrr8">
<ref role="3cqZAo" node="5QlJgjTE4sF" resolve="args" />
</node>
</node>
</node>
</node>
</node>
@ -3426,9 +3449,6 @@
<node concept="3I6s7M" id="4S1mDSNQvOh" role="3I6sU7">
<node concept="3jm4v3" id="4S1mDSNQvNB" role="3I6s78">
<ref role="3jm46O" node="4S1mDSNQjm4" resolve="checkInvoke" />
<node concept="37vLTw" id="4S1mDSNQvOb" role="3jicU7">
<ref role="3cqZAo" node="4S1mDSNPTKO" resolve="args" />
</node>
<node concept="a7P8L" id="5QlJgjTDK_c" role="3jm6SO">
<ref role="a7OzE" node="5QlJgjTDK$c" resolve="RetT" />
</node>
@ -3438,6 +3458,12 @@
<node concept="a7P8L" id="4S1mDSNQvNT" role="3jm6SO">
<ref role="a7OzE" node="4S1mDSNODjo" resolve="ArgsT" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHq" role="3GayWF">
<ref role="1uXrre" node="4S1mDSNQjma" resolve="args" />
<node concept="37vLTw" id="4S1mDSNQvOb" role="1uXrr8">
<ref role="3cqZAo" node="4S1mDSNPTKO" resolve="args" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="5QlJgjTDLN9" role="3I6sU7">
@ -3539,6 +3565,7 @@
<node concept="2I9FWS" id="4S1mDSNQjxp" role="3hPmi9">
<ref role="2I9WkF" to="tpee:fz3vP1J" resolve="Expression" />
</node>
<node concept="10Nm6u" id="1OAJnH6vHx" role="1u322O" />
</node>
<node concept="3clFbS" id="4S1mDSNQjm6" role="3hEL4E">
<node concept="3Aqczg" id="4S1mDSNQpsl" role="3cqZAp">
@ -4939,15 +4966,6 @@
<node concept="3Aqczg" id="7hlgk9K_Wzm" role="3cqZAp">
<node concept="3jm4v3" id="7hlgk9K_Wzn" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
<node concept="37vLTw" id="7hlgk9K_Wzo" role="3jicU7">
<ref role="3cqZAo" node="7hlgk9K_IRZ" resolve="mdecl" />
</node>
<node concept="37vLTw" id="7hlgk9K_Wzp" role="3jicU7">
<ref role="3cqZAo" node="7hlgk9K_JpH" resolve="noMethodTyArgs" />
</node>
<node concept="37vLTw" id="7hlgk9K_Wzq" role="3jicU7">
<ref role="3cqZAo" node="7hlgk9K_JpB" resolve="ctvds" />
</node>
<node concept="a7P8L" id="7hlgk9K_Wzr" role="3jm6SO">
<ref role="a7OzE" node="7hlgk9K_WeV" resolve="InstMethSig" />
</node>
@ -4957,6 +4975,24 @@
<node concept="a7P8L" id="7hlgk9K_WEO" role="3jm6SO">
<ref role="a7OzE" node="7hlgk9K_WCp" resolve="ClsTypeArgs" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHr" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9Jdj" resolve="origin" />
<node concept="37vLTw" id="7hlgk9K_Wzo" role="1uXrr8">
<ref role="3cqZAo" node="7hlgk9K_IRZ" resolve="mdecl" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHs" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9igS" resolve="tyArgs" />
<node concept="37vLTw" id="7hlgk9K_Wzp" role="1uXrr8">
<ref role="3cqZAo" node="7hlgk9K_JpH" resolve="noMethodTyArgs" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHt" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMsqySa" resolve="contextTvds" />
<node concept="37vLTw" id="7hlgk9K_Wzq" role="1uXrr8">
<ref role="3cqZAo" node="7hlgk9K_JpB" resolve="ctvds" />
</node>
</node>
</node>
</node>
<node concept="3Aqczg" id="7hlgk9K_WLK" role="3cqZAp">
@ -5540,15 +5576,6 @@
<node concept="3Aqczg" id="53tmmMtoIEH" role="3cqZAp">
<node concept="3jm4v3" id="53tmmMtoIED" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
<node concept="37vLTw" id="53tmmMtoIIw" role="3jicU7">
<ref role="3cqZAo" node="3DgB4rOyEsk" resolve="mdecl" />
</node>
<node concept="37vLTw" id="4jGoIleP8gR" role="3jicU7">
<ref role="3cqZAo" node="53tmmMtoJCO" resolve="noMethodTyArgs" />
</node>
<node concept="37vLTw" id="53tmmMtoKN_" role="3jicU7">
<ref role="3cqZAo" node="554EtBH_$Cz" resolve="ctvds" />
</node>
<node concept="a7P8L" id="53tmmMtoII3" role="3jm6SO">
<ref role="a7OzE" node="53tmmMtoEqI" resolve="InstMethSig" />
</node>
@ -5558,6 +5585,24 @@
<node concept="a7P8L" id="53tmmMtoIIl" role="3jm6SO">
<ref role="a7OzE" node="554EtBH_$D2" resolve="ClsTypeArgs" />
</node>
<node concept="1uXrbS" id="1OAJnH6vHu" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9Jdj" resolve="origin" />
<node concept="37vLTw" id="53tmmMtoIIw" role="1uXrr8">
<ref role="3cqZAo" node="3DgB4rOyEsk" resolve="mdecl" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHv" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9igS" resolve="tyArgs" />
<node concept="37vLTw" id="4jGoIleP8gR" role="1uXrr8">
<ref role="3cqZAo" node="53tmmMtoJCO" resolve="noMethodTyArgs" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vHw" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMsqySa" resolve="contextTvds" />
<node concept="37vLTw" id="53tmmMtoKN_" role="1uXrr8">
<ref role="3cqZAo" node="554EtBH_$Cz" resolve="ctvds" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="53tmmMtp7pH" role="3cqZAp" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
View File

@ -79,7 +79,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

1678
samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
View File

File diff suppressed because it is too large Load Diff

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
View File

@ -78,7 +78,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

7
samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>
@ -28,6 +28,7 @@
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
@ -194,6 +195,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
<reference id="6097203247182937177" name="template" index="3jbY9l" />
@ -401,18 +403,21 @@
<node concept="2I9FWS" id="6$MmqWfmoJg" role="3hPmi9">
<ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vK8" role="1u322O" />
</node>
<node concept="3hPv5a" id="6$MmqWfmoJj" role="3hP23H">
<property role="TrG5h" value="resultType" />
<node concept="3Tqbb2" id="6$MmqWfmoJp" role="3hPmi9">
<ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vK9" role="1u322O" />
</node>
<node concept="3hPv5a" id="554EtBHzVCE" role="3hP23H">
<property role="TrG5h" value="subs" />
<node concept="3uibUv" id="554EtBHzVCM" role="3hPmi9">
<ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKa" role="1u322O" />
</node>
<node concept="3clFbS" id="6$MmqWfmo8v" role="3hEL4E">
<node concept="3clFbJ" id="2MpDLe9wosm" role="3cqZAp">

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
View File

@ -31,7 +31,7 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:992fb193-05bb-4cd5-a608-066498d6f2d3(jetbrains.mps.baseLanguage.javadocExt.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<engage id="afc17aaf-3a3d-4d69-a38d-db90d5e858c6" name="jetbrains.mps.lang.types" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
View File

@ -77,7 +77,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

32
samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>
@ -22,6 +22,7 @@
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
@ -136,6 +137,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
<reference id="6097203247182937177" name="template" index="3jbY9l" />
@ -152,8 +154,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
@ -167,6 +169,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
@ -208,12 +214,14 @@
<node concept="3Tqbb2" id="1oUE7CX4dOh" role="3hPmi9">
<ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKd" role="1u322O" />
</node>
<node concept="3hPv5a" id="1oUE7CXkYVc" role="3hP23H">
<property role="TrG5h" value="subs" />
<node concept="3uibUv" id="1oUE7CXkYVd" role="3hPmi9">
<ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKe" role="1u322O" />
</node>
<node concept="3clFbS" id="1oUE7CX4dOd" role="3hEL4E">
<node concept="3clFbJ" id="1oUE7CX4dPF" role="3cqZAp">
@ -317,26 +325,34 @@
<node concept="3Tqbb2" id="1oUE7CXmlyh" role="3hPmi9">
<ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKf" role="1u322O" />
</node>
<node concept="3hPv5a" id="1oUE7CXmlyj" role="3hP23H">
<property role="TrG5h" value="subs" />
<node concept="3uibUv" id="1oUE7CXmlyl" role="3hPmi9">
<ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKg" role="1u322O" />
</node>
<node concept="3clFbS" id="1oUE7CXmlxM" role="3hEL4E">
<node concept="3Aqczg" id="1oUE7CXmmkN" role="3cqZAp">
<node concept="3jm4v3" id="1oUE7CXmmkL" role="3Aqpz8">
<ref role="3jm46O" node="1oUE7CX4dOb" resolve="elementType" />
<node concept="3hN9Ij" id="1oUE7CXmmln" role="3jicU7">
<ref role="3hLkJx" node="1oUE7CXmlxO" resolve="elementType" />
</node>
<node concept="3hN9Ij" id="1oUE7CXmmlw" role="3jicU7">
<ref role="3hLkJx" node="1oUE7CXmlyj" resolve="subs" />
</node>
<node concept="a7P8L" id="1oUE7CXmmlg" role="3jm6SO">
<ref role="a7OzE" node="1oUE7CXmmkR" resolve="Elem" />
</node>
<node concept="1uXrbS" id="1OAJnH6vKb" role="3GayWF">
<ref role="1uXrre" node="1oUE7CX4dOf" resolve="elementType" />
<node concept="3hN9Ij" id="1oUE7CXmmln" role="1uXrr8">
<ref role="3hLkJx" node="1oUE7CXmlxO" resolve="elementType" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vKc" role="3GayWF">
<ref role="1uXrre" node="1oUE7CXkYVc" resolve="subs" />
<node concept="3hN9Ij" id="1oUE7CXmmlw" role="1uXrr8">
<ref role="3hLkJx" node="1oUE7CXmlyj" resolve="subs" />
</node>
</node>
</node>
</node>
<node concept="3Aqczg" id="2GIrmkQ2LZ9" role="3cqZAp">

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
View File

@ -81,7 +81,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

30
samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
@ -53,6 +53,7 @@
<child id="1081256993305" name="classType" index="2ZW6by" />
<child id="1081256993304" name="leftExpression" index="2ZW6bz" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
<child id="1070534934091" name="type" index="10QFUM" />
@ -307,6 +308,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
@ -331,8 +333,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
<child id="4957570047287138243" name="message" index="1lp$hM" />
@ -355,6 +357,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
@ -417,17 +423,20 @@
<node concept="3Aqczg" id="4E290qPYypd" role="3cqZAp">
<node concept="3jm4v3" id="4E290qPYyr6" role="3Aqpz8">
<ref role="3jm46O" node="4E290qPYyfd" resolve="tupleType" />
<node concept="2OqwBi" id="4E290qPYyBa" role="3jicU7">
<node concept="3j8tct" id="4E290qPYysU" role="2Oq$k0">
<ref role="3j8tcu" node="4E290qPYhEy" resolve="tupleType" />
</node>
<node concept="3Tsc0h" id="4E290qPYyOi" role="2OqNvi">
<ref role="3TtcxE" to="cx9y:i1Lm7_s" resolve="componentType" />
</node>
</node>
<node concept="a7P8L" id="4E290qPYyrA" role="3jm6SO">
<ref role="a7OzE" node="4E290qPYhEw" resolve="Type" />
</node>
<node concept="1uXrbS" id="1OAJnH6vKh" role="3GayWF">
<ref role="1uXrre" node="4E290qPYyiG" resolve="componentTypes" />
<node concept="2OqwBi" id="4E290qPYyBa" role="1uXrr8">
<node concept="3j8tct" id="4E290qPYysU" role="2Oq$k0">
<ref role="3j8tcu" node="4E290qPYhEy" resolve="tupleType" />
</node>
<node concept="3Tsc0h" id="4E290qPYyOi" role="2OqNvi">
<ref role="3TtcxE" to="cx9y:i1Lm7_s" resolve="componentType" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3CulEO3zp9s" role="3cqZAp" />
@ -553,6 +562,7 @@
<node concept="2I9FWS" id="4E290qPYyS4" role="3hPmi9">
<ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
</node>
<node concept="10Nm6u" id="1OAJnH6vKi" role="1u322O" />
</node>
<node concept="3clFbS" id="4E290qPYyff" role="3hEL4E">
<node concept="1Dw8fO" id="4E290qPYBou" role="3cqZAp">

2
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
View File

@ -39,7 +39,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

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

File diff suppressed because it is too large Load Diff

2
samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
View File

@ -75,7 +75,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />

2
samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
View File

@ -78,7 +78,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />

2
samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
View File

@ -89,7 +89,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

62
samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
View File

@ -2,7 +2,7 @@
<model ref="r:9071f0f9-8ac0-4a08-8867-06e41ca1c7d9(jetbrains.mps.lang.coderulesExt.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
@ -283,8 +283,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
<child id="4957570047287138243" name="message" index="1lp$hM" />
@ -306,6 +306,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
@ -600,19 +604,22 @@
<node concept="3I6s7M" id="kHzC1TY7_k" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TY7_i" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTVm" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTVn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTVo" role="2c44tc">
<ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTVp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY7A0" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY7_z" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMe" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTVm" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTVn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTVo" role="2c44tc">
<ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTVp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="7LI_gNMWubg" role="3I6sU7">
@ -1062,22 +1069,25 @@
<node concept="3I6s7M" id="kHzC1TY7Ub" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TY7U9" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="7LI_gNMXlnQ" role="3jicU7">
<node concept="2OqwBi" id="7LI_gNMXl0Q" role="2Oq$k0">
<node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
<ref role="3A2yKK" node="7LI_gNMXkRz" resolve="qp" />
</node>
<node concept="2qgKlT" id="7LI_gNMXl9x" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5EDW3XEbK7c" resolve="getQueryTemplate" />
</node>
</node>
<node concept="2qgKlT" id="7LI_gNMXB1c" role="2OqNvi">
<ref role="37wK5l" to="x5bw:7LI_gNMXm_R" resolve="getQueryClassifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY7UJ" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY7B9" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMf" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="7LI_gNMXlnQ" role="1uXrr8">
<node concept="2OqwBi" id="7LI_gNMXl0Q" role="2Oq$k0">
<node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
<ref role="3A2yKK" node="7LI_gNMXkRz" resolve="qp" />
</node>
<node concept="2qgKlT" id="7LI_gNMXl9x" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5EDW3XEbK7c" resolve="getQueryTemplate" />
</node>
</node>
<node concept="2qgKlT" id="7LI_gNMXB1c" role="2OqNvi">
<ref role="37wK5l" to="x5bw:7LI_gNMXm_R" resolve="getQueryClassifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="7LI_gNMXkRZ" role="3I6sU7">
@ -2557,7 +2567,7 @@
</node>
</node>
<node concept="a7P8L" id="1Y9T4w6MGzS" role="3AunhB">
<ref role="a7OzE" node="1Y9T4w6MDlW" resolve="Type" />
<ref role="a7OzE" node="1Y9T4w6MDlW" resolve="ParamType" />
<node concept="37vLTw" id="1Y9T4w6MG$8" role="3gCZO6">
<ref role="3cqZAo" node="1Y9T4w6MF3x" resolve="idx" />
</node>

2
samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
View File

@ -82,7 +82,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
View File

@ -82,7 +82,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
View File

@ -82,7 +82,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
View File

@ -85,7 +85,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
View File

@ -84,7 +84,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
View File

@ -76,7 +76,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
View File

@ -80,7 +80,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
View File

@ -82,7 +82,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
View File

@ -93,7 +93,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

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

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
@ -472,6 +472,7 @@
</concept>
<concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
<child id="6097203247142468229" name="type" index="3hPmi9" />
<child id="1697725338400041095" name="init" index="1u322O" />
</concept>
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
@ -500,8 +501,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
<child id="4957570047287138243" name="message" index="1lp$hM" />
@ -530,6 +531,10 @@
<child id="4363939677057762080" name="constructor" index="3sNhsz" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
@ -4202,17 +4207,20 @@
<node concept="3Aqczg" id="7kXqzcT$xyj" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$xyi" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$zo5" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$zo6" role="2Oq$k0">
<ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zo7" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$znW" role="3jm6SO">
<ref role="a7OzE" node="3lXUvG02$HO" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMg" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$zo5" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$zo6" role="2Oq$k0">
<ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zo7" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4275,17 +4283,20 @@
<node concept="3Aqczg" id="7kXqzcT$zr7" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$zr8" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$zr9" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$zra" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zrb" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:6qMaajUPFaH" resolve="concept" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$zrc" role="3jm6SO">
<ref role="a7OzE" node="t7AM9FHVSu" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMh" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$zr9" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$zra" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zrb" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:6qMaajUPFaH" resolve="concept" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4350,17 +4361,20 @@
<node concept="3Aqczg" id="7kXqzcT$zEp" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$zEq" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$zFh" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$zFi" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zFj" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:gEI9Wgx" resolve="elementConcept" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$zEu" role="3jm6SO">
<ref role="a7OzE" node="43iDt9R2oZP" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMi" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$zFh" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$zFi" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zFj" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:gEI9Wgx" resolve="elementConcept" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4425,17 +4439,20 @@
<node concept="3Aqczg" id="7kXqzcT$zRb" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$zRc" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$zS0" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$zS1" role="2Oq$k0">
<ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zS2" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$zRg" role="3jm6SO">
<ref role="a7OzE" node="43iDt9R2pTO" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMj" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$zS0" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$zS1" role="2Oq$k0">
<ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zS2" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4500,17 +4517,20 @@
<node concept="3Aqczg" id="7kXqzcT$zUo" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$zUp" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$zUq" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$zUr" role="2Oq$k0">
<ref role="3j8tcu" node="5dFCr0y80K0" resolve="ct" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zUs" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:4JM1Q3lfSBF" resolve="conceptDeclaraton" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$$0e" role="3jm6SO">
<ref role="a7OzE" node="7kXqzcT$zVf" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMk" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$zUq" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$zUr" role="2Oq$k0">
<ref role="3j8tcu" node="5dFCr0y80K0" resolve="ct" />
</node>
<node concept="3TrEf2" id="7kXqzcT$zUs" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:4JM1Q3lfSBF" resolve="conceptDeclaraton" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4575,17 +4595,20 @@
<node concept="3Aqczg" id="7kXqzcT$$eI" role="3cqZAp">
<node concept="3jm4v3" id="7kXqzcT$$eJ" role="3Aqpz8">
<ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
<node concept="2OqwBi" id="7kXqzcT$$eK" role="3jicU7">
<node concept="3j8tct" id="7kXqzcT$$fv" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mdtU" resolve="cnt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$$gs" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:hbqa45m" resolve="conceptDeclaraton" />
</node>
</node>
<node concept="a7P8L" id="7kXqzcT$$eN" role="3jm6SO">
<ref role="a7OzE" node="7kXqzcT$$0U" resolve="Concept" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMl" role="3GayWF">
<ref role="1uXrre" node="7kXqzcT$7oW" resolve="cd" />
<node concept="2OqwBi" id="7kXqzcT$$eK" role="1uXrr8">
<node concept="3j8tct" id="7kXqzcT$$fv" role="2Oq$k0">
<ref role="3j8tcu" node="5wYq9r5mdtU" resolve="cnt" />
</node>
<node concept="3TrEf2" id="7kXqzcT$$gs" role="2OqNvi">
<ref role="3Tt5mk" to="tp25:hbqa45m" resolve="conceptDeclaraton" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -4883,6 +4906,7 @@
<node concept="3Tqbb2" id="7kXqzcT$7p1" role="3hPmi9">
<ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
</node>
<node concept="10Nm6u" id="1OAJnH6vMq" role="1u322O" />
</node>
<node concept="3clFbS" id="7kXqzcT$7jd" role="3hEL4E">
<node concept="3clFbJ" id="7kXqzcTAj_h" role="3cqZAp">
@ -20625,11 +20649,6 @@
<node concept="3Aqczg" id="3GLv42Mz9bJ" role="3cqZAp">
<node concept="3jm4v3" id="3GLv42Mz9bF" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
<node concept="37vLTw" id="3GLv42Mz9cA" role="3jicU7">
<ref role="3cqZAo" node="3GLv42MyEnz" resolve="mdecl" />
</node>
<node concept="10Nm6u" id="3GLv42MzhAl" role="3jicU7" />
<node concept="10Nm6u" id="3GLv42MzhAy" role="3jicU7" />
<node concept="a7P8L" id="3GLv42Mz9c4" role="3jm6SO">
<ref role="a7OzE" node="3GLv42Mz9bW" resolve="MethSig" />
</node>
@ -20639,14 +20658,25 @@
<node concept="a7P8L" id="3GLv42Mz9cw" role="3jm6SO">
<ref role="a7OzE" node="3GLv42Mz9cd" resolve="Wldc" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMm" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9Jdj" resolve="origin" />
<node concept="37vLTw" id="3GLv42Mz9cA" role="1uXrr8">
<ref role="3cqZAo" node="3GLv42MyEnz" resolve="mdecl" />
</node>
</node>
<node concept="1uXrbS" id="1OAJnH6vMn" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMs9igS" resolve="tyArgs" />
<node concept="10Nm6u" id="3GLv42MzhAl" role="1uXrr8" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMo" role="3GayWF">
<ref role="1uXrre" to="kqnc:53tmmMsqySa" resolve="contextTvds" />
<node concept="10Nm6u" id="3GLv42MzhAy" role="1uXrr8" />
</node>
</node>
</node>
<node concept="3Aqczg" id="3GLv42MzhAH" role="3cqZAp">
<node concept="3jm4v3" id="3GLv42MzhAD" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3hZrJU5cHtp" resolve="checkMethodCall" />
<node concept="3A2sRY" id="3GLv42MzhBi" role="3jicU7">
<ref role="3A2yKK" node="3GLv42MyDYR" resolve="ncmc" />
</node>
<node concept="a7P8L" id="3GLv42MzhB4" role="3jm6SO">
<ref role="a7OzE" node="3GLv42MzhB1" resolve="CapRetT" />
</node>
@ -20656,6 +20686,12 @@
<node concept="a7P8L" id="3GLv42MzhBc" role="3jm6SO">
<ref role="a7OzE" node="3GLv42MyOce" resolve="ArgsT" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMp" role="3GayWF">
<ref role="1uXrre" to="kqnc:3hZrJU5cZZN" resolve="imc" />
<node concept="3A2sRY" id="3GLv42MzhBi" role="1uXrr8">
<ref role="3A2yKK" node="3GLv42MyDYR" resolve="ncmc" />
</node>
</node>
</node>
</node>
<node concept="3Aqczg" id="3GLv42MzhBH" role="3cqZAp">

2
samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
View File

@ -81,7 +81,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
View File

@ -90,7 +90,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

35
samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps
View File

@ -57,8 +57,8 @@
<concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
@ -72,6 +72,10 @@
<concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
@ -123,22 +127,25 @@
<node concept="3I6s7M" id="kHzC1TY7Ub" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TY7U9" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3vih5250XRK" role="3jicU7">
<node concept="2OqwBi" id="7LI_gNMXl0Q" role="2Oq$k0">
<node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
<ref role="3A2yKK" node="3vih5250MoZ" resolve="tqp" />
</node>
<node concept="2qgKlT" id="3vih5250XG3" role="2OqNvi">
<ref role="37wK5l" to="h103:7lmP5gAYgVD" resolve="getTypecheckingQueryTemplate" />
</node>
</node>
<node concept="2qgKlT" id="3vih5250Y3t" role="2OqNvi">
<ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY7UJ" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY7B9" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMr" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3vih5250XRK" role="1uXrr8">
<node concept="2OqwBi" id="7LI_gNMXl0Q" role="2Oq$k0">
<node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
<ref role="3A2yKK" node="3vih5250MoZ" resolve="tqp" />
</node>
<node concept="2qgKlT" id="3vih5250XG3" role="2OqNvi">
<ref role="37wK5l" to="h103:7lmP5gAYgVD" resolve="getTypecheckingQueryTemplate" />
</node>
</node>
<node concept="2qgKlT" id="3vih5250Y3t" role="2OqNvi">
<ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="7LI_gNMXkRZ" role="3I6sU7">

2
samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
View File

@ -91,7 +91,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

2
samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
</languages>

2
samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
View File

@ -77,7 +77,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="24" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />

140
samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="24" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@ -258,8 +258,8 @@
</concept>
<concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
<reference id="6097203247184207800" name="template" index="3jm46O" />
<child id="6097203247185219723" name="argument" index="3jicU7" />
<child id="6097203247184212024" name="logical" index="3jm6SO" />
<child id="32821478321731038" name="argumentBinding" index="3GayWF" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
@ -276,6 +276,10 @@
<child id="3575255234174969665" name="rule" index="1nLNNK" />
</concept>
<concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
<concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
<reference id="1697725338399424253" name="declaration" index="1uXrre" />
<child id="1697725338399424251" name="argument" index="1uXrr8" />
</concept>
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
@ -1418,19 +1422,22 @@
<node concept="3Aqczg" id="kHzC1TY8Hd" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TY8Hb" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTUi" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUj" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUk" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUl" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY8Hr" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMs" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTUi" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTUj" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUk" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUl" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7LI_gNMBaFR" role="3cqZAp" />
@ -1440,19 +1447,22 @@
<node concept="3Aqczg" id="kHzC1TYa92" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYa93" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTUm" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUo" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYa96" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMt" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTUm" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTUn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUo" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -1484,14 +1494,17 @@
<node concept="a7P8L" id="kHzC1TYayQ" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="2OqwBi" id="3CulEO26nN8" role="3jicU7">
<node concept="2c44tf" id="3CulEO26nN9" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO26nNa" role="2c44tc">
<ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
<node concept="1uXrbS" id="1OAJnH6vMu" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO26nN8" role="1uXrr8">
<node concept="2c44tf" id="3CulEO26nN9" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO26nNa" role="2c44tc">
<ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO26nNb" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO26nNb" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -1519,19 +1532,22 @@
<node concept="3Aqczg" id="kHzC1TYazd" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYaze" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTUu" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUv" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUw" role="2c44tc">
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUx" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYazh" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMv" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTUu" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTUv" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUw" role="2c44tc">
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUx" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7LI_gNMB5So" role="3cqZAp" />
@ -1557,19 +1573,22 @@
<node concept="3Aqczg" id="kHzC1TYazC" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYazD" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTUy" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUz" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTU$" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTU_" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYazG" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMw" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTUy" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTUz" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTU$" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTU_" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
</node>
@ -1643,19 +1662,22 @@
<node concept="3I6s7M" id="kHzC1TYbLu" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TYbLs" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2OqwBi" id="3CulEO1ZTUA" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUB" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUC" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUD" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYbLH" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TYbGM" resolve="DF" />
</node>
<node concept="1uXrbS" id="1OAJnH6vMx" role="3GayWF">
<ref role="1uXrre" to="kqnc:3qUnz9vk$cM" resolve="cls" />
<node concept="2OqwBi" id="3CulEO1ZTUA" role="1uXrr8">
<node concept="2c44tf" id="3CulEO1ZTUB" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUC" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUD" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="7LI_gNMBfh3" role="3I6sU7">