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

Apply migration and rebuild project

This commit is contained in:
Fedor Isakov 2021-05-04 18:10:00 +02:00
parent a9fc3db841
commit ea6e930954
58 changed files with 2238 additions and 4189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>

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

@ -76,7 +76,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

42
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
@ -107,9 +107,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -177,6 +174,7 @@
<concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -354,18 +352,14 @@
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<node concept="nsMwS" id="7mB3viLdI7t" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<node concept="1nq8_$" id="7mB3viLdI7A" role="nsMwV">
<node concept="a7P8L" id="7mB3viLdI7$" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
</node>
<node concept="a7P8L" id="7mB3viLdI7$" role="iSaTp">
<ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
</node>
</node>
<node concept="nsMwS" id="7mB3viLbLNk" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="7mB3viLbLOy" role="nsMwV">
<node concept="a7P8L" id="7mB3viLbLOw" role="1nq8_t">
<ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
</node>
<node concept="a7P8L" id="7mB3viLbLOw" role="iSaTp">
<ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
</node>
</node>
</node>
@ -488,10 +482,8 @@
</node>
<node concept="nsMwS" id="7mB3viLi4rh" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="7mB3viLi4v0" role="nsMwV">
<node concept="a7P8L" id="7mB3viLi4uY" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
</node>
<node concept="a7P8L" id="7mB3viLi4uY" role="iSaTp">
<ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
</node>
</node>
</node>
@ -510,10 +502,8 @@
</node>
<node concept="nsMwS" id="7mB3viLi4w2" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="7mB3viLi4w3" role="nsMwV">
<node concept="a7P8L" id="7mB3viLi4wZ" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
</node>
<node concept="a7P8L" id="7mB3viLi4wZ" role="iSaTp">
<ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
</node>
</node>
</node>
@ -593,10 +583,8 @@
</node>
<node concept="nsMwS" id="2DIFeUB7n6p" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="2DIFeUB7n6q" role="nsMwV">
<node concept="a7P8L" id="2DIFeUB7sez" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
</node>
<node concept="a7P8L" id="2DIFeUB7sez" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
</node>
</node>
</node>
@ -615,10 +603,8 @@
</node>
<node concept="nsMwS" id="2DIFeUB7n6x" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="2DIFeUB7n6y" role="nsMwV">
<node concept="a7P8L" id="2DIFeUB7seD" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
</node>
<node concept="a7P8L" id="2DIFeUB7seD" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
</node>
</node>
</node>

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

@ -45,7 +45,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

145
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
</languages>
<imports>
@ -203,9 +203,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -311,7 +308,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
<child id="1149537088045275069" name="item" index="iSaTp" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@ -1041,18 +1038,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="7qe1GumRXOX" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="7qe1GumRXOY" role="nsMwV">
<node concept="a7P8L" id="7qe1GumRXOZ" role="1nq8_t">
<ref role="a7OzE" node="7qe1GumRXOP" resolve="L" />
</node>
<node concept="a7P8L" id="7qe1GumRXOZ" role="iSaTp">
<ref role="a7OzE" node="7qe1GumRXOP" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="7qe1GumRXP0" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="7qe1GumRXP1" role="nsMwV">
<node concept="a7P8L" id="7qe1GumRXP2" role="1nq8_t">
<ref role="a7OzE" node="7qe1GumRXOQ" resolve="R" />
</node>
<node concept="a7P8L" id="7qe1GumRXP2" role="iSaTp">
<ref role="a7OzE" node="7qe1GumRXOQ" resolve="R" />
</node>
</node>
</node>
@ -1163,18 +1156,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="Jfcwnvuw$7" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="Jfcwnvuw$8" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$9" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT54SS" resolve="L" />
</node>
<node concept="a7P8L" id="Jfcwnvuw$9" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT54SS" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="Jfcwnvuw$a" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="Jfcwnvuw$b" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$c" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT54ST" resolve="R" />
</node>
<node concept="a7P8L" id="Jfcwnvuw$c" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT54ST" resolve="R" />
</node>
</node>
</node>
@ -1295,18 +1284,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="Jfcwnvuw$K" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="Jfcwnvuw$L" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$M" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5511" resolve="L" />
</node>
<node concept="a7P8L" id="Jfcwnvuw$M" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT5511" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="Jfcwnvuw$N" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="Jfcwnvuw$O" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$P" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5512" resolve="R" />
</node>
<node concept="a7P8L" id="Jfcwnvuw$P" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT5512" resolve="R" />
</node>
</node>
</node>
@ -1427,18 +1412,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="JfcwnvuwBo" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="JfcwnvuwBp" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwBq" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55hT" resolve="L" />
</node>
<node concept="a7P8L" id="JfcwnvuwBq" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55hT" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="JfcwnvuwBr" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="JfcwnvuwBs" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwBt" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55hU" resolve="R" />
</node>
<node concept="a7P8L" id="JfcwnvuwBt" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55hU" resolve="R" />
</node>
</node>
</node>
@ -1552,18 +1533,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="JfcwnvuwE2" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="JfcwnvuwE3" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwE4" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55s9" resolve="L" />
</node>
<node concept="a7P8L" id="JfcwnvuwE4" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55s9" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="JfcwnvuwE5" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="JfcwnvuwE6" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwE7" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55sa" resolve="R" />
</node>
<node concept="a7P8L" id="JfcwnvuwE7" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55sa" resolve="R" />
</node>
</node>
</node>
@ -1691,18 +1668,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="4t6qIYSPdaU" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="4t6qIYSPdaV" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdaW" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55$P" resolve="L" />
</node>
<node concept="a7P8L" id="4t6qIYSPdaW" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55$P" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPdaX" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="4t6qIYSPdaY" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdo8" role="1nq8_t">
<ref role="a7OzE" node="4t6qIYSPdm_" resolve="Local2" />
</node>
<node concept="a7P8L" id="4t6qIYSPdo8" role="iSaTp">
<ref role="a7OzE" node="4t6qIYSPdm_" resolve="Local2" />
</node>
</node>
</node>
@ -1723,18 +1696,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="4t6qIYSPdtC" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="4t6qIYSPdtI" role="nsMwV">
<node concept="a7P8L" id="4t6qIYT2aT_" role="1nq8_t">
<ref role="a7OzE" node="4t6qIYT2aJm" resolve="Local3" />
</node>
<node concept="a7P8L" id="4t6qIYT2aT_" role="iSaTp">
<ref role="a7OzE" node="4t6qIYT2aJm" resolve="Local3" />
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPdtP" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="4t6qIYSPdvJ" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdvQ" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55$Q" resolve="R" />
</node>
<node concept="a7P8L" id="4t6qIYSPdvQ" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55$Q" resolve="R" />
</node>
</node>
</node>
@ -1851,18 +1820,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="4t6qIYSPqa_" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="4t6qIYSPqaA" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPqaB" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55Om" resolve="L" />
</node>
<node concept="a7P8L" id="4t6qIYSPqaB" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55Om" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPqaC" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="4t6qIYSPqaD" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8QF" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55Og" resolve="Local2" />
</node>
<node concept="a7P8L" id="4t6qIYTd8QF" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT55Og" resolve="Local2" />
</node>
</node>
</node>
@ -1972,18 +1937,14 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="4t6qIYTd7Es" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="4t6qIYTd7Et" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd7Eu" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564B" resolve="L" />
</node>
<node concept="a7P8L" id="4t6qIYTd7Eu" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT564B" resolve="L" />
</node>
</node>
<node concept="nsMwS" id="4t6qIYTd7Ev" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<node concept="1nq8_$" id="4t6qIYTd7Ew" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8S2" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
</node>
<node concept="a7P8L" id="4t6qIYTd8S2" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
</node>
</node>
</node>
@ -1998,10 +1959,8 @@
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<node concept="nsMwS" id="4t6qIYTd8KA" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<node concept="1nq8_$" id="4t6qIYTd8KG" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8Tv" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564y" resolve="Local3" />
</node>
<node concept="a7P8L" id="4t6qIYTd8Tv" role="iSaTp">
<ref role="a7OzE" node="5TXeSYT564y" resolve="Local3" />
</node>
</node>
</node>
@ -3145,18 +3104,14 @@
<ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
<node concept="nsMwS" id="JfcwnvutGg" role="ns1xD">
<ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
<node concept="1nq8_$" id="JfcwnvutGm" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutGk" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7phr7" resolve="NewTV" />
</node>
<node concept="a7P8L" id="JfcwnvutGk" role="iSaTp">
<ref role="a7OzE" node="48ZGLP7phr7" resolve="NewTV" />
</node>
</node>
<node concept="nsMwS" id="JfcwnvutGB" role="ns1xD">
<ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="JfcwnvutGK" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutGI" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7pgwC" resolve="E" />
</node>
<node concept="a7P8L" id="JfcwnvutGI" role="iSaTp">
<ref role="a7OzE" node="48ZGLP7pgwC" resolve="E" />
</node>
</node>
</node>
@ -3233,18 +3188,14 @@
<ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
<node concept="nsMwS" id="JfcwnvutH9" role="ns1xD">
<ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
<node concept="1nq8_$" id="JfcwnvutHa" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutHb" role="1nq8_t">
<ref role="a7OzE" node="JfcwnvutGZ" resolve="NewTV" />
</node>
<node concept="a7P8L" id="JfcwnvutHb" role="iSaTp">
<ref role="a7OzE" node="JfcwnvutGZ" resolve="NewTV" />
</node>
</node>
<node concept="nsMwS" id="JfcwnvutHc" role="ns1xD">
<ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
<node concept="1nq8_$" id="JfcwnvutHd" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutHe" role="1nq8_t">
<ref role="a7OzE" node="JfcwnvutGX" resolve="E" />
</node>
<node concept="a7P8L" id="JfcwnvutHe" role="iSaTp">
<ref role="a7OzE" node="JfcwnvutGX" resolve="E" />
</node>
</node>
</node>

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

@ -71,7 +71,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

55
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<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="0" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
@ -112,9 +112,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -214,7 +211,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
<child id="1149537088045275069" name="item" index="iSaTp" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@ -357,18 +354,14 @@
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<node concept="nsMwS" id="7VBaGntKJ8W" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<node concept="1nq8_$" id="3w0n0hzlYjG" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzlYjF" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzlYhK" resolve="Left" />
</node>
<node concept="a7P8L" id="3w0n0hzlYjF" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzlYhK" resolve="Left" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ8X" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<node concept="1nq8_$" id="3w0n0hzlYwu" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzlYwt" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzlYhT" resolve="Right" />
</node>
<node concept="a7P8L" id="3w0n0hzlYwt" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzlYhT" resolve="Right" />
</node>
</node>
</node>
@ -473,18 +466,14 @@
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<node concept="nsMwS" id="7VBaGntKJ95" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<node concept="1nq8_$" id="3w0n0hzmj5J" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmj5I" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
</node>
<node concept="a7P8L" id="3w0n0hzmj5I" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ96" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<node concept="1nq8_$" id="3w0n0hzmjcz" role="nsMwV">
<node concept="a7P8L" id="2gcGVmG$Rdc" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
</node>
<node concept="a7P8L" id="2gcGVmG$Rdc" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
</node>
</node>
</node>
@ -1108,18 +1097,14 @@
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<node concept="nsMwS" id="7VBaGntKJ8Z" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<node concept="1nq8_$" id="3w0n0hzmnoI" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmnoH" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmjfs" resolve="EqLeft" />
</node>
<node concept="a7P8L" id="3w0n0hzmnoH" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzmjfs" resolve="EqLeft" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ90" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<node concept="1nq8_$" id="3w0n0hzmnri" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmnrh" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmjfI" resolve="EqRight" />
</node>
<node concept="a7P8L" id="3w0n0hzmnrh" role="iSaTp">
<ref role="a7OzE" node="3w0n0hzmjfI" resolve="EqRight" />
</node>
</node>
</node>
@ -1889,18 +1874,14 @@
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<node concept="nsMwS" id="7VBaGntKJ92" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<node concept="1nq8_$" id="3w0n0hznwzX" role="nsMwV">
<node concept="a7P8L" id="3w0n0hznwzY" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hznw$l" resolve="EqLeft" />
</node>
<node concept="a7P8L" id="3w0n0hznwzY" role="iSaTp">
<ref role="a7OzE" node="3w0n0hznw$l" resolve="EqLeft" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ93" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<node concept="1nq8_$" id="3w0n0hznw$3" role="nsMwV">
<node concept="a7P8L" id="3w0n0hznw$4" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hznw$m" resolve="EqRight" />
</node>
<node concept="a7P8L" id="3w0n0hznw$4" role="iSaTp">
<ref role="a7OzE" node="3w0n0hznw$m" resolve="EqRight" />
</node>
</node>
</node>

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

@ -78,7 +78,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

124
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<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" />
@ -162,9 +162,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -289,6 +286,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -432,18 +430,14 @@
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<node concept="nsMwS" id="5itBwMa8vVd" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<node concept="1nq8_$" id="5itBwMa8vVe" role="nsMwV">
<node concept="a7P8L" id="5itBwMa8vVf" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEEJk" resolve="Var" />
</node>
<node concept="a7P8L" id="5itBwMa8vVf" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLEEJk" resolve="Var" />
</node>
</node>
<node concept="nsMwS" id="5itBwMa8vVg" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<node concept="1nq8_$" id="5itBwMa8vVh" role="nsMwV">
<node concept="a7P8L" id="5itBwMa9DlF" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEEJq" resolve="Body" />
</node>
<node concept="a7P8L" id="5itBwMa9DlF" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLEEJq" resolve="Body" />
</node>
</node>
</node>
@ -516,18 +510,14 @@
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<node concept="nsMwS" id="7VBaGntKJaq" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<node concept="1nq8_$" id="Vo$tzLEFM$" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLEFM_" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEFMH" resolve="Var" />
</node>
<node concept="a7P8L" id="Vo$tzLEFM_" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLEFMH" resolve="Var" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJar" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<node concept="1nq8_$" id="Vo$tzLEFME" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLEFMF" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEFMI" resolve="Body" />
</node>
<node concept="a7P8L" id="Vo$tzLEFMF" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLEFMI" resolve="Body" />
</node>
</node>
</node>
@ -635,10 +625,8 @@
</node>
<node concept="nsMwS" id="7VBaGntKJax" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ71" resolve="member" />
<node concept="1nq8_$" id="Vo$tzLIpZQ" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLIpZR" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLIpZg" resolve="Memb" />
</node>
<node concept="a7P8L" id="Vo$tzLIpZR" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLIpZg" resolve="Memb" />
</node>
</node>
</node>
@ -836,10 +824,8 @@
</node>
<node concept="nsMwS" id="7VBaGntKJaD" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ7b" resolve="argument" />
<node concept="1nq8_$" id="Vo$tzLIpVG" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLIpVF" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLIcAp" resolve="Arg" />
</node>
<node concept="a7P8L" id="Vo$tzLIpVF" role="iSaTp">
<ref role="a7OzE" node="Vo$tzLIcAp" resolve="Arg" />
</node>
</node>
</node>
@ -1130,18 +1116,14 @@
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<node concept="nsMwS" id="7VBaGntKJaF" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<node concept="1nq8_$" id="2oO2uzBXAqH" role="nsMwV">
<node concept="a7P8L" id="2oO2uzBXAqF" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWTdP" resolve="Var" />
</node>
<node concept="a7P8L" id="2oO2uzBXAqF" role="iSaTp">
<ref role="a7OzE" node="2oO2uzBWTdP" resolve="Var" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaG" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<node concept="1nq8_$" id="2oO2uzBXAsU" role="nsMwV">
<node concept="a7P8L" id="2oO2uzBXAsT" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWT6$" resolve="Prem" />
</node>
<node concept="a7P8L" id="2oO2uzBXAsT" role="iSaTp">
<ref role="a7OzE" node="2oO2uzBWT6$" resolve="Prem" />
</node>
</node>
</node>
@ -1787,18 +1769,14 @@
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<node concept="nsMwS" id="7VBaGntKJah" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<node concept="1nq8_$" id="2CF5XF5oJvc" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5oJvd" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWNnU" resolve="Var" />
</node>
<node concept="a7P8L" id="2CF5XF5oJvd" role="iSaTp">
<ref role="a7OzE" node="2oO2uzBWNnU" resolve="Var" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJai" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<node concept="1nq8_$" id="2CF5XF5oJvi" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5oJvj" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBXx8g" resolve="Stc" />
</node>
<node concept="a7P8L" id="2CF5XF5oJvj" role="iSaTp">
<ref role="a7OzE" node="2oO2uzBXx8g" resolve="Stc" />
</node>
</node>
</node>
@ -2024,18 +2002,14 @@
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<node concept="nsMwS" id="7VBaGntKJak" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<node concept="1nq8_$" id="2CF5XF5qul1" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qul0" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qukG" resolve="Var" />
</node>
<node concept="a7P8L" id="2CF5XF5qul0" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qukG" resolve="Var" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJal" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<node concept="1nq8_$" id="2CF5XF5quA1" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5quA0" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5quzw" resolve="Stc" />
</node>
<node concept="a7P8L" id="2CF5XF5quA0" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5quzw" resolve="Stc" />
</node>
</node>
</node>
@ -2303,18 +2277,14 @@
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<node concept="nsMwS" id="7VBaGntKJa_" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<node concept="1nq8_$" id="2CF5XF5qAuj" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qAui" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qAtH" resolve="ExVar" />
</node>
<node concept="a7P8L" id="2CF5XF5qAui" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qAtH" resolve="ExVar" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaA" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<node concept="1nq8_$" id="2CF5XF5qAwy" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qODY" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qOwG" resolve="ExStc" />
</node>
<node concept="a7P8L" id="2CF5XF5qODY" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qOwG" resolve="ExStc" />
</node>
</node>
</node>
@ -2357,32 +2327,24 @@
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<node concept="nsMwS" id="7VBaGntKJae" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<node concept="1nq8_$" id="3dsgZcixZw2" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZw3" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qNbA" resolve="UniVar" />
</node>
<node concept="a7P8L" id="3dsgZcixZw3" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qNbA" resolve="UniVar" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaf" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<node concept="1nq8_$" id="3dsgZcixZw8" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJas" role="1nq8_t">
<ref role="ns1xF" to="6r1k:7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJat" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3dsgZcixZwe" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZwf" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qAtS" resolve="UniStc" />
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJas" role="iSaTp">
<ref role="ns1xF" to="6r1k:7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJat" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8b" resolve="antecedent" />
<node concept="a7P8L" id="3dsgZcixZwf" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qAtS" resolve="UniStc" />
</node>
<node concept="nsMwS" id="7VBaGntKJau" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3dsgZcixZwk" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZwl" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qF8v" resolve="Con" />
</node>
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJau" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8c" resolve="consequence" />
<node concept="a7P8L" id="3dsgZcixZwl" role="iSaTp">
<ref role="a7OzE" node="2CF5XF5qF8v" resolve="Con" />
</node>
</node>
</node>

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

@ -79,7 +79,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

386
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
@ -87,16 +87,13 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
<child id="2105510410850136264" name="contents" index="KCVpo" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
<child id="7571593955706125526" name="root" index="1oi0x0" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -173,6 +170,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -412,10 +410,8 @@
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<node concept="nsMwS" id="5itBwM9YtBj" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<node concept="1nq8_$" id="5itBwM9YtBk" role="nsMwV">
<node concept="a7P8L" id="5itBwMa4JBJ" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa4Fv7" resolve="Conj" />
</node>
<node concept="a7P8L" id="5itBwMa4JBJ" role="iSaTp">
<ref role="a7OzE" node="5itBwMa4Fv7" resolve="Conj" />
</node>
</node>
</node>
@ -535,10 +531,8 @@
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<node concept="nsMwS" id="5itBwMa4_iK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<node concept="1nq8_$" id="5itBwMa4_iL" role="nsMwV">
<node concept="a7P8L" id="5itBwMa4Kvy" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa4JVK" resolve="Disj" />
</node>
<node concept="a7P8L" id="5itBwMa4Kvy" role="iSaTp">
<ref role="a7OzE" node="5itBwMa4JVK" resolve="Disj" />
</node>
</node>
</node>
@ -614,10 +608,8 @@
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="5itBwMa4F79" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="5itBwMa4F7a" role="nsMwV">
<node concept="a7P8L" id="5itBwMa4F7b" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa4CQK" resolve="Target" />
</node>
<node concept="a7P8L" id="5itBwMa4F7b" role="iSaTp">
<ref role="a7OzE" node="5itBwMa4CQK" resolve="Target" />
</node>
</node>
</node>
@ -687,18 +679,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="5itBwMa5UrL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="5itBwMa5UrM" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UrN" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5SHO" resolve="Atcd" />
</node>
<node concept="a7P8L" id="5itBwMa5UrN" role="iSaTp">
<ref role="a7OzE" node="5itBwMa5SHO" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="5itBwMa5UrO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="5itBwMa5UrP" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UrQ" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5STx" resolve="Csqt" />
</node>
<node concept="a7P8L" id="5itBwMa5UrQ" role="iSaTp">
<ref role="a7OzE" node="5itBwMa5STx" resolve="Csqt" />
</node>
</node>
</node>
@ -771,18 +759,14 @@
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<node concept="nsMwS" id="5itBwMa5UZi" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<node concept="1nq8_$" id="5itBwMa5UZj" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UZk" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5UZp" resolve="Atcd" />
</node>
<node concept="a7P8L" id="5itBwMa5UZk" role="iSaTp">
<ref role="a7OzE" node="5itBwMa5UZp" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="5itBwMa5UZl" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<node concept="1nq8_$" id="5itBwMa5UZm" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UZn" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5UZq" resolve="Csqt" />
</node>
<node concept="a7P8L" id="5itBwMa5UZn" role="iSaTp">
<ref role="a7OzE" node="5itBwMa5UZq" resolve="Csqt" />
</node>
</node>
</node>
@ -1236,8 +1220,8 @@
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<node concept="nsMwS" id="7VBaGntKJeg" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<node concept="1oi1Uc" id="2AfSc6JvNjG" role="nsMwV">
<node concept="KCUsM" id="2AfSc6JvNm_" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGt" role="iSaTp">
<node concept="KCUsM" id="2AfSc6JvNm_" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsMC" role="KCVpo">
<node concept="a7P8L" id="2AfSc6JvNBr" role="3wAq21">
<ref role="a7OzE" node="2AfSc6JvIqJ" resolve="Prem1" />
@ -1450,8 +1434,8 @@
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<node concept="nsMwS" id="7VBaGntKJff" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<node concept="1oi1Uc" id="2AfSc6JvO6C" role="nsMwV">
<node concept="KCUsM" id="2AfSc6JvO6D" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGu" role="iSaTp">
<node concept="KCUsM" id="2AfSc6JvO6D" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsME" role="KCVpo">
<node concept="a7P8L" id="2AfSc6JwBjN" role="3wAq21">
<ref role="a7OzE" node="2AfSc6JvO6R" resolve="Prem2" />
@ -1621,8 +1605,8 @@
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<node concept="nsMwS" id="7VBaGntKJf2" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<node concept="1oi1Uc" id="2AfSc6Jwgqh" role="nsMwV">
<node concept="KCUsM" id="2AfSc6Jwgta" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGv" role="iSaTp">
<node concept="KCUsM" id="2AfSc6Jwgta" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsMG" role="KCVpo">
<node concept="a7P8L" id="2AfSc6JwRNl" role="3wAq21">
<ref role="a7OzE" node="2AfSc6JwgnU" resolve="Con" />
@ -1771,8 +1755,8 @@
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<node concept="nsMwS" id="7VBaGntKJfa" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<node concept="1oi1Uc" id="2AfSc6Jw_SP" role="nsMwV">
<node concept="KCUsM" id="2AfSc6Jw_SQ" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGw" role="iSaTp">
<node concept="KCUsM" id="2AfSc6Jw_SQ" role="Hz6kd">
<node concept="2IllgU" id="2AfSc6Jw_SV" role="KCVpo" />
<node concept="3wAshV" id="3zXFZnUhsMH" role="KCVpo">
<node concept="a7P8L" id="2AfSc6JwRND" role="3wAq21">
@ -1934,8 +1918,8 @@
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<node concept="nsMwS" id="7VBaGntKJes" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<node concept="1oi1Uc" id="2YqrT$P4bbQ" role="nsMwV">
<node concept="KCUsM" id="2YqrT$P4beJ" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGx" role="iSaTp">
<node concept="KCUsM" id="2YqrT$P4beJ" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsMI" role="KCVpo">
<node concept="a7P8L" id="2YqrT$P4hvl" role="3wAq21">
<ref role="a7OzE" node="2aBGSFgfwOx" resolve="Prem" />
@ -2079,8 +2063,8 @@
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<node concept="nsMwS" id="7VBaGntKJdW" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<node concept="1oi1Uc" id="2YqrT$P4hvt" role="nsMwV">
<node concept="KCUsM" id="2YqrT$P4hvu" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGy" role="iSaTp">
<node concept="KCUsM" id="2YqrT$P4hvu" role="Hz6kd">
<node concept="2IllgU" id="2YqrT$P4hvz" role="KCVpo" />
<node concept="3wAshV" id="3zXFZnUhsMJ" role="KCVpo">
<node concept="a7P8L" id="2YqrT$P4hvy" role="3wAq21">
@ -2211,18 +2195,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJep" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVnr0E" role="nsMwV">
<node concept="a7P8L" id="3l440nVnr0D" role="1nq8_t">
<ref role="a7OzE" node="3l440nVnmQi" resolve="Disj1" />
</node>
<node concept="a7P8L" id="3l440nVnr0D" role="iSaTp">
<ref role="a7OzE" node="3l440nVnmQi" resolve="Disj1" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeq" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2AfSc6JyU7k" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JyU7j" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
</node>
<node concept="a7P8L" id="2AfSc6JyU7j" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
</node>
</node>
</node>
@ -2260,18 +2240,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJfh" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVnrk5" role="nsMwV">
<node concept="a7P8L" id="3l440nVnrk4" role="1nq8_t">
<ref role="a7OzE" node="3l440nVnmVa" resolve="Disj2" />
</node>
<node concept="a7P8L" id="3l440nVnrk4" role="iSaTp">
<ref role="a7OzE" node="3l440nVnmVa" resolve="Disj2" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfi" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVnrhp" role="nsMwV">
<node concept="a7P8L" id="3l440nVnrsh" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
</node>
<node concept="a7P8L" id="3l440nVnrsh" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
</node>
</node>
</node>
@ -2309,8 +2285,8 @@
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<node concept="nsMwS" id="7VBaGntKJf8" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<node concept="1oi1Uc" id="3l440nVnqu3" role="nsMwV">
<node concept="KCUsM" id="3l440nVnqx4" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYGz" role="iSaTp">
<node concept="KCUsM" id="3l440nVnqx4" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsMK" role="KCVpo">
<node concept="a7P8L" id="3l440nVnqI5" role="3wAq21">
<ref role="a7OzE" node="3l440nVnmQi" resolve="Disj1" />
@ -2529,18 +2505,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeW" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVo7SD" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7SE" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tl" resolve="Disj1" />
</node>
<node concept="a7P8L" id="3l440nVo7SE" role="iSaTp">
<ref role="a7OzE" node="3l440nVo7Tl" resolve="Disj1" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeX" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVo7SJ" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7SK" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
</node>
<node concept="a7P8L" id="3l440nVo7SK" role="iSaTp">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
</node>
</node>
</node>
@ -2578,18 +2550,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJe5" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVo7T2" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7T3" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tm" resolve="Disj2" />
</node>
<node concept="a7P8L" id="3l440nVo7T3" role="iSaTp">
<ref role="a7OzE" node="3l440nVo7Tm" resolve="Disj2" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe6" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVo7T8" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7T9" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
</node>
<node concept="a7P8L" id="3l440nVo7T9" role="iSaTp">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
</node>
</node>
</node>
@ -2627,8 +2595,8 @@
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<node concept="nsMwS" id="7VBaGntKJfn" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<node concept="1oi1Uc" id="3l440nVo7Sk" role="nsMwV">
<node concept="KCUsM" id="3l440nVo7Sl" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYG$" role="iSaTp">
<node concept="KCUsM" id="3l440nVo7Sl" role="Hz6kd">
<node concept="3wAshV" id="3zXFZnUhsMM" role="KCVpo">
<node concept="a7P8L" id="3l440nVo8On" role="3wAq21">
<ref role="a7OzE" node="3l440nVo7Tm" resolve="Disj2" />
@ -2834,10 +2802,8 @@
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJe8" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P4Dek" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Dej" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4Dej" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
</node>
</node>
@ -2859,18 +2825,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJem" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2YqrT$P4CDm" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4CDl" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4CDl" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJen" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2YqrT$P4CLS" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4CLR" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
</node>
<node concept="a7P8L" id="2YqrT$P4CLR" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
</node>
</node>
</node>
@ -2903,24 +2865,18 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJdQ" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2YqrT$P4I0M" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4I0N" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4I0N" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdR" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2YqrT$P4If5" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJet" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJeu" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P4IjJ" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IjI" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJet" role="iSaTp">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJeu" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="a7P8L" id="2YqrT$P4IjI" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
</node>
</node>
</node>
@ -3079,10 +3035,8 @@
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJey" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P4IqB" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqC" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4IqC" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
</node>
</node>
@ -3104,24 +3058,18 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeZ" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2YqrT$P4Ir9" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Ira" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4Ira" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJf0" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2YqrT$P4Irf" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJev" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJew" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P4Irl" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Irm" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJev" role="iSaTp">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJew" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="a7P8L" id="2YqrT$P4Irm" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
</node>
</node>
</node>
@ -3156,18 +3104,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJe0" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2YqrT$P4IqM" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqN" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
<node concept="a7P8L" id="2YqrT$P4IqN" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe1" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2YqrT$P4IqS" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqT" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
</node>
<node concept="a7P8L" id="2YqrT$P4IqT" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
</node>
</node>
</node>
@ -3337,16 +3281,12 @@
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJdY" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P5jLb" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJf5" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJf6" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="1nq8_$" id="2YqrT$P5jNi" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P5rMC" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4S09" resolve="Con" />
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJf5" role="iSaTp">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<node concept="nsMwS" id="7VBaGntKJf6" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<node concept="a7P8L" id="2YqrT$P5rMC" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P4S09" resolve="Con" />
</node>
</node>
</node>
@ -3485,18 +3425,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJdN" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2YqrT$P64tX" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P64tW" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P64s7" resolve="Atcd" />
</node>
<node concept="a7P8L" id="2YqrT$P64tW" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P64s7" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2YqrT$P64EJ" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P64EI" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P64tc" resolve="Csqt" />
</node>
<node concept="a7P8L" id="2YqrT$P64EI" role="iSaTp">
<ref role="a7OzE" node="2YqrT$P64tc" resolve="Csqt" />
</node>
</node>
</node>
@ -3746,18 +3682,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeT" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2AfSc6JxXJm" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JxXJn" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
</node>
<node concept="a7P8L" id="2AfSc6JxXJn" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeU" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2AfSc6JxXJs" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JxYMg" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
</node>
<node concept="a7P8L" id="2AfSc6JxYMg" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
</node>
</node>
</node>
@ -3977,18 +3909,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeE" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="2AfSc6JuArn" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JuArm" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JuA9o" resolve="AtcdPrem" />
</node>
<node concept="a7P8L" id="2AfSc6JuArm" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JuA9o" resolve="AtcdPrem" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeF" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="2AfSc6Juz2J" role="nsMwV">
<node concept="a7P8L" id="2AfSc6Juz2I" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JuwUs" resolve="Con" />
</node>
<node concept="a7P8L" id="2AfSc6Juz2I" role="iSaTp">
<ref role="a7OzE" node="2AfSc6JuwUs" resolve="Con" />
</node>
</node>
</node>
@ -4177,18 +4105,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJdT" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrMxP" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMxO" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVrMxO" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdU" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrM$p" role="nsMwV">
<node concept="a7P8L" id="3l440nVrM$o" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVrM$o" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
</node>
</node>
@ -4226,18 +4150,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJdK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrQu5" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmqS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVsmqS" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrQub" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmEY" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVsmEY" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
</node>
</node>
@ -4275,18 +4195,14 @@
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<node concept="nsMwS" id="7VBaGntKJed" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrMgT" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMgS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVrMgS" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJee" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrMnH" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMnG" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVrMnG" role="iSaTp">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
</node>
</node>
</node>
@ -4438,18 +4354,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrS7l" role="nsMwV">
<node concept="a7P8L" id="3l440nVrS7m" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVrS7m" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrS7r" role="nsMwV">
<node concept="a7P8L" id="3l440nVrS7s" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVrS7s" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
</node>
</node>
@ -4487,18 +4399,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJea" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrS7I" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmO_" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVsmO_" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeb" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrS7O" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmYc" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVsmYc" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
</node>
</node>
@ -4536,18 +4444,14 @@
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<node concept="nsMwS" id="7VBaGntKJfk" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVrS87" role="nsMwV">
<node concept="a7P8L" id="3l440nVrT6x" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVrT6x" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfl" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVrS8d" role="nsMwV">
<node concept="a7P8L" id="3l440nVrTfl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
<node concept="a7P8L" id="3l440nVrTfl" role="iSaTp">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
</node>
</node>
</node>
@ -4644,18 +4548,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJfc" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVqBjm" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBjl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
</node>
<node concept="a7P8L" id="3l440nVqBjl" role="iSaTp">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfd" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVqBA6" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBA5" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVqBA5" role="iSaTp">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
</node>
</node>
</node>
@ -4678,18 +4578,14 @@
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<node concept="nsMwS" id="7VBaGntKJe$" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVqBK4" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBK5" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
</node>
<node concept="a7P8L" id="3l440nVqBK5" role="iSaTp">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe_" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVqBKa" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBKb" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVqBKb" role="iSaTp">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
</node>
</node>
</node>
@ -4824,18 +4720,14 @@
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<node concept="nsMwS" id="7VBaGntKJeN" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVqJkR" role="nsMwV">
<node concept="a7P8L" id="3l440nVqJkS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />
</node>
<node concept="a7P8L" id="3l440nVqJkS" role="iSaTp">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVqJkX" role="nsMwV">
<node concept="a7P8L" id="3l440nVqJkY" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVqJkY" role="iSaTp">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
</node>
</node>
</node>
@ -4858,18 +4750,14 @@
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<node concept="nsMwS" id="7VBaGntKJeB" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<node concept="1nq8_$" id="3l440nVqJla" role="nsMwV">
<node concept="a7P8L" id="3l440nVqKhl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
</node>
<node concept="a7P8L" id="3l440nVqKhl" role="iSaTp">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeC" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<node concept="1nq8_$" id="3l440nVqJlg" role="nsMwV">
<node concept="a7P8L" id="3l440nVqKpT" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />
</node>
<node concept="a7P8L" id="3l440nVqKpT" role="iSaTp">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />
</node>
</node>
</node>

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

@ -77,7 +77,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
<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="0" />

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

@ -77,7 +77,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

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

File diff suppressed because it is too large Load Diff

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

@ -39,7 +39,7 @@
<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:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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

@ -67,7 +67,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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

@ -78,7 +78,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

12
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -125,9 +125,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -202,6 +199,7 @@
<concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -1377,10 +1375,8 @@
<ref role="ns1xF" node="2q9s7foUKiD" resolve="defaultClassifier" />
<node concept="nsMwS" id="2q9s7foUPlH" role="ns1xD">
<ref role="nsMwP" node="2q9s7foUKjg" resolve="classifier" />
<node concept="1nq8_$" id="2q9s7foUPmo" role="nsMwV">
<node concept="a7P8L" id="2q9s7foUPmn" role="1nq8_t">
<ref role="a7OzE" node="2q9s7foUPm8" resolve="Cls" />
</node>
<node concept="a7P8L" id="2q9s7foUPmn" role="iSaTp">
<ref role="a7OzE" node="2q9s7foUPm8" resolve="Cls" />
</node>
</node>
</node>

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

@ -82,7 +82,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

230
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<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" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
@ -254,11 +254,8 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
<child id="7571593955706125526" name="root" index="1oi0x0" />
<concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
@ -448,6 +445,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -666,18 +664,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="6$MmqWfm93a" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="6$MmqWfm93f" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfm93e" role="1nq8_t">
<ref role="a7OzE" node="5upUcEtdY0_" resolve="ParamTypes" />
</node>
<node concept="a7P8L" id="6$MmqWfm93e" role="iSaTp">
<ref role="a7OzE" node="5upUcEtdY0_" resolve="ParamTypes" />
</node>
</node>
<node concept="nsMwS" id="6$MmqWfm93s" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="6$MmqWfm93$" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfm93z" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfm8Yx" resolve="ResultType" />
</node>
<node concept="a7P8L" id="6$MmqWfm93z" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfm8Yx" resolve="ResultType" />
</node>
</node>
</node>
@ -1590,18 +1584,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="4Z0pyZIF$YA" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="4Z0pyZIFWu2" role="nsMwV">
<node concept="a7P8L" id="4Z0pyZIFWu1" role="1nq8_t">
<ref role="a7OzE" node="4S1mDSNOe5N" resolve="ParamT" />
</node>
<node concept="a7P8L" id="4Z0pyZIFWu1" role="iSaTp">
<ref role="a7OzE" node="4S1mDSNOe5N" resolve="ParamT" />
</node>
</node>
<node concept="nsMwS" id="4Z0pyZIF$YE" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="4Z0pyZIF$YL" role="nsMwV">
<node concept="a7P8L" id="4Z0pyZIF$YK" role="1nq8_t">
<ref role="a7OzE" node="4S1mDSNOmvb" resolve="RetT" />
</node>
<node concept="a7P8L" id="4Z0pyZIF$YK" role="iSaTp">
<ref role="a7OzE" node="4S1mDSNOmvb" resolve="RetT" />
</node>
</node>
</node>
@ -1704,10 +1694,8 @@
<ref role="ns1xF" to="yh6q:3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="2GIrmkQ2LRi" role="ns1xD">
<ref role="nsMwP" to="yh6q:3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="2GIrmkQ2LRn" role="nsMwV">
<node concept="a7P8L" id="2GIrmkQ2LRm" role="1nq8_t">
<ref role="a7OzE" node="5jbgz$E6gUK" resolve="YieldT" />
</node>
<node concept="a7P8L" id="2GIrmkQ2LRm" role="iSaTp">
<ref role="a7OzE" node="5jbgz$E6gUK" resolve="YieldT" />
</node>
</node>
</node>
@ -1743,10 +1731,8 @@
<ref role="ns1xF" to="yh6q:3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="2GIrmkQ2LXb" role="ns1xD">
<ref role="nsMwP" to="yh6q:3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="2GIrmkQ2LXc" role="nsMwV">
<node concept="a7P8L" id="2GIrmkQ2LXs" role="1nq8_t">
<ref role="a7OzE" node="5jbgz$E6j5t" resolve="Elem" />
</node>
<node concept="a7P8L" id="2GIrmkQ2LXs" role="iSaTp">
<ref role="a7OzE" node="5jbgz$E6j5t" resolve="Elem" />
</node>
</node>
</node>
@ -1844,10 +1830,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2o" resolve="array" />
<node concept="nsMwS" id="5jbgz$E6kWK" role="ns1xD">
<ref role="nsMwP" to="kqnc:39Sam6Zio_N" resolve="parameter" />
<node concept="1nq8_$" id="5jbgz$E6kWP" role="nsMwV">
<node concept="a7P8L" id="5jbgz$E6kWO" role="1nq8_t">
<ref role="a7OzE" node="5jbgz$E6j5t" resolve="Elem" />
</node>
<node concept="a7P8L" id="5jbgz$E6kWO" role="iSaTp">
<ref role="a7OzE" node="5jbgz$E6j5t" resolve="Elem" />
</node>
</node>
</node>
@ -2421,10 +2405,8 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="5QlJgjTEhLG" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="5QlJgjTEhLH" role="nsMwV">
<node concept="a7P8L" id="5QlJgjTEhLI" role="1nq8_t">
<ref role="a7OzE" node="5QlJgjTEhLM" resolve="RetT" />
</node>
<node concept="a7P8L" id="5QlJgjTEhLI" role="iSaTp">
<ref role="a7OzE" node="5QlJgjTEhLM" resolve="RetT" />
</node>
</node>
</node>
@ -2990,18 +2972,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="4S1mDSNQpsp" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="4S1mDSNQpsq" role="nsMwV">
<node concept="a7P8L" id="4S1mDSNQpst" role="1nq8_t">
<ref role="a7OzE" node="4S1mDSNQpAr" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="4S1mDSNQpst" role="iSaTp">
<ref role="a7OzE" node="4S1mDSNQpAr" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="4S1mDSNQpsu" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="4S1mDSNQpsv" role="nsMwV">
<node concept="a7P8L" id="4S1mDSNQpsw" role="1nq8_t">
<ref role="a7OzE" node="4S1mDSNQprM" resolve="RetT" />
</node>
<node concept="a7P8L" id="4S1mDSNQpsw" role="iSaTp">
<ref role="a7OzE" node="4S1mDSNQprM" resolve="RetT" />
</node>
</node>
</node>
@ -4364,10 +4342,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3DgB4rOwRzq" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="1nq8_$" id="3DgB4rOwREw" role="nsMwV">
<node concept="a7P8L" id="3DgB4rOwREv" role="1nq8_t">
<ref role="a7OzE" node="3DgB4rOwRDU" resolve="ClsDecl" />
</node>
<node concept="a7P8L" id="3DgB4rOwREv" role="iSaTp">
<ref role="a7OzE" node="3DgB4rOwRDU" resolve="ClsDecl" />
</node>
</node>
</node>
@ -4560,10 +4536,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2x" resolve="lowerBound" />
<node concept="nsMwS" id="6zber0NSjL2" role="ns1xD">
<ref role="nsMwP" to="kqnc:39Sam6Yh3nH" resolve="parameter" />
<node concept="1nq8_$" id="6zber0NSjLD" role="nsMwV">
<node concept="a7P8L" id="6zber0NSjLC" role="1nq8_t">
<ref role="a7OzE" node="6zber0NSjL7" resolve="Orig" />
</node>
<node concept="a7P8L" id="6zber0NSjLC" role="iSaTp">
<ref role="a7OzE" node="6zber0NSjL7" resolve="Orig" />
</node>
</node>
</node>
@ -4826,10 +4800,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="554EtBHBWP4" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="554EtBHCaWd" role="nsMwV">
<node concept="a7P8L" id="554EtBHCaWc" role="1nq8_t">
<ref role="a7OzE" node="554EtBHBWUn" resolve="ClsTyParams" />
</node>
<node concept="a7P8L" id="554EtBHCaWc" role="iSaTp">
<ref role="a7OzE" node="554EtBHBWUn" resolve="ClsTyParams" />
</node>
</node>
</node>
@ -4958,18 +4930,14 @@
<ref role="ns1xF" to="kqnc:ZJPHcupkiE" resolve="methodSign" />
<node concept="nsMwS" id="6yxoGiojafo" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
<node concept="1nq8_$" id="6yxoGiojafp" role="nsMwV">
<node concept="a7P8L" id="6yxoGiojarn" role="1nq8_t">
<ref role="a7OzE" node="6yxoGioj12j" resolve="MethParams" />
</node>
<node concept="a7P8L" id="6yxoGiojarn" role="iSaTp">
<ref role="a7OzE" node="6yxoGioj12j" resolve="MethParams" />
</node>
</node>
<node concept="nsMwS" id="6yxoGiojafu" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="6yxoGiojafv" role="nsMwV">
<node concept="a7P8L" id="6yxoGioji0J" role="1nq8_t">
<ref role="a7OzE" node="6yxoGiojas8" resolve="MethTVs" />
</node>
<node concept="a7P8L" id="6yxoGioji0J" role="iSaTp">
<ref role="a7OzE" node="6yxoGiojas8" resolve="MethTVs" />
</node>
</node>
</node>
@ -4982,10 +4950,8 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="6yxoGiojipq" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="6yxoGiojipr" role="nsMwV">
<node concept="a7P8L" id="6yxoGiojips" role="1nq8_t">
<ref role="a7OzE" node="554EtBHCj3A" resolve="ClosureParams" />
</node>
<node concept="a7P8L" id="6yxoGiojips" role="iSaTp">
<ref role="a7OzE" node="554EtBHCj3A" resolve="ClosureParams" />
</node>
</node>
</node>
@ -5306,10 +5272,8 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="554EtBHCubC" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="554EtBHCubD" role="nsMwV">
<node concept="a7P8L" id="554EtBHCubE" role="1nq8_t">
<ref role="a7OzE" node="554EtBHCuaQ" resolve="ClosureParams" />
</node>
<node concept="a7P8L" id="554EtBHCubE" role="iSaTp">
<ref role="a7OzE" node="554EtBHCuaQ" resolve="ClosureParams" />
</node>
</node>
</node>
@ -5655,10 +5619,8 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="554EtBHOt8r" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="554EtBHOt8s" role="nsMwV">
<node concept="a7P8L" id="554EtBHOt8t" role="1nq8_t">
<ref role="a7OzE" node="554EtBHOt86" resolve="ClosureParams" />
</node>
<node concept="a7P8L" id="554EtBHOt8t" role="iSaTp">
<ref role="a7OzE" node="554EtBHOt86" resolve="ClosureParams" />
</node>
</node>
</node>
@ -5801,10 +5763,8 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="554EtBHOyl1" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="554EtBHOyl2" role="nsMwV">
<node concept="a7P8L" id="554EtBHOyl3" role="1nq8_t">
<ref role="a7OzE" node="554EtBHOykM" resolve="ClosureParams" />
</node>
<node concept="a7P8L" id="554EtBHOyl3" role="iSaTp">
<ref role="a7OzE" node="554EtBHOykM" resolve="ClosureParams" />
</node>
</node>
</node>
@ -6206,10 +6166,8 @@
</node>
<node concept="nsMwS" id="554EtBH_$CT" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="554EtBH_$CU" role="nsMwV">
<node concept="a7P8L" id="554EtBH_$CV" role="1nq8_t">
<ref role="a7OzE" node="554EtBH_$D2" resolve="ClsTypeArgs" />
</node>
<node concept="a7P8L" id="554EtBH_$CV" role="iSaTp">
<ref role="a7OzE" node="554EtBH_$D2" resolve="ClsTypeArgs" />
</node>
</node>
</node>
@ -6323,26 +6281,20 @@
<ref role="ns1xF" to="kqnc:ZJPHcupkiE" resolve="methodSign" />
<node concept="nsMwS" id="53tmmMtoLiY" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
<node concept="1nq8_$" id="53tmmMtoOOH" role="nsMwV">
<node concept="a7P8L" id="53tmmMtoOOG" role="1nq8_t">
<ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="53tmmMtoOOG" role="iSaTp">
<ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="53tmmMtoOOU" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkk9" resolve="result" />
<node concept="1nq8_$" id="53tmmMtoOP2" role="nsMwV">
<node concept="a7P8L" id="53tmmMtoOP1" role="1nq8_t">
<ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
</node>
<node concept="a7P8L" id="53tmmMtoOP1" role="iSaTp">
<ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
</node>
</node>
<node concept="nsMwS" id="53tmmMtoQOu" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="53tmmMtp29d" role="nsMwV">
<node concept="a7P8L" id="53tmmMtp29c" role="1nq8_t">
<ref role="a7OzE" node="53tmmMtoThW" resolve="MethTVs" />
</node>
<node concept="a7P8L" id="53tmmMtp29c" role="iSaTp">
<ref role="a7OzE" node="53tmmMtoThW" resolve="MethTVs" />
</node>
</node>
</node>
@ -6357,18 +6309,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="53tmmMtoOV3" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="53tmmMtoOV8" role="nsMwV">
<node concept="a7P8L" id="53tmmMtoOV7" role="1nq8_t">
<ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="53tmmMtoOV7" role="iSaTp">
<ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="53tmmMtoOVl" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="53tmmMtoOVt" role="nsMwV">
<node concept="a7P8L" id="53tmmMtoOVs" role="1nq8_t">
<ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
</node>
<node concept="a7P8L" id="53tmmMtoOVs" role="iSaTp">
<ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
</node>
</node>
</node>
@ -15472,18 +15420,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="3ZfjIHuczu_" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="3ZfjIHuczuA" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHuczuB" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHuczho" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="3ZfjIHuczuB" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHuczho" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="3ZfjIHuczuC" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="3ZfjIHuc$ao" role="nsMwV">
<node concept="ns1u0" id="3ZfjIHuc$ap" role="1nq8_t">
<ref role="ns1xF" to="kqnc:JOGAOsVt3a" resolve="_void_" />
</node>
<node concept="ns1u0" id="3ZfjIHuc$ap" role="iSaTp">
<ref role="ns1xF" to="kqnc:JOGAOsVt3a" resolve="_void_" />
</node>
</node>
</node>
@ -15573,18 +15517,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="64$y60z7_3R" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="1nq8_$" id="64$y60z7_3S" role="nsMwV">
<node concept="a7P8L" id="64$y60z7_3T" role="1nq8_t">
<ref role="a7OzE" node="64$y60z7_3t" resolve="ClsDecl" />
</node>
<node concept="a7P8L" id="64$y60z7_3T" role="iSaTp">
<ref role="a7OzE" node="64$y60z7_3t" resolve="ClsDecl" />
</node>
</node>
<node concept="nsMwS" id="3ZfjIHuc$aw" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="3ZfjIHuc$DM" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHuc$DL" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHuczho" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="3ZfjIHuc$DL" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHuczho" resolve="ParamsT" />
</node>
</node>
</node>
@ -15617,18 +15557,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="3ZfjIHuczvf" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="3ZfjIHuczvg" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHuczvh" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHuczvz" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="3ZfjIHuczvh" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHuczvz" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="3ZfjIHuczvi" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="3ZfjIHuczvj" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHuczvk" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHuczvo" resolve="ReturnT" />
</node>
<node concept="a7P8L" id="3ZfjIHuczvk" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHuczvo" resolve="ReturnT" />
</node>
</node>
</node>
@ -15718,16 +15654,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3ZfjIHuczvS" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="1nq8_$" id="3ZfjIHuczvT" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHuczvU" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHuczvr" resolve="ClsDecl" />
</node>
<node concept="a7P8L" id="3ZfjIHuczvU" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHuczvr" resolve="ClsDecl" />
</node>
</node>
<node concept="nsMwS" id="3ZfjIHuc$PA" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1oi1Uc" id="3ZfjIHucA6L" role="nsMwV">
<node concept="1Pxxm1" id="3ZfjIHucA6Q" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYJY" role="iSaTp">
<node concept="1Pxxm1" id="3ZfjIHucA6Q" role="Hz6kd">
<node concept="3wAshV" id="3ZfjIHucA6W" role="1Pxxm0">
<node concept="a7P8L" id="3ZfjIHucA6V" role="3wAq21">
<ref role="a7OzE" node="3ZfjIHuczvo" resolve="ReturnT" />
@ -15776,18 +15710,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="3DgB4rOxaH8" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="3DgB4rOxaH9" role="nsMwV">
<node concept="a7P8L" id="3DgB4rOxaHa" role="1nq8_t">
<ref role="a7OzE" node="3DgB4rOxaHm" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="3DgB4rOxaHa" role="iSaTp">
<ref role="a7OzE" node="3DgB4rOxaHm" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="3DgB4rOxaHb" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="3DgB4rOxaHc" role="nsMwV">
<node concept="ns1u0" id="3DgB4rOxbel" role="1nq8_t">
<ref role="ns1xF" to="kqnc:JOGAOsVt3a" resolve="_void_" />
</node>
<node concept="ns1u0" id="3DgB4rOxbel" role="iSaTp">
<ref role="ns1xF" to="kqnc:JOGAOsVt3a" resolve="_void_" />
</node>
</node>
</node>
@ -15869,18 +15799,14 @@
<ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="3DgB4rOwUVU" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="3DgB4rOwUY2" role="nsMwV">
<node concept="a7P8L" id="3DgB4rOwUY1" role="1nq8_t">
<ref role="a7OzE" node="3DgB4rOwUX8" resolve="ParamsT" />
</node>
<node concept="a7P8L" id="3DgB4rOwUY1" role="iSaTp">
<ref role="a7OzE" node="3DgB4rOwUX8" resolve="ParamsT" />
</node>
</node>
<node concept="nsMwS" id="3DgB4rOwVG3" role="ns1xD">
<ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="3DgB4rOwVGp" role="nsMwV">
<node concept="a7P8L" id="3DgB4rOwVGo" role="1nq8_t">
<ref role="a7OzE" node="3DgB4rOwUVZ" resolve="ReturnT" />
</node>
<node concept="a7P8L" id="3DgB4rOwVGo" role="iSaTp">
<ref role="a7OzE" node="3DgB4rOwUVZ" resolve="ReturnT" />
</node>
</node>
</node>

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

@ -79,7 +79,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

1515
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

@ -77,7 +77,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

43
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -84,9 +84,6 @@
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -147,7 +144,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
<child id="1149537088045275069" name="item" index="iSaTp" />
</concept>
<concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
<reference id="3541122455446356437" name="extends" index="2YbDB9" />
@ -268,18 +265,14 @@
<ref role="ns1xF" node="6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="6$MmqWfmA9y" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="6$MmqWfmA9B" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfmA9A" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfm_Rk" resolve="ParamsL" />
</node>
<node concept="a7P8L" id="6$MmqWfmA9A" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfm_Rk" resolve="ParamsL" />
</node>
</node>
<node concept="nsMwS" id="6$MmqWfmAOi" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="6$MmqWfmAOq" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfmAOp" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfm_Tg" resolve="ResL" />
</node>
<node concept="a7P8L" id="6$MmqWfmAOp" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfm_Tg" resolve="ResL" />
</node>
</node>
</node>
@ -292,18 +285,14 @@
<ref role="ns1xF" node="6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="6$MmqWfmAPz" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="6$MmqWfmAPC" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfmAPB" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfm_SL" resolve="ParamsR" />
</node>
<node concept="a7P8L" id="6$MmqWfmAPB" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfm_SL" resolve="ParamsR" />
</node>
</node>
<node concept="nsMwS" id="6$MmqWfmAPF" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="6$MmqWfmAPX" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfmAPW" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfm_TR" resolve="ResR" />
</node>
<node concept="a7P8L" id="6$MmqWfmAPW" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfm_TR" resolve="ResR" />
</node>
</node>
</node>
@ -540,18 +529,14 @@
<ref role="ns1xF" node="6$MmqWflYd6" resolve="function" />
<node concept="nsMwS" id="6$MmqWfmpv5" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdw" resolve="params" />
<node concept="1nq8_$" id="6$MmqWfmw1Q" role="nsMwV">
<node concept="a7P8L" id="2MpDLe9wpWd" role="1nq8_t">
<ref role="a7OzE" node="2MpDLe9worb" resolve="ParamTypesList" />
</node>
<node concept="a7P8L" id="2MpDLe9wpWd" role="iSaTp">
<ref role="a7OzE" node="2MpDLe9worb" resolve="ParamTypesList" />
</node>
</node>
<node concept="nsMwS" id="6$MmqWfmwCT" role="ns1xD">
<ref role="nsMwP" node="6$MmqWflYdg" resolve="result" />
<node concept="1nq8_$" id="6$MmqWfmwD1" role="nsMwV">
<node concept="a7P8L" id="6$MmqWfmwD0" role="1nq8_t">
<ref role="a7OzE" node="6$MmqWfmrtC" resolve="ResultType" />
</node>
<node concept="a7P8L" id="6$MmqWfmwD0" role="iSaTp">
<ref role="a7OzE" node="6$MmqWfmrtC" resolve="ResultType" />
</node>
</node>
</node>

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

@ -32,7 +32,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<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: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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

112
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -57,9 +57,6 @@
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
<child id="2105510410850136264" name="contents" index="KCVpo" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -99,6 +96,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
@ -255,10 +253,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="3Z1xyIvWi8a" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="3Z1xyIvWi8f" role="nsMwV">
<node concept="a7P8L" id="3Z1xyIvWi8e" role="1nq8_t">
<ref role="a7OzE" node="3Z1xyIvWi72" resolve="Elem" />
</node>
<node concept="a7P8L" id="3Z1xyIvWi8e" role="iSaTp">
<ref role="a7OzE" node="3Z1xyIvWi72" resolve="Elem" />
</node>
</node>
</node>
@ -313,10 +309,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="2GIrmkQ2LRi" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="2GIrmkQ2LRn" role="nsMwV">
<node concept="a7P8L" id="2GIrmkQ2LZQ" role="1nq8_t">
<ref role="a7OzE" node="1oUE7CXmmkR" resolve="Elem" />
</node>
<node concept="a7P8L" id="2GIrmkQ2LZQ" role="iSaTp">
<ref role="a7OzE" node="1oUE7CXmmkR" resolve="Elem" />
</node>
</node>
</node>
@ -358,10 +352,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="3MFPGC50KD$" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="3MFPGC50KD_" role="nsMwV">
<node concept="a7P8L" id="3MFPGC50KDA" role="1nq8_t">
<ref role="a7OzE" node="3MFPGC50KDL" resolve="TElem" />
</node>
<node concept="a7P8L" id="3MFPGC50KDA" role="iSaTp">
<ref role="a7OzE" node="3MFPGC50KDL" resolve="TElem" />
</node>
</node>
</node>
@ -374,16 +366,12 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="3MFPGC50KDE" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="6BxgBHb9Wc2" role="nsMwV">
<node concept="ns1u0" id="6BxgBHb9Wc1" role="1nq8_t">
<ref role="ns1xF" to="kqnc:JOGAOsVt2u" resolve="upperBound" />
<node concept="nsMwS" id="6BxgBHb9Wc7" role="ns1xD">
<ref role="nsMwP" to="kqnc:39Sam6YgyvP" resolve="parameter" />
<node concept="1nq8_$" id="6BxgBHb9Wcf" role="nsMwV">
<node concept="a7P8L" id="6BxgBHb9Wce" role="1nq8_t">
<ref role="a7OzE" node="3MFPGC50KDK" resolve="SElem" />
</node>
</node>
<node concept="ns1u0" id="6BxgBHb9Wc1" role="iSaTp">
<ref role="ns1xF" to="kqnc:JOGAOsVt2u" resolve="upperBound" />
<node concept="nsMwS" id="6BxgBHb9Wc7" role="ns1xD">
<ref role="nsMwP" to="kqnc:39Sam6YgyvP" resolve="parameter" />
<node concept="a7P8L" id="6BxgBHb9Wce" role="iSaTp">
<ref role="a7OzE" node="3MFPGC50KDK" resolve="SElem" />
</node>
</node>
</node>
@ -458,10 +446,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="6BxgBHb9W8t" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="6BxgBHb9W8u" role="nsMwV">
<node concept="a7P8L" id="6BxgBHb9W8v" role="1nq8_t">
<ref role="a7OzE" node="6BxgBHb9W8F" resolve="TElem" />
</node>
<node concept="a7P8L" id="6BxgBHb9W8v" role="iSaTp">
<ref role="a7OzE" node="6BxgBHb9W8F" resolve="TElem" />
</node>
</node>
</node>
@ -474,10 +460,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="6BxgBHb9W8z" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="6BxgBHb9W8$" role="nsMwV">
<node concept="a7P8L" id="6BxgBHb9W8_" role="1nq8_t">
<ref role="a7OzE" node="6BxgBHb9W8E" resolve="SElem" />
</node>
<node concept="a7P8L" id="6BxgBHb9W8_" role="iSaTp">
<ref role="a7OzE" node="6BxgBHb9W8E" resolve="SElem" />
</node>
</node>
</node>
@ -581,10 +565,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="2GIrmkQ2JlQ" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="2GIrmkQ2JlV" role="nsMwV">
<node concept="a7P8L" id="2GIrmkQ2JlU" role="1nq8_t">
<ref role="a7OzE" node="3MFPGC50D2g" resolve="SElem" />
</node>
<node concept="a7P8L" id="2GIrmkQ2JlU" role="iSaTp">
<ref role="a7OzE" node="3MFPGC50D2g" resolve="SElem" />
</node>
</node>
</node>
@ -642,10 +624,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="QTGPMEwRUC" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="QTGPMEwRUD" role="nsMwV">
<node concept="a7P8L" id="QTGPMEwRUE" role="1nq8_t">
<ref role="a7OzE" node="QTGPMEwRUK" resolve="SElem" />
</node>
<node concept="a7P8L" id="QTGPMEwRUE" role="iSaTp">
<ref role="a7OzE" node="QTGPMEwRUK" resolve="SElem" />
</node>
</node>
</node>
@ -706,13 +686,11 @@
</node>
<node concept="nsMwS" id="QTGPMEwRV1" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="QTGPMEwRV2" role="nsMwV">
<node concept="Hz6ka" id="QTGPMEwRV3" role="1nq8_t">
<node concept="KCUsM" id="QTGPMEwRV4" role="Hz6kd">
<node concept="3wAshV" id="QTGPMEwRV5" role="KCVpo">
<node concept="a7P8L" id="QTGPMEwRV6" role="3wAq21">
<ref role="a7OzE" node="QTGPMEwRUJ" resolve="TElem" />
</node>
<node concept="Hz6ka" id="QTGPMEwRV3" role="iSaTp">
<node concept="KCUsM" id="QTGPMEwRV4" role="Hz6kd">
<node concept="3wAshV" id="QTGPMEwRV5" role="KCVpo">
<node concept="a7P8L" id="QTGPMEwRV6" role="3wAq21">
<ref role="a7OzE" node="QTGPMEwRUJ" resolve="TElem" />
</node>
</node>
</node>
@ -764,10 +742,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="2GIrmkQ2Jmk" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="2GIrmkQ2Jmp" role="nsMwV">
<node concept="a7P8L" id="2GIrmkQ2Jmo" role="1nq8_t">
<ref role="a7OzE" node="3MFPGC50Fa8" resolve="TElem" />
</node>
<node concept="a7P8L" id="2GIrmkQ2Jmo" role="iSaTp">
<ref role="a7OzE" node="3MFPGC50Fa8" resolve="TElem" />
</node>
</node>
</node>
@ -830,13 +806,11 @@
</node>
<node concept="nsMwS" id="3MFPGC50Fak" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="4NtT$ZxGOm4" role="nsMwV">
<node concept="Hz6ka" id="4NtT$ZxGOm3" role="1nq8_t">
<node concept="KCUsM" id="4NtT$ZxGOm9" role="Hz6kd">
<node concept="3wAshV" id="4NtT$ZxGOmf" role="KCVpo">
<node concept="a7P8L" id="4NtT$ZxGOme" role="3wAq21">
<ref role="a7OzE" node="3MFPGC50Fa8" resolve="TElem" />
</node>
<node concept="Hz6ka" id="4NtT$ZxGOm3" role="iSaTp">
<node concept="KCUsM" id="4NtT$ZxGOm9" role="Hz6kd">
<node concept="3wAshV" id="4NtT$ZxGOmf" role="KCVpo">
<node concept="a7P8L" id="4NtT$ZxGOme" role="3wAq21">
<ref role="a7OzE" node="3MFPGC50Fa8" resolve="TElem" />
</node>
</node>
</node>
@ -883,10 +857,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="61SyIbXrh2X" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="61SyIbXrh32" role="nsMwV">
<node concept="a7P8L" id="61SyIbXrh31" role="1nq8_t">
<ref role="a7OzE" node="61SyIbXrh2w" resolve="LeftE" />
</node>
<node concept="a7P8L" id="61SyIbXrh31" role="iSaTp">
<ref role="a7OzE" node="61SyIbXrh2w" resolve="LeftE" />
</node>
</node>
</node>
@ -899,10 +871,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="61SyIbXrh35" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="61SyIbXrh3a" role="nsMwV">
<node concept="a7P8L" id="61SyIbXrh39" role="1nq8_t">
<ref role="a7OzE" node="61SyIbXrh2R" resolve="RightE" />
</node>
<node concept="a7P8L" id="61SyIbXrh39" role="iSaTp">
<ref role="a7OzE" node="61SyIbXrh2R" resolve="RightE" />
</node>
</node>
</node>
@ -958,10 +928,8 @@
<ref role="ns1xF" node="3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="61SyIbXrh4H" role="ns1xD">
<ref role="nsMwP" node="3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="61SyIbXrh4M" role="nsMwV">
<node concept="a7P8L" id="61SyIbXrh4L" role="1nq8_t">
<ref role="a7OzE" node="61SyIbXrh3t" resolve="ResE" />
</node>
<node concept="a7P8L" id="61SyIbXrh4L" role="iSaTp">
<ref role="a7OzE" node="61SyIbXrh3t" resolve="ResE" />
</node>
</node>
</node>

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

@ -81,7 +81,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

79
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -160,9 +160,6 @@
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -257,7 +254,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
<child id="1149537088045275069" name="item" index="iSaTp" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@ -422,10 +419,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="3CulEO3zrsn" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="3CulEO3zrso" role="nsMwV">
<node concept="a7P8L" id="3CulEO3zrsK" role="1nq8_t">
<ref role="a7OzE" node="3CulEO3zrrJ" resolve="Components" />
</node>
<node concept="a7P8L" id="3CulEO3zrsK" role="iSaTp">
<ref role="a7OzE" node="3CulEO3zrrJ" resolve="Components" />
</node>
</node>
</node>
@ -518,10 +513,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="4E290qPYMxW" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="4E290qPYMyR" role="nsMwV">
<node concept="a7P8L" id="4E290qPYMyQ" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYySZ" resolve="CompT" />
</node>
<node concept="a7P8L" id="4E290qPYMyQ" role="iSaTp">
<ref role="a7OzE" node="4E290qPYySZ" resolve="CompT" />
</node>
</node>
</node>
@ -706,18 +699,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="5Oz70LKtpTk" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="1nq8_$" id="5cBWTAdG2mJ" role="nsMwV">
<node concept="a7P8L" id="5cBWTAdG2mI" role="1nq8_t">
<ref role="a7OzE" node="5cBWTAdG1u6" resolve="Classifier" />
</node>
<node concept="a7P8L" id="5cBWTAdG2mI" role="iSaTp">
<ref role="a7OzE" node="5cBWTAdG1u6" resolve="Classifier" />
</node>
</node>
<node concept="nsMwS" id="5Oz70LKtpTo" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="5Oz70LKtpTp" role="nsMwV">
<node concept="a7P8L" id="5cBWTAdFveb" role="1nq8_t">
<ref role="a7OzE" node="5cBWTAdFiBR" resolve="Components" />
</node>
<node concept="a7P8L" id="5cBWTAdFveb" role="iSaTp">
<ref role="a7OzE" node="5cBWTAdFiBR" resolve="Components" />
</node>
</node>
</node>
@ -797,10 +786,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="4E290qPZMeh" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="4E290qPZMfc" role="nsMwV">
<node concept="a7P8L" id="4E290qPZMfb" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYTGQ" resolve="CompTypes" />
</node>
<node concept="a7P8L" id="4E290qPZMfb" role="iSaTp">
<ref role="a7OzE" node="4E290qPYTGQ" resolve="CompTypes" />
</node>
</node>
</node>
@ -1180,10 +1167,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="4E290qPZr0L" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="4E290qPZr1G" role="nsMwV">
<node concept="a7P8L" id="4E290qPZr1F" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYXCS" resolve="ComponentTypesList" />
</node>
<node concept="a7P8L" id="4E290qPZr1F" role="iSaTp">
<ref role="a7OzE" node="4E290qPYXCS" resolve="ComponentTypesList" />
</node>
</node>
</node>
@ -1382,10 +1367,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="2WQBycG$n_7" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="2WQBycG$nAg" role="nsMwV">
<node concept="a7P8L" id="2WQBycG$nAf" role="1nq8_t">
<ref role="a7OzE" node="5upUcEtdY0_" resolve="CompTypes" />
</node>
<node concept="a7P8L" id="2WQBycG$nAf" role="iSaTp">
<ref role="a7OzE" node="5upUcEtdY0_" resolve="CompTypes" />
</node>
</node>
</node>
@ -1543,10 +1526,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="3CulEO3zn8h" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="3CulEO3zoOa" role="nsMwV">
<node concept="a7P8L" id="3CulEO3zoO9" role="1nq8_t">
<ref role="a7OzE" node="3CulEO3zn8r" resolve="ComponentsA" />
</node>
<node concept="a7P8L" id="3CulEO3zoO9" role="iSaTp">
<ref role="a7OzE" node="3CulEO3zn8r" resolve="ComponentsA" />
</node>
</node>
</node>
@ -1641,10 +1622,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="4c4BT_mtQA4" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="4c4BT_mtQA5" role="nsMwV">
<node concept="a7P8L" id="4c4BT_mtQA6" role="1nq8_t">
<ref role="a7OzE" node="4c4BT_mtQAg" resolve="ComponentsA" />
</node>
<node concept="a7P8L" id="4c4BT_mtQA6" role="iSaTp">
<ref role="a7OzE" node="4c4BT_mtQAg" resolve="ComponentsA" />
</node>
</node>
</node>
@ -1657,10 +1636,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="7d4cQRsjGuc" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="7d4cQRsjGuK" role="nsMwV">
<node concept="a7P8L" id="7d4cQRsjGuJ" role="1nq8_t">
<ref role="a7OzE" node="4c4BT_mtQAh" resolve="ComponentsB" />
</node>
<node concept="a7P8L" id="7d4cQRsjGuJ" role="iSaTp">
<ref role="a7OzE" node="4c4BT_mtQAh" resolve="ComponentsB" />
</node>
</node>
</node>
@ -1758,10 +1735,8 @@
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<node concept="nsMwS" id="5cBWTAdEYBL" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<node concept="1nq8_$" id="5cBWTAdEYBM" role="nsMwV">
<node concept="a7P8L" id="5cBWTAdEYBN" role="1nq8_t">
<ref role="a7OzE" node="5cBWTAdEYBX" resolve="Components" />
</node>
<node concept="a7P8L" id="5cBWTAdEYBN" role="iSaTp">
<ref role="a7OzE" node="5cBWTAdEYBX" resolve="Components" />
</node>
</node>
</node>
@ -1939,10 +1914,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="5BZU0S2DayR" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="5BZU0S2DazZ" role="nsMwV">
<node concept="a7P8L" id="5BZU0S2DazY" role="1nq8_t">
<ref role="a7OzE" node="5BZU0S2DayV" resolve="TPs" />
</node>
<node concept="a7P8L" id="5BZU0S2DazY" role="iSaTp">
<ref role="a7OzE" node="5BZU0S2DayV" resolve="TPs" />
</node>
</node>
</node>

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

@ -35,7 +35,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

1321
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: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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

13
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -53,12 +53,12 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
<child id="2105510410850136264" name="contents" index="KCVpo" />
</concept>
<concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
<child id="7571593955706125526" name="root" index="1oi0x0" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -111,6 +111,7 @@
<concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -1205,8 +1206,8 @@
</node>
<node concept="nsMwS" id="7gMIJIxWm0n" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1oi1Uc" id="7gMIJIxWrqw" role="nsMwV">
<node concept="KCUsM" id="7gMIJIxWrq_" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYTO" role="iSaTp">
<node concept="KCUsM" id="7gMIJIxWrq_" role="Hz6kd">
<node concept="3wAshV" id="7gMIJIxWrqS" role="KCVpo">
<node concept="a7P8L" id="7gMIJIxWrqR" role="3wAq21">
<ref role="a7OzE" node="7gMIJIxWlGX" resolve="Type" />

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

@ -84,7 +84,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
<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="18" />

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

@ -97,7 +97,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

70
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="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -116,9 +116,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -205,6 +202,7 @@
<concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -443,10 +441,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="14oWJ2NFhGN" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="14oWJ2NFhGO" role="nsMwV">
<node concept="a7P8L" id="14oWJ2NFhGP" role="1nq8_t">
<ref role="a7OzE" node="14oWJ2NFhGS" resolve="DType" />
</node>
<node concept="a7P8L" id="14oWJ2NFhGP" role="iSaTp">
<ref role="a7OzE" node="14oWJ2NFhGS" resolve="DType" />
</node>
</node>
</node>
@ -952,10 +948,8 @@
<ref role="ns1xF" to="yh6q:3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="7LI_gNMXkoN" role="ns1xD">
<ref role="nsMwP" to="yh6q:3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="7LI_gNMXkoS" role="nsMwV">
<node concept="ns1u0" id="7LI_gNMXkoR" role="1nq8_t">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
</node>
<node concept="ns1u0" id="7LI_gNMXkoR" role="iSaTp">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
</node>
</node>
</node>
@ -1809,10 +1803,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7LI_gNMXJbW" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7LI_gNMXJc1" role="nsMwV">
<node concept="a7P8L" id="7LI_gNMXJc0" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMXIer" resolve="Type" />
</node>
<node concept="a7P8L" id="7LI_gNMXJc0" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMXIer" resolve="Type" />
</node>
</node>
</node>
@ -2040,12 +2032,10 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="3QaPPfnPfII" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="3QaPPfnPgsk" role="nsMwV">
<node concept="a7P8L" id="3QaPPfnPgsj" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
<node concept="37vLTw" id="3QaPPfnPh8K" role="3gCZO6">
<ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
</node>
<node concept="a7P8L" id="3QaPPfnPgsj" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
<node concept="37vLTw" id="3QaPPfnPh8K" role="3gCZO6">
<ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
</node>
</node>
</node>
@ -3670,10 +3660,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7kXqzcTKecp" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7kXqzcTKecJ" role="nsMwV">
<node concept="a7P8L" id="7kXqzcTKecI" role="1nq8_t">
<ref role="a7OzE" node="7kXqzcTKecx" resolve="SDataType" />
</node>
<node concept="a7P8L" id="7kXqzcTKecI" role="iSaTp">
<ref role="a7OzE" node="7kXqzcTKecx" resolve="SDataType" />
</node>
</node>
</node>
@ -3686,10 +3674,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="51ek2rScB7k" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="51ek2rScB9a" role="nsMwV">
<node concept="a7P8L" id="vq9UdHmPHY" role="1nq8_t">
<ref role="a7OzE" node="vq9UdHmP$m" resolve="TDataType" />
</node>
<node concept="a7P8L" id="vq9UdHmPHY" role="iSaTp">
<ref role="a7OzE" node="vq9UdHmP$m" resolve="TDataType" />
</node>
</node>
</node>
@ -3751,10 +3737,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7kXqzcTKe5s" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7kXqzcTKe5t" role="nsMwV">
<node concept="a7P8L" id="7kXqzcTKe5u" role="1nq8_t">
<ref role="a7OzE" node="7kXqzcTKe5y" resolve="TDataType" />
</node>
<node concept="a7P8L" id="7kXqzcTKe5u" role="iSaTp">
<ref role="a7OzE" node="7kXqzcTKe5y" resolve="TDataType" />
</node>
</node>
</node>
@ -3810,10 +3794,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="51ek2rScB9_" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="51ek2rScB9A" role="nsMwV">
<node concept="a7P8L" id="51ek2rScB9B" role="1nq8_t">
<ref role="a7OzE" node="51ek2rScB9F" resolve="SDataType" />
</node>
<node concept="a7P8L" id="51ek2rScB9B" role="iSaTp">
<ref role="a7OzE" node="51ek2rScB9F" resolve="SDataType" />
</node>
</node>
</node>
@ -3901,10 +3883,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7FV1iGvO12g" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7FV1iGvO12Q" role="nsMwV">
<node concept="a7P8L" id="7FV1iGvO12P" role="1nq8_t">
<ref role="a7OzE" node="7FV1iGvO12y" resolve="SDataType" />
</node>
<node concept="a7P8L" id="7FV1iGvO12P" role="iSaTp">
<ref role="a7OzE" node="7FV1iGvO12y" resolve="SDataType" />
</node>
</node>
</node>
@ -3974,10 +3954,8 @@
<ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7FV1iGvO1Wf" role="ns1xD">
<ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7FV1iGvO1Wg" role="nsMwV">
<node concept="a7P8L" id="7FV1iGvO1Wh" role="1nq8_t">
<ref role="a7OzE" node="7FV1iGvO1W6" resolve="TDataType" />
</node>
<node concept="a7P8L" id="7FV1iGvO1Wh" role="iSaTp">
<ref role="a7OzE" node="7FV1iGvO1W6" resolve="TDataType" />
</node>
</node>
</node>

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

@ -88,7 +88,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>

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

@ -86,7 +86,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

12
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -115,9 +115,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -179,6 +176,7 @@
<concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -794,10 +792,8 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="5BZU0S2DbRP" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="5BZU0S2DbSs" role="nsMwV">
<node concept="a7P8L" id="5BZU0S2DbSr" role="1nq8_t">
<ref role="a7OzE" node="5BZU0S2DbRU" resolve="TPs" />
</node>
<node concept="a7P8L" id="5BZU0S2DbSr" role="iSaTp">
<ref role="a7OzE" node="5BZU0S2DbRU" resolve="TPs" />
</node>
</node>
</node>

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

@ -87,7 +87,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

24
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -144,9 +144,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -241,6 +238,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -348,10 +346,8 @@
<ref role="ns1xF" to="jxwi:3bgqfmmLhUu" resolve="nodeList" />
<node concept="nsMwS" id="3ZfjIHulfWq" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="1nq8_$" id="3ZfjIHulfWr" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHulfWs" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHulfUh" resolve="Concept" />
</node>
<node concept="a7P8L" id="3ZfjIHulfWs" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHulfUh" resolve="Concept" />
</node>
</node>
</node>
@ -373,10 +369,8 @@
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="3ZfjIHulgYM" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="1nq8_$" id="3ZfjIHulgYN" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHulgYO" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHulfUh" resolve="Concept" />
</node>
<node concept="a7P8L" id="3ZfjIHulgYO" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHulfUh" resolve="Concept" />
</node>
</node>
</node>
@ -1011,10 +1005,8 @@
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="3ZfjIHulvQq" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="1nq8_$" id="3ZfjIHulvQr" role="nsMwV">
<node concept="a7P8L" id="3ZfjIHulvQs" role="1nq8_t">
<ref role="a7OzE" node="3ZfjIHulvQC" resolve="Concept" />
</node>
<node concept="a7P8L" id="3ZfjIHulvQs" role="iSaTp">
<ref role="a7OzE" node="3ZfjIHulvQC" resolve="Concept" />
</node>
</node>
</node>

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

@ -89,7 +89,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -111,9 +111,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -160,6 +157,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -550,24 +548,22 @@
<ref role="ns1xF" to="yh6q:3MFPGC50Ab3" resolve="sequence" />
<node concept="nsMwS" id="5zhVuyLcKi5" role="ns1xD">
<ref role="nsMwP" to="yh6q:3MFPGC50Aiu" resolve="elem" />
<node concept="1nq8_$" id="5zhVuyLcKD3" role="nsMwV">
<node concept="ns1u0" id="5zhVuyLcKD2" role="1nq8_t">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="5zhVuyLcJne" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="2OqwBi" id="5zhVuyLcJnf" role="nsMwV">
<node concept="2OqwBi" id="5zhVuyLcJng" role="2Oq$k0">
<node concept="3A2sRY" id="5zhVuyLcJnh" role="2Oq$k0">
<ref role="3A2yKK" node="5zhVuyLcGia" resolve="nbil" />
</node>
<node concept="3TrEf2" id="5zhVuyLcJni" role="2OqNvi">
<ref role="3Tt5mk" to="tp3r:4IP40Bi38Ss" resolve="link" />
</node>
<node concept="ns1u0" id="5zhVuyLcKD2" role="iSaTp">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="5zhVuyLcJne" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="2OqwBi" id="5zhVuyLcJnf" role="nsMwV">
<node concept="2OqwBi" id="5zhVuyLcJng" role="2Oq$k0">
<node concept="3A2sRY" id="5zhVuyLcJnh" role="2Oq$k0">
<ref role="3A2yKK" node="5zhVuyLcGia" resolve="nbil" />
</node>
<node concept="3TrEf2" id="5zhVuyLcJnj" role="2OqNvi">
<ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
<node concept="3TrEf2" id="5zhVuyLcJni" role="2OqNvi">
<ref role="3Tt5mk" to="tp3r:4IP40Bi38Ss" resolve="link" />
</node>
</node>
<node concept="3TrEf2" id="5zhVuyLcJnj" role="2OqNvi">
<ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
</node>
</node>
</node>
</node>
@ -1222,10 +1218,8 @@
<ref role="ns1xF" to="wi9y:1oUE7CX3tx9" resolve="list" />
<node concept="nsMwS" id="5c7SrrUYufV" role="ns1xD">
<ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
<node concept="1nq8_$" id="5c7SrrUYuhF" role="nsMwV">
<node concept="ns1u0" id="5c7SrrUYuhE" role="1nq8_t">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
</node>
<node concept="ns1u0" id="5c7SrrUYuhE" role="iSaTp">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
</node>
</node>
</node>

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

@ -84,7 +84,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>

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

@ -97,7 +97,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

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

File diff suppressed because it is too large Load Diff

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

@ -94,7 +94,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>

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

@ -94,7 +94,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

46
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
@ -126,9 +126,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@ -216,6 +213,7 @@
</concept>
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -423,10 +421,8 @@
<ref role="ns1xF" node="5zhVuyL8Wga" resolve="join" />
<node concept="nsMwS" id="6T3vXgtM$bj" role="ns1xD">
<ref role="nsMwP" node="5zhVuyL8Wgj" resolve="component" />
<node concept="1nq8_$" id="6T3vXgtM$bA" role="nsMwV">
<node concept="a7P8L" id="6T3vXgtM$b_" role="1nq8_t">
<ref role="a7OzE" node="6T3vXgtMw_D" resolve="Args" />
</node>
<node concept="a7P8L" id="6T3vXgtM$b_" role="iSaTp">
<ref role="a7OzE" node="6T3vXgtMw_D" resolve="Args" />
</node>
</node>
</node>
@ -531,10 +527,8 @@
<ref role="ns1xF" node="5zhVuyL8Wg4" resolve="meet" />
<node concept="nsMwS" id="6T3vXgtM$l0" role="ns1xD">
<ref role="nsMwP" node="6N2bvv_fHBX" resolve="component" />
<node concept="1nq8_$" id="6T3vXgtM$l1" role="nsMwV">
<node concept="a7P8L" id="6T3vXgtM$l2" role="1nq8_t">
<ref role="a7OzE" node="6T3vXgtM$l9" resolve="Args" />
</node>
<node concept="a7P8L" id="6T3vXgtM$l2" role="iSaTp">
<ref role="a7OzE" node="6T3vXgtM$l9" resolve="Args" />
</node>
</node>
</node>
@ -3158,10 +3152,8 @@
<ref role="ns1xF" node="5zhVuyL8Wg4" resolve="meet" />
<node concept="nsMwS" id="5zhVuyL93eM" role="ns1xD">
<ref role="nsMwP" node="6N2bvv_fHBX" resolve="component" />
<node concept="1nq8_$" id="5zhVuyL93gF" role="nsMwV">
<node concept="a7P8L" id="5zhVuyL93gE" role="1nq8_t">
<ref role="a7OzE" node="5zhVuyL93fq" resolve="MeetComponents" />
</node>
<node concept="a7P8L" id="5zhVuyL93gE" role="iSaTp">
<ref role="a7OzE" node="5zhVuyL93fq" resolve="MeetComponents" />
</node>
</node>
</node>
@ -3241,10 +3233,8 @@
<ref role="ns1xF" node="5zhVuyL8Wga" resolve="join" />
<node concept="nsMwS" id="5zhVuyL9GvJ" role="ns1xD">
<ref role="nsMwP" node="5zhVuyL8Wgj" resolve="component" />
<node concept="1nq8_$" id="5zhVuyL9GvO" role="nsMwV">
<node concept="a7P8L" id="5zhVuyL9GvN" role="1nq8_t">
<ref role="a7OzE" node="5zhVuyL9Gqo" resolve="JoinComponents" />
</node>
<node concept="a7P8L" id="5zhVuyL9GvN" role="iSaTp">
<ref role="a7OzE" node="5zhVuyL9Gqo" resolve="JoinComponents" />
</node>
</node>
</node>
@ -4152,16 +4142,12 @@
<ref role="ns1xF" to="wi9y:1oUE7CX3txf" resolve="set" />
<node concept="nsMwS" id="5zhVuyL9tJp" role="ns1xD">
<ref role="nsMwP" to="wi9y:1oUE7CX3Xc2" resolve="elem" />
<node concept="1nq8_$" id="5zhVuyL9tJu" role="nsMwV">
<node concept="ns1u0" id="5zhVuyL9tJt" role="1nq8_t">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="7kXqzcTBGBA" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="1nq8_$" id="7kXqzcTBGBI" role="nsMwV">
<node concept="a7P8L" id="7kXqzcTBGBH" role="1nq8_t">
<ref role="a7OzE" node="7kXqzcTBFOa" resolve="Concept" />
</node>
</node>
<node concept="ns1u0" id="5zhVuyL9tJt" role="iSaTp">
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="7kXqzcTBGBA" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="a7P8L" id="7kXqzcTBGBH" role="iSaTp">
<ref role="a7OzE" node="7kXqzcTBFOa" resolve="Concept" />
</node>
</node>
</node>

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

@ -79,7 +79,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="21" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="22" />
<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" />

126
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="0" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="21" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="22" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
<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="18" />
@ -101,15 +101,12 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
<child id="6856711987710888500" name="root" index="Hz6kd" />
</concept>
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
<child id="2105510410850136264" name="contents" index="KCVpo" />
</concept>
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
<child id="7571593955706125526" name="root" index="1oi0x0" />
</concept>
<concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
<child id="960803923479549586" name="variable" index="3wAq21" />
</concept>
@ -203,6 +200,7 @@
<concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="1149537088045275069" name="item" index="iSaTp" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@ -477,10 +475,8 @@
<ref role="ns1xF" node="7LI_gNMpUS4" resolve="multiLogical" />
<node concept="nsMwS" id="6VI6Kr6Vack" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpUS6" resolve="dataType" />
<node concept="1nq8_$" id="6VI6Kr6VanE" role="nsMwV">
<node concept="a7P8L" id="6VI6Kr6VanD" role="1nq8_t">
<ref role="a7OzE" node="6VI6Kr6V97G" resolve="DataT" />
</node>
<node concept="a7P8L" id="6VI6Kr6VanD" role="iSaTp">
<ref role="a7OzE" node="6VI6Kr6V97G" resolve="DataT" />
</node>
</node>
</node>
@ -502,10 +498,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="6VI6Kr6Vbeu" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="6VI6Kr6Vbon" role="nsMwV">
<node concept="a7P8L" id="6VI6Kr6VouC" role="1nq8_t">
<ref role="a7OzE" node="6VI6Kr6V97G" resolve="DataT" />
</node>
<node concept="a7P8L" id="6VI6Kr6VouC" role="iSaTp">
<ref role="a7OzE" node="6VI6Kr6V97G" resolve="DataT" />
</node>
</node>
</node>
@ -866,10 +860,8 @@
<ref role="ns1xF" node="7LI_gNMpUS4" resolve="multiLogical" />
<node concept="nsMwS" id="7LI_gNMpUSl" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpUS6" resolve="dataType" />
<node concept="1nq8_$" id="7LI_gNMpUSm" role="nsMwV">
<node concept="a7P8L" id="7LI_gNMpUSn" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
</node>
<node concept="a7P8L" id="7LI_gNMpUSn" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
</node>
</node>
</node>
@ -902,10 +894,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7LI_gNMpTMt" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7LI_gNMpUI$" role="nsMwV">
<node concept="a7P8L" id="7LI_gNMpUIz" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
</node>
<node concept="a7P8L" id="7LI_gNMpUIz" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
</node>
</node>
</node>
@ -995,10 +985,8 @@
</node>
<node concept="nsMwS" id="7kXqzcTLKUL" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="7kXqzcTLKVC" role="nsMwV">
<node concept="a7P8L" id="7kXqzcTLKVB" role="1nq8_t">
<ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
</node>
<node concept="a7P8L" id="7kXqzcTLKVB" role="iSaTp">
<ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
</node>
</node>
</node>
@ -1020,12 +1008,10 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7kXqzcTLKWj" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7kXqzcTLKWk" role="nsMwV">
<node concept="a7P8L" id="7kXqzcTLKWC" role="1nq8_t">
<ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
<node concept="3cmrfG" id="7kXqzcTLS7r" role="3gCZO6">
<property role="3cmrfH" value="0" />
</node>
<node concept="a7P8L" id="7kXqzcTLKWC" role="iSaTp">
<ref role="a7OzE" node="7kXqzcTLKVf" resolve="DataType" />
<node concept="3cmrfG" id="7kXqzcTLS7r" role="3gCZO6">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
@ -1050,10 +1036,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7LI_gNMpTAI" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7LI_gNMpUTR" role="nsMwV">
<node concept="a7P8L" id="7FV1iGvQrqN" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMpTiv" resolve="CType" />
</node>
<node concept="a7P8L" id="7FV1iGvQrqN" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMpTiv" resolve="CType" />
</node>
</node>
</node>
@ -1104,10 +1088,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="7LI_gNMpX8R" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="7LI_gNMpX9I" role="nsMwV">
<node concept="a7P8L" id="7LI_gNMpX9H" role="1nq8_t">
<ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
</node>
<node concept="a7P8L" id="7LI_gNMpX9H" role="iSaTp">
<ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
</node>
</node>
</node>
@ -1712,10 +1694,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="3GLv42MBmsM" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="3GLv42MBmsR" role="nsMwV">
<node concept="a7P8L" id="3GLv42MBmsQ" role="1nq8_t">
<ref role="a7OzE" node="3GLv42MBmsI" resolve="DataT" />
</node>
<node concept="a7P8L" id="3GLv42MBmsQ" role="iSaTp">
<ref role="a7OzE" node="3GLv42MBmsI" resolve="DataT" />
</node>
</node>
</node>
@ -1728,10 +1708,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="3GLv42MBmtP" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="3GLv42MBmtU" role="nsMwV">
<node concept="a7P8L" id="3GLv42MBmtT" role="1nq8_t">
<ref role="a7OzE" node="3GLv42MBmtK" resolve="LogicalDataT" />
</node>
<node concept="a7P8L" id="3GLv42MBmtT" role="iSaTp">
<ref role="a7OzE" node="3GLv42MBmtK" resolve="LogicalDataT" />
</node>
</node>
</node>
@ -1807,10 +1785,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="3GLv42MBmvu" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="3GLv42MBmvz" role="nsMwV">
<node concept="a7P8L" id="3GLv42MBmvy" role="1nq8_t">
<ref role="a7OzE" node="3GLv42MBmv4" resolve="LogicalDataT" />
</node>
<node concept="a7P8L" id="3GLv42MBmvy" role="iSaTp">
<ref role="a7OzE" node="3GLv42MBmv4" resolve="LogicalDataT" />
</node>
</node>
</node>
@ -1884,10 +1860,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="3CulEO39INR" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="3CulEO39INW" role="nsMwV">
<node concept="a7P8L" id="3CulEO39INV" role="1nq8_t">
<ref role="a7OzE" node="3CulEO39F96" resolve="DataType" />
</node>
<node concept="a7P8L" id="3CulEO39INV" role="iSaTp">
<ref role="a7OzE" node="3CulEO39F96" resolve="DataType" />
</node>
</node>
</node>
@ -1937,18 +1911,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3CulEO39QWt" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="1nq8_$" id="3CulEO39R3G" role="nsMwV">
<node concept="a7P8L" id="3CulEO39R3F" role="1nq8_t">
<ref role="a7OzE" node="3CulEO39QWx" resolve="WldCls" />
</node>
<node concept="a7P8L" id="3CulEO39R3F" role="iSaTp">
<ref role="a7OzE" node="3CulEO39QWx" resolve="WldCls" />
</node>
</node>
<node concept="nsMwS" id="3CulEO39R3T" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1nq8_$" id="3CulEO39R41" role="nsMwV">
<node concept="a7P8L" id="3CulEO39R40" role="1nq8_t">
<ref role="a7OzE" node="3CulEO39R1v" resolve="WldPrm" />
</node>
<node concept="a7P8L" id="3CulEO39R40" role="iSaTp">
<ref role="a7OzE" node="3CulEO39R1v" resolve="WldPrm" />
</node>
</node>
</node>
@ -1998,8 +1968,8 @@
</node>
<node concept="nsMwS" id="3CulEO39IaH" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1oi1Uc" id="3CulEO39IaI" role="nsMwV">
<node concept="KCUsM" id="3CulEO39IaJ" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYYc" role="iSaTp">
<node concept="KCUsM" id="3CulEO39IaJ" role="Hz6kd">
<node concept="3wAshV" id="3CulEO39IaK" role="KCVpo">
<node concept="a7P8L" id="3CulEO39Jae" role="3wAq21">
<ref role="a7OzE" node="3CulEO39IO9" resolve="ClsDataType" />
@ -2142,8 +2112,8 @@
</node>
<node concept="nsMwS" id="3CulEO39IEX" role="ns1xD">
<ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
<node concept="1oi1Uc" id="3CulEO39IEY" role="nsMwV">
<node concept="KCUsM" id="3CulEO39IEZ" role="1oi0x0">
<node concept="Hz6ka" id="ZNYugtnYYd" role="iSaTp">
<node concept="KCUsM" id="3CulEO39IEZ" role="Hz6kd">
<node concept="3wAshV" id="3CulEO39IF0" role="KCVpo">
<node concept="a7P8L" id="3CulEO39JkR" role="3wAq21">
<ref role="a7OzE" node="3CulEO39Jbv" resolve="ClsDataType" />
@ -2261,10 +2231,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="14oWJ2N_qQk" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="14oWJ2N_qXI" role="nsMwV">
<node concept="a7P8L" id="14oWJ2N_qXH" role="1nq8_t">
<ref role="a7OzE" node="14oWJ2N_ptc" resolve="DType" />
</node>
<node concept="a7P8L" id="14oWJ2N_qXH" role="iSaTp">
<ref role="a7OzE" node="14oWJ2N_ptc" resolve="DType" />
</node>
</node>
</node>
@ -2485,10 +2453,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="6Dg__VK8zZ9" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="6Dg__VK8$34" role="nsMwV">
<node concept="a7P8L" id="6Dg__VK8$33" role="1nq8_t">
<ref role="a7OzE" node="6Dg__VK8zef" resolve="DType" />
</node>
<node concept="a7P8L" id="6Dg__VK8$33" role="iSaTp">
<ref role="a7OzE" node="6Dg__VK8zef" resolve="DType" />
</node>
</node>
</node>
@ -2539,10 +2505,8 @@
<ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
<node concept="nsMwS" id="6Dg__VK8LWX" role="ns1xD">
<ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
<node concept="1nq8_$" id="6Dg__VK8Mbd" role="nsMwV">
<node concept="a7P8L" id="6Dg__VK8Mbc" role="1nq8_t">
<ref role="a7OzE" node="6Dg__VK8M2M" resolve="DType" />
</node>
<node concept="a7P8L" id="6Dg__VK8Mbc" role="iSaTp">
<ref role="a7OzE" node="6Dg__VK8M2M" resolve="DType" />
</node>
</node>
</node>