Separate logic-related stuff from proof-related.

samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl

@@ -41,16 +41,11 @@
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
-  <dependencies>
-    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</dependency>
-    <dependency reexport="false">ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)</dependency>
-  </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -102,10 +97,7 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" version="0" />
   </dependencyVersions>
-  <extendedLanguages>
-    <extendedLanguage>ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)</extendedLanguage>
-  </extendedLanguages>
+  <extendedLanguages />
 </language>
 

samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps

@@ -6,7 +6,6 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -124,7 +123,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="conclusion" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="27wh:3JXBM6C3Cnq" resolve="Sentence" />
+      <ref role="20lvS9" node="4LBPYGV4cY1" resolve="LogicalSentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C4o1Q" role="PrDN$">
       <ref role="PrY4T" node="3JXBM6C4ntZ" resolve="Leaf" />
@@ -296,7 +295,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="sentence" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="27wh:3JXBM6C3Cnq" resolve="Sentence" />
+      <ref role="20lvS9" node="4LBPYGV4cY1" resolve="LogicalSentence" />
     </node>
   </node>
   <node concept="1TIwiD" id="2aBGSFge6pw">
@@ -317,5 +316,9 @@
     <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="LogicalSentence" />
+  </node>
 </model>
 

samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl

@@ -85,6 +85,8 @@
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.typesystem2" version="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps

@@ -17,7 +17,9 @@
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
       </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
+        <child id="1169127546356" name="extends" index="PrDN$" />
+      </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
@@ -156,6 +158,9 @@
     <property role="EcuMT" value="4322786184247805402" />
     <property role="TrG5h" value="Sentence" />
     <property role="3GE5qa" value="sentence" />
+    <node concept="PrWs8" id="4LBPYGV4d_8" role="PrDN$">
+      <ref role="PrY4T" to="jfgh:4LBPYGV4cY1" resolve="LogicalSentence" />
+    </node>
   </node>
 </model>