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 switch to BodyBlock.

This commit is contained in:
Fedor Isakov 2020-02-06 12:55:32 +01:00
parent fa4537dbc3
commit 4a84ebce5f
21 changed files with 22948 additions and 21863 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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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" />

341
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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<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" />
@ -209,7 +209,7 @@
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969659" name="guard" index="1nLNMa" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<child id="3575255234174969633" name="input" index="1nLNMg" />
@ -233,6 +233,9 @@
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
<concept id="1878265754077060950" name="jetbrains.mps.lang.coderules.structure.ConstraintParameterDeclaration" flags="ng" index="1zAUYm">
<child id="6036655413802463897" name="dataType" index="3gTf24" />
</concept>
@ -306,57 +309,6 @@
<node concept="3clFbS" id="7lt0LtPOZVi" role="1nLNMH">
<node concept="1nLNNL" id="7lt0LtPOZW0" role="3cqZAp">
<node concept="1nLNMm" id="7lt0LtPOZW1" role="1nLNNK">
<node concept="3Aq9E8" id="7lt0LtPP11l" role="1nLNMd">
<node concept="3I6sU6" id="7lt0LtPP11m" role="3Ip0Jz">
<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>
</node>
<node concept="liA8E" id="5fMWD6Iyeel" role="2OqNvi">
<ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
<node concept="2OqwBi" id="5fMWD6Iyeqh" role="37wK5m">
<node concept="3A2sRY" id="5fMWD6Iyeg4" role="2Oq$k0">
<ref role="3A2yKK" node="7lt0LtPOZVo" resolve="bc" />
</node>
<node concept="iZEcu" id="5fMWD6Iye_2" role="2OqNvi" />
</node>
<node concept="2pJPEk" id="5fMWD6IyeVN" role="37wK5m">
<node concept="2pJPED" id="5fMWD6IyeVO" role="2pJPEn">
<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>
</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>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq93q" id="7mB3viLbLCU" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="7mB3viLbLCV" role="3Ip0Jz">
@ -437,6 +389,59 @@
</node>
<node concept="17QB3L" id="7wAOnq6x9fr" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5A" role="3xSepv">
<node concept="3Aq9E8" id="7lt0LtPP11l" role="3xSepj">
<node concept="3I6sU6" id="7lt0LtPP11m" role="3Ip0Jz">
<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>
</node>
<node concept="liA8E" id="5fMWD6Iyeel" role="2OqNvi">
<ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
<node concept="2OqwBi" id="5fMWD6Iyeqh" role="37wK5m">
<node concept="3A2sRY" id="5fMWD6Iyeg4" role="2Oq$k0">
<ref role="3A2yKK" node="7lt0LtPOZVo" resolve="bc" />
</node>
<node concept="iZEcu" id="5fMWD6Iye_2" role="2OqNvi" />
</node>
<node concept="2pJPEk" id="5fMWD6IyeVN" role="37wK5m">
<node concept="2pJPED" id="5fMWD6IyeVO" role="2pJPEn">
<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>
</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>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -673,17 +678,6 @@
<node concept="3clFbH" id="7mB3viLien3" role="3cqZAp" />
<node concept="1nLNNL" id="7mB3viLiewM" role="3cqZAp">
<node concept="1nLNMm" id="7mB3viLiewO" role="1nLNNK">
<node concept="3Aq9E8" id="7mB3viLieDS" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLieDT" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLieEm" role="3I6sU7">
<node concept="3wWvb2" id="7mB3viLieEl" role="3I6s78">
<node concept="3clFbT" id="7mB3viLieEp" role="3wWo3s">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq93q" id="7mB3viLieDW" role="1nLNMb">
<property role="3ArMco" value="false" />
<node concept="3I6sU6" id="7mB3viLieDX" role="3Ip0Jz">
@ -709,6 +703,19 @@
</node>
<node concept="32pEOW" id="24ciDNzxNuW" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5B" role="3xSepv">
<node concept="3Aq9E8" id="7mB3viLieDS" role="3xSepj">
<node concept="3I6sU6" id="7mB3viLieDT" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLieEm" role="3I6sU7">
<node concept="3wWvb2" id="7mB3viLieEl" role="3I6s78">
<node concept="3clFbT" id="7mB3viLieEp" role="3wWo3s">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -738,20 +745,6 @@
<node concept="3clFbS" id="6OXbTD$fzlj" role="fHCRw">
<node concept="1nLNNL" id="6OXbTD$fzlv" role="3cqZAp">
<node concept="1nLNMm" id="6OXbTD$fzlw" role="1nLNNK">
<node concept="3Aq9E8" id="7mB3viLbExB" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLbExC" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLbExU" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLbExT" role="3I6s78">
<ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
<node concept="aZ4PW" id="5fMWD6IydEn" role="3AunhB">
<node concept="2_cIyK" id="5fMWD6IydEt" role="aZ4eD">
<ref role="2_cIwb" node="5fMWD6IydE6" resolve="typeCollector" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="6OXbTD$fzlK" role="0Rg$4">
<node concept="aZer4" id="6OXbTD$fzlL" role="3XD1gS">
<property role="TrG5h" value="A" />
@ -761,6 +754,22 @@
</node>
<node concept="32pEOW" id="24ciDNzxNuX" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5C" role="3xSepv">
<node concept="3Aq9E8" id="7mB3viLbExB" role="3xSepj">
<node concept="3I6sU6" id="7mB3viLbExC" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLbExU" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLbExT" role="3I6s78">
<ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
<node concept="aZ4PW" id="5fMWD6IydEn" role="3AunhB">
<node concept="2_cIyK" id="5fMWD6IydEt" role="aZ4eD">
<ref role="2_cIwb" node="5fMWD6IydE6" resolve="typeCollector" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -786,36 +795,6 @@
<node concept="3clFbS" id="7lt0LtPHRZ9" role="1nLNMH">
<node concept="1nLNNL" id="7mB3viLbCo_" role="3cqZAp">
<node concept="1nLNMm" id="7mB3viLbCoA" role="1nLNNK">
<node concept="3Aq9E8" id="7mB3viLbCoN" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLbCoO" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLcDAS" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLcDAM" role="3I6s78">
<node concept="a7P8L" id="7mB3viLcDBe" role="1imXu6">
<ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
</node>
<node concept="3A2sRY" id="7mB3viLcDBj" role="1imXSf">
<ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLbCph" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLbCpk" role="3I6s78">
<ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
<node concept="37jhX" id="1TH_SRmhqyj" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8F" role="37jj2">
<node concept="3A2sRY" id="7mB3viLbCpy" role="2Oq$k0">
<ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8G" role="2OqNvi" />
</node>
</node>
<node concept="a7P8L" id="7mB3viLcGwk" role="3AunhB">
<ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq93q" id="7mB3viLcDAc" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="7mB3viLcDAd" role="3Ip0Jz" />
@ -826,6 +805,38 @@
</node>
<node concept="32pEOW" id="24ciDNzxNuY" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5D" role="3xSepv">
<node concept="3Aq9E8" id="7mB3viLbCoN" role="3xSepj">
<node concept="3I6sU6" id="7mB3viLbCoO" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLcDAS" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLcDAM" role="3I6s78">
<node concept="a7P8L" id="7mB3viLcDBe" role="1imXu6">
<ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
</node>
<node concept="3A2sRY" id="7mB3viLcDBj" role="1imXSf">
<ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLbCph" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLbCpk" role="3I6s78">
<ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
<node concept="37jhX" id="1TH_SRmhqyj" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8F" role="37jj2">
<node concept="3A2sRY" id="7mB3viLbCpy" role="2Oq$k0">
<ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8G" role="2OqNvi" />
</node>
</node>
<node concept="a7P8L" id="7mB3viLcGwk" role="3AunhB">
<ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -895,32 +906,34 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="7mB3viLdfAx" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLdfAy" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLdfAA" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLdfA_" role="3I6s78">
<ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
<node concept="37jhX" id="1TH_SRmhqyl" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8J" role="37jj2">
<node concept="3A2sRY" id="7mB3viLdfAU" role="2Oq$k0">
<ref role="3A2yKK" node="7mB3viLddke" resolve="varDecl" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8K" role="2OqNvi" />
</node>
</node>
<node concept="a7P8L" id="7mB3viLdfB6" role="3AunhB">
<ref role="a7OzE" node="7mB3viLdf_2" resolve="T" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="7mB3viLdf_1" role="0Rg$4">
<node concept="aZer4" id="7mB3viLdf_2" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuZ" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5E" role="3xSepv">
<node concept="3Aq9E8" id="7mB3viLdfAx" role="3xSepj">
<node concept="3I6sU6" id="7mB3viLdfAy" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLdfAA" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLdfA_" role="3I6s78">
<ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
<node concept="37jhX" id="1TH_SRmhqyl" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8J" role="37jj2">
<node concept="3A2sRY" id="7mB3viLdfAU" role="2Oq$k0">
<ref role="3A2yKK" node="7mB3viLddke" resolve="varDecl" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8K" role="2OqNvi" />
</node>
</node>
<node concept="a7P8L" id="7mB3viLdfB6" role="3AunhB">
<ref role="a7OzE" node="7mB3viLdf_2" resolve="T" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -1131,41 +1144,6 @@
<node concept="3clFbS" id="7mB3viLg9bL" role="fHCRw">
<node concept="1nLNNL" id="7mB3viLg9c$" role="3cqZAp">
<node concept="1nLNMm" id="7mB3viLg9cA" role="1nLNNK">
<node concept="3Aq9E8" id="7mB3viLg9eq" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLg9er" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLieE$" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLieEx" role="3I6s78">
<node concept="a7P8L" id="7mB3viLieEJ" role="1imXu6">
<ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
</node>
<node concept="2_cIyK" id="7mB3viLieF0" role="1imXSf">
<ref role="2_cIwb" node="7mB3viLg9eu" resolve="from" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLieF9" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLieF3" role="3I6s78">
<node concept="a7P8L" id="7mB3viLieFo" role="1imXu6">
<ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
</node>
<node concept="2_cIyK" id="7mB3viLieFy" role="1imXSf">
<ref role="2_cIwb" node="7mB3viLg9fj" resolve="to" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLieFT" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLieFR" role="3I6s78">
<ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
<node concept="a7P8L" id="7mB3viLieGe" role="3AunhB">
<ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
</node>
<node concept="a7P8L" id="7mB3viLieG6" role="3AunhB">
<ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="7mB3viLg9gh" role="0Rg$4">
<node concept="aZer4" id="7mB3viLg9gi" role="3XD1gS">
<property role="TrG5h" value="From" />
@ -1175,6 +1153,43 @@
</node>
<node concept="32pEOW" id="24ciDNzxNv0" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh5F" role="3xSepv">
<node concept="3Aq9E8" id="7mB3viLg9eq" role="3xSepj">
<node concept="3I6sU6" id="7mB3viLg9er" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLieE$" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLieEx" role="3I6s78">
<node concept="a7P8L" id="7mB3viLieEJ" role="1imXu6">
<ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
</node>
<node concept="2_cIyK" id="7mB3viLieF0" role="1imXSf">
<ref role="2_cIwb" node="7mB3viLg9eu" resolve="from" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLieF9" role="3I6sU7">
<node concept="1imXTs" id="7mB3viLieF3" role="3I6s78">
<node concept="a7P8L" id="7mB3viLieFo" role="1imXu6">
<ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
</node>
<node concept="2_cIyK" id="7mB3viLieFy" role="1imXSf">
<ref role="2_cIwb" node="7mB3viLg9fj" resolve="to" />
</node>
</node>
</node>
<node concept="3I6s7M" id="7mB3viLieFT" role="3I6sU7">
<node concept="3Aqt3T" id="7mB3viLieFR" role="3I6s78">
<ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
<node concept="a7P8L" id="7mB3viLieGe" role="3AunhB">
<ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
</node>
<node concept="a7P8L" id="7mB3viLieG6" role="3AunhB">
<ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>

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

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

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

File diff suppressed because it is too large Load Diff

267
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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<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" />
@ -261,7 +261,7 @@
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969659" name="guard" index="1nLNMa" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<child id="3575255234175001641" name="condition" index="1nLFYo" />
@ -288,6 +288,9 @@
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
<concept id="7368070394769089081" name="jetbrains.mps.lang.coderules.structure.RuleInputDeclaration" flags="ng" index="3A20r5" />
<concept id="7368070394769139970" name="jetbrains.mps.lang.coderules.structure.RuleInputReference" flags="ng" index="3A2sRY">
<reference id="7368070394769213644" name="declaration" index="3A2yKK" />
@ -446,47 +449,49 @@
<node concept="3clFbS" id="6$MtiK8GZNf" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8GZNg" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8GZNh" role="1nLNNK">
<node concept="3Aq9E8" id="3w0n0hzmfKd" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hzmfKe" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzminh" role="3I6sU7">
<node concept="1imXTs" id="3w0n0hzminb" role="3I6s78">
<node concept="a7P8L" id="3w0n0hzmin_" role="1imXu6">
<ref role="a7OzE" node="3w0n0hzmins" resolve="Stc" />
</node>
<node concept="2OqwBi" id="3w0n0hzmixe" role="1imXSf">
<node concept="3A2sRY" id="3w0n0hzminE" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzmfJX" resolve="eqi" />
</node>
<node concept="3TrEf2" id="3w0n0hzmj0X" role="2OqNvi">
<ref role="3Tt5mk" to="jfgh:2aBGSFggvpT" resolve="conclusion" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hzmfKi" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hzmfKh" role="3I6s78">
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="a7P8L" id="3w0n0hzmj3I" role="3AunhB">
<ref role="a7OzE" node="3w0n0hzmins" resolve="Stc" />
</node>
<node concept="37jhX" id="1TH_SRmhqyY" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8L" role="37jj2">
<node concept="3A2sRY" id="3w0n0hzmj3Y" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzmfJX" resolve="eqi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8M" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hzminr" role="0Rg$4">
<node concept="aZer4" id="3w0n0hzmins" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNvm" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh85" role="3xSepv">
<node concept="3Aq9E8" id="3w0n0hzmfKd" role="3xSepj">
<node concept="3I6sU6" id="3w0n0hzmfKe" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzminh" role="3I6sU7">
<node concept="1imXTs" id="3w0n0hzminb" role="3I6s78">
<node concept="a7P8L" id="3w0n0hzmin_" role="1imXu6">
<ref role="a7OzE" node="3w0n0hzmins" resolve="Stc" />
</node>
<node concept="2OqwBi" id="3w0n0hzmixe" role="1imXSf">
<node concept="3A2sRY" id="3w0n0hzminE" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzmfJX" resolve="eqi" />
</node>
<node concept="3TrEf2" id="3w0n0hzmj0X" role="2OqNvi">
<ref role="3Tt5mk" to="jfgh:2aBGSFggvpT" resolve="conclusion" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hzmfKi" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hzmfKh" role="3I6s78">
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="a7P8L" id="3w0n0hzmj3I" role="3AunhB">
<ref role="a7OzE" node="3w0n0hzmins" resolve="Stc" />
</node>
<node concept="37jhX" id="1TH_SRmhqyY" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8L" role="37jj2">
<node concept="3A2sRY" id="3w0n0hzmj3Y" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzmfJX" resolve="eqi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8M" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -544,23 +549,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="3w0n0hzm36f" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hzm36g" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzm3dC" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hzm3dB" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqz0" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8P" role="37jj2">
<node concept="3A2sRY" id="3w0n0hzm3dQ" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzm360" resolve="eqi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8Q" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hzmj4b" role="0Rg$4">
<node concept="aZer4" id="3w0n0hzmj4x" role="3XD1gS">
<property role="TrG5h" value="Con" />
@ -570,6 +558,25 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvn" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh86" role="3xSepv">
<node concept="3Aq9E8" id="3w0n0hzm36f" role="3xSepj">
<node concept="3I6sU6" id="3w0n0hzm36g" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzm3dC" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hzm3dB" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqz0" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD8P" role="37jj2">
<node concept="3A2sRY" id="3w0n0hzm3dQ" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzm360" resolve="eqi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD8Q" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -1292,42 +1299,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="3w0n0hzmrM0" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hzmrM1" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzno$y" role="3I6sU7">
<node concept="3lcGGY" id="3w0n0hzno$x" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8GZNA" role="3wWo3s">
<ref role="3cqZAo" node="3w0n0hzmrNy" resolve="replOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hznoZS" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hznoZQ" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqz6" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD91" role="37jj2">
<node concept="3A2sRY" id="3w0n0hznp09" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzm3em" resolve="eqe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD92" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="2CF5XF5v8Pa" role="1nLNMd">
<node concept="3I6sU6" id="2CF5XF5v8Pb" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSf1T5" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSf1T4" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSf21x" role="1ljv2e">
<property role="Xl_RC" value="replacement is not OK" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hzmjfi" role="0Rg$4">
<node concept="aZer4" id="3w0n0hzmjg7" role="3XD1gS">
<property role="TrG5h" value="Prem" />
@ -1346,6 +1317,46 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvo" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh87" role="3xSepv">
<node concept="3Aq9E8" id="3w0n0hzmrM0" role="3xSepj">
<node concept="3I6sU6" id="3w0n0hzmrM1" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzno$y" role="3I6sU7">
<node concept="3lcGGY" id="3w0n0hzno$x" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8GZNA" role="3wWo3s">
<ref role="3cqZAo" node="3w0n0hzmrNy" resolve="replOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hznoZS" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hznoZQ" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqz6" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD91" role="37jj2">
<node concept="3A2sRY" id="3w0n0hznp09" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hzm3em" resolve="eqe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD92" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3xSepi" id="6E2cNicdh88" role="3xSepv">
<node concept="3Aq9E8" id="2CF5XF5v8Pa" role="3xSepj">
<node concept="3I6sU6" id="2CF5XF5v8Pb" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSf1T5" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSf1T4" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSf21x" role="1ljv2e">
<property role="Xl_RC" value="replacement is not OK" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -2089,42 +2100,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="3w0n0hznw_3" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hznw_4" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hznw_5" role="3I6sU7">
<node concept="3lcGGY" id="3w0n0hznw_6" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8GZNB" role="3wWo3s">
<ref role="3cqZAo" node="3w0n0hznw_s" resolve="replOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hznw_8" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hznw_9" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqzc" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9d" role="37jj2">
<node concept="3A2sRY" id="3w0n0hznw_b" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hznw$J" resolve="eqe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9e" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="3w0n0hznw_c" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hznw_d" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSf2K9" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSf2K8" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSf2Ki" role="1ljv2e">
<property role="Xl_RC" value="replacement is not OK" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hznw$i" role="0Rg$4">
<node concept="aZer4" id="3w0n0hznw$j" role="3XD1gS">
<property role="TrG5h" value="Prem" />
@ -2143,6 +2118,46 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvp" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh89" role="3xSepv">
<node concept="3Aq9E8" id="3w0n0hznw_3" role="3xSepj">
<node concept="3I6sU6" id="3w0n0hznw_4" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hznw_5" role="3I6sU7">
<node concept="3lcGGY" id="3w0n0hznw_6" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8GZNB" role="3wWo3s">
<ref role="3cqZAo" node="3w0n0hznw_s" resolve="replOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="3w0n0hznw_8" role="3I6sU7">
<node concept="3Aqt3T" id="3w0n0hznw_9" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqzc" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9d" role="37jj2">
<node concept="3A2sRY" id="3w0n0hznw_b" role="2Oq$k0">
<ref role="3A2yKK" node="3w0n0hznw$J" resolve="eqe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9e" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3xSepi" id="6E2cNicdh8a" role="3xSepv">
<node concept="3Aq9E8" id="3w0n0hznw_c" role="3xSepj">
<node concept="3I6sU6" id="3w0n0hznw_d" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSf2K9" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSf2K8" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSf2Ki" role="1ljv2e">
<property role="Xl_RC" value="replacement is not OK" />
</node>
</node>
</node>
</node>
</node>
</node>
</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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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" />

271
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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<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" />
@ -349,7 +349,7 @@
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969659" name="guard" index="1nLNMa" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<child id="3575255234175001641" name="condition" index="1nLFYo" />
@ -376,6 +376,9 @@
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
<concept id="4492335231042132271" name="jetbrains.mps.lang.coderules.structure.ContextParameterReference" flags="ng" index="1$qI8S">
<reference id="4492335231042132281" name="parameter" index="1$qI8I" />
</concept>
@ -1372,42 +1375,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="Vo$tzLETb6" role="1nLNMd">
<node concept="3I6sU6" id="Vo$tzLETb7" role="3Ip0Jz">
<node concept="3I6s7M" id="2CF5XF5t4aQ" role="3I6sU7">
<node concept="3lcGGY" id="2CF5XF5t4aO" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qV" role="3wWo3s">
<ref role="3cqZAo" node="2CF5XF5rJR3" resolve="variableOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="Vo$tzLETbb" role="3I6sU7">
<node concept="3Aqt3T" id="Vo$tzLETba" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqAT" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9l" role="37jj2">
<node concept="3A2sRY" id="Vo$tzLETbv" role="2Oq$k0">
<ref role="3A2yKK" node="Vo$tzLEGtN" resolve="fi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9m" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="2CF5XF5tgIy" role="1nLNMd">
<node concept="3I6sU6" id="2CF5XF5tgIz" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSfqT9" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSfqT8" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSfqTi" role="1ljv2e">
<property role="Xl_RC" value="variable is not OK" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="2oO2uzBWT6y" role="0Rg$4">
<node concept="aZer4" id="2oO2uzBWT6z" role="3XD1gS">
<property role="TrG5h" value="Con" />
@ -1420,6 +1387,46 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvF" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh8k" role="3xSepv">
<node concept="3Aq9E8" id="Vo$tzLETb6" role="3xSepj">
<node concept="3I6sU6" id="Vo$tzLETb7" role="3Ip0Jz">
<node concept="3I6s7M" id="2CF5XF5t4aQ" role="3I6sU7">
<node concept="3lcGGY" id="2CF5XF5t4aO" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qV" role="3wWo3s">
<ref role="3cqZAo" node="2CF5XF5rJR3" resolve="variableOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="Vo$tzLETbb" role="3I6sU7">
<node concept="3Aqt3T" id="Vo$tzLETba" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqAT" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9l" role="37jj2">
<node concept="3A2sRY" id="Vo$tzLETbv" role="2Oq$k0">
<ref role="3A2yKK" node="Vo$tzLEGtN" resolve="fi" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9m" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3xSepi" id="6E2cNicdh8l" role="3xSepv">
<node concept="3Aq9E8" id="2CF5XF5tgIy" role="3xSepj">
<node concept="3I6sU6" id="2CF5XF5tgIz" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSfqT9" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSfqT8" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSfqTi" role="1ljv2e">
<property role="Xl_RC" value="variable is not OK" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -2089,42 +2096,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2oO2uzBWQ4s" role="1nLNMd">
<node concept="3I6sU6" id="2oO2uzBWQ4t" role="3Ip0Jz">
<node concept="3I6s7M" id="2cLnr$rDh$3" role="3I6sU7">
<node concept="3lcGGY" id="2cLnr$rDh$1" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qT" role="3wWo3s">
<ref role="3cqZAo" node="2CF5XF5tSik" resolve="termOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="2oO2uzBWQaH" role="3I6sU7">
<node concept="3Aqt3T" id="2oO2uzBWQaG" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqAX" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9t" role="37jj2">
<node concept="3A2sRY" id="2oO2uzBWQaV" role="2Oq$k0">
<ref role="3A2yKK" node="2oO2uzBWNhx" resolve="fe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9u" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="2CF5XF5v8Pa" role="1nLNMd">
<node concept="3I6sU6" id="2CF5XF5v8Pb" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSg2Xh" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSg2Xg" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSg4aG" role="1ljv2e">
<property role="Xl_RC" value="term is not OK" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="2oO2uzBXpHP" role="0Rg$4">
<node concept="aZer4" id="2oO2uzBWNhT" role="3XD1gS">
<property role="TrG5h" value="Prem" />
@ -2143,6 +2114,46 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvG" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh8m" role="3xSepv">
<node concept="3Aq9E8" id="2oO2uzBWQ4s" role="3xSepj">
<node concept="3I6sU6" id="2oO2uzBWQ4t" role="3Ip0Jz">
<node concept="3I6s7M" id="2cLnr$rDh$3" role="3I6sU7">
<node concept="3lcGGY" id="2cLnr$rDh$1" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qT" role="3wWo3s">
<ref role="3cqZAo" node="2CF5XF5tSik" resolve="termOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="2oO2uzBWQaH" role="3I6sU7">
<node concept="3Aqt3T" id="2oO2uzBWQaG" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqAX" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9t" role="37jj2">
<node concept="3A2sRY" id="2oO2uzBWQaV" role="2Oq$k0">
<ref role="3A2yKK" node="2oO2uzBWNhx" resolve="fe" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9u" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3xSepi" id="6E2cNicdh8n" role="3xSepv">
<node concept="3Aq9E8" id="2CF5XF5v8Pa" role="3xSepj">
<node concept="3I6sU6" id="2CF5XF5v8Pb" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSg2Xh" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSg2Xg" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSg4aG" role="1ljv2e">
<property role="Xl_RC" value="term is not OK" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -2308,23 +2319,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2CF5XF5qxtw" role="1nLNMd">
<node concept="3I6sU6" id="2CF5XF5qxtx" role="3Ip0Jz">
<node concept="3I6s7M" id="2CF5XF5qxt_" role="3I6sU7">
<node concept="3Aqt3T" id="2CF5XF5qxt$" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqB1" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9_" role="37jj2">
<node concept="3A2sRY" id="2CF5XF5qxtN" role="2Oq$k0">
<ref role="3A2yKK" node="2CF5XF5qrjo" resolve="ei" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9A" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="2CF5XF5qrJn" role="0Rg$4">
<node concept="aZer4" id="2CF5XF5qrJo" role="3XD1gS">
<property role="TrG5h" value="Prem" />
@ -2343,6 +2337,25 @@
</node>
<node concept="32pEOW" id="24ciDNzxNvH" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh8o" role="3xSepv">
<node concept="3Aq9E8" id="2CF5XF5qxtw" role="3xSepj">
<node concept="3I6sU6" id="2CF5XF5qxtx" role="3Ip0Jz">
<node concept="3I6s7M" id="2CF5XF5qxt_" role="3I6sU7">
<node concept="3Aqt3T" id="2CF5XF5qxt$" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqB1" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9_" role="37jj2">
<node concept="3A2sRY" id="2CF5XF5qxtN" role="2Oq$k0">
<ref role="3A2yKK" node="2CF5XF5qrjo" resolve="ei" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9A" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -2733,42 +2746,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2CF5XF5qN3_" role="1nLNMd">
<node concept="3I6sU6" id="2CF5XF5qN3A" role="3Ip0Jz">
<node concept="3I6s7M" id="2cLnr$rIwWm" role="3I6sU7">
<node concept="3lcGGY" id="2cLnr$rIwWk" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qU" role="3wWo3s">
<ref role="3cqZAo" node="2cLnr$rHydI" resolve="variableOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="2CF5XF5qN3E" role="3I6sU7">
<node concept="3Aqt3T" id="2CF5XF5qN3D" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqB7" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9L" role="37jj2">
<node concept="3A2sRY" id="2CF5XF5qN3S" role="2Oq$k0">
<ref role="3A2yKK" node="2CF5XF5q_lG" resolve="ee" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9M" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="2cLnr$rI$M8" role="1nLNMd">
<node concept="3I6sU6" id="2cLnr$rI$M9" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSgnUa" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSgnU9" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSgnUj" role="1ljv2e">
<property role="Xl_RC" value="variable is not OK" />
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="2CF5XF5qAsd" role="0Rg$4">
<node concept="aZer4" id="2CF5XF5qAse" role="3XD1gS">
<property role="TrG5h" value="Ex" />
@ -2799,6 +2776,46 @@
</node>
<node concept="17QB3L" id="2cLnr$rI$Mm" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdh8p" role="3xSepv">
<node concept="3Aq9E8" id="2CF5XF5qN3_" role="3xSepj">
<node concept="3I6sU6" id="2CF5XF5qN3A" role="3Ip0Jz">
<node concept="3I6s7M" id="2cLnr$rIwWm" role="3I6sU7">
<node concept="3lcGGY" id="2cLnr$rIwWk" role="3I6s78">
<node concept="37vLTw" id="6$MtiK8H0qU" role="3wWo3s">
<ref role="3cqZAo" node="2cLnr$rHydI" resolve="variableOk" />
</node>
</node>
</node>
<node concept="3I6s7M" id="2CF5XF5qN3E" role="3I6sU7">
<node concept="3Aqt3T" id="2CF5XF5qN3D" role="3I6s78">
<ref role="3AqCNq" to="f3ld:2YqrT$P7tud" resolve="valid" />
<node concept="37jhX" id="1TH_SRmhqB7" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXD9L" role="37jj2">
<node concept="3A2sRY" id="2CF5XF5qN3S" role="2Oq$k0">
<ref role="3A2yKK" node="2CF5XF5q_lG" resolve="ee" />
</node>
<node concept="iZEcu" id="1TH_SRlXD9M" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3xSepi" id="6E2cNicdh8q" role="3xSepv">
<node concept="3Aq9E8" id="2cLnr$rI$M8" role="3xSepj">
<node concept="3I6sU6" id="2cLnr$rI$M9" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RSgnUa" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RSgnU9" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RSgnUj" role="1ljv2e">
<property role="Xl_RC" value="variable is not OK" />
</node>
</node>
</node>
</node>
</node>
</node>
</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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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" />

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

File diff suppressed because it is too large Load Diff

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

193
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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<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="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
@ -125,7 +125,7 @@
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<child id="3575255234174969633" name="input" index="1nLNMg" />
@ -137,6 +137,9 @@
<concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
<child id="5372587443968983820" name="expression" index="3wWo3s" />
</concept>
<concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
<child id="7674753015762572647" name="body" index="3xSepj" />
</concept>
<concept id="1878265754076919072" name="jetbrains.mps.lang.coderules.structure.Comment" flags="ng" index="1zAsnw">
<child id="5974055334837370567" name="part" index="27qylF" />
</concept>
@ -221,23 +224,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2YqrT$P6Qmq" role="1nLNMd">
<node concept="3I6sU6" id="2YqrT$P6Qmr" role="3Ip0Jz">
<node concept="3I6s7M" id="2YqrT$P6Qmv" role="3I6sU7">
<node concept="3Aqt3T" id="2YqrT$P6Qmu" role="3I6s78">
<ref role="3AqCNq" node="2YqrT$P6Q6Q" resolve="check" />
<node concept="37jhX" id="1TH_SRmhrb9" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXDdb" role="37jj2">
<node concept="3A2sRY" id="2YqrT$P6QmD" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P6Qmb" resolve="rsn" />
</node>
<node concept="iZEcu" id="1TH_SRlXDdc" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="5fMWD6Iy9zG" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9zH" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
@ -248,6 +234,25 @@
<node concept="3Tqbb2" id="5fMWD6Iy9zP" role="11_B2D" />
</node>
</node>
<node concept="3xSepi" id="6E2cNicdhi$" role="3xSepv">
<node concept="3Aq9E8" id="2YqrT$P6Qmq" role="3xSepj">
<node concept="3I6sU6" id="2YqrT$P6Qmr" role="3Ip0Jz">
<node concept="3I6s7M" id="2YqrT$P6Qmv" role="3I6sU7">
<node concept="3Aqt3T" id="2YqrT$P6Qmu" role="3I6s78">
<ref role="3AqCNq" node="2YqrT$P6Q6Q" resolve="check" />
<node concept="37jhX" id="1TH_SRmhrb9" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXDdb" role="37jj2">
<node concept="3A2sRY" id="2YqrT$P6QmD" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P6Qmb" resolve="rsn" />
</node>
<node concept="iZEcu" id="1TH_SRlXDdc" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -276,23 +281,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2YqrT$P7S$d" role="1nLNMd">
<node concept="3I6sU6" id="2YqrT$P7S$e" role="3Ip0Jz">
<node concept="3I6s7M" id="2YqrT$P7S$f" role="3I6sU7">
<node concept="3Aqt3T" id="2YqrT$P7S$g" role="3I6s78">
<ref role="3AqCNq" node="2YqrT$P6Q6Q" resolve="check" />
<node concept="37jhX" id="1TH_SRmhrba" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXDdd" role="37jj2">
<node concept="3A2sRY" id="2YqrT$P7S$i" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P7S$k" resolve="goal" />
</node>
<node concept="iZEcu" id="1TH_SRlXDde" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="5fMWD6Iy9Ah" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9Ai" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
@ -303,6 +291,25 @@
<node concept="3Tqbb2" id="5fMWD6Iy9Al" role="11_B2D" />
</node>
</node>
<node concept="3xSepi" id="6E2cNicdhi_" role="3xSepv">
<node concept="3Aq9E8" id="2YqrT$P7S$d" role="3xSepj">
<node concept="3I6sU6" id="2YqrT$P7S$e" role="3Ip0Jz">
<node concept="3I6s7M" id="2YqrT$P7S$f" role="3I6sU7">
<node concept="3Aqt3T" id="2YqrT$P7S$g" role="3I6s78">
<ref role="3AqCNq" node="2YqrT$P6Q6Q" resolve="check" />
<node concept="37jhX" id="1TH_SRmhrba" role="3AunhB">
<node concept="2OqwBi" id="1TH_SRlXDdd" role="37jj2">
<node concept="3A2sRY" id="2YqrT$P7S$i" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P7S$k" resolve="goal" />
</node>
<node concept="iZEcu" id="1TH_SRlXDde" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -385,13 +392,15 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2YqrT$P6Q3i" role="1nLNMd">
<node concept="3I6sU6" id="2YqrT$P6Q3j" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RS2h1U" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RS2h1T" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RS2h23" role="1ljv2e">
<property role="Xl_RC" value="invalid" />
<node concept="3xSepi" id="6E2cNicdhiA" role="3xSepv">
<node concept="3Aq9E8" id="2YqrT$P6Q3i" role="3xSepj">
<node concept="3I6sU6" id="2YqrT$P6Q3j" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RS2h1U" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RS2h1T" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RS2h23" role="1ljv2e">
<property role="Xl_RC" value="invalid" />
</node>
</node>
</node>
</node>
@ -455,37 +464,6 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2YqrT$P7Suu" role="1nLNMd">
<node concept="3I6sU6" id="2YqrT$P7Suv" role="3Ip0Jz">
<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>
</node>
<node concept="liA8E" id="5fMWD6Iya6q" role="2OqNvi">
<ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
<node concept="2OqwBi" id="5fMWD6Iyajv" role="37wK5m">
<node concept="3A2sRY" id="5fMWD6Iyaa8" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P7StR" resolve="goal" />
</node>
<node concept="iZEcu" id="5fMWD6Iyawc" role="2OqNvi" />
</node>
<node concept="2pJPEk" id="5fMWD6Iya$T" role="37wK5m">
<node concept="2pJPED" id="5fMWD6Iya$U" role="2pJPEn">
<ref role="2pJxaS" to="jfgh:2aBGSFge6pw" resolve="Ok" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3NuqgR" id="5fMWD6Iy9CF" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9CG" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
@ -502,6 +480,39 @@
</node>
<node concept="3Tqbb2" id="2YqrT$P7SuH" role="3vLBG7" />
</node>
<node concept="3xSepi" id="6E2cNicdhiB" role="3xSepv">
<node concept="3Aq9E8" id="2YqrT$P7Suu" role="3xSepj">
<node concept="3I6sU6" id="2YqrT$P7Suv" role="3Ip0Jz">
<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>
</node>
<node concept="liA8E" id="5fMWD6Iya6q" role="2OqNvi">
<ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
<node concept="2OqwBi" id="5fMWD6Iyajv" role="37wK5m">
<node concept="3A2sRY" id="5fMWD6Iyaa8" role="2Oq$k0">
<ref role="3A2yKK" node="2YqrT$P7StR" resolve="goal" />
</node>
<node concept="iZEcu" id="5fMWD6Iyawc" role="2OqNvi" />
</node>
<node concept="2pJPEk" id="5fMWD6Iya$T" role="37wK5m">
<node concept="2pJPED" id="5fMWD6Iya$U" role="2pJPEn">
<ref role="2pJxaS" to="jfgh:2aBGSFge6pw" resolve="Ok" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -534,13 +545,15 @@
</node>
</node>
</node>
<node concept="3Aq9E8" id="2YqrT$P7SAG" role="1nLNMd">
<node concept="3I6sU6" id="2YqrT$P7SAH" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RS2h2v" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RS2h2u" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RS2h2C" role="1ljv2e">
<property role="Xl_RC" value="invalid" />
<node concept="3xSepi" id="6E2cNicdhiC" role="3xSepv">
<node concept="3Aq9E8" id="2YqrT$P7SAG" role="3xSepj">
<node concept="3I6sU6" id="2YqrT$P7SAH" role="3Ip0Jz">
<node concept="3I6s7M" id="1laj_RS2h2v" role="3I6sU7">
<node concept="1lHd6T" id="1laj_RS2h2u" role="3I6s78">
<property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
<node concept="Xl_RD" id="1laj_RS2h2C" role="1ljv2e">
<property role="Xl_RC" value="invalid" />
</node>
</node>
</node>
</node>
@ -572,14 +585,16 @@
<node concept="3clFbS" id="2rdxkKxrXze" role="fHCRw">
<node concept="1nLNNL" id="2rdxkKxrX$v" role="3cqZAp">
<node concept="1nLNMm" id="2rdxkKxrX$x" role="1nLNNK">
<node concept="3Aq9E8" id="2rdxkKxrXAg" role="1nLNMd">
<node concept="3I6sU6" id="2rdxkKxrXAh" role="3Ip0Jz">
<node concept="3I6s7M" id="2rdxkKxrXAl" role="3I6sU7">
<node concept="3Aqt3T" id="2rdxkKxrXAk" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFge6lJ" resolve="checkAll" />
<node concept="aZ4PW" id="5fMWD6IydCl" role="3AunhB">
<node concept="2_cIyK" id="5fMWD6IydCt" role="aZ4eD">
<ref role="2_cIwb" node="5fMWD6Iy9vK" resolve="typeCollector" />
<node concept="3xSepi" id="6E2cNicdhiD" role="3xSepv">
<node concept="3Aq9E8" id="2rdxkKxrXAg" role="3xSepj">
<node concept="3I6sU6" id="2rdxkKxrXAh" role="3Ip0Jz">
<node concept="3I6s7M" id="2rdxkKxrXAl" role="3I6sU7">
<node concept="3Aqt3T" id="2rdxkKxrXAk" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFge6lJ" resolve="checkAll" />
<node concept="aZ4PW" id="5fMWD6IydCl" role="3AunhB">
<node concept="2_cIyK" id="5fMWD6IydCt" role="aZ4eD">
<ref role="2_cIwb" node="5fMWD6Iy9vK" resolve="typeCollector" />
</node>
</node>
</node>
</node>

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

9209
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

@ -38,7 +38,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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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/jetbrains.mps.baseLanguage.javadocExt.mpl
View File

@ -33,7 +33,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="18" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="19" />
<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="18" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="19" />
<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.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
View File

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

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff