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

Update all usages of moved concepts.

This commit is contained in:
Fedor Isakov 2020-04-13 14:18:24 +02:00
parent a0bc96b3e0
commit 5b1449fa82
10 changed files with 1596 additions and 1596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,28 +107,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
<property id="861509610434276456" name="final" index="nspS5" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
<child id="861509610434276451" name="feature" index="nspSe" />
</concept>
<concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -187,6 +165,27 @@
<concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
<child id="7871500063838282362" name="code" index="fHCRw" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434276453" name="" flags="ng" index="nspS8">
<property id="861509610434276456" name="" index="nspS5" />
</concept>
<concept id="861509610434276450" name="" flags="ng" index="nspSf">
<child id="861509610434276451" name="" index="nspSe" />
</concept>
<concept id="861509610434294982" name="" flags="ng" index="nssqF" />
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -202,6 +201,7 @@
<child id="1980609059185345194" name="constraint" index="8PkJo" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
<child id="6097203247147235901" name="logical" index="3h32gL" />
<child id="6097203247141261094" name="code" index="3hEL4E" />
@ -360,9 +360,9 @@
<ref role="a7OzE" node="7lt0LtPOZW8" resolve="T" />
</node>
<node concept="ns1u0" id="7mB3viLbLNi" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLdI7t" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="1nq8_$" id="7mB3viLdI7A" role="nsMwV">
<node concept="a7P8L" id="7mB3viLdI7$" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
@ -370,7 +370,7 @@
</node>
</node>
<node concept="nsMwS" id="7mB3viLbLNk" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="1nq8_$" id="7mB3viLbLOy" role="nsMwV">
<node concept="a7P8L" id="7mB3viLbLOw" role="1nq8_t">
<ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
@ -484,15 +484,15 @@
<ref role="a7OzE" node="7mB3viLi4pQ" resolve="A" />
</node>
<node concept="ns1u0" id="7mB3viLi4rf" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLi4rl" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="7mB3viLi4rr" role="nsMwV">
<property role="Xl_RC" value="Integer" />
</node>
</node>
<node concept="nsMwS" id="7mB3viLi4rh" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="1nq8_$" id="7mB3viLi4v0" role="nsMwV">
<node concept="a7P8L" id="7mB3viLi4uY" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
@ -506,15 +506,15 @@
<ref role="a7OzE" node="7mB3viLi4qh" resolve="B" />
</node>
<node concept="ns1u0" id="7mB3viLi4vZ" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLi4w0" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="7mB3viLi4w1" role="nsMwV">
<property role="Xl_RC" value="Integer" />
</node>
</node>
<node concept="nsMwS" id="7mB3viLi4w2" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="1nq8_$" id="7mB3viLi4w3" role="nsMwV">
<node concept="a7P8L" id="7mB3viLi4wZ" role="1nq8_t">
<ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
@ -589,15 +589,15 @@
<ref role="a7OzE" node="5TXeSYT5cnn" resolve="A" />
</node>
<node concept="ns1u0" id="2DIFeUB7n6m" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="2DIFeUB7n6n" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="2DIFeUB7n6o" role="nsMwV">
<property role="Xl_RC" value="String" />
</node>
</node>
<node concept="nsMwS" id="2DIFeUB7n6p" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="1nq8_$" id="2DIFeUB7n6q" role="nsMwV">
<node concept="a7P8L" id="2DIFeUB7sez" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
@ -611,15 +611,15 @@
<ref role="a7OzE" node="5TXeSYT5cno" resolve="B" />
</node>
<node concept="ns1u0" id="2DIFeUB7n6u" role="1uarlW">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="2DIFeUB7n6v" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="2DIFeUB7n6w" role="nsMwV">
<property role="Xl_RC" value="String" />
</node>
</node>
<node concept="nsMwS" id="2DIFeUB7n6x" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="1nq8_$" id="2DIFeUB7n6y" role="nsMwV">
<node concept="a7P8L" id="2DIFeUB7seD" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
@ -1038,15 +1038,15 @@
</node>
</node>
<node concept="ns1u0" id="7mB3viLcOh9" role="3A8w4Q">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLdDgZ" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="7mB3viLdDh5" role="nsMwV">
<property role="Xl_RC" value="Integer" />
</node>
</node>
<node concept="nsMwS" id="7mB3viLcOhb" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="37vLTw" id="1ALxU7reSPU" role="nsMwV">
<ref role="3cqZAo" node="1ALxU7reSPQ" resolve="val" />
</node>
@ -1132,15 +1132,15 @@
</node>
</node>
<node concept="ns1u0" id="7mB3viLdDcc" role="3A8w4Q">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLdDce" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="7mB3viLdDcD" role="nsMwV">
<property role="Xl_RC" value="String" />
</node>
</node>
<node concept="nsMwS" id="7mB3viLdDci" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="37vLTw" id="1ALxU7rfknU" role="nsMwV">
<ref role="3cqZAo" node="1ALxU7rfknQ" resolve="val" />
</node>
@ -1200,9 +1200,9 @@
<ref role="a7OzE" node="1ALxU7rh13o" resolve="Type" />
</node>
<node concept="ns1u0" id="1ALxU7rhb4_" role="3A8w4Q">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="1ALxU7rhbwt" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="Xl_RD" id="1ALxU7rhcod" role="nsMwV">
<property role="Xl_RC" value="Pair" />
</node>
@ -1265,9 +1265,9 @@
</node>
</node>
<node concept="ns1u0" id="7mB3viLggs9" role="3A8w4Q">
<ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" node="JOGAOsVt6y" />
<node concept="nsMwS" id="7mB3viLggsn" role="ns1xD">
<ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" node="7mB3viLdDa5" />
<node concept="2OqwBi" id="1ALxU7rgm5L" role="nsMwV">
<node concept="3hN9Ij" id="1ALxU7rglY_" role="2Oq$k0">
<ref role="3hLkJx" node="1ALxU7rgfrQ" resolve="type" />
@ -1278,7 +1278,7 @@
</node>
</node>
<node concept="nsMwS" id="7mB3viLggsC" role="ns1xD">
<ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" node="JOGAOsVt6$" />
<node concept="2OqwBi" id="1ALxU7rgnGQ" role="nsMwV">
<node concept="3hN9Ij" id="1ALxU7rgn_E" role="2Oq$k0">
<ref role="3hLkJx" node="1ALxU7rgfrQ" resolve="type" />

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

@ -213,15 +213,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -318,6 +309,14 @@
<concept id="6928531011217258898" name="jetbrains.mps.lang.coderules.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
<child id="6928531011217290187" name="variable" index="2aLmnP" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -326,6 +325,7 @@
<child id="1980609059185345194" name="constraint" index="8PkJo" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
<reference id="6097203247182937177" name="template" index="3jbY9l" />
<child id="6097203247182937145" name="input" index="3jbY8P" />
@ -1076,9 +1076,9 @@
<ref role="a7OzE" node="7qe1GumRXOO" resolve="T" />
</node>
<node concept="ns1u0" id="7qe1GumRXOW" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="7qe1GumRXOX" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="7qe1GumRXOY" role="nsMwV">
<node concept="a7P8L" id="7qe1GumRXOZ" role="1nq8_t">
<ref role="a7OzE" node="7qe1GumRXOP" resolve="L" />
@ -1086,7 +1086,7 @@
</node>
</node>
<node concept="nsMwS" id="7qe1GumRXP0" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="7qe1GumRXP1" role="nsMwV">
<node concept="a7P8L" id="7qe1GumRXP2" role="1nq8_t">
<ref role="a7OzE" node="7qe1GumRXOQ" resolve="R" />
@ -1198,9 +1198,9 @@
<ref role="a7OzE" node="5TXeSYT54SR" resolve="T" />
</node>
<node concept="ns1u0" id="Jfcwnvuw$6" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="Jfcwnvuw$7" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="Jfcwnvuw$8" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$9" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT54SS" resolve="L" />
@ -1208,7 +1208,7 @@
</node>
</node>
<node concept="nsMwS" id="Jfcwnvuw$a" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="Jfcwnvuw$b" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$c" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT54ST" resolve="R" />
@ -1310,7 +1310,7 @@
<ref role="a7OzE" node="5TXeSYT559h" resolve="TLocal" />
</node>
<node concept="ns1u0" id="Jfcwnvuw$E" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
</node>
</node>
</node>
@ -1330,9 +1330,9 @@
<ref role="a7OzE" node="5TXeSYT5510" resolve="T" />
</node>
<node concept="ns1u0" id="Jfcwnvuw$J" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="Jfcwnvuw$K" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="Jfcwnvuw$L" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$M" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5511" resolve="L" />
@ -1340,7 +1340,7 @@
</node>
</node>
<node concept="nsMwS" id="Jfcwnvuw$N" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="Jfcwnvuw$O" role="nsMwV">
<node concept="a7P8L" id="Jfcwnvuw$P" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT5512" resolve="R" />
@ -1452,7 +1452,7 @@
<ref role="a7OzE" node="5TXeSYT55hP" resolve="TLocal" />
</node>
<node concept="ns1u0" id="JfcwnvuwDW" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
</node>
</node>
</node>
@ -1462,9 +1462,9 @@
<ref role="a7OzE" node="5TXeSYT55hS" resolve="T" />
</node>
<node concept="ns1u0" id="JfcwnvuwBn" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="JfcwnvuwBo" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="JfcwnvuwBp" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwBq" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55hT" resolve="L" />
@ -1472,7 +1472,7 @@
</node>
</node>
<node concept="nsMwS" id="JfcwnvuwBr" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="JfcwnvuwBs" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwBt" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55hU" resolve="R" />
@ -1587,9 +1587,9 @@
<ref role="a7OzE" node="5TXeSYT55s8" resolve="T" />
</node>
<node concept="ns1u0" id="JfcwnvuwE1" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="JfcwnvuwE2" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="JfcwnvuwE3" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwE4" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55s9" resolve="L" />
@ -1597,7 +1597,7 @@
</node>
</node>
<node concept="nsMwS" id="JfcwnvuwE5" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="JfcwnvuwE6" role="nsMwV">
<node concept="a7P8L" id="JfcwnvuwE7" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55sa" resolve="R" />
@ -1726,9 +1726,9 @@
<ref role="a7OzE" node="5TXeSYT55$O" resolve="T" />
</node>
<node concept="ns1u0" id="4t6qIYSPdaT" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="4t6qIYSPdaU" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="4t6qIYSPdaV" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdaW" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55$P" resolve="L" />
@ -1736,7 +1736,7 @@
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPdaX" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="4t6qIYSPdaY" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdo8" role="1nq8_t">
<ref role="a7OzE" node="4t6qIYSPdm_" resolve="Local2" />
@ -1758,9 +1758,9 @@
<ref role="a7OzE" node="5TXeSYT55G1" resolve="T1" />
</node>
<node concept="ns1u0" id="4t6qIYSPdty" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="4t6qIYSPdtC" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="4t6qIYSPdtI" role="nsMwV">
<node concept="a7P8L" id="4t6qIYT2aT_" role="1nq8_t">
<ref role="a7OzE" node="4t6qIYT2aJm" resolve="Local3" />
@ -1768,7 +1768,7 @@
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPdtP" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="4t6qIYSPdvJ" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPdvQ" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55$Q" resolve="R" />
@ -1886,9 +1886,9 @@
<node concept="3I6s7M" id="4t6qIYSPqax" role="3I6sU7">
<node concept="3A8Hvi" id="4t6qIYSPqay" role="3I6s78">
<node concept="ns1u0" id="4t6qIYSPqa$" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="4t6qIYSPqa_" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="4t6qIYSPqaA" role="nsMwV">
<node concept="a7P8L" id="4t6qIYSPqaB" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55Om" resolve="L" />
@ -1896,7 +1896,7 @@
</node>
</node>
<node concept="nsMwS" id="4t6qIYSPqaC" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="4t6qIYSPqaD" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8QF" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT55Og" resolve="Local2" />
@ -2007,9 +2007,9 @@
<ref role="a7OzE" node="5TXeSYT564w" resolve="Local" />
</node>
<node concept="ns1u0" id="4t6qIYTd7Er" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="4t6qIYTd7Es" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="4t6qIYTd7Et" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd7Eu" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564B" resolve="L" />
@ -2017,7 +2017,7 @@
</node>
</node>
<node concept="nsMwS" id="4t6qIYTd7Ev" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
<ref role="nsMwP" to="zuft:JfcwnvuueX" />
<node concept="1nq8_$" id="4t6qIYTd7Ew" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8S2" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
@ -2033,9 +2033,9 @@
<ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
</node>
<node concept="ns1u0" id="4t6qIYTd8JD" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
<ref role="ns1xF" to="zuft:JfcwnvuueH" />
<node concept="nsMwS" id="4t6qIYTd8KA" role="ns1xD">
<ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
<ref role="nsMwP" to="zuft:JfcwnvuueR" />
<node concept="1nq8_$" id="4t6qIYTd8KG" role="nsMwV">
<node concept="a7P8L" id="4t6qIYTd8Tv" role="1nq8_t">
<ref role="a7OzE" node="5TXeSYT564y" resolve="Local3" />
@ -3180,9 +3180,9 @@
</node>
</node>
<node concept="ns1u0" id="JfcwnvutGa" role="3AunhB">
<ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" to="zuft:JOGAOsVt6y" />
<node concept="nsMwS" id="JfcwnvutGg" role="ns1xD">
<ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" to="zuft:7mB3viLdDa5" />
<node concept="1nq8_$" id="JfcwnvutGm" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutGk" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7phr7" resolve="NewTV" />
@ -3190,7 +3190,7 @@
</node>
</node>
<node concept="nsMwS" id="JfcwnvutGB" role="ns1xD">
<ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" to="zuft:JOGAOsVt6$" />
<node concept="1nq8_$" id="JfcwnvutGK" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutGI" role="1nq8_t">
<ref role="a7OzE" node="48ZGLP7pgwC" resolve="E" />
@ -3268,9 +3268,9 @@
<ref role="a7OzE" node="JfcwnvutMw" resolve="G" />
</node>
<node concept="ns1u0" id="JfcwnvutH8" role="3A8w4Q">
<ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
<ref role="ns1xF" to="zuft:JOGAOsVt6y" />
<node concept="nsMwS" id="JfcwnvutH9" role="ns1xD">
<ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
<ref role="nsMwP" to="zuft:7mB3viLdDa5" />
<node concept="1nq8_$" id="JfcwnvutHa" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutHb" role="1nq8_t">
<ref role="a7OzE" node="JfcwnvutGZ" resolve="NewTV" />
@ -3278,7 +3278,7 @@
</node>
</node>
<node concept="nsMwS" id="JfcwnvutHc" role="ns1xD">
<ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
<ref role="nsMwP" to="zuft:JOGAOsVt6$" />
<node concept="1nq8_$" id="JfcwnvutHd" role="nsMwV">
<node concept="a7P8L" id="JfcwnvutHe" role="1nq8_t">
<ref role="a7OzE" node="JfcwnvutGX" resolve="E" />

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

@ -112,28 +112,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
<property id="861509610434276456" name="final" index="nspS5" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
<child id="861509610434276451" name="feature" index="nspSe" />
</concept>
<concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -220,6 +198,27 @@
<reference id="6097203247219331496" name="extends" index="3tg4Y$" />
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434276453" name="" flags="ng" index="nspS8">
<property id="861509610434276456" name="" index="nspS5" />
</concept>
<concept id="861509610434276450" name="" flags="ng" index="nspSf">
<child id="861509610434276451" name="" index="nspSe" />
</concept>
<concept id="861509610434289827" name="" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -228,6 +227,7 @@
<reference id="3541122455446356437" name="extends" index="2YbDB9" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
<child id="6097203247156107501" name="input" index="3ix8rx" />
@ -362,9 +362,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJ8V" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<ref role="ns1xF" node="7VBaGntKJ6C" />
<node concept="nsMwS" id="7VBaGntKJ8W" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<ref role="nsMwP" node="7VBaGntKJ6E" />
<node concept="1nq8_$" id="3w0n0hzlYjG" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzlYjF" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzlYhK" resolve="Left" />
@ -372,7 +372,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ8X" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<ref role="nsMwP" node="7VBaGntKJ6F" />
<node concept="1nq8_$" id="3w0n0hzlYwu" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzlYwt" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzlYhT" resolve="Right" />
@ -478,9 +478,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIM7" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJ94" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<ref role="ns1xF" node="7VBaGntKJ6C" />
<node concept="nsMwS" id="7VBaGntKJ95" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<ref role="nsMwP" node="7VBaGntKJ6E" />
<node concept="1nq8_$" id="3w0n0hzmj5J" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmj5I" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
@ -488,7 +488,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ96" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<ref role="nsMwP" node="7VBaGntKJ6F" />
<node concept="1nq8_$" id="3w0n0hzmjcz" role="nsMwV">
<node concept="a7P8L" id="2gcGVmG$Rdc" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
@ -1113,9 +1113,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIM5" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJ8Y" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<ref role="ns1xF" node="7VBaGntKJ6C" />
<node concept="nsMwS" id="7VBaGntKJ8Z" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<ref role="nsMwP" node="7VBaGntKJ6E" />
<node concept="1nq8_$" id="3w0n0hzmnoI" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmnoH" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmjfs" resolve="EqLeft" />
@ -1123,7 +1123,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ90" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<ref role="nsMwP" node="7VBaGntKJ6F" />
<node concept="1nq8_$" id="3w0n0hzmnri" role="nsMwV">
<node concept="a7P8L" id="3w0n0hzmnrh" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hzmjfI" resolve="EqRight" />
@ -1894,9 +1894,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIM6" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJ91" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
<ref role="ns1xF" node="7VBaGntKJ6C" />
<node concept="nsMwS" id="7VBaGntKJ92" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
<ref role="nsMwP" node="7VBaGntKJ6E" />
<node concept="1nq8_$" id="3w0n0hznwzX" role="nsMwV">
<node concept="a7P8L" id="3w0n0hznwzY" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hznw$l" resolve="EqLeft" />
@ -1904,7 +1904,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJ93" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
<ref role="nsMwP" node="7VBaGntKJ6F" />
<node concept="1nq8_$" id="3w0n0hznw$3" role="nsMwV">
<node concept="a7P8L" id="3w0n0hznw$4" role="1nq8_t">
<ref role="a7OzE" node="3w0n0hznw$m" resolve="EqRight" />

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

@ -162,30 +162,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
<concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
<property id="861509610434276456" name="final" index="nspS5" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
<child id="861509610434276451" name="feature" index="nspSe" />
</concept>
<concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -295,6 +271,29 @@
<reference id="6097203247219331496" name="extends" index="3tg4Y$" />
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="" flags="ng" index="nsiOd" />
<concept id="861509610434276453" name="" flags="ng" index="nspS8">
<property id="861509610434276456" name="" index="nspS5" />
</concept>
<concept id="861509610434276450" name="" flags="ng" index="nspSf">
<child id="861509610434276451" name="" index="nspSe" />
</concept>
<concept id="861509610434294982" name="" flags="ng" index="nssqF" />
<concept id="861509610434289827" name="" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -303,6 +302,7 @@
<reference id="3541122455446356437" name="extends" index="2YbDB9" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
<child id="6097203247156107501" name="input" index="3ix8rx" />
@ -437,9 +437,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwMa8vVc" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<ref role="ns1xF" node="7VBaGntKJ6Q" />
<node concept="nsMwS" id="5itBwMa8vVd" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6S" />
<node concept="1nq8_$" id="5itBwMa8vVe" role="nsMwV">
<node concept="a7P8L" id="5itBwMa8vVf" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEEJk" resolve="Var" />
@ -447,7 +447,7 @@
</node>
</node>
<node concept="nsMwS" id="5itBwMa8vVg" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6T" />
<node concept="1nq8_$" id="5itBwMa8vVh" role="nsMwV">
<node concept="37jhX" id="5itBwMa9DlH" role="1nq8_t">
<node concept="1nq8_$" id="5itBwMa9DlG" role="37jj2">
@ -529,9 +529,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJap" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<ref role="ns1xF" node="7VBaGntKJ6U" />
<node concept="nsMwS" id="7VBaGntKJaq" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6W" />
<node concept="1nq8_$" id="Vo$tzLEFM$" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLEFM_" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEFMH" resolve="Var" />
@ -539,7 +539,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJar" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6X" />
<node concept="1nq8_$" id="Vo$tzLEFME" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLEFMF" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLEFMI" resolve="Body" />
@ -641,9 +641,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJav" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ6Y" resolve="Relation" />
<ref role="ns1xF" node="7VBaGntKJ6Y" />
<node concept="nsMwS" id="7VBaGntKJaw" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ70" resolve="name" />
<ref role="nsMwP" node="7VBaGntKJ70" />
<node concept="1nq8_$" id="5itBwMa8D5Q" role="nsMwV">
<node concept="37jhX" id="5itBwMa8D5P" role="1nq8_t">
<node concept="2OqwBi" id="5itBwMa8DeG" role="37jj2">
@ -658,7 +658,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJax" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ71" resolve="member" />
<ref role="nsMwP" node="7VBaGntKJ71" />
<node concept="1nq8_$" id="Vo$tzLIpZQ" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLIpZR" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLIpZg" resolve="Memb" />
@ -712,9 +712,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJab" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ72" resolve="Object" />
<ref role="ns1xF" node="7VBaGntKJ72" />
<node concept="nsMwS" id="7VBaGntKJac" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ74" resolve="name" />
<ref role="nsMwP" node="7VBaGntKJ74" />
<node concept="1nq8_$" id="5itBwMa8FtG" role="nsMwV">
<node concept="37jhX" id="5itBwMa8FtF" role="1nq8_t">
<node concept="2OqwBi" id="5itBwMa8FAq" role="37jj2">
@ -758,9 +758,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJay" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ75" resolve="Variable" />
<ref role="ns1xF" node="7VBaGntKJ75" />
<node concept="nsMwS" id="7VBaGntKJaz" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ77" resolve="name" />
<ref role="nsMwP" node="7VBaGntKJ77" />
<node concept="1nq8_$" id="5itBwMa8I0J" role="nsMwV">
<node concept="37jhX" id="5itBwMa8I0I" role="1nq8_t">
<node concept="2OqwBi" id="5itBwMa8Idj" role="37jj2">
@ -866,9 +866,9 @@
</node>
</node>
<node concept="ns1u0" id="7VBaGntKJaB" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ78" resolve="Function" />
<ref role="ns1xF" node="7VBaGntKJ78" />
<node concept="nsMwS" id="7VBaGntKJaC" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ7a" resolve="name" />
<ref role="nsMwP" node="7VBaGntKJ7a" />
<node concept="2OqwBi" id="5itBwMa8M0X" role="nsMwV">
<node concept="3j8tct" id="5itBwMa8M0Y" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwMa8JC7" resolve="fun" />
@ -879,7 +879,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaD" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ7b" resolve="argument" />
<ref role="nsMwP" node="7VBaGntKJ7b" />
<node concept="1nq8_$" id="Vo$tzLIpVG" role="nsMwV">
<node concept="a7P8L" id="Vo$tzLIpVF" role="1nq8_t">
<ref role="a7OzE" node="Vo$tzLIcAp" resolve="Arg" />
@ -1171,9 +1171,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKINM" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJaE" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<ref role="ns1xF" node="7VBaGntKJ6Q" />
<node concept="nsMwS" id="7VBaGntKJaF" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6S" />
<node concept="1nq8_$" id="2oO2uzBXAqH" role="nsMwV">
<node concept="a7P8L" id="2oO2uzBXAqF" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWTdP" resolve="Var" />
@ -1181,7 +1181,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaG" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6T" />
<node concept="1nq8_$" id="2oO2uzBXAsU" role="nsMwV">
<node concept="a7P8L" id="2oO2uzBXAsT" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWT6$" resolve="Prem" />
@ -1828,9 +1828,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKINL" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJag" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<ref role="ns1xF" node="7VBaGntKJ6Q" />
<node concept="nsMwS" id="7VBaGntKJah" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6S" />
<node concept="1nq8_$" id="2CF5XF5oJvc" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5oJvd" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBWNnU" resolve="Var" />
@ -1838,7 +1838,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJai" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6T" />
<node concept="1nq8_$" id="2CF5XF5oJvi" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5oJvj" role="1nq8_t">
<ref role="a7OzE" node="2oO2uzBXx8g" resolve="Stc" />
@ -2065,9 +2065,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKINN" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJaj" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<ref role="ns1xF" node="7VBaGntKJ6U" />
<node concept="nsMwS" id="7VBaGntKJak" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6W" />
<node concept="1nq8_$" id="2CF5XF5qul1" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qul0" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qukG" resolve="Var" />
@ -2075,7 +2075,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJal" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6X" />
<node concept="1nq8_$" id="2CF5XF5quA1" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5quA0" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5quzw" resolve="Stc" />
@ -2344,9 +2344,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKINO" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJa$" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
<ref role="ns1xF" node="7VBaGntKJ6U" />
<node concept="nsMwS" id="7VBaGntKJa_" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6W" />
<node concept="1nq8_$" id="2CF5XF5qAuj" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qAui" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qAtH" resolve="ExVar" />
@ -2354,7 +2354,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaA" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6X" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6X" />
<node concept="1nq8_$" id="2CF5XF5qAwy" role="nsMwV">
<node concept="a7P8L" id="2CF5XF5qODY" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qOwG" resolve="ExStc" />
@ -2398,9 +2398,9 @@
<ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKINP" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJad" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
<ref role="ns1xF" node="7VBaGntKJ6Q" />
<node concept="nsMwS" id="7VBaGntKJae" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
<ref role="nsMwP" node="7VBaGntKJ6S" />
<node concept="1nq8_$" id="3dsgZcixZw2" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZw3" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qNbA" resolve="UniVar" />
@ -2408,12 +2408,12 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJaf" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ6T" resolve="sentence" />
<ref role="nsMwP" node="7VBaGntKJ6T" />
<node concept="1nq8_$" id="3dsgZcixZw8" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJas" role="1nq8_t">
<ref role="ns1xF" to="6r1k:7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" to="6r1k:7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJat" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" to="6r1k:7VBaGntKJ8b" />
<node concept="1nq8_$" id="3dsgZcixZwe" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZwf" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qAtS" resolve="UniStc" />
@ -2421,7 +2421,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJau" role="ns1xD">
<ref role="nsMwP" to="6r1k:7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" to="6r1k:7VBaGntKJ8c" />
<node concept="1nq8_$" id="3dsgZcixZwk" role="nsMwV">
<node concept="a7P8L" id="3dsgZcixZwl" role="1nq8_t">
<ref role="a7OzE" node="2CF5XF5qF8v" resolve="Con" />

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

@ -87,34 +87,10 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
<concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
<property id="861509610434276456" name="final" index="nspS5" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
<child id="861509610434276451" name="feature" index="nspSe" />
</concept>
<concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
<concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
<concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
<child id="2105510410850136264" name="contents" index="KCVpo" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -179,6 +155,29 @@
<child id="1618328391714763070" name="macro" index="0oKgB" />
<child id="6097203247162410403" name="prototype" index="3iTdIJ" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="" flags="ng" index="nsiOd" />
<concept id="861509610434276453" name="" flags="ng" index="nspS8">
<property id="861509610434276456" name="" index="nspS5" />
</concept>
<concept id="861509610434276450" name="" flags="ng" index="nspSf">
<child id="861509610434276451" name="" index="nspSe" />
</concept>
<concept id="861509610434294982" name="" flags="ng" index="nssqF" />
<concept id="861509610434289827" name="" flags="ng" index="nstbe" />
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -188,6 +187,7 @@
<child id="1980609059185345194" name="constraint" index="8PkJo" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
<reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
<child id="6097203247156107501" name="input" index="3ix8rx" />
@ -297,9 +297,9 @@
<ref role="a7OzE" node="5itBwM9U0XA" resolve="Sent" />
</node>
<node concept="ns1u0" id="5itBwM9U1$0" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ7X" resolve="Const" />
<ref role="ns1xF" node="7VBaGntKJ7X" />
<node concept="nsMwS" id="5itBwM9U1$2" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ7Z" resolve="name" />
<ref role="nsMwP" node="7VBaGntKJ7Z" />
<node concept="1nq8_$" id="5itBwM9U29D" role="nsMwV">
<node concept="37jhX" id="5itBwM9U29C" role="1nq8_t">
<node concept="2OqwBi" id="5itBwM9U2m7" role="37jj2">
@ -420,9 +420,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwM9YtBi" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<ref role="ns1xF" node="7VBaGntKJ80" />
<node concept="nsMwS" id="5itBwM9YtBj" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<ref role="nsMwP" node="7VBaGntKJ82" />
<node concept="1nq8_$" id="5itBwM9YtBk" role="nsMwV">
<node concept="37jhX" id="5itBwMa4JBL" role="1nq8_t">
<node concept="1nq8_$" id="5itBwMa4JBK" role="37jj2">
@ -551,9 +551,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwMa4_iJ" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<ref role="ns1xF" node="7VBaGntKJ83" />
<node concept="nsMwS" id="5itBwMa4_iK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<ref role="nsMwP" node="7VBaGntKJ85" />
<node concept="1nq8_$" id="5itBwMa4_iL" role="nsMwV">
<node concept="37jhX" id="5itBwMa4Kv$" role="1nq8_t">
<node concept="1nq8_$" id="5itBwMa4Kvz" role="37jj2">
@ -638,9 +638,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwMa4F78" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="5itBwMa4F79" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="5itBwMa4F7a" role="nsMwV">
<node concept="a7P8L" id="5itBwMa4F7b" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa4CQK" resolve="Target" />
@ -715,9 +715,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwMa5UrK" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="5itBwMa5UrL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="5itBwMa5UrM" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UrN" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5SHO" resolve="Atcd" />
@ -725,7 +725,7 @@
</node>
</node>
<node concept="nsMwS" id="5itBwMa5UrO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="5itBwMa5UrP" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UrQ" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5STx" resolve="Csqt" />
@ -803,9 +803,9 @@
</node>
</node>
<node concept="ns1u0" id="5itBwMa5UZh" role="3A8w4Q">
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<ref role="ns1xF" node="7VBaGntKJ8d" />
<node concept="nsMwS" id="5itBwMa5UZi" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8f" />
<node concept="1nq8_$" id="5itBwMa5UZj" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UZk" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5UZp" resolve="Atcd" />
@ -813,7 +813,7 @@
</node>
</node>
<node concept="nsMwS" id="5itBwMa5UZl" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8g" />
<node concept="1nq8_$" id="5itBwMa5UZm" role="nsMwV">
<node concept="a7P8L" id="5itBwMa5UZn" role="1nq8_t">
<ref role="a7OzE" node="5itBwMa5UZq" resolve="Csqt" />
@ -1268,9 +1268,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR1" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJef" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<ref role="ns1xF" node="7VBaGntKJ80" />
<node concept="nsMwS" id="7VBaGntKJeg" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<ref role="nsMwP" node="7VBaGntKJ82" />
<node concept="1oi1Uc" id="2AfSc6JvNjG" role="nsMwV">
<node concept="KCUsM" id="2AfSc6JvNm_" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsMC" role="KCVpo">
@ -1482,9 +1482,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRb" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJfe" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<ref role="ns1xF" node="7VBaGntKJ80" />
<node concept="nsMwS" id="7VBaGntKJff" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<ref role="nsMwP" node="7VBaGntKJ82" />
<node concept="1oi1Uc" id="2AfSc6JvO6C" role="nsMwV">
<node concept="KCUsM" id="2AfSc6JvO6D" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsME" role="KCVpo">
@ -1653,9 +1653,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRo" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJf1" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<ref role="ns1xF" node="7VBaGntKJ80" />
<node concept="nsMwS" id="7VBaGntKJf2" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<ref role="nsMwP" node="7VBaGntKJ82" />
<node concept="1oi1Uc" id="2AfSc6Jwgqh" role="nsMwV">
<node concept="KCUsM" id="2AfSc6Jwgta" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsMG" role="KCVpo">
@ -1803,9 +1803,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR8" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJf9" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
<ref role="ns1xF" node="7VBaGntKJ80" />
<node concept="nsMwS" id="7VBaGntKJfa" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
<ref role="nsMwP" node="7VBaGntKJ82" />
<node concept="1oi1Uc" id="2AfSc6Jw_SP" role="nsMwV">
<node concept="KCUsM" id="2AfSc6Jw_SQ" role="1oi0x0">
<node concept="2IllgU" id="2AfSc6Jw_SV" role="KCVpo" />
@ -1966,9 +1966,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRj" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJer" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<ref role="ns1xF" node="7VBaGntKJ83" />
<node concept="nsMwS" id="7VBaGntKJes" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<ref role="nsMwP" node="7VBaGntKJ85" />
<node concept="1oi1Uc" id="2YqrT$P4bbQ" role="nsMwV">
<node concept="KCUsM" id="2YqrT$P4beJ" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsMI" role="KCVpo">
@ -2111,9 +2111,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRl" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJdV" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<ref role="ns1xF" node="7VBaGntKJ83" />
<node concept="nsMwS" id="7VBaGntKJdW" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<ref role="nsMwP" node="7VBaGntKJ85" />
<node concept="1oi1Uc" id="2YqrT$P4hvt" role="nsMwV">
<node concept="KCUsM" id="2YqrT$P4hvu" role="1oi0x0">
<node concept="2IllgU" id="2YqrT$P4hvz" role="KCVpo" />
@ -2243,9 +2243,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIQV" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeo" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJep" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVnr0E" role="nsMwV">
<node concept="a7P8L" id="3l440nVnr0D" role="1nq8_t">
<ref role="a7OzE" node="3l440nVnmQi" resolve="Disj1" />
@ -2253,7 +2253,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeq" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2AfSc6JyU7k" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JyU7j" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
@ -2292,9 +2292,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRe" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJfg" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJfh" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVnrk5" role="nsMwV">
<node concept="a7P8L" id="3l440nVnrk4" role="1nq8_t">
<ref role="a7OzE" node="3l440nVnmVa" resolve="Disj2" />
@ -2302,7 +2302,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfi" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVnrhp" role="nsMwV">
<node concept="a7P8L" id="3l440nVnrsh" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JyU4R" resolve="Con" />
@ -2341,9 +2341,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR6" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJf7" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<ref role="ns1xF" node="7VBaGntKJ83" />
<node concept="nsMwS" id="7VBaGntKJf8" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<ref role="nsMwP" node="7VBaGntKJ85" />
<node concept="1oi1Uc" id="3l440nVnqu3" role="nsMwV">
<node concept="KCUsM" id="3l440nVnqx4" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsMK" role="KCVpo">
@ -2561,9 +2561,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR5" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeV" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeW" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVo7SD" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7SE" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tl" resolve="Disj1" />
@ -2571,7 +2571,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeX" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVo7SJ" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7SK" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
@ -2610,9 +2610,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIQX" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJe4" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJe5" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVo7T2" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7T3" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tm" resolve="Disj2" />
@ -2620,7 +2620,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe6" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVo7T8" role="nsMwV">
<node concept="a7P8L" id="3l440nVo7T9" role="1nq8_t">
<ref role="a7OzE" node="3l440nVo7Tj" resolve="Con" />
@ -2659,9 +2659,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR2" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJfm" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
<ref role="ns1xF" node="7VBaGntKJ83" />
<node concept="nsMwS" id="7VBaGntKJfn" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
<ref role="nsMwP" node="7VBaGntKJ85" />
<node concept="1oi1Uc" id="3l440nVo7Sk" role="nsMwV">
<node concept="KCUsM" id="3l440nVo7Sl" role="1oi0x0">
<node concept="3wAshV" id="3zXFZnUhsMM" role="KCVpo">
@ -2866,9 +2866,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIQY" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJe7" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJe8" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P4Dek" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Dej" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
@ -2891,9 +2891,9 @@
<node concept="3Aqt3T" id="2YqrT$P4CCM" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="ns1u0" id="7VBaGntKJel" role="3AunhB">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJem" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2YqrT$P4CDm" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4CDl" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
@ -2901,7 +2901,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJen" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2YqrT$P4CLS" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4CLR" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
@ -2935,9 +2935,9 @@
<node concept="3Aqt3T" id="2YqrT$P4I0G" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="ns1u0" id="7VBaGntKJdP" role="3AunhB">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJdQ" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2YqrT$P4I0M" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4I0N" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCk" resolve="PremAtcd" />
@ -2945,12 +2945,12 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdR" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2YqrT$P4If5" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJet" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJeu" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P4IjJ" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IjI" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4CCw" resolve="PremCsq" />
@ -3111,9 +3111,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRd" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJex" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJey" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P4IqB" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqC" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
@ -3136,9 +3136,9 @@
<node concept="3Aqt3T" id="2YqrT$P4Ir3" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="ns1u0" id="7VBaGntKJeY" role="3AunhB">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeZ" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2YqrT$P4Ir9" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Ira" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
@ -3146,12 +3146,12 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJf0" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2YqrT$P4Irf" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJev" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJew" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P4Irl" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4Irm" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
@ -3188,9 +3188,9 @@
<node concept="3Aqt3T" id="2YqrT$P4IqG" role="3I6s78">
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="ns1u0" id="7VBaGntKJdZ" role="3AunhB">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJe0" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2YqrT$P4IqM" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqN" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Irx" resolve="PremAtcd" />
@ -3198,7 +3198,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe1" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2YqrT$P4IqS" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P4IqT" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4Iry" resolve="PremCsq" />
@ -3369,14 +3369,14 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRn" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJdX" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJdY" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P5jLb" role="nsMwV">
<node concept="ns1u0" id="7VBaGntKJf5" role="1nq8_t">
<ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
<ref role="ns1xF" node="7VBaGntKJ86" />
<node concept="nsMwS" id="7VBaGntKJf6" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
<ref role="nsMwP" node="7VBaGntKJ88" />
<node concept="1nq8_$" id="2YqrT$P5jNi" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P5rMC" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P4S09" resolve="Con" />
@ -3517,9 +3517,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRf" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJdM" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJdN" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2YqrT$P64tX" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P64tW" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P64s7" resolve="Atcd" />
@ -3527,7 +3527,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2YqrT$P64EJ" role="nsMwV">
<node concept="a7P8L" id="2YqrT$P64EI" role="1nq8_t">
<ref role="a7OzE" node="2YqrT$P64tc" resolve="Csqt" />
@ -3778,9 +3778,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIQW" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeS" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeT" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2AfSc6JxXJm" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JxXJn" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
@ -3788,7 +3788,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeU" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2AfSc6JxXJs" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JxYMg" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JxXK4" resolve="Ass" />
@ -4009,9 +4009,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRc" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeD" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeE" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="2AfSc6JuArn" role="nsMwV">
<node concept="a7P8L" id="2AfSc6JuArm" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JuA9o" resolve="AtcdPrem" />
@ -4019,7 +4019,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeF" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="2AfSc6Juz2J" role="nsMwV">
<node concept="a7P8L" id="2AfSc6Juz2I" role="1nq8_t">
<ref role="a7OzE" node="2AfSc6JuwUs" resolve="Con" />
@ -4209,9 +4209,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRk" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJdS" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJdT" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVrMxP" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMxO" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
@ -4219,7 +4219,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdU" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVrM$p" role="nsMwV">
<node concept="a7P8L" id="3l440nVrM$o" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
@ -4258,9 +4258,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR9" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJdJ" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJdK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVrQu5" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmqS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
@ -4268,7 +4268,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJdL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVrQub" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmEY" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
@ -4307,9 +4307,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRi" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJec" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<ref role="ns1xF" node="7VBaGntKJ8d" />
<node concept="nsMwS" id="7VBaGntKJed" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8f" />
<node concept="1nq8_$" id="3l440nVrMgT" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMgS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcp" resolve="Atcd" />
@ -4317,7 +4317,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJee" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8g" />
<node concept="1nq8_$" id="3l440nVrMnH" role="nsMwV">
<node concept="a7P8L" id="3l440nVrMnG" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrMcF" resolve="Csqt" />
@ -4470,9 +4470,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIQZ" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeJ" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeK" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVrS7l" role="nsMwV">
<node concept="a7P8L" id="3l440nVrS7m" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
@ -4480,7 +4480,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeL" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVrS7r" role="nsMwV">
<node concept="a7P8L" id="3l440nVrS7s" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
@ -4519,9 +4519,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRa" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJe9" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJea" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVrS7I" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmO_" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
@ -4529,7 +4529,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeb" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVrS7O" role="nsMwV">
<node concept="a7P8L" id="3l440nVsmYc" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
@ -4568,9 +4568,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR3" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJfj" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<ref role="ns1xF" node="7VBaGntKJ8d" />
<node concept="nsMwS" id="7VBaGntKJfk" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8f" />
<node concept="1nq8_$" id="3l440nVrS87" role="nsMwV">
<node concept="a7P8L" id="3l440nVrT6x" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8k" resolve="Csqt" />
@ -4578,7 +4578,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfl" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8g" />
<node concept="1nq8_$" id="3l440nVrS8d" role="nsMwV">
<node concept="a7P8L" id="3l440nVrTfl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVrS8j" resolve="Atcd" />
@ -4676,9 +4676,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRg" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJfb" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJfc" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVqBjm" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBjl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
@ -4686,7 +4686,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJfd" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVqBA6" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBA5" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
@ -4710,9 +4710,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRh" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJez" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<ref role="ns1xF" node="7VBaGntKJ8d" />
<node concept="nsMwS" id="7VBaGntKJe$" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8f" />
<node concept="1nq8_$" id="3l440nVqBK4" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBK5" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBii" resolve="Acdt" />
@ -4720,7 +4720,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJe_" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8g" />
<node concept="1nq8_$" id="3l440nVqBKa" role="nsMwV">
<node concept="a7P8L" id="3l440nVqBKb" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqBiE" resolve="Csqt" />
@ -4856,9 +4856,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIRm" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeM" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
<ref role="ns1xF" node="7VBaGntKJ89" />
<node concept="nsMwS" id="7VBaGntKJeN" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8b" />
<node concept="1nq8_$" id="3l440nVqJkR" role="nsMwV">
<node concept="a7P8L" id="3l440nVqJkS" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />
@ -4866,7 +4866,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeO" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8c" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8c" />
<node concept="1nq8_$" id="3l440nVqJkX" role="nsMwV">
<node concept="a7P8L" id="3l440nVqJkY" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
@ -4890,9 +4890,9 @@
<ref role="3AqCNq" node="2aBGSFgfwNi" resolve="conclusion" />
<node concept="1HFMs5" id="7VBaGntKIR7" role="3AunhB">
<node concept="ns1u0" id="7VBaGntKJeA" role="1uarlW">
<ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
<ref role="ns1xF" node="7VBaGntKJ8d" />
<node concept="nsMwS" id="7VBaGntKJeB" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
<ref role="nsMwP" node="7VBaGntKJ8f" />
<node concept="1nq8_$" id="3l440nVqJla" role="nsMwV">
<node concept="a7P8L" id="3l440nVqKhl" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlu" resolve="Csqt" />
@ -4900,7 +4900,7 @@
</node>
</node>
<node concept="nsMwS" id="7VBaGntKJeC" role="ns1xD">
<ref role="nsMwP" node="7VBaGntKJ8g" resolve="consequence" />
<ref role="nsMwP" node="7VBaGntKJ8g" />
<node concept="1nq8_$" id="3l440nVqJlg" role="nsMwV">
<node concept="a7P8L" id="3l440nVqKpT" role="1nq8_t">
<ref role="a7OzE" node="3l440nVqJlt" resolve="Acdt" />

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

@ -65,13 +65,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -98,6 +91,13 @@
<concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
<child id="7871500063838282362" name="code" index="fHCRw" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434276450" name="" flags="ng" index="nspSf" />
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />

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

File diff suppressed because it is too large Load Diff

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

@ -142,27 +142,6 @@
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
<child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
</concept>
<concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="decl" index="ns1xF" />
<child id="861509610434243076" name="override" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
<child id="861509610434243105" name="contents" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
<property id="5177758076344254900" name="open" index="3uGXoX" />
<reference id="861509610434243089" name="prototype" index="ns1xW" />
<child id="861509610434243084" name="template" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
<concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
<child id="861509610434276451" name="feature" index="nspSe" />
</concept>
<concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="feature" index="nsMwP" />
<child id="861509610434435670" name="getter" index="nsMwV" />
</concept>
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
<child id="4780620083400582654" name="logical" index="1nq8_t" />
</concept>
@ -216,6 +195,26 @@
<reference id="6097203247219331496" name="extends" index="3tg4Y$" />
<child id="1618328391714763070" name="macro" index="0oKgB" />
</concept>
<concept id="861509610434242029" name="" flags="ng" index="ns1u0">
<reference id="861509610434243078" name="" index="ns1xF" />
<child id="861509610434243076" name="" index="ns1xD" />
</concept>
<concept id="861509610434243104" name="" flags="ng" index="ns1xd">
<child id="861509610434243105" name="" index="ns1xc" />
</concept>
<concept id="861509610434243081" name="" flags="ng" index="ns1x$">
<property id="5177758076344254900" name="" index="3uGXoX" />
<reference id="861509610434243089" name="" index="ns1xW" />
<child id="861509610434243084" name="" index="ns1xx" />
</concept>
<concept id="861509610434305888" name="" flags="ng" index="nsiOd" />
<concept id="861509610434276450" name="" flags="ng" index="nspSf">
<child id="861509610434276451" name="" index="nspSe" />
</concept>
<concept id="861509610434435669" name="" flags="ng" index="nsMwS">
<reference id="861509610434435672" name="" index="nsMwP" />
<child id="861509610434435670" name="" index="nsMwV" />
</concept>
<concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
<reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
<child id="6691972578451986151" name="input" index="2t_VXX" />
@ -228,6 +227,7 @@
<concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
<child id="6856711987714624233" name="code" index="HKQng" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
<child id="6097203247147235901" name="logical" index="3h32gL" />
<child id="6097203247141261094" name="code" index="3hEL4E" />
@ -428,9 +428,9 @@
<ref role="a7OzE" node="4E290qPYynt" resolve="Type" />
</node>
<node concept="ns1u0" id="4E290qPYMxa" role="3A8w4Q">
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<ref role="ns1xF" node="4E290qPYB6e" />
<node concept="nsMwS" id="4E290qPYMxW" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<ref role="nsMwP" node="4E290qPYBjo" />
<node concept="1nq8_$" id="4E290qPYMyR" role="nsMwV">
<node concept="a7P8L" id="4E290qPYMyQ" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYySZ" resolve="CompT" />
@ -461,23 +461,6 @@
</node>
</node>
</node>
<node concept="ns1xd" id="4E290qPYB4i">
<property role="TrG5h" value="TupleTerms" />
<node concept="ns1x$" id="4lCLOtwq2MF" role="ns1xc">
<property role="TrG5h" value="type" />
<property role="3uGXoX" value="true" />
<node concept="nspSf" id="4lCLOtwq2MG" role="ns1xx" />
</node>
<node concept="ns1x$" id="4E290qPYB6e" role="ns1xc">
<property role="TrG5h" value="tuple" />
<ref role="ns1xW" node="4lCLOtwq2MF" resolve="type" />
<node concept="nspSf" id="4E290qPYB6f" role="ns1xx">
<node concept="nsiOd" id="4E290qPYBjo" role="nspSe">
<property role="TrG5h" value="types" />
</node>
</node>
</node>
</node>
<node concept="AVZre" id="4E290qPYMO2">
<property role="TrG5h" value="IndexedTuple" />
<property role="3GE5qa" value="rule" />
@ -525,9 +508,9 @@
</node>
</node>
<node concept="ns1u0" id="4E290qPZMdM" role="3AunhB">
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<ref role="ns1xF" node="4E290qPYB6e" />
<node concept="nsMwS" id="4E290qPZMeh" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<ref role="nsMwP" node="4E290qPYBjo" />
<node concept="1nq8_$" id="4E290qPZMfc" role="nsMwV">
<node concept="a7P8L" id="4E290qPZMfb" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYTGQ" resolve="CompTypes" />
@ -781,7 +764,7 @@
<ref role="a7OzE" node="4E290qPZCaH" resolve="IndexT" />
</node>
<node concept="ns1u0" id="4E290qPZwqf" role="3AunhB">
<ref role="ns1xF" to="kqnc:JOGAOsVt2E" resolve="_int_" />
<ref role="ns1xF" to="kqnc:JOGAOsVt2E" />
</node>
</node>
</node>
@ -913,9 +896,9 @@
<ref role="a7OzE" node="4E290qPZqQk" resolve="TupleType" />
</node>
<node concept="ns1u0" id="4E290qPZr0k" role="3AunhB">
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<ref role="ns1xF" node="4E290qPYB6e" />
<node concept="nsMwS" id="4E290qPZr0L" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<ref role="nsMwP" node="4E290qPYBjo" />
<node concept="1nq8_$" id="4E290qPZr1G" role="nsMwV">
<node concept="a7P8L" id="4E290qPZr1F" role="1nq8_t">
<ref role="a7OzE" node="4E290qPYXCS" resolve="ComponentTypesList" />
@ -1123,9 +1106,9 @@
</node>
<node concept="1HFMs5" id="1mdVbTSaq2o" role="3AunhB">
<node concept="ns1u0" id="JOGAOsVt9$" role="1uarlW">
<ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
<ref role="ns1xF" node="4E290qPYB6e" />
<node concept="nsMwS" id="2WQBycG$n_7" role="ns1xD">
<ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
<ref role="nsMwP" node="4E290qPYBjo" />
<node concept="1nq8_$" id="2WQBycG$nAg" role="nsMwV">
<node concept="a7P8L" id="2WQBycG$nAf" role="1nq8_t">
<ref role="a7OzE" node="5upUcEtdY0_" resolve="CompTypes" />
@ -1220,5 +1203,22 @@
</node>
</node>
</node>
<node concept="ns1xd" id="4E290qPYB4i">
<property role="TrG5h" value="TupleTerms" />
<node concept="ns1x$" id="4lCLOtwq2MF" role="ns1xc">
<property role="TrG5h" value="type" />
<property role="3uGXoX" value="true" />
<node concept="nspSf" id="4lCLOtwq2MG" role="ns1xx" />
</node>
<node concept="ns1x$" id="4E290qPYB6e" role="ns1xc">
<property role="TrG5h" value="tuple" />
<ref role="ns1xW" node="4lCLOtwq2MF" />
<node concept="nspSf" id="4E290qPYB6f" role="ns1xx">
<node concept="nsiOd" id="4E290qPYBjo" role="nspSe">
<property role="TrG5h" value="types" />
</node>
</node>
</node>
</node>
</model>

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

@ -135,7 +135,6 @@
<reference id="8829335963593822893" name="declaration" index="a7OzE" />
</concept>
<concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
<concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
<concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
<child id="8713947027062064784" name="logical" index="1FtiSR" />
</concept>
@ -265,6 +264,7 @@
<concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
<child id="6856711987714624233" name="code" index="HKQng" />
</concept>
<concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
<concept id="4957570047283823112" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackConstraint" flags="ng" index="1lHd6T">
<property id="4957570047283824112" name="severity" index="1lHdp1" />
<child id="4957570047284421439" name="message" index="1ljv2e" />

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

File diff suppressed because it is too large Load Diff