From e3d2ac503bb9d78166d034a10ee92c7549d83d8a Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 9 Jan 2018 12:04:27 +0100
Subject: [PATCH] Move inference rules to propositional logic language.

---
 .../jetbrains.mps.fitch/models/structure.mps  | 91 -------------------
 .../models/jetbrains.mps.fitch.sandbox.mps    | 20 ++--
 .../models/structure.mps                      | 81 +++++++++++++++++
 .../models/types.mps                          | 36 ++++----
 4 files changed, 109 insertions(+), 119 deletions(-)

diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps b/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps
index 6a4bc9ca..2580b858 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps
+++ b/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps
@@ -128,9 +128,6 @@
     <node concept="PrWs8" id="3JXBM6C4o1Q" role="PrDN$">
       <ref role="PrY4T" node="3JXBM6C4ntZ" resolve="Leaf" />
     </node>
-    <node concept="PrWs8" id="5jVx7S23jt3" role="PrDN$">
-      <ref role="PrY4T" node="5jVx7S23jsE" resolve="Proposition" />
-    </node>
   </node>
   <node concept="1TIwiD" id="3JXBM6C3Pwi">
     <property role="EcuMT" value="4322786184247859218" />
@@ -159,9 +156,6 @@
     <node concept="PrWs8" id="3JXBM6C3UQC" role="PzmwI">
       <ref role="PrY4T" node="3JXBM6C3UQB" resolve="Node" />
     </node>
-    <node concept="PrWs8" id="5jVx7S23jsM" role="PzmwI">
-      <ref role="PrY4T" node="5jVx7S23jsE" resolve="Proposition" />
-    </node>
   </node>
   <node concept="PlHQZ" id="3JXBM6C3UQB">
     <property role="EcuMT" value="4322786184247881127" />
@@ -178,86 +172,6 @@
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
   </node>
-  <node concept="1TIwiD" id="3JXBM6C3URE">
-    <property role="EcuMT" value="4322786184247881194" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="AndIntro" />
-    <property role="34LRSv" value="&amp;I" />
-    <property role="R4oN_" value="And Introduction" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3UTz">
-    <property role="EcuMT" value="4322786184247881315" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="AndElim" />
-    <property role="34LRSv" value="&amp;E" />
-    <property role="R4oN_" value="And Elimination" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3UT$">
-    <property role="EcuMT" value="4322786184247881316" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="OrIntro" />
-    <property role="34LRSv" value="|I" />
-    <property role="R4oN_" value="OrIntroduction" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3UT_">
-    <property role="EcuMT" value="4322786184247881317" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="OrElim" />
-    <property role="34LRSv" value="|E" />
-    <property role="R4oN_" value="Or Elimination" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3UTA">
-    <property role="EcuMT" value="4322786184247881318" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="NotIntro" />
-    <property role="34LRSv" value="~I" />
-    <property role="R4oN_" value="Negation Introduction" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3ZJ8">
-    <property role="EcuMT" value="4322786184247901128" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="NotElim" />
-    <property role="34LRSv" value="~E" />
-    <property role="R4oN_" value="Negation Elimination" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3ZJ9">
-    <property role="EcuMT" value="4322786184247901129" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="IfIntro" />
-    <property role="34LRSv" value="=&gt;I" />
-    <property role="R4oN_" value="Implication Introduction" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3ZJm">
-    <property role="EcuMT" value="4322786184247901142" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="IfElim" />
-    <property role="34LRSv" value="=&gt;E" />
-    <property role="R4oN_" value="Implication Elimination" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3ZJn">
-    <property role="EcuMT" value="4322786184247901143" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="IffIntro" />
-    <property role="34LRSv" value="&lt;=&gt;I" />
-    <property role="R4oN_" value="Biconditional Introduction" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
-  <node concept="1TIwiD" id="3JXBM6C3ZJo">
-    <property role="EcuMT" value="4322786184247901144" />
-    <property role="3GE5qa" value="proof.rule" />
-    <property role="TrG5h" value="IffElim" />
-    <property role="34LRSv" value="&lt;=&gt;E" />
-    <property role="R4oN_" value="Biconditional Elimination" />
-    <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
-  </node>
   <node concept="PlHQZ" id="3JXBM6C4ntZ">
     <property role="EcuMT" value="4322786184247998335" />
     <property role="3GE5qa" value="proof" />
@@ -311,11 +225,6 @@
     <property role="R4oN_" value="Reiteration" />
     <ref role="1TJDcQ" node="3JXBM6C3FsA" resolve="Judgement" />
   </node>
-  <node concept="PlHQZ" id="5jVx7S23jsE">
-    <property role="EcuMT" value="6123633795075487530" />
-    <property role="3GE5qa" value="proof" />
-    <property role="TrG5h" value="Proposition" />
-  </node>
   <node concept="PlHQZ" id="4LBPYGV4cY1">
     <property role="EcuMT" value="5505606474791964545" />
     <property role="TrG5h" value="Sentence" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/sandbox/models/jetbrains.mps.fitch.sandbox.mps b/samples/fitch/languages/jetbrains.mps.fitch/sandbox/models/jetbrains.mps.fitch.sandbox.mps
index a175a2c8..b4d71763 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/sandbox/models/jetbrains.mps.fitch.sandbox.mps
+++ b/samples/fitch/languages/jetbrains.mps.fitch/sandbox/models/jetbrains.mps.fitch.sandbox.mps
@@ -8,6 +8,16 @@
   <imports />
   <registry>
     <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional">
+      <concept id="4322786184247881315" name="jetbrains.mps.logic.propositional.structure.AndElim" flags="ng" index="2jWz52" />
+      <concept id="4322786184247881317" name="jetbrains.mps.logic.propositional.structure.OrElim" flags="ng" index="2jWz54" />
+      <concept id="4322786184247881316" name="jetbrains.mps.logic.propositional.structure.OrIntro" flags="ng" index="2jWz55" />
+      <concept id="4322786184247881318" name="jetbrains.mps.logic.propositional.structure.NotIntro" flags="ng" index="2jWz57" />
+      <concept id="4322786184247881194" name="jetbrains.mps.logic.propositional.structure.AndIntro" flags="ng" index="2jWzbb" />
+      <concept id="4322786184247901129" name="jetbrains.mps.logic.propositional.structure.IfIntro" flags="ng" index="2jWAjC" />
+      <concept id="4322786184247901128" name="jetbrains.mps.logic.propositional.structure.NotElim" flags="ng" index="2jWAjD" />
+      <concept id="4322786184247901143" name="jetbrains.mps.logic.propositional.structure.IffIntro" flags="ng" index="2jWAjQ" />
+      <concept id="4322786184247901142" name="jetbrains.mps.logic.propositional.structure.IfElim" flags="ng" index="2jWAjR" />
+      <concept id="4322786184247901144" name="jetbrains.mps.logic.propositional.structure.IffElim" flags="ng" index="2jWAjT" />
       <concept id="4322786184247805384" name="jetbrains.mps.logic.propositional.structure.Proposition" flags="ng" index="2jWLFD" />
       <concept id="4322786184247805399" name="jetbrains.mps.logic.propositional.structure.Not" flags="ng" index="2jWLFQ">
         <child id="4322786184247805400" name="target" index="2jWLFT" />
@@ -28,19 +38,9 @@
       </concept>
     </language>
     <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch">
-      <concept id="4322786184247881315" name="jetbrains.mps.fitch.structure.AndElim" flags="ng" index="2jWz52" />
-      <concept id="4322786184247881317" name="jetbrains.mps.fitch.structure.OrElim" flags="ng" index="2jWz54" />
-      <concept id="4322786184247881316" name="jetbrains.mps.fitch.structure.OrIntro" flags="ng" index="2jWz55" />
-      <concept id="4322786184247881318" name="jetbrains.mps.fitch.structure.NotIntro" flags="ng" index="2jWz57" />
       <concept id="4322786184247881124" name="jetbrains.mps.fitch.structure.SubProof" flags="ng" index="2jWza5">
         <child id="4322786184247881125" name="content" index="2jWza4" />
       </concept>
-      <concept id="4322786184247881194" name="jetbrains.mps.fitch.structure.AndIntro" flags="ng" index="2jWzbb" />
-      <concept id="4322786184247901129" name="jetbrains.mps.fitch.structure.IfIntro" flags="ng" index="2jWAjC" />
-      <concept id="4322786184247901128" name="jetbrains.mps.fitch.structure.NotElim" flags="ng" index="2jWAjD" />
-      <concept id="4322786184247901143" name="jetbrains.mps.fitch.structure.IffIntro" flags="ng" index="2jWAjQ" />
-      <concept id="4322786184247901142" name="jetbrains.mps.fitch.structure.IfElim" flags="ng" index="2jWAjR" />
-      <concept id="4322786184247901144" name="jetbrains.mps.fitch.structure.IffElim" flags="ng" index="2jWAjT" />
       <concept id="4322786184247859218" name="jetbrains.mps.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
       <concept id="4322786184247854968" name="jetbrains.mps.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
         <child id="2497161927181071993" name="conclusion" index="3MT$nN" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps
index c44d0d15..3626d0ca 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps
+++ b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps
@@ -24,6 +24,7 @@
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
@@ -162,5 +163,85 @@
       <ref role="PrY4T" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
   </node>
+  <node concept="1TIwiD" id="3JXBM6C3UTz">
+    <property role="EcuMT" value="4322786184247881315" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="AndElim" />
+    <property role="34LRSv" value="&amp;E" />
+    <property role="R4oN_" value="And Elimination" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3URE">
+    <property role="EcuMT" value="4322786184247881194" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="AndIntro" />
+    <property role="34LRSv" value="&amp;I" />
+    <property role="R4oN_" value="And Introduction" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3ZJm">
+    <property role="EcuMT" value="4322786184247901142" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="IfElim" />
+    <property role="34LRSv" value="=&gt;E" />
+    <property role="R4oN_" value="Implication Elimination" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3ZJ9">
+    <property role="EcuMT" value="4322786184247901129" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="IfIntro" />
+    <property role="34LRSv" value="=&gt;I" />
+    <property role="R4oN_" value="Implication Introduction" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3ZJo">
+    <property role="EcuMT" value="4322786184247901144" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="IffElim" />
+    <property role="34LRSv" value="&lt;=&gt;E" />
+    <property role="R4oN_" value="Biconditional Elimination" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3ZJn">
+    <property role="EcuMT" value="4322786184247901143" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="IffIntro" />
+    <property role="34LRSv" value="&lt;=&gt;I" />
+    <property role="R4oN_" value="Biconditional Introduction" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3ZJ8">
+    <property role="EcuMT" value="4322786184247901128" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="NotElim" />
+    <property role="34LRSv" value="~E" />
+    <property role="R4oN_" value="Negation Elimination" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3UTA">
+    <property role="EcuMT" value="4322786184247881318" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="NotIntro" />
+    <property role="34LRSv" value="~I" />
+    <property role="R4oN_" value="Negation Introduction" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3UT_">
+    <property role="EcuMT" value="4322786184247881317" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="OrElim" />
+    <property role="34LRSv" value="|E" />
+    <property role="R4oN_" value="Or Elimination" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
+  <node concept="1TIwiD" id="3JXBM6C3UT$">
+    <property role="EcuMT" value="4322786184247881316" />
+    <property role="3GE5qa" value="proof.rule" />
+    <property role="TrG5h" value="OrIntro" />
+    <property role="34LRSv" value="|I" />
+    <property role="R4oN_" value="OrIntroduction" />
+    <ref role="1TJDcQ" to="jfgh:3JXBM6C3FsA" resolve="Judgement" />
+  </node>
 </model>
 
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
index de54f1d3..6dfc39ef 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
@@ -1401,7 +1401,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6Jv_Cn" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3URE" resolve="AndIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3URE" resolve="AndIntro" />
         <node concept="3A20r5" id="2AfSc6Jv_Co" role="2t_VXX">
           <property role="TrG5h" value="ai" />
         </node>
@@ -1622,7 +1622,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6JvO7e" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3URE" resolve="AndIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3URE" resolve="AndIntro" />
         <node concept="3A20r5" id="2AfSc6JvO7f" role="2t_VXX">
           <property role="TrG5h" value="ai" />
         </node>
@@ -1775,7 +1775,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6Jw7Tt" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UTz" resolve="AndElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UTz" resolve="AndElim" />
         <node concept="3A20r5" id="2AfSc6Jw7Tu" role="2t_VXX">
           <property role="TrG5h" value="ae" />
         </node>
@@ -1928,7 +1928,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6Jw_Tj" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UTz" resolve="AndElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UTz" resolve="AndElim" />
         <node concept="3A20r5" id="2AfSc6Jw_Tk" role="2t_VXX">
           <property role="TrG5h" value="ae" />
         </node>
@@ -2067,7 +2067,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2aBGSFgfrJs" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UT$" resolve="OrIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UT$" resolve="OrIntro" />
         <node concept="3A20r5" id="2aBGSFgfrJt" role="2t_VXX">
           <property role="TrG5h" value="oi" />
         </node>
@@ -2215,7 +2215,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2aBGSFgfGfT" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UT$" resolve="OrIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UT$" resolve="OrIntro" />
         <node concept="3A20r5" id="2aBGSFgfGfU" role="2t_VXX">
           <property role="TrG5h" value="oi" />
         </node>
@@ -2573,7 +2573,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6JyL1T" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UT_" resolve="OrElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UT_" resolve="OrElim" />
         <node concept="3A20r5" id="2AfSc6JyL1U" role="2t_VXX">
           <property role="TrG5h" value="oe" />
         </node>
@@ -2922,7 +2922,7 @@
         </node>
       </node>
       <node concept="2t___k" id="3l440nVo7TF" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UT_" resolve="OrElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UT_" resolve="OrElim" />
         <node concept="3A20r5" id="3l440nVo7TG" role="2t_VXX">
           <property role="TrG5h" value="oe" />
         </node>
@@ -3196,7 +3196,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2YqrT$P4vEx" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UTA" resolve="NotIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UTA" resolve="NotIntro" />
         <node concept="3A20r5" id="2YqrT$P4vEy" role="2t_VXX">
           <property role="TrG5h" value="ni" />
         </node>
@@ -3470,7 +3470,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2YqrT$P4Irz" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3UTA" resolve="NotIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3UTA" resolve="NotIntro" />
         <node concept="3A20r5" id="2YqrT$P4Ir$" role="2t_VXX">
           <property role="TrG5h" value="ni" />
         </node>
@@ -3635,7 +3635,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2YqrT$P4RZQ" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJ8" resolve="NotElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJ8" resolve="NotElim" />
         <node concept="3A20r5" id="2YqrT$P4RZR" role="2t_VXX">
           <property role="TrG5h" value="ne" />
         </node>
@@ -3901,7 +3901,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2YqrT$P5VJL" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJ9" resolve="IfIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJ9" resolve="IfIntro" />
         <node concept="3A20r5" id="2YqrT$P5VJV" role="2t_VXX">
           <property role="TrG5h" value="ifi" />
         </node>
@@ -4087,7 +4087,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6JxXKC" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJ9" resolve="IfIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJ9" resolve="IfIntro" />
         <node concept="3A20r5" id="2AfSc6JxXKD" role="2t_VXX">
           <property role="TrG5h" value="ifi" />
         </node>
@@ -4342,7 +4342,7 @@
         </node>
       </node>
       <node concept="2t___k" id="2AfSc6JuwV1" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJm" resolve="IfElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJm" resolve="IfElim" />
         <node concept="3A20r5" id="2AfSc6JuwV2" role="2t_VXX">
           <property role="TrG5h" value="ife" />
         </node>
@@ -4632,7 +4632,7 @@
         </node>
       </node>
       <node concept="2t___k" id="3l440nVrA_7" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJn" resolve="IffIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJn" resolve="IffIntro" />
         <node concept="3A20r5" id="3l440nVrA_8" role="2t_VXX">
           <property role="TrG5h" value="iffi" />
         </node>
@@ -4867,7 +4867,7 @@
         </node>
       </node>
       <node concept="2t___k" id="3l440nVrS8n" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJn" resolve="IffIntro" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJn" resolve="IffIntro" />
         <node concept="3A20r5" id="3l440nVrS8o" role="2t_VXX">
           <property role="TrG5h" value="iffi" />
         </node>
@@ -5064,7 +5064,7 @@
         </node>
       </node>
       <node concept="2t___k" id="3l440nVqqeN" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJo" resolve="IffElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJo" resolve="IffElim" />
         <node concept="3A20r5" id="3l440nVqqeO" role="2t_VXX">
           <property role="TrG5h" value="iffe" />
         </node>
@@ -5261,7 +5261,7 @@
         </node>
       </node>
       <node concept="2t___k" id="3l440nVqJlF" role="20_v8_">
-        <ref role="2t_S0q" to="jfgh:3JXBM6C3ZJo" resolve="IffElim" />
+        <ref role="2t_S0q" to="27wh:3JXBM6C3ZJo" resolve="IffElim" />
         <node concept="3A20r5" id="3l440nVqJlG" role="2t_VXX">
           <property role="TrG5h" value="iffe" />
         </node>