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 ParameterContainer.

This commit is contained in:
Fedor Isakov 2020-02-05 16:58:16 +01:00
parent c15c6694de
commit c353f89ea0
21 changed files with 8055 additions and 9272 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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

207
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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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" />
@ -164,9 +164,6 @@
</concept>
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
@ -209,7 +206,7 @@
<child id="1302893676238672106" name="origin" index="1imXSf" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<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" />
@ -309,33 +306,6 @@
<node concept="3clFbS" id="7lt0LtPOZVi" role="1nLNMH">
<node concept="1nLNNL" id="7lt0LtPOZW0" role="3cqZAp">
<node concept="1nLNMm" id="7lt0LtPOZW1" role="1nLNNK">
<node concept="0eUR_" id="7lt0LtPOZW5" role="0UC6o">
<node concept="3NuqgR" id="5fMWD6IydHR" role="0eVf_">
<node concept="aZer4" id="5fMWD6IydHS" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6IydIz" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6IydI$" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6IydI_" role="11_B2D" />
</node>
</node>
<node concept="3NuqgR" id="7lt0LtPOZW7" role="0eVf_">
<node concept="aZer4" id="7lt0LtPOZW8" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuT" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7wAOnq6x9ez" role="0eVf_">
<node concept="aZer4" id="7mB3viLdI2x" role="3XD1gS">
<property role="TrG5h" value="Name" />
</node>
<node concept="aZer4" id="7lt0LtPP29U" role="3XD1gS">
<property role="TrG5h" value="Val" />
</node>
<node concept="17QB3L" id="7wAOnq6x9fr" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="7lt0LtPP11l" role="1nLNMd">
<node concept="3I6sU6" id="7lt0LtPP11m" role="3Ip0Jz">
<node concept="3I6s7M" id="5fMWD6IydMw" role="3I6sU7">
@ -442,6 +412,31 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5fMWD6IydHR" role="0Rg$4">
<node concept="aZer4" id="5fMWD6IydHS" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6IydIz" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6IydI$" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6IydI_" role="11_B2D" />
</node>
</node>
<node concept="3NuqgR" id="7lt0LtPOZW7" role="0Rg$4">
<node concept="aZer4" id="7lt0LtPOZW8" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuT" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7wAOnq6x9ez" role="0Rg$4">
<node concept="aZer4" id="7mB3viLdI2x" role="3XD1gS">
<property role="TrG5h" value="Name" />
</node>
<node concept="aZer4" id="7lt0LtPP29U" role="3XD1gS">
<property role="TrG5h" value="Val" />
</node>
<node concept="17QB3L" id="7wAOnq6x9fr" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -460,26 +455,6 @@
<node concept="3clFbS" id="7mB3viLi4po" role="1nLNMH">
<node concept="1nLNNL" id="7mB3viLi4pI" role="3cqZAp">
<node concept="1nLNMm" id="7mB3viLi4pJ" role="1nLNNK">
<node concept="0eUR_" id="7mB3viLi4pN" role="0UC6o">
<node concept="3NuqgR" id="7mB3viLi4pP" role="0eVf_">
<node concept="aZer4" id="7mB3viLi4pQ" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="7mB3viLi4qh" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuU" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7wAOnq6x5Pr" role="0eVf_">
<node concept="aZer4" id="7mB3viLi4pZ" role="3XD1gS">
<property role="TrG5h" value="AVal" />
</node>
<node concept="aZer4" id="7mB3viLi4qx" role="3XD1gS">
<property role="TrG5h" value="BVal" />
</node>
<node concept="17QB3L" id="7wAOnq6x5Qk" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="7mB3viLi4qS" role="1nLNMb">
<property role="3ArMco" value="false" />
<node concept="3I6sU6" id="7mB3viLi4qT" role="3Ip0Jz">
@ -566,31 +541,29 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="7mB3viLi4pP" role="0Rg$4">
<node concept="aZer4" id="7mB3viLi4pQ" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="7mB3viLi4qh" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuU" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7wAOnq6x5Pr" role="0Rg$4">
<node concept="aZer4" id="7mB3viLi4pZ" role="3XD1gS">
<property role="TrG5h" value="AVal" />
</node>
<node concept="aZer4" id="7mB3viLi4qx" role="3XD1gS">
<property role="TrG5h" value="BVal" />
</node>
<node concept="17QB3L" id="7wAOnq6x5Qk" role="3vLBG7" />
</node>
</node>
</node>
<node concept="3clFbH" id="2DIFeUB7ncx" role="3cqZAp" />
<node concept="1nLNNL" id="2DIFeUB7n66" role="3cqZAp">
<node concept="1nLNMm" id="2DIFeUB7n67" role="1nLNNK">
<node concept="0eUR_" id="5TXeSYT5cnl" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT5cnm" role="0eVf_">
<node concept="aZer4" id="5TXeSYT5cnn" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="5TXeSYT5cno" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuV" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5TXeSYT5cnp" role="0eVf_">
<node concept="aZer4" id="5TXeSYT5cnq" role="3XD1gS">
<property role="TrG5h" value="AVal" />
</node>
<node concept="aZer4" id="5TXeSYT5cnr" role="3XD1gS">
<property role="TrG5h" value="BVal" />
</node>
<node concept="17QB3L" id="5TXeSYT5cns" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2DIFeUB7n6g" role="1nLNMb">
<property role="3ArMco" value="false" />
<node concept="3I6sU6" id="2DIFeUB7n6h" role="3Ip0Jz">
@ -677,6 +650,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5TXeSYT5cnm" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT5cnn" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="5TXeSYT5cno" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuV" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5TXeSYT5cnp" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT5cnq" role="3XD1gS">
<property role="TrG5h" value="AVal" />
</node>
<node concept="aZer4" id="5TXeSYT5cnr" role="3XD1gS">
<property role="TrG5h" value="BVal" />
</node>
<node concept="17QB3L" id="5TXeSYT5cns" role="3vLBG7" />
</node>
</node>
</node>
<node concept="3clFbH" id="7mB3viLien3" role="3cqZAp" />
@ -709,16 +700,14 @@
</node>
</node>
</node>
<node concept="0eUR_" id="5TXeSYT5cFl" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT5cFm" role="0eVf_">
<node concept="aZer4" id="5TXeSYT5cFn" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="5TXeSYT5cFo" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuW" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT5cFm" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT5cFn" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="5TXeSYT5cFo" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuW" role="3vLBG7" />
</node>
</node>
</node>
@ -763,16 +752,14 @@
</node>
</node>
</node>
<node concept="0eUR_" id="6OXbTD$fzlJ" role="0UC6o">
<node concept="3NuqgR" id="6OXbTD$fzlK" role="0eVf_">
<node concept="aZer4" id="6OXbTD$fzlL" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="6OXbTD$fzlM" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuX" role="3vLBG7" />
<node concept="3NuqgR" id="6OXbTD$fzlK" role="0Rg$4">
<node concept="aZer4" id="6OXbTD$fzlL" role="3XD1gS">
<property role="TrG5h" value="A" />
</node>
<node concept="aZer4" id="6OXbTD$fzlM" role="3XD1gS">
<property role="TrG5h" value="B" />
</node>
<node concept="32pEOW" id="24ciDNzxNuX" role="3vLBG7" />
</node>
</node>
</node>
@ -833,13 +820,11 @@
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="7mB3viLcDAd" role="3Ip0Jz" />
</node>
<node concept="0eUR_" id="7mB3viLcDAh" role="0UC6o">
<node concept="3NuqgR" id="7mB3viLcDAj" role="0eVf_">
<node concept="aZer4" id="7mB3viLcDAk" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuY" role="3vLBG7" />
<node concept="3NuqgR" id="7mB3viLcDAj" role="0Rg$4">
<node concept="aZer4" id="7mB3viLcDAk" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuY" role="3vLBG7" />
</node>
</node>
</node>
@ -910,14 +895,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7mB3viLdf$Z" role="0UC6o">
<node concept="3NuqgR" id="7mB3viLdf_1" role="0eVf_">
<node concept="aZer4" id="7mB3viLdf_2" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="32pEOW" id="24ciDNzxNuZ" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="7mB3viLdfAx" role="1nLNMd">
<node concept="3I6sU6" id="7mB3viLdfAy" role="3Ip0Jz">
<node concept="3I6s7M" id="7mB3viLdfAA" role="3I6sU7">
@ -938,6 +915,12 @@
</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>
</node>
</node>
@ -1183,16 +1166,14 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7mB3viLg9gf" role="0UC6o">
<node concept="3NuqgR" id="7mB3viLg9gh" role="0eVf_">
<node concept="aZer4" id="7mB3viLg9gi" role="3XD1gS">
<property role="TrG5h" value="From" />
</node>
<node concept="aZer4" id="7mB3viLg9gr" role="3XD1gS">
<property role="TrG5h" value="To" />
</node>
<node concept="32pEOW" id="24ciDNzxNv0" role="3vLBG7" />
<node concept="3NuqgR" id="7mB3viLg9gh" role="0Rg$4">
<node concept="aZer4" id="7mB3viLg9gi" role="3XD1gS">
<property role="TrG5h" value="From" />
</node>
<node concept="aZer4" id="7mB3viLg9gr" role="3XD1gS">
<property role="TrG5h" value="To" />
</node>
<node concept="32pEOW" id="24ciDNzxNv0" role="3vLBG7" />
</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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

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

@ -12,7 +12,7 @@
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="5" />
<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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
</languages>
<imports>
@ -315,9 +315,6 @@
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="6928531011217292466" name="jetbrains.mps.lang.coderules.structure.IsfreeVariableConstraint" flags="ng" index="2aLmEc" />
<concept id="6928531011217258898" name="jetbrains.mps.lang.coderules.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
<child id="6928531011217290187" name="variable" index="2aLmnP" />
@ -340,7 +337,7 @@
<child id="1302893676238672106" name="origin" index="1imXSf" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<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" />
@ -857,20 +854,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7qe1GumCiX8" role="0UC6o">
<node concept="3NuqgR" id="7qe1GumCiXa" role="0eVf_">
<node concept="aZer4" id="7qe1GumCiXb" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="7qe1GumCiXh" role="3XD1gS">
<property role="TrG5h" value="T2" />
</node>
<node concept="aZer4" id="7qe1GumE0ZL" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="32pEOW" id="24ciDNzxNPk" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9_M" id="7qe1GumCoBB" role="1nLNMa">
<node concept="3I6sU6" id="7qe1GumCoBC" role="3Ip0Jz">
<node concept="3I6s7M" id="7qe1GumCoBG" role="3I6sU7">
@ -885,6 +868,18 @@
<node concept="3xLA65" id="7qe1GumE39g" role="lGtFl">
<property role="TrG5h" value="checkConverts1" />
</node>
<node concept="3NuqgR" id="7qe1GumCiXa" role="0Rg$4">
<node concept="aZer4" id="7qe1GumCiXb" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="7qe1GumCiXh" role="3XD1gS">
<property role="TrG5h" value="T2" />
</node>
<node concept="aZer4" id="7qe1GumE0ZL" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="32pEOW" id="24ciDNzxNPk" role="3vLBG7" />
</node>
</node>
</node>
<node concept="3clFbH" id="7qe1GumTFWw" role="3cqZAp" />
@ -917,28 +912,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7qe1GumTFYw" role="0UC6o">
<node concept="3NuqgR" id="7qe1GumTFYy" role="0eVf_">
<node concept="aZer4" id="7qe1GumTFYz" role="3XD1gS">
<property role="TrG5h" value="N" />
</node>
<node concept="32pEOW" id="24ciDNzxNPl" role="3vLBG7" />
</node>
</node>
<node concept="0eUR_" id="5TXeSYT54OZ" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT54P0" role="0eVf_">
<node concept="aZer4" id="5TXeSYT54P1" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT54P2" role="3XD1gS">
<property role="TrG5h" value="T2" />
</node>
<node concept="aZer4" id="5TXeSYT54P3" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="32pEOW" id="24ciDNzxNPm" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="7qe1GumTFZ4" role="1nLNMd">
<node concept="3I6sU6" id="7qe1GumTFZ5" role="3Ip0Jz">
<node concept="3I6s7M" id="7qe1GumTFZb" role="3I6sU7">
@ -956,6 +929,24 @@
<node concept="3xLA65" id="7qe1GumTGLU" role="lGtFl">
<property role="TrG5h" value="conservatively" />
</node>
<node concept="3NuqgR" id="7qe1GumTFYy" role="0Rg$4">
<node concept="aZer4" id="7qe1GumTFYz" role="3XD1gS">
<property role="TrG5h" value="N" />
</node>
<node concept="32pEOW" id="24ciDNzxNPl" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5TXeSYT54P0" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT54P1" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT54P2" role="3XD1gS">
<property role="TrG5h" value="T2" />
</node>
<node concept="aZer4" id="5TXeSYT54P3" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="32pEOW" id="24ciDNzxNPm" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -998,16 +989,14 @@
<node concept="3xLA65" id="7qe1GumUjp4" role="lGtFl">
<property role="TrG5h" value="macroExpand" />
</node>
<node concept="0eUR_" id="7qe1GumUjp9" role="0UC6o">
<node concept="3NuqgR" id="7qe1GumUjpc" role="0eVf_">
<node concept="aZer4" id="7qe1GumUjpd" role="3XD1gS">
<property role="TrG5h" value="N" />
</node>
<node concept="aZer4" id="7qe1GumUjpj" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="32pEOW" id="24ciDNzxNPn" role="3vLBG7" />
<node concept="3NuqgR" id="7qe1GumUjpc" role="0Rg$4">
<node concept="aZer4" id="7qe1GumUjpd" role="3XD1gS">
<property role="TrG5h" value="N" />
</node>
<node concept="aZer4" id="7qe1GumUjpj" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="32pEOW" id="24ciDNzxNPn" role="3vLBG7" />
</node>
</node>
</node>
@ -1061,20 +1050,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7qe1GumRXOM" role="0UC6o">
<node concept="3NuqgR" id="7qe1GumRXON" role="0eVf_">
<node concept="aZer4" id="7qe1GumRXOO" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="7qe1GumRXOP" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="7qe1GumRXOQ" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPo" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="7qe1GumRXOR" role="1nLNMd">
<node concept="3I6sU6" id="7qe1GumRXOS" role="3Ip0Jz">
<node concept="3I6s7M" id="7qe1GumRXOT" role="3I6sU7">
@ -1124,6 +1099,18 @@
<node concept="3xLA65" id="7qe1GumRXP8" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_1" />
</node>
<node concept="3NuqgR" id="7qe1GumRXON" role="0Rg$4">
<node concept="aZer4" id="7qe1GumRXOO" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="7qe1GumRXOP" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="7qe1GumRXOQ" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPo" role="3vLBG7" />
</node>
</node>
</node>
<node concept="3clFbH" id="7qe1GumRYFm" role="3cqZAp" />
@ -1176,28 +1163,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7qe1GumRY74" role="0UC6o">
<node concept="3NuqgR" id="7qe1GumRY75" role="0eVf_">
<node concept="aZer4" id="7qe1GumRY76" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPp" role="3vLBG7" />
</node>
</node>
<node concept="0eUR_" id="5TXeSYT54SP" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT54SQ" role="0eVf_">
<node concept="aZer4" id="5TXeSYT54SR" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT54SS" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT54ST" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPq" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="7qe1GumRY77" role="1nLNMd">
<node concept="3I6sU6" id="7qe1GumRY78" role="3Ip0Jz">
<node concept="3I6s7M" id="7qe1GumRY79" role="3I6sU7">
@ -1257,6 +1222,24 @@
<node concept="3xLA65" id="7qe1GumRY7s" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_2" />
</node>
<node concept="3NuqgR" id="7qe1GumRY75" role="0Rg$4">
<node concept="aZer4" id="7qe1GumRY76" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPp" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="5TXeSYT54SQ" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT54SR" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT54SS" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT54ST" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPq" role="3vLBG7" />
</node>
</node>
</node>
<node concept="3clFbH" id="7qe1GumRYDk" role="3cqZAp" />
@ -1378,27 +1361,23 @@
<node concept="3xLA65" id="7qe1GumF4bg" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_3" />
</node>
<node concept="0eUR_" id="5TXeSYT559f" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT559g" role="0eVf_">
<node concept="aZer4" id="5TXeSYT559h" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPr" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT559g" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT559h" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPr" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT550Y" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT550Z" role="0eVf_">
<node concept="aZer4" id="5TXeSYT5510" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT5511" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT5512" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPs" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT550Z" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT5510" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT5511" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT5512" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPs" role="3vLBG7" />
</node>
</node>
</node>
@ -1521,27 +1500,23 @@
<node concept="3xLA65" id="7qe1GumTyT6" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_4" />
</node>
<node concept="0eUR_" id="5TXeSYT55hN" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55hO" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55hP" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPt" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55hO" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55hP" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPt" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT55hQ" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55hR" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55hS" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55hT" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55hU" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPu" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55hR" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55hS" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55hT" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55hU" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPu" role="3vLBG7" />
</node>
</node>
</node>
@ -1644,27 +1619,23 @@
<node concept="3xLA65" id="7qe1GumTP75" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_6" />
</node>
<node concept="0eUR_" id="5TXeSYT55s3" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55s4" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55s5" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPv" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55s4" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55s5" role="3XD1gS">
<property role="TrG5h" value="TLocal" />
</node>
<node concept="32pEOW" id="24ciDNzxNPv" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT55s6" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55s7" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55s8" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55s9" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55sa" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPw" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55s7" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55s8" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55s9" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55sa" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPw" role="3vLBG7" />
</node>
</node>
</node>
@ -1818,36 +1789,32 @@
<node concept="3xLA65" id="4t6qIYSPdb0" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_7" />
</node>
<node concept="0eUR_" id="4t6qIYSPdmi" role="0UC6o">
<node concept="3NuqgR" id="4t6qIYSPdml" role="0eVf_">
<node concept="aZer4" id="4t6qIYTd8O3" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="4t6qIYSPdm_" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="4t6qIYT2aJm" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNPx" role="3vLBG7" />
<node concept="3NuqgR" id="4t6qIYSPdml" role="0Rg$4">
<node concept="aZer4" id="4t6qIYTd8O3" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="4t6qIYSPdm_" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="4t6qIYT2aJm" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNPx" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT55$M" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55$N" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55$O" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55G1" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT55$P" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55$Q" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPy" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55$N" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55$O" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55G1" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT55$P" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55$Q" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPy" role="3vLBG7" />
</node>
</node>
</node>
@ -1970,36 +1937,32 @@
<node concept="3xLA65" id="4t6qIYSPqaR" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_8" />
</node>
<node concept="0eUR_" id="5TXeSYT55Od" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55Oe" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55Of" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="5TXeSYT55Og" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="5TXeSYT55Oh" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNPz" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55Oe" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55Of" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="5TXeSYT55Og" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="5TXeSYT55Oh" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNPz" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT55Oi" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT55Oj" role="0eVf_">
<node concept="aZer4" id="5TXeSYT55Ok" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55Ol" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT55Om" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55On" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNP$" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT55Oj" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT55Ok" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT55Ol" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT55Om" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT55On" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNP$" role="3vLBG7" />
</node>
</node>
</node>
@ -2114,36 +2077,32 @@
<node concept="3xLA65" id="4t6qIYTd7EA" role="lGtFl">
<property role="TrG5h" value="typeOf_Pair_9" />
</node>
<node concept="0eUR_" id="5TXeSYT564u" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT564v" role="0eVf_">
<node concept="aZer4" id="5TXeSYT564w" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="5TXeSYT564x" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="5TXeSYT564y" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNP_" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT564v" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT564w" role="3XD1gS">
<property role="TrG5h" value="Local" />
</node>
<node concept="aZer4" id="5TXeSYT564x" role="3XD1gS">
<property role="TrG5h" value="Local2" />
</node>
<node concept="aZer4" id="5TXeSYT564y" role="3XD1gS">
<property role="TrG5h" value="Local3" />
</node>
<node concept="32pEOW" id="24ciDNzxNP_" role="3vLBG7" />
</node>
<node concept="0eUR_" id="5TXeSYT564z" role="0UC6o">
<node concept="3NuqgR" id="5TXeSYT564$" role="0eVf_">
<node concept="aZer4" id="5TXeSYT564_" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT564A" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT564B" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT564C" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPA" role="3vLBG7" />
<node concept="3NuqgR" id="5TXeSYT564$" role="0Rg$4">
<node concept="aZer4" id="5TXeSYT564_" role="3XD1gS">
<property role="TrG5h" value="T" />
</node>
<node concept="aZer4" id="5TXeSYT564A" role="3XD1gS">
<property role="TrG5h" value="T1" />
</node>
<node concept="aZer4" id="5TXeSYT564B" role="3XD1gS">
<property role="TrG5h" value="L" />
</node>
<node concept="aZer4" id="5TXeSYT564C" role="3XD1gS">
<property role="TrG5h" value="R" />
</node>
<node concept="32pEOW" id="24ciDNzxNPA" role="3vLBG7" />
</node>
</node>
</node>
@ -3212,20 +3171,6 @@
<node concept="3clFbS" id="48ZGLP7pgwr" role="1nLNMH">
<node concept="1nLNNL" id="48ZGLP7pgwy" role="3cqZAp">
<node concept="1nLNMm" id="48ZGLP7pgwz" role="1nLNNK">
<node concept="0eUR_" id="48ZGLP7pgw$" role="0UC6o">
<node concept="3NuqgR" id="48ZGLP7pgwB" role="0eVf_">
<node concept="aZer4" id="48ZGLP7pgwC" role="3XD1gS">
<property role="TrG5h" value="E" />
</node>
<node concept="32pEOW" id="24ciDNzxNPB" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="48ZGLP7phr6" role="0eVf_">
<node concept="aZer4" id="48ZGLP7phr7" role="3XD1gS">
<property role="TrG5h" value="NewTV" />
</node>
<node concept="32pEOW" id="24ciDNzxNPC" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="48ZGLP7pgwD" role="1nLNMd">
<node concept="3I6sU6" id="48ZGLP7pgwE" role="3Ip0Jz">
<node concept="3I6s7M" id="48ZGLP7pkxm" role="3I6sU7">
@ -3296,6 +3241,18 @@
<node concept="3xLA65" id="6V4Y$98qRdr" role="lGtFl">
<property role="TrG5h" value="letVarBind1" />
</node>
<node concept="3NuqgR" id="48ZGLP7pgwB" role="0Rg$4">
<node concept="aZer4" id="48ZGLP7pgwC" role="3XD1gS">
<property role="TrG5h" value="E" />
</node>
<node concept="32pEOW" id="24ciDNzxNPB" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="48ZGLP7phr6" role="0Rg$4">
<node concept="aZer4" id="48ZGLP7phr7" role="3XD1gS">
<property role="TrG5h" value="NewTV" />
</node>
<node concept="32pEOW" id="24ciDNzxNPC" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3311,23 +3268,6 @@
<node concept="3clFbS" id="JfcwnvutGS" role="1nLNMH">
<node concept="1nLNNL" id="JfcwnvutGT" role="3cqZAp">
<node concept="1nLNMm" id="JfcwnvutGU" role="1nLNNK">
<node concept="0eUR_" id="JfcwnvutGV" role="0UC6o">
<node concept="3NuqgR" id="JfcwnvutGW" role="0eVf_">
<node concept="aZer4" id="JfcwnvutMw" role="3XD1gS">
<property role="TrG5h" value="G" />
</node>
<node concept="aZer4" id="JfcwnvutGX" role="3XD1gS">
<property role="TrG5h" value="E" />
</node>
<node concept="32pEOW" id="24ciDNzxNPD" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="JfcwnvutGY" role="0eVf_">
<node concept="aZer4" id="JfcwnvutGZ" role="3XD1gS">
<property role="TrG5h" value="NewTV" />
</node>
<node concept="32pEOW" id="24ciDNzxNPE" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="JfcwnvutH0" role="1nLNMd">
<node concept="3I6sU6" id="JfcwnvutH1" role="3Ip0Jz">
<node concept="3I6s7M" id="JfcwnvutMe" role="3I6sU7">
@ -3408,6 +3348,21 @@
<node concept="3xLA65" id="JfcwnvutHo" role="lGtFl">
<property role="TrG5h" value="letVarBind2" />
</node>
<node concept="3NuqgR" id="JfcwnvutGW" role="0Rg$4">
<node concept="aZer4" id="JfcwnvutMw" role="3XD1gS">
<property role="TrG5h" value="G" />
</node>
<node concept="aZer4" id="JfcwnvutGX" role="3XD1gS">
<property role="TrG5h" value="E" />
</node>
<node concept="32pEOW" id="24ciDNzxNPD" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="JfcwnvutGY" role="0Rg$4">
<node concept="aZer4" id="JfcwnvutGZ" role="3XD1gS">
<property role="TrG5h" value="NewTV" />
</node>
<node concept="32pEOW" id="24ciDNzxNPE" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3661,23 +3616,6 @@
<node concept="3clFbS" id="12QmIo_7sjh" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sji" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sjj" role="1nLNNK">
<node concept="0eUR_" id="7lt0LtPBjTk" role="0UC6o">
<node concept="3NuqgR" id="4nIWweB_n$w" role="0eVf_">
<node concept="aZer4" id="4nIWweB_n$x" role="3XD1gS">
<property role="TrG5h" value="ResultType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPF" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="4nIWweB_nk9" role="0eVf_">
<node concept="aZer4" id="4nIWweB_nka" role="3XD1gS">
<property role="TrG5h" value="LeftType" />
</node>
<node concept="aZer4" id="4nIWweB_nkw" role="3XD1gS">
<property role="TrG5h" value="RightType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPG" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="1PFbZN6tO4W" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="4nIWweB_nxi" role="3Ip0Jz">
@ -3760,6 +3698,21 @@
<node concept="3xLA65" id="2NnDL4GcFIW" role="lGtFl">
<property role="TrG5h" value="equalsExpression" />
</node>
<node concept="3NuqgR" id="4nIWweB_n$w" role="0Rg$4">
<node concept="aZer4" id="4nIWweB_n$x" role="3XD1gS">
<property role="TrG5h" value="ResultType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPF" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="4nIWweB_nk9" role="0Rg$4">
<node concept="aZer4" id="4nIWweB_nka" role="3XD1gS">
<property role="TrG5h" value="LeftType" />
</node>
<node concept="aZer4" id="4nIWweB_nkw" role="3XD1gS">
<property role="TrG5h" value="RightType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPG" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3775,17 +3728,6 @@
<node concept="3clFbS" id="12QmIo_7sjl" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sjm" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sjn" role="1nLNNK">
<node concept="0eUR_" id="7lt0LtPBjTM" role="0UC6o">
<node concept="3NuqgR" id="13kcg0BqDZ" role="0eVf_">
<node concept="aZer4" id="13kcg0BqE0" role="3XD1gS">
<property role="TrG5h" value="LType" />
</node>
<node concept="aZer4" id="13kcg0BqE9" role="3XD1gS">
<property role="TrG5h" value="RType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPH" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="1PFbZN6ez$L" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="4nIWweB_nOp" role="3Ip0Jz">
@ -3867,6 +3809,15 @@
<node concept="3xLA65" id="2NnDL4GcGb8" role="lGtFl">
<property role="TrG5h" value="assignmentExpression" />
</node>
<node concept="3NuqgR" id="13kcg0BqDZ" role="0Rg$4">
<node concept="aZer4" id="13kcg0BqE0" role="3XD1gS">
<property role="TrG5h" value="LType" />
</node>
<node concept="aZer4" id="13kcg0BqE9" role="3XD1gS">
<property role="TrG5h" value="RType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPH" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3924,20 +3875,6 @@
</node>
</node>
</node>
<node concept="0eUR_" id="7lt0LtPBjUH" role="0UC6o">
<node concept="3NuqgR" id="13kcg0BqLr" role="0eVf_">
<node concept="aZer4" id="13kcg0BqLs" role="3XD1gS">
<property role="TrG5h" value="OpndT" />
</node>
<node concept="aZer4" id="13kcg0BqLt" role="3XD1gS">
<property role="TrG5h" value="ValueT" />
</node>
<node concept="aZer4" id="35YJGAK4GHo" role="3XD1gS">
<property role="TrG5h" value="CaptureT" />
</node>
<node concept="32pEOW" id="24ciDNzxNPI" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="1PFbZN6fRH7" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="4nIWweB_nSb" role="3Ip0Jz">
@ -3988,6 +3925,18 @@
<node concept="3xLA65" id="2NnDL4GcGDc" role="lGtFl">
<property role="TrG5h" value="opAssignmentExpression" />
</node>
<node concept="3NuqgR" id="13kcg0BqLr" role="0Rg$4">
<node concept="aZer4" id="13kcg0BqLs" role="3XD1gS">
<property role="TrG5h" value="OpndT" />
</node>
<node concept="aZer4" id="13kcg0BqLt" role="3XD1gS">
<property role="TrG5h" value="ValueT" />
</node>
<node concept="aZer4" id="35YJGAK4GHo" role="3XD1gS">
<property role="TrG5h" value="CaptureT" />
</node>
<node concept="32pEOW" id="24ciDNzxNPI" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4003,29 +3952,6 @@
<node concept="3clFbS" id="12QmIo_7sjt" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sju" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sjv" role="1nLNNK">
<node concept="0eUR_" id="7lt0LtPBjU$" role="0UC6o">
<node concept="3NuqgR" id="4nIWweB_ocj" role="0eVf_">
<node concept="aZer4" id="4nIWweB_ock" role="3XD1gS">
<property role="TrG5h" value="BoolType" />
</node>
<node concept="aZer4" id="4nIWweB_ocI" role="3XD1gS">
<property role="TrG5h" value="Lub" />
</node>
<node concept="32pEOW" id="24ciDNzxNPJ" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7nkyKX6XThp" role="0eVf_">
<node concept="aZer4" id="7nkyKX6XThq" role="3XD1gS">
<property role="TrG5h" value="CondType" />
</node>
<node concept="aZer4" id="7nkyKX6XThz" role="3XD1gS">
<property role="TrG5h" value="IfTType" />
</node>
<node concept="aZer4" id="7nkyKX6XThJ" role="3XD1gS">
<property role="TrG5h" value="IfFType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPK" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="1PFbZN6sL9Z" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="4nIWweB_o0G" role="3Ip0Jz">
@ -4151,6 +4077,27 @@
<node concept="3xLA65" id="2NnDL4GcHZi" role="lGtFl">
<property role="TrG5h" value="ternaryOperation" />
</node>
<node concept="3NuqgR" id="4nIWweB_ocj" role="0Rg$4">
<node concept="aZer4" id="4nIWweB_ock" role="3XD1gS">
<property role="TrG5h" value="BoolType" />
</node>
<node concept="aZer4" id="4nIWweB_ocI" role="3XD1gS">
<property role="TrG5h" value="Lub" />
</node>
<node concept="32pEOW" id="24ciDNzxNPJ" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="7nkyKX6XThp" role="0Rg$4">
<node concept="aZer4" id="7nkyKX6XThq" role="3XD1gS">
<property role="TrG5h" value="CondType" />
</node>
<node concept="aZer4" id="7nkyKX6XThz" role="3XD1gS">
<property role="TrG5h" value="IfTType" />
</node>
<node concept="aZer4" id="7nkyKX6XThJ" role="3XD1gS">
<property role="TrG5h" value="IfFType" />
</node>
<node concept="32pEOW" id="24ciDNzxNPK" role="3vLBG7" />
</node>
</node>
</node>
</node>

117
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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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" />
@ -220,9 +220,6 @@
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
@ -261,7 +258,7 @@
<child id="4957570047284421439" name="message" index="1ljv2e" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<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" />
@ -449,14 +446,6 @@
<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="0eUR_" id="3dsgZciwak0" role="0UC6o">
<node concept="3NuqgR" id="3w0n0hzminr" role="0eVf_">
<node concept="aZer4" id="3w0n0hzmins" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNvm" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="3w0n0hzmfKd" role="1nLNMd">
<node concept="3I6sU6" id="3w0n0hzmfKe" role="3Ip0Jz">
<node concept="3I6s7M" id="3w0n0hzminh" role="3I6sU7">
@ -492,6 +481,12 @@
</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>
</node>
</node>
@ -507,17 +502,6 @@
<node concept="3clFbS" id="6$MtiK8GZNj" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8GZNk" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8GZNl" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwak3" role="0UC6o">
<node concept="3NuqgR" id="3w0n0hzmj4b" role="0eVf_">
<node concept="aZer4" id="3w0n0hzmj4x" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3w0n0hzmj4c" role="3XD1gS">
<property role="TrG5h" value="Term" />
</node>
<node concept="32pEOW" id="24ciDNzxNvn" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3w0n0hzmj46" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3w0n0hzmj47" role="3Ip0Jz">
@ -577,6 +561,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hzmj4b" role="0Rg$4">
<node concept="aZer4" id="3w0n0hzmj4x" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3w0n0hzmj4c" role="3XD1gS">
<property role="TrG5h" value="Term" />
</node>
<node concept="32pEOW" id="24ciDNzxNvn" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1112,26 +1105,6 @@
<node concept="3clFbH" id="1laj_RSf1Vk" role="3cqZAp" />
<node concept="1nLNNL" id="6$MtiK8GZNs" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8GZNt" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwak1" role="0UC6o">
<node concept="3NuqgR" id="3w0n0hzmjfi" role="0eVf_">
<node concept="aZer4" id="3w0n0hzmjg7" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3w0n0hzmjfj" role="3XD1gS">
<property role="TrG5h" value="Eq" />
</node>
<node concept="aZer4" id="3w0n0hzmjfs" role="3XD1gS">
<property role="TrG5h" value="EqLeft" />
</node>
<node concept="aZer4" id="3w0n0hzmjfI" role="3XD1gS">
<property role="TrG5h" value="EqRight" />
</node>
<node concept="aZer4" id="3w0n0hzmrDC" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvo" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3w0n0hzmfIT" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3w0n0hzmfIU" role="3Ip0Jz">
@ -1355,6 +1328,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3w0n0hzmjfi" role="0Rg$4">
<node concept="aZer4" id="3w0n0hzmjg7" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3w0n0hzmjfj" role="3XD1gS">
<property role="TrG5h" value="Eq" />
</node>
<node concept="aZer4" id="3w0n0hzmjfs" role="3XD1gS">
<property role="TrG5h" value="EqLeft" />
</node>
<node concept="aZer4" id="3w0n0hzmjfI" role="3XD1gS">
<property role="TrG5h" value="EqRight" />
</node>
<node concept="aZer4" id="3w0n0hzmrDC" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvo" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1911,26 +1902,6 @@
</node>
<node concept="1nLNNL" id="6$MtiK8GZN$" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8GZN_" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwak2" role="0UC6o">
<node concept="3NuqgR" id="3w0n0hznw$i" role="0eVf_">
<node concept="aZer4" id="3w0n0hznw$j" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3w0n0hznw$k" role="3XD1gS">
<property role="TrG5h" value="Eq" />
</node>
<node concept="aZer4" id="3w0n0hznw$l" role="3XD1gS">
<property role="TrG5h" value="EqLeft" />
</node>
<node concept="aZer4" id="3w0n0hznw$m" role="3XD1gS">
<property role="TrG5h" value="EqRight" />
</node>
<node concept="aZer4" id="3w0n0hznw$n" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvp" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3w0n0hznwzB" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3w0n0hznwzC" role="3Ip0Jz">
@ -2154,6 +2125,24 @@
</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" />
</node>
<node concept="aZer4" id="3w0n0hznw$k" role="3XD1gS">
<property role="TrG5h" value="Eq" />
</node>
<node concept="aZer4" id="3w0n0hznw$l" role="3XD1gS">
<property role="TrG5h" value="EqLeft" />
</node>
<node concept="aZer4" id="3w0n0hznw$m" role="3XD1gS">
<property role="TrG5h" value="EqRight" />
</node>
<node concept="aZer4" id="3w0n0hznw$n" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvp" role="3vLBG7" />
</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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

171
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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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" />
@ -308,9 +308,6 @@
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
@ -349,7 +346,7 @@
<child id="4957570047284421439" name="message" index="1ljv2e" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<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" />
@ -1269,20 +1266,6 @@
<node concept="3clFbH" id="1laj_RSfiUf" role="3cqZAp" />
<node concept="1nLNNL" id="6$MtiK8H0qz" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H0q$" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwakT" role="0UC6o">
<node concept="3NuqgR" id="2oO2uzBWT6y" role="0eVf_">
<node concept="aZer4" id="2oO2uzBWT6z" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2oO2uzBWT6$" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2oO2uzBWTdP" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="32pEOW" id="24ciDNzxNvF" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2oO2uzBWQgb" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2oO2uzBWQhg" role="3Ip0Jz">
@ -1425,6 +1408,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2oO2uzBWT6y" role="0Rg$4">
<node concept="aZer4" id="2oO2uzBWT6z" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2oO2uzBWT6$" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2oO2uzBWTdP" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="32pEOW" id="24ciDNzxNvF" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1966,26 +1961,6 @@
<node concept="3clFbH" id="1laj_RSfrGB" role="3cqZAp" />
<node concept="1nLNNL" id="6$MtiK8H0qF" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H0qG" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwakQ" role="0UC6o">
<node concept="3NuqgR" id="2oO2uzBXpHP" role="0eVf_">
<node concept="aZer4" id="2oO2uzBWNhT" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2oO2uzBWNnU" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="aZer4" id="2S9ARS6yyhD" role="3XD1gS">
<property role="TrG5h" value="Fresh" />
</node>
<node concept="aZer4" id="2oO2uzBXx8g" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="aZer4" id="2oO2uzBWNhK" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvG" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2oO2uzBXpGs" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2oO2uzBXpGt" role="3Ip0Jz">
@ -2150,6 +2125,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2oO2uzBXpHP" role="0Rg$4">
<node concept="aZer4" id="2oO2uzBWNhT" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2oO2uzBWNnU" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="aZer4" id="2S9ARS6yyhD" role="3XD1gS">
<property role="TrG5h" value="Fresh" />
</node>
<node concept="aZer4" id="2oO2uzBXx8g" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="aZer4" id="2oO2uzBWNhK" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvG" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2187,26 +2180,6 @@
<node concept="3clFbS" id="6$MtiK8H0qI" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H0qJ" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H0qK" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwakR" role="0UC6o">
<node concept="3NuqgR" id="2CF5XF5qrJn" role="0eVf_">
<node concept="aZer4" id="2CF5XF5qrJo" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2CF5XF5qrJ$" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2CF5XF5qukG" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="aZer4" id="2CF5XF5q_9W" role="3XD1gS">
<property role="TrG5h" value="Fresh" />
</node>
<node concept="aZer4" id="2CF5XF5quzw" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNvH" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2CF5XF5qrJ2" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2CF5XF5qrJ3" role="3Ip0Jz">
@ -2352,6 +2325,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2CF5XF5qrJn" role="0Rg$4">
<node concept="aZer4" id="2CF5XF5qrJo" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="2CF5XF5qrJ$" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2CF5XF5qukG" role="3XD1gS">
<property role="TrG5h" value="Var" />
</node>
<node concept="aZer4" id="2CF5XF5q_9W" role="3XD1gS">
<property role="TrG5h" value="Fresh" />
</node>
<node concept="aZer4" id="2CF5XF5quzw" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNvH" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2508,38 +2499,6 @@
</node>
<node concept="1nLNNL" id="6$MtiK8H0qR" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H0qS" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwakS" role="0UC6o">
<node concept="3NuqgR" id="2CF5XF5qAsd" role="0eVf_">
<node concept="aZer4" id="2CF5XF5qAse" role="3XD1gS">
<property role="TrG5h" value="Ex" />
</node>
<node concept="aZer4" id="2CF5XF5qAtH" role="3XD1gS">
<property role="TrG5h" value="ExVar" />
</node>
<node concept="aZer4" id="2CF5XF5qOwG" role="3XD1gS">
<property role="TrG5h" value="ExStc" />
</node>
<node concept="aZer4" id="2CF5XF5qAzp" role="3XD1gS">
<property role="TrG5h" value="Uni" />
</node>
<node concept="aZer4" id="2CF5XF5qNbA" role="3XD1gS">
<property role="TrG5h" value="UniVar" />
</node>
<node concept="aZer4" id="2CF5XF5qAtS" role="3XD1gS">
<property role="TrG5h" value="UniStc" />
</node>
<node concept="aZer4" id="2CF5XF5qF8v" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvI" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="2cLnr$rI$Mk" role="0eVf_">
<node concept="aZer4" id="2cLnr$rI$Ml" role="3XD1gS">
<property role="TrG5h" value="Msg" />
</node>
<node concept="17QB3L" id="2cLnr$rI$Mm" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2CF5XF5qA5P" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2CF5XF5qA5Q" role="3Ip0Jz">
@ -2810,6 +2769,36 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2CF5XF5qAsd" role="0Rg$4">
<node concept="aZer4" id="2CF5XF5qAse" role="3XD1gS">
<property role="TrG5h" value="Ex" />
</node>
<node concept="aZer4" id="2CF5XF5qAtH" role="3XD1gS">
<property role="TrG5h" value="ExVar" />
</node>
<node concept="aZer4" id="2CF5XF5qOwG" role="3XD1gS">
<property role="TrG5h" value="ExStc" />
</node>
<node concept="aZer4" id="2CF5XF5qAzp" role="3XD1gS">
<property role="TrG5h" value="Uni" />
</node>
<node concept="aZer4" id="2CF5XF5qNbA" role="3XD1gS">
<property role="TrG5h" value="UniVar" />
</node>
<node concept="aZer4" id="2CF5XF5qAtS" role="3XD1gS">
<property role="TrG5h" value="UniStc" />
</node>
<node concept="aZer4" id="2CF5XF5qF8v" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="32pEOW" id="24ciDNzxNvI" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="2cLnr$rI$Mk" role="0Rg$4">
<node concept="aZer4" id="2cLnr$rI$Ml" role="3XD1gS">
<property role="TrG5h" value="Msg" />
</node>
<node concept="17QB3L" id="2cLnr$rI$Mm" role="3vLBG7" />
</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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

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

@ -2,7 +2,7 @@
<model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)">
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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" />
@ -177,9 +177,6 @@
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
@ -209,7 +206,7 @@
<child id="1302893676238672106" name="origin" index="1imXSf" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
</concept>
@ -868,14 +865,6 @@
<node concept="3clFbS" id="6$MtiK8H12V" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H12W" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H12X" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamm" role="0UC6o">
<node concept="3NuqgR" id="2aBGSFgfAEt" role="0eVf_">
<node concept="aZer4" id="2aBGSFgfAEu" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw0" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="2aBGSFgfAEo" role="1nLNMd">
<node concept="3I6sU6" id="2aBGSFgfAEp" role="3Ip0Jz">
<node concept="3I6s7M" id="2aBGSFgfAEE" role="3I6sU7">
@ -911,6 +900,12 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2aBGSFgfAEt" role="0Rg$4">
<node concept="aZer4" id="2aBGSFgfAEu" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw0" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -926,14 +921,6 @@
<node concept="3clFbS" id="6$MtiK8H12Z" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H130" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H131" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwama" role="0UC6o">
<node concept="3NuqgR" id="5jVx7S22gV2" role="0eVf_">
<node concept="aZer4" id="5jVx7S22gV3" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw1" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="5jVx7S22gUL" role="1nLNMd">
<node concept="3I6sU6" id="5jVx7S22gUM" role="3Ip0Jz">
<node concept="3I6s7M" id="5jVx7S22gUN" role="3I6sU7">
@ -982,6 +969,12 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5jVx7S22gV2" role="0Rg$4">
<node concept="aZer4" id="5jVx7S22gV3" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw1" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -997,14 +990,6 @@
<node concept="3clFbS" id="6$MtiK8H133" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H134" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H135" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamg" role="0UC6o">
<node concept="3NuqgR" id="5RfK0kxl_zV" role="0eVf_">
<node concept="aZer4" id="2aBGSFgfVxh" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw2" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="5RfK0kxl_zH" role="1nLNMd">
<node concept="3I6sU6" id="5RfK0kxl_zI" role="3Ip0Jz">
<node concept="3I6s7M" id="2aBGSFgfVxM" role="3I6sU7">
@ -1053,6 +1038,12 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5RfK0kxl_zV" role="0Rg$4">
<node concept="aZer4" id="2aBGSFgfVxh" role="3XD1gS">
<property role="TrG5h" value="Stc" />
</node>
<node concept="32pEOW" id="24ciDNzxNw2" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1068,17 +1059,6 @@
<node concept="3clFbS" id="6$MtiK8H137" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H138" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H139" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam1" role="0UC6o">
<node concept="3NuqgR" id="5jVx7S217sO" role="0eVf_">
<node concept="aZer4" id="5jVx7S21pW_" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="5jVx7S217sP" role="3XD1gS">
<property role="TrG5h" value="Ass" />
</node>
<node concept="32pEOW" id="24ciDNzxNw3" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="5jVx7S217sJ" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="5jVx7S217sK" role="3Ip0Jz">
@ -1182,6 +1162,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5jVx7S217sO" role="0Rg$4">
<node concept="aZer4" id="5jVx7S21pW_" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="5jVx7S217sP" role="3XD1gS">
<property role="TrG5h" value="Ass" />
</node>
<node concept="32pEOW" id="24ciDNzxNw3" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1219,20 +1208,6 @@
<node concept="3clFbS" id="6$MtiK8H13b" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13c" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13d" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamf" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JvIq_" role="0eVf_">
<node concept="aZer4" id="2AfSc6JvIqA" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JvIqJ" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="2AfSc6JvIr1" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNw4" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JvIqw" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JvIqx" role="3Ip0Jz">
@ -1416,6 +1391,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JvIq_" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JvIqA" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JvIqJ" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="2AfSc6JvIr1" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNw4" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1453,20 +1440,6 @@
<node concept="3clFbS" id="6$MtiK8H13f" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13g" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13h" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamc" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JvO6O" role="0eVf_">
<node concept="aZer4" id="2AfSc6JvO6P" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JvO6Q" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="2AfSc6JvO6R" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNw5" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JvO67" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JvO68" role="3Ip0Jz">
@ -1650,6 +1623,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JvO6O" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JvO6P" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JvO6Q" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="2AfSc6JvO6R" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNw5" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1687,17 +1672,6 @@
<node concept="3clFbS" id="6$MtiK8H13j" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13k" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13l" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam5" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JwgnT" role="0eVf_">
<node concept="aZer4" id="2AfSc6JwgnU" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6Jwgo9" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw6" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JwgnK" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JwgnL" role="3Ip0Jz">
@ -1814,6 +1788,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JwgnT" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JwgnU" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6Jwgo9" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw6" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -1851,17 +1834,6 @@
<node concept="3clFbS" id="6$MtiK8H13n" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13o" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13p" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamh" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6Jw_T4" role="0eVf_">
<node concept="aZer4" id="2AfSc6Jw_T5" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6Jw_T6" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw7" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6Jw_S_" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6Jw_SA" role="3Ip0Jz">
@ -1978,6 +1950,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6Jw_T4" role="0Rg$4">
<node concept="aZer4" id="2AfSc6Jw_T5" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6Jw_T6" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw7" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2015,17 +1996,6 @@
<node concept="3clFbS" id="6$MtiK8H13r" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13s" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13t" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwami" role="0UC6o">
<node concept="3NuqgR" id="2aBGSFgfwOw" role="0eVf_">
<node concept="aZer4" id="2aBGSFgfFks" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2aBGSFgfwOx" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw8" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2aBGSFgfwOr" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2aBGSFgfwOs" role="3Ip0Jz">
@ -2142,6 +2112,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2aBGSFgfwOw" role="0Rg$4">
<node concept="aZer4" id="2aBGSFgfFks" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2aBGSFgfwOx" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw8" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2174,17 +2153,6 @@
<node concept="3clFbS" id="6$MtiK8H13v" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13w" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13x" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamd" role="0UC6o">
<node concept="3NuqgR" id="2aBGSFgfGfQ" role="0eVf_">
<node concept="aZer4" id="2aBGSFgfGfR" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2aBGSFgfGfS" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw9" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2aBGSFgfGfp" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2aBGSFgfGfq" role="3Ip0Jz">
@ -2301,6 +2269,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2aBGSFgfGfQ" role="0Rg$4">
<node concept="aZer4" id="2aBGSFgfGfR" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2aBGSFgfGfS" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNw9" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2333,29 +2310,6 @@
<node concept="3clFbS" id="6$MtiK8H13z" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13$" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13_" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamj" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JyU4Q" role="0eVf_">
<node concept="aZer4" id="2AfSc6JyU4R" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVo6AP" role="3XD1gS">
<property role="TrG5h" value="PremOr" />
</node>
<node concept="aZer4" id="3l440nVnmQi" role="3XD1gS">
<property role="TrG5h" value="Disj1" />
</node>
<node concept="aZer4" id="3l440nVnmVa" role="3XD1gS">
<property role="TrG5h" value="Disj2" />
</node>
<node concept="aZer4" id="2AfSc6JyU68" role="3XD1gS">
<property role="TrG5h" value="PremIf1" />
</node>
<node concept="aZer4" id="2AfSc6JyU6p" role="3XD1gS">
<property role="TrG5h" value="PremIf2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwa" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JyU4L" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JyU4M" role="3Ip0Jz">
@ -2640,6 +2594,27 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JyU4Q" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JyU4R" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVo6AP" role="3XD1gS">
<property role="TrG5h" value="PremOr" />
</node>
<node concept="aZer4" id="3l440nVnmQi" role="3XD1gS">
<property role="TrG5h" value="Disj1" />
</node>
<node concept="aZer4" id="3l440nVnmVa" role="3XD1gS">
<property role="TrG5h" value="Disj2" />
</node>
<node concept="aZer4" id="2AfSc6JyU68" role="3XD1gS">
<property role="TrG5h" value="PremIf1" />
</node>
<node concept="aZer4" id="2AfSc6JyU6p" role="3XD1gS">
<property role="TrG5h" value="PremIf2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwa" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -2677,29 +2652,6 @@
<node concept="3clFbS" id="6$MtiK8H13B" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13C" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13D" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam7" role="0UC6o">
<node concept="3NuqgR" id="3l440nVo7Ti" role="0eVf_">
<node concept="aZer4" id="3l440nVo7Tj" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVo7Tk" role="3XD1gS">
<property role="TrG5h" value="PremOr" />
</node>
<node concept="aZer4" id="3l440nVo7Tl" role="3XD1gS">
<property role="TrG5h" value="Disj1" />
</node>
<node concept="aZer4" id="3l440nVo7Tm" role="3XD1gS">
<property role="TrG5h" value="Disj2" />
</node>
<node concept="aZer4" id="3l440nVo7Tn" role="3XD1gS">
<property role="TrG5h" value="PremIf1" />
</node>
<node concept="aZer4" id="3l440nVo7To" role="3XD1gS">
<property role="TrG5h" value="PremIf2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwb" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3l440nVo7S4" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3l440nVo7S5" role="3Ip0Jz">
@ -2984,6 +2936,27 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3l440nVo7Ti" role="0Rg$4">
<node concept="aZer4" id="3l440nVo7Tj" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVo7Tk" role="3XD1gS">
<property role="TrG5h" value="PremOr" />
</node>
<node concept="aZer4" id="3l440nVo7Tl" role="3XD1gS">
<property role="TrG5h" value="Disj1" />
</node>
<node concept="aZer4" id="3l440nVo7Tm" role="3XD1gS">
<property role="TrG5h" value="Disj2" />
</node>
<node concept="aZer4" id="3l440nVo7Tn" role="3XD1gS">
<property role="TrG5h" value="PremIf1" />
</node>
<node concept="aZer4" id="3l440nVo7To" role="3XD1gS">
<property role="TrG5h" value="PremIf2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwb" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3021,20 +2994,6 @@
<node concept="3clFbS" id="6$MtiK8H13F" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13G" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13H" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamb" role="0UC6o">
<node concept="3NuqgR" id="2YqrT$P4CCj" role="0eVf_">
<node concept="aZer4" id="2YqrT$P4D5$" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P4CCk" role="3XD1gS">
<property role="TrG5h" value="PremAtcd" />
</node>
<node concept="aZer4" id="2YqrT$P4CCw" role="3XD1gS">
<property role="TrG5h" value="PremCsq" />
</node>
<node concept="32pEOW" id="24ciDNzxNwc" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P4CCe" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P4CCf" role="3Ip0Jz">
@ -3249,6 +3208,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P4CCj" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P4D5$" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P4CCk" role="3XD1gS">
<property role="TrG5h" value="PremAtcd" />
</node>
<node concept="aZer4" id="2YqrT$P4CCw" role="3XD1gS">
<property role="TrG5h" value="PremCsq" />
</node>
<node concept="32pEOW" id="24ciDNzxNwc" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3286,20 +3257,6 @@
<node concept="3clFbS" id="6$MtiK8H13J" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13K" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13L" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamn" role="0UC6o">
<node concept="3NuqgR" id="2YqrT$P4Irv" role="0eVf_">
<node concept="aZer4" id="2YqrT$P4Irw" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P4Irx" role="3XD1gS">
<property role="TrG5h" value="PremAtcd" />
</node>
<node concept="aZer4" id="2YqrT$P4Iry" role="3XD1gS">
<property role="TrG5h" value="PremCsq" />
</node>
<node concept="32pEOW" id="24ciDNzxNwd" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P4Iqs" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P4Iqt" role="3Ip0Jz">
@ -3514,6 +3471,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P4Irv" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P4Irw" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P4Irx" role="3XD1gS">
<property role="TrG5h" value="PremAtcd" />
</node>
<node concept="aZer4" id="2YqrT$P4Iry" role="3XD1gS">
<property role="TrG5h" value="PremCsq" />
</node>
<node concept="32pEOW" id="24ciDNzxNwd" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3551,23 +3520,6 @@
<node concept="3clFbS" id="6$MtiK8H13N" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13O" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13P" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam8" role="0UC6o">
<node concept="3NuqgR" id="2YqrT$P4S08" role="0eVf_">
<node concept="aZer4" id="2YqrT$P4S09" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P54za" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNwe" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="2YqrT$P6DI_" role="0eVf_">
<node concept="aZer4" id="2YqrT$P6DIA" role="3XD1gS">
<property role="TrG5h" value="OK" />
</node>
<node concept="32pEOW" id="24ciDNzxNwf" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P4S03" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P4S04" role="3Ip0Jz">
@ -3689,6 +3641,21 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P4S08" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P4S09" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P54za" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="32pEOW" id="24ciDNzxNwe" role="3vLBG7" />
</node>
<node concept="3NuqgR" id="2YqrT$P6DI_" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P6DIA" role="3XD1gS">
<property role="TrG5h" value="OK" />
</node>
<node concept="32pEOW" id="24ciDNzxNwf" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -3726,20 +3693,6 @@
<node concept="3clFbS" id="6$MtiK8H13R" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13S" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13T" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam4" role="0UC6o">
<node concept="3NuqgR" id="2YqrT$P64rX" role="0eVf_">
<node concept="aZer4" id="2YqrT$P64rY" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P64s7" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="2YqrT$P64tc" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwg" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P64rS" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P64rT" role="3Ip0Jz">
@ -3970,6 +3923,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P64rX" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P64rY" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2YqrT$P64s7" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="2YqrT$P64tc" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwg" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4007,17 +3972,6 @@
<node concept="3clFbS" id="6$MtiK8H13V" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H13W" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H13X" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam6" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JxXK2" role="0eVf_">
<node concept="aZer4" id="2AfSc6JxXK3" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JxXK4" role="3XD1gS">
<property role="TrG5h" value="Ass" />
</node>
<node concept="32pEOW" id="24ciDNzxNwh" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JxXJb" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JxXJc" role="3Ip0Jz">
@ -4165,6 +4119,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JxXK2" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JxXK3" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JxXK4" role="3XD1gS">
<property role="TrG5h" value="Ass" />
</node>
<node concept="32pEOW" id="24ciDNzxNwh" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4239,20 +4202,6 @@
<node concept="3clFbS" id="6$MtiK8H13Z" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H140" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H141" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam0" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JuwUr" role="0eVf_">
<node concept="aZer4" id="2AfSc6JuwUs" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JuA9o" role="3XD1gS">
<property role="TrG5h" value="AtcdPrem" />
</node>
<node concept="aZer4" id="2AfSc6Juz0Q" role="3XD1gS">
<property role="TrG5h" value="IfPrem" />
</node>
<node concept="32pEOW" id="24ciDNzxNwi" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2AfSc6JuwT$" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2AfSc6JuwT_" role="3Ip0Jz">
@ -4435,6 +4384,18 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JuwUr" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JuwUs" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="2AfSc6JuA9o" role="3XD1gS">
<property role="TrG5h" value="AtcdPrem" />
</node>
<node concept="aZer4" id="2AfSc6Juz0Q" role="3XD1gS">
<property role="TrG5h" value="IfPrem" />
</node>
<node concept="32pEOW" id="24ciDNzxNwi" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4472,26 +4433,6 @@
<node concept="3clFbS" id="6$MtiK8H143" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H144" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H145" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam2" role="0UC6o">
<node concept="3NuqgR" id="3l440nVrMcf" role="0eVf_">
<node concept="aZer4" id="3l440nVrMcg" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVrMcp" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="3l440nVrMcF" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="aZer4" id="3l440nVrMrr" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="3l440nVrMuk" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwj" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3l440nVrMc4" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3l440nVrMc5" role="3Ip0Jz">
@ -4716,6 +4657,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3l440nVrMcf" role="0Rg$4">
<node concept="aZer4" id="3l440nVrMcg" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVrMcp" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="3l440nVrMcF" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="aZer4" id="3l440nVrMrr" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="3l440nVrMuk" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwj" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4753,26 +4712,6 @@
<node concept="3clFbS" id="6$MtiK8H147" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H148" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H149" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam3" role="0UC6o">
<node concept="3NuqgR" id="3l440nVrS8h" role="0eVf_">
<node concept="aZer4" id="3l440nVrS8i" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVrS8j" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="3l440nVrS8k" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="aZer4" id="3l440nVrS8l" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="3l440nVrS8m" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwk" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3l440nVrS7a" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3l440nVrS7b" role="3Ip0Jz">
@ -4936,6 +4875,24 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3l440nVrS8h" role="0Rg$4">
<node concept="aZer4" id="3l440nVrS8i" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVrS8j" role="3XD1gS">
<property role="TrG5h" value="Atcd" />
</node>
<node concept="aZer4" id="3l440nVrS8k" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="aZer4" id="3l440nVrS8l" role="3XD1gS">
<property role="TrG5h" value="Prem1" />
</node>
<node concept="aZer4" id="3l440nVrS8m" role="3XD1gS">
<property role="TrG5h" value="Prem2" />
</node>
<node concept="32pEOW" id="24ciDNzxNwk" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -4973,23 +4930,6 @@
<node concept="3clFbS" id="6$MtiK8H14b" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H14c" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H14d" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwame" role="0UC6o">
<node concept="3NuqgR" id="3l440nVqBe8" role="0eVf_">
<node concept="aZer4" id="3l440nVqBe9" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVqBi1" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3l440nVqBii" role="3XD1gS">
<property role="TrG5h" value="Acdt" />
</node>
<node concept="aZer4" id="3l440nVqBiE" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwl" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3l440nVqBdX" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3l440nVqBdY" role="3Ip0Jz">
@ -5130,6 +5070,21 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3l440nVqBe8" role="0Rg$4">
<node concept="aZer4" id="3l440nVqBe9" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVqBi1" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3l440nVqBii" role="3XD1gS">
<property role="TrG5h" value="Acdt" />
</node>
<node concept="aZer4" id="3l440nVqBiE" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwl" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -5167,23 +5122,6 @@
<node concept="3clFbS" id="6$MtiK8H14f" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H14g" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H14h" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwaml" role="0UC6o">
<node concept="3NuqgR" id="3l440nVqJlq" role="0eVf_">
<node concept="aZer4" id="3l440nVqJlr" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVqJls" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3l440nVqJlt" role="3XD1gS">
<property role="TrG5h" value="Acdt" />
</node>
<node concept="aZer4" id="3l440nVqJlu" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwm" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="3l440nVqJkG" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3l440nVqJkH" role="3Ip0Jz">
@ -5324,6 +5262,21 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="3l440nVqJlq" role="0Rg$4">
<node concept="aZer4" id="3l440nVqJlr" role="3XD1gS">
<property role="TrG5h" value="Con" />
</node>
<node concept="aZer4" id="3l440nVqJls" role="3XD1gS">
<property role="TrG5h" value="Prem" />
</node>
<node concept="aZer4" id="3l440nVqJlt" role="3XD1gS">
<property role="TrG5h" value="Acdt" />
</node>
<node concept="aZer4" id="3l440nVqJlu" role="3XD1gS">
<property role="TrG5h" value="Csqt" />
</node>
<node concept="32pEOW" id="24ciDNzxNwm" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -5361,14 +5314,6 @@
<node concept="3clFbS" id="6$MtiK8H14j" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H14k" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H14l" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwam9" role="0UC6o">
<node concept="3NuqgR" id="2AfSc6JuwTp" role="0eVf_">
<node concept="aZer4" id="2AfSc6JuwTq" role="3XD1gS">
<property role="TrG5h" value="Goal" />
</node>
<node concept="32pEOW" id="24ciDNzxNwn" role="3vLBG7" />
</node>
</node>
<node concept="3Aq9E8" id="2AfSc6JuwTc" role="1nLNMd">
<node concept="3I6sU6" id="2AfSc6JuwTd" role="3Ip0Jz">
<node concept="3I6s7M" id="2AfSc6JuwTe" role="3I6sU7">
@ -5404,6 +5349,12 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2AfSc6JuwTp" role="0Rg$4">
<node concept="aZer4" id="2AfSc6JuwTq" role="3XD1gS">
<property role="TrG5h" value="Goal" />
</node>
<node concept="32pEOW" id="24ciDNzxNwn" role="3vLBG7" />
</node>
</node>
</node>
</node>
@ -5419,17 +5370,6 @@
<node concept="3clFbS" id="6$MtiK8H14n" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8H14o" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8H14p" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwamk" role="0UC6o">
<node concept="3NuqgR" id="2YqrT$P7QXy" role="0eVf_">
<node concept="aZer4" id="2YqrT$P7QXz" role="3XD1gS">
<property role="TrG5h" value="Goal" />
</node>
<node concept="aZer4" id="2YqrT$P7QXD" role="3XD1gS">
<property role="TrG5h" value="ProofCon" />
</node>
<node concept="32pEOW" id="24ciDNzxNwo" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P7I4z" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P7I4$" role="3Ip0Jz">
@ -5547,6 +5487,15 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P7QXy" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P7QXz" role="3XD1gS">
<property role="TrG5h" value="Goal" />
</node>
<node concept="aZer4" id="2YqrT$P7QXD" role="3XD1gS">
<property role="TrG5h" value="ProofCon" />
</node>
<node concept="32pEOW" id="24ciDNzxNwo" role="3vLBG7" />
</node>
</node>
</node>
</node>

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

@ -77,7 +77,7 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

77
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="17" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="18" />
<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" />
@ -96,9 +96,6 @@
</concept>
</language>
<language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
<concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
<child id="8456919074560454898" name="parameter" index="0eVf_" />
</concept>
<concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
<child id="7871500063866331596" name="queryStage" index="92CTm" />
<child id="3026409000515988658" name="parameter" index="2_cLD1" />
@ -126,7 +123,7 @@
<child id="4957570047284421439" name="message" index="1ljv2e" />
</concept>
<concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
<child id="8456919074565751439" name="parameter" index="0UC6o" />
<child id="4814011019633607808" name="parameter" index="0Rg$4" />
<child id="3575255234174969658" name="head" index="1nLNMb" />
<child id="3575255234174969660" name="body" index="1nLNMd" />
</concept>
@ -241,16 +238,14 @@
</node>
</node>
</node>
<node concept="0eUR_" id="5fMWD6Iy9zE" role="0UC6o">
<node concept="3NuqgR" id="5fMWD6Iy9zG" role="0eVf_">
<node concept="aZer4" id="5fMWD6Iy9zH" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9zN" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9zO" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9zP" role="11_B2D" />
</node>
<node concept="3NuqgR" id="5fMWD6Iy9zG" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9zH" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9zN" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9zO" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9zP" role="11_B2D" />
</node>
</node>
</node>
@ -298,16 +293,14 @@
</node>
</node>
</node>
<node concept="0eUR_" id="5fMWD6Iy9Af" role="0UC6o">
<node concept="3NuqgR" id="5fMWD6Iy9Ah" role="0eVf_">
<node concept="aZer4" id="5fMWD6Iy9Ai" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9Aj" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9Ak" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9Al" role="11_B2D" />
</node>
<node concept="3NuqgR" id="5fMWD6Iy9Ah" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9Ai" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9Aj" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9Ak" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9Al" role="11_B2D" />
</node>
</node>
</node>
@ -419,24 +412,6 @@
<node concept="3clFbS" id="6$MtiK8GZF0" role="1nLNMH">
<node concept="1nLNNL" id="6$MtiK8GZF1" role="3cqZAp">
<node concept="1nLNMm" id="6$MtiK8GZF2" role="1nLNNK">
<node concept="0eUR_" id="3dsgZciwajt" role="0UC6o">
<node concept="3NuqgR" id="5fMWD6Iy9CF" role="0eVf_">
<node concept="aZer4" id="5fMWD6Iy9CG" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9CH" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9CI" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9CJ" role="11_B2D" />
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P7SuF" role="0eVf_">
<node concept="aZer4" id="2YqrT$P7SuG" role="3XD1gS">
<property role="TrG5h" value="Node" />
</node>
<node concept="3Tqbb2" id="2YqrT$P7SuH" role="3vLBG7" />
</node>
</node>
<node concept="3Aq93q" id="2YqrT$P7Su3" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="2YqrT$P7Su4" role="3Ip0Jz">
@ -511,6 +486,22 @@
</node>
</node>
</node>
<node concept="3NuqgR" id="5fMWD6Iy9CF" role="0Rg$4">
<node concept="aZer4" id="5fMWD6Iy9CG" role="3XD1gS">
<property role="TrG5h" value="TypeCollector" />
</node>
<node concept="3uibUv" id="5fMWD6Iy9CH" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9CI" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9CJ" role="11_B2D" />
</node>
</node>
<node concept="3NuqgR" id="2YqrT$P7SuF" role="0Rg$4">
<node concept="aZer4" id="2YqrT$P7SuG" role="3XD1gS">
<property role="TrG5h" value="Node" />
</node>
<node concept="3Tqbb2" id="2YqrT$P7SuH" role="3vLBG7" />
</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="17" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="18" />
<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" />

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

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff