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 to drop ValueOfExpression.

This commit is contained in:
Fedor Isakov 2020-02-12 12:26:09 +01:00
parent 0d7316adf4
commit 796ad9ad2c
37 changed files with 453 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
<use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />

4
coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
View File

@ -54,7 +54,7 @@
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@ -159,7 +159,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
</languageVersions>
<dependencyVersions>

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

@ -2,7 +2,7 @@
<model ref="r:6a6b9246-6407-4ef2-8408-df149f70bcd9(jetbrains.mps.lang.coderules.typesystem)">
<persistence version="9" />
<languages>
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
</languages>
<imports>

2
coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
View File

@ -33,7 +33,7 @@
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
</languageVersions>
<dependencyVersions>

2
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
View File

@ -10,7 +10,7 @@
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
<use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />

2
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -11,7 +11,7 @@
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
<use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
</languages>
<imports>

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

@ -9,7 +9,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
<use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />

2
coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
View File

@ -49,7 +49,7 @@
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -55,7 +55,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -109,7 +109,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -6,7 +6,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@ -129,8 +129,8 @@
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
<child id="2455719244613924416" name="logical" index="1Tms7$" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@ -395,11 +395,9 @@
<node concept="3I6s7M" id="5fMWD6IydMw" role="3I6sU7">
<node concept="3wWvb2" id="5fMWD6IydMs" role="3I6s78">
<node concept="2OqwBi" id="5fMWD6IydWI" role="3wWo3s">
<node concept="1TmgYN" id="5fMWD6IydMP" role="2Oq$k0">
<node concept="1nq8_$" id="5fMWD6IydN0" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6IydMY" role="1nq8_t">
<ref role="a7OzE" node="5fMWD6IydHS" resolve="TypeCollector" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxa" role="2Oq$k0">
<node concept="a7P8L" id="5fMWD6IydMY" role="1FtiSR">
<ref role="a7OzE" node="5fMWD6IydHS" resolve="TypeCollector" />
</node>
</node>
<node concept="liA8E" id="5fMWD6Iyeel" role="2OqNvi">
@ -415,21 +413,17 @@
<ref role="2pJxaS" to="qulx:7mB3viLbCL0" resolve="Type" />
<node concept="2pJxcG" id="5fMWD6IyeVP" role="2pJxcM">
<ref role="2pJxcJ" to="qulx:7mB3viLbCL1" resolve="name" />
<node concept="1TmgYN" id="5fMWD6IyeVQ" role="28ntcv">
<node concept="1nq8_$" id="5fMWD6IyeVR" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6IyeVS" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxb" role="28ntcv">
<node concept="a7P8L" id="5fMWD6IyeVS" role="1FtiSR">
<ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
</node>
</node>
</node>
<node concept="2pJxcG" id="5fMWD6IyeVT" role="2pJxcM">
<ref role="2pJxcJ" to="qulx:7mB3viLggsO" resolve="val" />
<node concept="1TmgYN" id="5fMWD6IyeVU" role="28ntcv">
<node concept="1nq8_$" id="5fMWD6IyeVV" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6IyeVW" role="1nq8_t">
<ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxc" role="28ntcv">
<node concept="a7P8L" id="5fMWD6IyeVW" role="1FtiSR">
<ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
</node>
</node>
</node>
@ -522,22 +516,18 @@
<node concept="2YIFZM" id="7mB3viLiciz" role="3uHU7B">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="7mB3viLicQJ" role="37wK5m">
<node concept="1nq8_$" id="7mB3viLicSp" role="1Tms7$">
<node concept="a7P8L" id="7mB3viLicSn" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxd" role="37wK5m">
<node concept="a7P8L" id="7mB3viLicSn" role="1FtiSR">
<ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
</node>
</node>
</node>
<node concept="2YIFZM" id="7mB3viLie5Z" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="7mB3viLie60" role="37wK5m">
<node concept="1nq8_$" id="7mB3viLie61" role="1Tms7$">
<node concept="a7P8L" id="7mB3viLieeF" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxe" role="37wK5m">
<node concept="a7P8L" id="7mB3viLieeF" role="1FtiSR">
<ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
</node>
</node>
</node>
@ -631,22 +621,18 @@
<node concept="2YIFZM" id="2DIFeUB7n6D" role="3uHU7B">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="2DIFeUB7n6E" role="37wK5m">
<node concept="1nq8_$" id="2DIFeUB7n6F" role="1Tms7$">
<node concept="a7P8L" id="2DIFeUB7seG" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxf" role="37wK5m">
<node concept="a7P8L" id="2DIFeUB7seG" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
</node>
</node>
</node>
<node concept="2YIFZM" id="2DIFeUB7n6H" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="2DIFeUB7n6I" role="37wK5m">
<node concept="1nq8_$" id="2DIFeUB7n6J" role="1Tms7$">
<node concept="a7P8L" id="2DIFeUB7seJ" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYxg" role="37wK5m">
<node concept="a7P8L" id="2DIFeUB7seJ" role="1FtiSR">
<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

@ -49,7 +49,7 @@
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
<language slang="l:3a1f0f04-b5e0-43be-884e-b856bfdeca21:jetbrains.mps.typechecking.testlang" version="0" />
</languageVersions>
<dependencyVersions>

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

@ -10,7 +10,7 @@
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
<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="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<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="20" />
<use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />

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

@ -16,7 +16,7 @@
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
<use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
</languages>
<imports>
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />

2
coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
View File

@ -32,7 +32,7 @@
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

2
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
View File

@ -6,7 +6,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
<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="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
</languages>
<imports>
<import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />

2
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -9,7 +9,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
</languages>
<imports>
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />

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

@ -39,7 +39,7 @@
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />

2
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />

2
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
</languages>

2
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />

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

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<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" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

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

@ -111,7 +111,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -5,7 +5,7 @@
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
<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="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<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" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

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

@ -112,7 +112,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -5,7 +5,7 @@
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<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" />

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

@ -110,7 +110,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -4,7 +4,7 @@
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<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" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@ -75,11 +75,8 @@
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
<child id="2455719244613924416" name="logical" index="1Tms7$" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@ -486,11 +483,9 @@
<node concept="3I6s7M" id="5fMWD6Iy9EN" role="3I6sU7">
<node concept="3wWvb2" id="5fMWD6Iy9EJ" role="3I6s78">
<node concept="2OqwBi" id="5fMWD6Iy9ON" role="3wWo3s">
<node concept="1TmgYN" id="5fMWD6Iy9F0" role="2Oq$k0">
<node concept="1nq8_$" id="5fMWD6Iy9Fb" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6Iy9F9" role="1nq8_t">
<ref role="a7OzE" node="5fMWD6Iy9CG" resolve="TypeCollector" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYAE" role="2Oq$k0">
<node concept="a7P8L" id="5fMWD6Iy9F9" role="1FtiSR">
<ref role="a7OzE" node="5fMWD6Iy9CG" resolve="TypeCollector" />
</node>
</node>
<node concept="liA8E" id="5fMWD6Iya6q" role="2OqNvi">

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

@ -114,7 +114,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -9,7 +9,7 @@
<use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
<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="-1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
<engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@ -252,8 +252,8 @@
<concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
<child id="960803923481835574" name="tail" index="3wIGS_" />
</concept>
<concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
<child id="2455719244613924416" name="logical" index="1Tms7$" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@ -3774,18 +3774,14 @@
<node concept="Xl_RD" id="1laj_RShlQz" role="37wK5m">
<property role="Xl_RC" value="cannot unify '%s' and '%s'" />
</node>
<node concept="1TmgYN" id="1laj_RShlQ$" role="37wK5m">
<node concept="1nq8_$" id="1laj_RShlQ_" role="1Tms7$">
<node concept="a7P8L" id="1laj_RShlQA" role="1nq8_t">
<ref role="a7OzE" node="44a9n8ErWrT" resolve="A" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCn" role="37wK5m">
<node concept="a7P8L" id="1laj_RShlQA" role="1FtiSR">
<ref role="a7OzE" node="44a9n8ErWrT" resolve="A" />
</node>
</node>
<node concept="1TmgYN" id="1laj_RShlQB" role="37wK5m">
<node concept="1nq8_$" id="1laj_RShlQC" role="1Tms7$">
<node concept="a7P8L" id="1laj_RShlQD" role="1nq8_t">
<ref role="a7OzE" node="44a9n8Es2A7" resolve="FA" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCo" role="37wK5m">
<node concept="a7P8L" id="1laj_RShlQD" role="1FtiSR">
<ref role="a7OzE" node="44a9n8Es2A7" resolve="FA" />
</node>
</node>
</node>
@ -5165,11 +5161,9 @@
<node concept="3I6s7M" id="5fMWD6IxDdh" role="3I6sU7">
<node concept="3wWvb2" id="5fMWD6IxDdd" role="3I6s78">
<node concept="2OqwBi" id="5fMWD6IxDnG" role="3wWo3s">
<node concept="1TmgYN" id="5fMWD6IxDdT" role="2Oq$k0">
<node concept="1nq8_$" id="5fMWD6IxDe4" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6IxDe2" role="1nq8_t">
<ref role="a7OzE" node="5fMWD6IxD8b" resolve="TypeCollector" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCp" role="2Oq$k0">
<node concept="a7P8L" id="5fMWD6IxDe2" role="1FtiSR">
<ref role="a7OzE" node="5fMWD6IxD8b" resolve="TypeCollector" />
</node>
</node>
<node concept="liA8E" id="5fMWD6IxDFs" role="2OqNvi">
@ -5180,11 +5174,9 @@
</node>
<node concept="iZEcu" id="5fMWD6IxEqZ" role="2OqNvi" />
</node>
<node concept="1TmgYN" id="5fMWD6IxDJe" role="37wK5m">
<node concept="1nq8_$" id="5fMWD6IxDL7" role="1Tms7$">
<node concept="a7P8L" id="5fMWD6IxDTm" role="1nq8_t">
<ref role="a7OzE" node="4dPZ2m2jBnq" resolve="Node" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCq" role="37wK5m">
<node concept="a7P8L" id="5fMWD6IxDTm" role="1FtiSR">
<ref role="a7OzE" node="4dPZ2m2jBnq" resolve="Node" />
</node>
</node>
</node>
@ -5304,11 +5296,9 @@
<property role="2qtEX8" value="def" />
<property role="P3scX" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4773731068388848390/4773731068388848403" />
<property role="3hQQBS" value="VarTypeRef" />
<node concept="1TmgYN" id="2O9ahh6IVfi" role="2c44t1">
<node concept="1nq8_$" id="2O9ahh6IVfB" role="1Tms7$">
<node concept="a7P8L" id="2O9ahh6IVf_" role="1nq8_t">
<ref role="a7OzE" node="2O9ahh6I0ou" resolve="VarNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCr" role="2c44t1">
<node concept="a7P8L" id="2O9ahh6IVf_" role="1FtiSR">
<ref role="a7OzE" node="2O9ahh6I0ou" resolve="VarNode" />
</node>
</node>
</node>
@ -5417,11 +5407,9 @@
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
<property role="3hQQBS" value="VarType" />
<property role="3qcH_f" value="true" />
<node concept="1TmgYN" id="48ZGLP8Lim5" role="2c44t1">
<node concept="1nq8_$" id="48ZGLP8Lim6" role="1Tms7$">
<node concept="a7P8L" id="48ZGLP8Lim7" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP8yKxg" resolve="Name" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCs" role="2c44t1">
<node concept="a7P8L" id="48ZGLP8Lim7" role="1FtiSR">
<ref role="a7OzE" node="48ZGLP8yKxg" resolve="Name" />
</node>
</node>
</node>
@ -5516,20 +5504,16 @@
<node concept="liA8E" id="2O9ahh6Ln6a" role="2OqNvi">
<ref role="37wK5l" node="6EwjVjWsiF5" resolve="nextIndex" />
</node>
<node concept="1TmgYN" id="2O9ahh6LnnE" role="2Oq$k0">
<node concept="1nq8_$" id="2O9ahh6LnqJ" role="1Tms7$">
<node concept="a7P8L" id="2O9ahh6LnqH" role="1nq8_t">
<ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCt" role="2Oq$k0">
<node concept="a7P8L" id="2O9ahh6LnqH" role="1FtiSR">
<ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
</node>
</node>
</node>
</node>
<node concept="1TmgYN" id="2O9ahh6Lnbz" role="2Oq$k0">
<node concept="1nq8_$" id="2O9ahh6LncL" role="1Tms7$">
<node concept="a7P8L" id="2O9ahh6LncJ" role="1nq8_t">
<ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCu" role="2Oq$k0">
<node concept="a7P8L" id="2O9ahh6LncJ" role="1FtiSR">
<ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
</node>
</node>
</node>
@ -5549,11 +5533,9 @@
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
<property role="3hQQBS" value="VarType" />
<property role="3qcH_f" value="true" />
<node concept="1TmgYN" id="2O9ahh6LnAP" role="2c44t1">
<node concept="1nq8_$" id="2O9ahh6LnBa" role="1Tms7$">
<node concept="a7P8L" id="2O9ahh6LnB8" role="1nq8_t">
<ref role="a7OzE" node="2O9ahh6LmhD" resolve="Name" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCv" role="2c44t1">
<node concept="a7P8L" id="2O9ahh6LnB8" role="1FtiSR">
<ref role="a7OzE" node="2O9ahh6LmhD" resolve="Name" />
</node>
</node>
</node>
@ -5775,11 +5757,9 @@
<node concept="3P8Jbz" id="4dPZ2m2i6wS" role="1jz_fp">
<node concept="2c44te" id="4dPZ2m2i6x1" role="lGtFl">
<node concept="2OqwBi" id="PoGdiA68Gk" role="2c44t1">
<node concept="1TmgYN" id="PoGdiA68Gl" role="2Oq$k0">
<node concept="1nq8_$" id="PoGdiA68Gm" role="1Tms7$">
<node concept="a7P8L" id="PoGdiA68Gn" role="1nq8_t">
<ref role="a7OzE" node="4dPZ2m2i6rS" resolve="TypeArgNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCw" role="2Oq$k0">
<node concept="a7P8L" id="PoGdiA68Gn" role="1FtiSR">
<ref role="a7OzE" node="4dPZ2m2i6rS" resolve="TypeArgNode" />
</node>
</node>
<node concept="1$rogu" id="PoGdiA68Go" role="2OqNvi" />
@ -5789,11 +5769,9 @@
<node concept="3P8Jbz" id="4dPZ2m2i6yC" role="1jz_f_">
<node concept="2c44te" id="4dPZ2m2i6yL" role="lGtFl">
<node concept="2OqwBi" id="PoGdiA68H_" role="2c44t1">
<node concept="1TmgYN" id="PoGdiA68HA" role="2Oq$k0">
<node concept="1nq8_$" id="PoGdiA68HB" role="1Tms7$">
<node concept="a7P8L" id="PoGdiA68HC" role="1nq8_t">
<ref role="a7OzE" node="4dPZ2m2i6s7" resolve="TypeResNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCx" role="2Oq$k0">
<node concept="a7P8L" id="PoGdiA68HC" role="1FtiSR">
<ref role="a7OzE" node="4dPZ2m2i6s7" resolve="TypeResNode" />
</node>
</node>
<node concept="1$rogu" id="PoGdiA68HD" role="2OqNvi" />
@ -5937,11 +5915,9 @@
<node concept="3P8Jbz" id="JqEP$8sK5B" role="3EVAi">
<node concept="2c44te" id="JqEP$8sK5C" role="lGtFl">
<node concept="2OqwBi" id="JqEP$8sK5D" role="2c44t1">
<node concept="1TmgYN" id="JqEP$8sK5E" role="2Oq$k0">
<node concept="1nq8_$" id="JqEP$8sK5F" role="1Tms7$">
<node concept="a7P8L" id="JqEP$8sK6v" role="1nq8_t">
<ref role="a7OzE" node="JqEP$8soEj" resolve="RNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCy" role="2Oq$k0">
<node concept="a7P8L" id="JqEP$8sK6v" role="1FtiSR">
<ref role="a7OzE" node="JqEP$8soEj" resolve="RNode" />
</node>
</node>
<node concept="1$rogu" id="JqEP$8sK5H" role="2OqNvi" />
@ -5951,11 +5927,9 @@
<node concept="3P8Jbz" id="JqEP$8sK7A" role="3EVAk">
<node concept="2c44te" id="JqEP$8sK7B" role="lGtFl">
<node concept="2OqwBi" id="JqEP$8sK7C" role="2c44t1">
<node concept="1TmgYN" id="JqEP$8sK7D" role="2Oq$k0">
<node concept="1nq8_$" id="JqEP$8sK7E" role="1Tms7$">
<node concept="a7P8L" id="JqEP$8sK8u" role="1nq8_t">
<ref role="a7OzE" node="JqEP$8soE6" resolve="LNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCz" role="2Oq$k0">
<node concept="a7P8L" id="JqEP$8sK8u" role="1FtiSR">
<ref role="a7OzE" node="JqEP$8soE6" resolve="LNode" />
</node>
</node>
<node concept="1$rogu" id="JqEP$8sK7G" role="2OqNvi" />
@ -6135,11 +6109,9 @@
<node concept="3JbUGG" id="PoGdiA68Yf" role="2c44tc">
<node concept="1FkZV4" id="47tET_WiT5J" role="1FkZ4g">
<node concept="2c44t8" id="47tET_WiT5Z" role="lGtFl">
<node concept="1TmgYN" id="47tET_WiT6m" role="2c44t1">
<node concept="1nq8_$" id="47tET_WiT6O" role="1Tms7$">
<node concept="a7P8L" id="47tET_WiT6M" role="1nq8_t">
<ref role="a7OzE" node="47tET_WiRqd" resolve="CtsNodes" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYC$" role="2c44t1">
<node concept="a7P8L" id="47tET_WiT6M" role="1FtiSR">
<ref role="a7OzE" node="47tET_WiRqd" resolve="CtsNodes" />
</node>
</node>
</node>
@ -6147,11 +6119,9 @@
<node concept="1jz_8w" id="PoGdiA68Yg" role="3JbKvY">
<node concept="2c44te" id="PoGdiA68Yh" role="lGtFl">
<node concept="2OqwBi" id="PoGdiA68Yi" role="2c44t1">
<node concept="1TmgYN" id="PoGdiA68Yj" role="2Oq$k0">
<node concept="1nq8_$" id="PoGdiA68Yk" role="1Tms7$">
<node concept="a7P8L" id="PoGdiA68Yl" role="1nq8_t">
<ref role="a7OzE" node="RRVBbp7DN3" resolve="TNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYC_" role="2Oq$k0">
<node concept="a7P8L" id="PoGdiA68Yl" role="1FtiSR">
<ref role="a7OzE" node="RRVBbp7DN3" resolve="TNode" />
</node>
</node>
<node concept="1$rogu" id="PoGdiA68Ym" role="2OqNvi" />
@ -6160,11 +6130,9 @@
</node>
<node concept="2BbKIm" id="48ZGLP7txTB" role="5lUUh">
<node concept="2c44t8" id="48ZGLP7txTR" role="lGtFl">
<node concept="1TmgYN" id="48ZGLP7txUe" role="2c44t1">
<node concept="1nq8_$" id="48ZGLP7txUG" role="1Tms7$">
<node concept="a7P8L" id="48ZGLP7txUE" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7rHRI" resolve="TVNodes" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCA" role="2c44t1">
<node concept="a7P8L" id="48ZGLP7txUE" role="1FtiSR">
<ref role="a7OzE" node="48ZGLP7rHRI" resolve="TVNodes" />
</node>
</node>
</node>
@ -6290,20 +6258,16 @@
<node concept="3Aqczg" id="47tET_Wheys" role="3cqZAp">
<node concept="3wWvb2" id="48ZGLP7rJ3Q" role="3Aqpz8">
<node concept="2OqwBi" id="48ZGLP7rJV5" role="3wWo3s">
<node concept="1TmgYN" id="48ZGLP7rJ3U" role="2Oq$k0">
<node concept="1nq8_$" id="48ZGLP7rJ43" role="1Tms7$">
<node concept="a7P8L" id="48ZGLP7rJ41" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7rJ0v" resolve="TVNodes" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCB" role="2Oq$k0">
<node concept="a7P8L" id="48ZGLP7rJ41" role="1FtiSR">
<ref role="a7OzE" node="48ZGLP7rJ0v" resolve="TVNodes" />
</node>
</node>
<node concept="TSZUe" id="28iKXKDgzNn" role="2OqNvi">
<node concept="2OqwBi" id="28iKXKDgzNp" role="25WWJ7">
<node concept="1TmgYN" id="28iKXKDgzNq" role="2Oq$k0">
<node concept="1nq8_$" id="28iKXKDgzNr" role="1Tms7$">
<node concept="a7P8L" id="28iKXKDgzNs" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7rLS4" resolve="TVNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCC" role="2Oq$k0">
<node concept="a7P8L" id="28iKXKDgzNs" role="1FtiSR">
<ref role="a7OzE" node="48ZGLP7rLS4" resolve="TVNode" />
</node>
</node>
<node concept="1$rogu" id="28iKXKDgzNt" role="2OqNvi" />
@ -6698,11 +6662,9 @@
<property role="2qtEX9" value="typeclassName" />
<property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258032205785" />
<property role="3qcH_f" value="true" />
<node concept="1TmgYN" id="47tET_X1EJJ" role="2c44t1">
<node concept="1nq8_$" id="47tET_X1EJR" role="1Tms7$">
<node concept="a7P8L" id="47tET_X1EJP" role="1nq8_t">
<ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCD" role="2c44t1">
<node concept="a7P8L" id="47tET_X1EJP" role="1FtiSR">
<ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
</node>
</node>
</node>
@ -6710,11 +6672,9 @@
<property role="2qtEX9" value="typeVarName" />
<property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258034063219" />
<property role="3qcH_f" value="true" />
<node concept="1TmgYN" id="47tET_X1EK2" role="2c44t1">
<node concept="1nq8_$" id="47tET_X1EKa" role="1Tms7$">
<node concept="a7P8L" id="5TXeSYSE$36" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSEyPh" resolve="TVName" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCE" role="2c44t1">
<node concept="a7P8L" id="5TXeSYSE$36" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSEyPh" resolve="TVName" />
</node>
</node>
</node>
@ -6726,19 +6686,15 @@
<node concept="3Aqczg" id="47tET_WiP86" role="3cqZAp">
<node concept="3wWvb2" id="47tET_WiP87" role="3Aqpz8">
<node concept="2OqwBi" id="47tET_WiP88" role="3wWo3s">
<node concept="1TmgYN" id="47tET_WiP89" role="2Oq$k0">
<node concept="1nq8_$" id="47tET_WiP8a" role="1Tms7$">
<node concept="a7P8L" id="5TXeSYSEzFq" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSEyq6" resolve="CtsNodes" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCF" role="2Oq$k0">
<node concept="a7P8L" id="5TXeSYSEzFq" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSEyq6" resolve="CtsNodes" />
</node>
</node>
<node concept="TSZUe" id="47tET_WiP8c" role="2OqNvi">
<node concept="1TmgYN" id="47tET_WiP8e" role="25WWJ7">
<node concept="1nq8_$" id="47tET_WiP8f" role="1Tms7$">
<node concept="a7P8L" id="47tET_WiPxh" role="1nq8_t">
<ref role="a7OzE" node="47tET_WiLgW" resolve="CtsNode" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCG" role="25WWJ7">
<node concept="a7P8L" id="47tET_WiPxh" role="1FtiSR">
<ref role="a7OzE" node="47tET_WiLgW" resolve="CtsNode" />
</node>
</node>
</node>
@ -15683,11 +15639,9 @@
</node>
<node concept="3I6s7M" id="47tET_WsEky" role="3I6sU7">
<node concept="3wWvb2" id="47tET_WsEkw" role="3I6s78">
<node concept="1TmgYN" id="47tET_WsEkE" role="3wWo3s">
<node concept="1nq8_$" id="47tET_WsEkN" role="1Tms7$">
<node concept="a7P8L" id="47tET_WsEkL" role="1nq8_t">
<ref role="a7OzE" node="47tET_WsEju" resolve="Result" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYCH" role="3wWo3s">
<node concept="a7P8L" id="47tET_WsEkL" role="1FtiSR">
<ref role="a7OzE" node="47tET_WsEju" resolve="Result" />
</node>
</node>
</node>

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

@ -71,7 +71,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
<language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:samples.lambdacalc" version="0" />
</languageVersions>
<dependencyVersions>

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

@ -58,7 +58,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

@ -59,7 +59,7 @@
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

145
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" version="0" />
<engage id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -136,11 +136,8 @@
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
<concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
<child id="2455719244613924416" name="logical" index="1Tms7$" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@ -5964,11 +5961,9 @@
</node>
<node concept="3Mi1_Z" id="PYgJzEqhLv" role="3Mj9YC">
<node concept="3Milgn" id="PYgJzEqhNR" role="3MiYds">
<node concept="1TmgYN" id="PYgJzEqhOH" role="3MiK7k">
<node concept="1nq8_$" id="PYgJzEqhQr" role="1Tms7$">
<node concept="a7P8L" id="PYgJzEqhQp" role="1nq8_t">
<ref role="a7OzE" node="7pxta7vmQA_" resolve="Loc" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYH9" role="3MiK7k">
<node concept="a7P8L" id="PYgJzEqhQp" role="1FtiSR">
<ref role="a7OzE" node="7pxta7vmQA_" resolve="Loc" />
</node>
</node>
<node concept="2ShNRf" id="5pIcDR7tvPR" role="3MiMdn">
@ -5976,11 +5971,9 @@
<node concept="3uibUv" id="5pIcDR7twcB" role="HW$YZ">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
<node concept="1TmgYN" id="PYgJzEqhPz" role="HW$Y0">
<node concept="1nq8_$" id="PYgJzEqhRg" role="1Tms7$">
<node concept="a7P8L" id="PYgJzEqhRe" role="1nq8_t">
<ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHa" role="HW$Y0">
<node concept="a7P8L" id="PYgJzEqhRe" role="1FtiSR">
<ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
</node>
</node>
</node>
@ -6104,19 +6097,15 @@
<node concept="3I6s7M" id="5pIcDR7zgQ0" role="3I6sU7">
<node concept="3wWvb2" id="5pIcDR7zgQ1" role="3I6s78">
<node concept="2OqwBi" id="5pIcDR7zgQ2" role="3wWo3s">
<node concept="1TmgYN" id="5pIcDR7zgQ3" role="2Oq$k0">
<node concept="1nq8_$" id="5pIcDR7zgQ4" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7zgQ5" role="1nq8_t">
<ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHb" role="2Oq$k0">
<node concept="a7P8L" id="5pIcDR7zgQ5" role="1FtiSR">
<ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
</node>
</node>
<node concept="kI3uX" id="5pIcDR7zgQ6" role="2OqNvi">
<node concept="1TmgYN" id="5pIcDR7zgQ7" role="kIiFs">
<node concept="1nq8_$" id="5pIcDR7zgQ8" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7zgQ9" role="1nq8_t">
<ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHc" role="kIiFs">
<node concept="a7P8L" id="5pIcDR7zgQ9" role="1FtiSR">
<ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
</node>
</node>
</node>
@ -6182,27 +6171,21 @@
<node concept="3wWvb2" id="2Uh$R6pCkEP" role="3I6s78">
<node concept="2OqwBi" id="2Uh$R6pDzZN" role="3wWo3s">
<node concept="3EllGN" id="2Uh$R6pDznl" role="2Oq$k0">
<node concept="1TmgYN" id="2Uh$R6pDznD" role="3ElVtu">
<node concept="1nq8_$" id="2Uh$R6pDznL" role="1Tms7$">
<node concept="a7P8L" id="2Uh$R6pDznJ" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG1kQ" resolve="Loc" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHd" role="3ElVtu">
<node concept="a7P8L" id="2Uh$R6pDznJ" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG1kQ" resolve="Loc" />
</node>
</node>
<node concept="1TmgYN" id="2Uh$R6pCkET" role="3ElQJh">
<node concept="1nq8_$" id="2Uh$R6pCkEZ" role="1Tms7$">
<node concept="a7P8L" id="2Uh$R6pCkEX" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG127" resolve="Uses" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHe" role="3ElQJh">
<node concept="a7P8L" id="2Uh$R6pCkEX" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG127" resolve="Uses" />
</node>
</node>
</node>
<node concept="3JPx81" id="2Uh$R6pD_1q" role="2OqNvi">
<node concept="1TmgYN" id="2Uh$R6pD_1w" role="25WWJ7">
<node concept="1nq8_$" id="2Uh$R6pD_1C" role="1Tms7$">
<node concept="a7P8L" id="2Uh$R6pD_1Q" role="1nq8_t">
<ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHf" role="25WWJ7">
<node concept="a7P8L" id="2Uh$R6pD_1Q" role="1FtiSR">
<ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
</node>
</node>
</node>
@ -6513,27 +6496,21 @@
<node concept="3wWvb2" id="PYgJzEx8mN" role="3I6s78">
<node concept="2OqwBi" id="5pIcDR7tx$G" role="3wWo3s">
<node concept="3EllGN" id="PYgJzEx8mP" role="2Oq$k0">
<node concept="1TmgYN" id="PYgJzEx8mQ" role="3ElVtu">
<node concept="1nq8_$" id="PYgJzEx8mR" role="1Tms7$">
<node concept="a7P8L" id="PYgJzEx8mS" role="1nq8_t">
<ref role="a7OzE" node="PYgJzEfgKz" resolve="Loc" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHg" role="3ElVtu">
<node concept="a7P8L" id="PYgJzEx8mS" role="1FtiSR">
<ref role="a7OzE" node="PYgJzEfgKz" resolve="Loc" />
</node>
</node>
<node concept="1TmgYN" id="PYgJzEx8mT" role="3ElQJh">
<node concept="1nq8_$" id="PYgJzEx8mU" role="1Tms7$">
<node concept="a7P8L" id="PYgJzEx8mV" role="1nq8_t">
<ref role="a7OzE" node="PYgJzEfhvA" resolve="Uses" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHh" role="3ElQJh">
<node concept="a7P8L" id="PYgJzEx8mV" role="1FtiSR">
<ref role="a7OzE" node="PYgJzEfhvA" resolve="Uses" />
</node>
</node>
</node>
<node concept="3JPx81" id="5pIcDR7tyTA" role="2OqNvi">
<node concept="1TmgYN" id="PYgJzEx8mW" role="25WWJ7">
<node concept="1nq8_$" id="PYgJzEx8mX" role="1Tms7$">
<node concept="a7P8L" id="PYgJzEx8mY" role="1nq8_t">
<ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHi" role="25WWJ7">
<node concept="a7P8L" id="PYgJzEx8mY" role="1FtiSR">
<ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
</node>
</node>
</node>
@ -6670,27 +6647,21 @@
<node concept="3wWvb2" id="5pIcDR7sJ8I" role="3I6s78">
<node concept="2OqwBi" id="5pIcDR7tAdt" role="3wWo3s">
<node concept="3EllGN" id="5pIcDR7sJ8K" role="2Oq$k0">
<node concept="1TmgYN" id="5pIcDR7sJ8L" role="3ElVtu">
<node concept="1nq8_$" id="5pIcDR7sJ8M" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7sJlB" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG1Vp" resolve="Loc" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHj" role="3ElVtu">
<node concept="a7P8L" id="5pIcDR7sJlB" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG1Vp" resolve="Loc" />
</node>
</node>
<node concept="1TmgYN" id="5pIcDR7sJ8O" role="3ElQJh">
<node concept="1nq8_$" id="5pIcDR7sJ8P" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7sJmq" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG1Vv" resolve="Uses" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHk" role="3ElQJh">
<node concept="a7P8L" id="5pIcDR7sJmq" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG1Vv" resolve="Uses" />
</node>
</node>
</node>
<node concept="3JPx81" id="5pIcDR7tBSN" role="2OqNvi">
<node concept="1TmgYN" id="5pIcDR7sJ8R" role="25WWJ7">
<node concept="1nq8_$" id="5pIcDR7sJ8S" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7sJkO" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG1Vs" resolve="RSite" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHl" role="25WWJ7">
<node concept="a7P8L" id="5pIcDR7sJkO" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG1Vs" resolve="RSite" />
</node>
</node>
</node>
@ -6948,18 +6919,14 @@
<node concept="2YIFZM" id="5pIcDR7tYH_" role="3wWo3s">
<ref role="37wK5l" node="5pIcDR7tDMk" resolve="append" />
<ref role="1Pybhc" node="7pxta7vc_Jb" resolve="Util" />
<node concept="1TmgYN" id="5pIcDR7tYL2" role="37wK5m">
<node concept="1nq8_$" id="5pIcDR7tYMl" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7tYMj" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG4cT" resolve="Into" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHm" role="37wK5m">
<node concept="a7P8L" id="5pIcDR7tYMj" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG4cT" resolve="Into" />
</node>
</node>
<node concept="1TmgYN" id="5pIcDR7tYOU" role="37wK5m">
<node concept="1nq8_$" id="5pIcDR7tYQj" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7tYQh" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG4cU" resolve="From" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHn" role="37wK5m">
<node concept="a7P8L" id="5pIcDR7tYQh" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG4cU" resolve="From" />
</node>
</node>
</node>
@ -7026,18 +6993,14 @@
<node concept="2YIFZM" id="5pIcDR7tYSm" role="3wWo3s">
<ref role="37wK5l" node="5pIcDR7tDMk" resolve="append" />
<ref role="1Pybhc" node="7pxta7vc_Jb" resolve="Util" />
<node concept="1TmgYN" id="5pIcDR7tYSn" role="37wK5m">
<node concept="1nq8_$" id="5pIcDR7tYSo" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7tYSp" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG4Dg" resolve="Into" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHo" role="37wK5m">
<node concept="a7P8L" id="5pIcDR7tYSp" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG4Dg" resolve="Into" />
</node>
</node>
<node concept="1TmgYN" id="5pIcDR7tYSq" role="37wK5m">
<node concept="1nq8_$" id="5pIcDR7tYSr" role="1Tms7$">
<node concept="a7P8L" id="5pIcDR7tYSs" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYSG4Dh" resolve="From" />
</node>
<node concept="1Ft4W6" id="7zIaaskbYHp" role="37wK5m">
<node concept="a7P8L" id="5pIcDR7tYSs" role="1FtiSR">
<ref role="a7OzE" node="5TXeSYSG4Dh" resolve="From" />
</node>
</node>
</node>

702
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/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
View File

@ -44,7 +44,7 @@
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="5" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
</languageVersions>
<dependencyVersions>

2
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
View File

@ -10,7 +10,7 @@
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="4" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>