From 5cc626ca571ef4f8e4e85779440fd3627034835b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 24 Mar 2017 09:42:33 +0100
Subject: [PATCH] Drop the NotPredicate.

---
 .../jetbrains/mps/logic/builtin/predicate.mps | 116 ------------------
 .../generator/template/main@generator.mps     |  50 --------
 .../languageModels/editor.mps                 |  19 ---
 .../languageModels/structure.mps              |  14 ---
 .../mps/lang/typesystem2/program.mps          |  33 -----
 .../mps/lang/typesystem2/typechecking.mps     |   4 -
 6 files changed, 236 deletions(-)

diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index a5316097..9000363c 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -1382,45 +1382,6 @@
               <node concept="3clFbH" id="7ISVfSJ2Nu" role="3cqZAp" />
             </node>
           </node>
-          <node concept="3eNFk2" id="7rf49NglbTU" role="3eNLev">
-            <node concept="2OqwBi" id="7rf49Nglcsd" role="3eO9$A">
-              <node concept="10M0yZ" id="7rf49NglclV" role="2Oq$k0">
-                <ref role="1PxDUh" node="7rf49NgkbDQ" resolve="NotPredicate" />
-                <ref role="3cqZAo" node="7rf49Ngke3n" resolve="NOT_SYM" />
-              </node>
-              <node concept="liA8E" id="7rf49NglcwB" role="2OqNvi">
-                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
-                <node concept="37vLTw" id="7rf49NglczJ" role="37wK5m">
-                  <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="7rf49NglbTW" role="3eOfB_">
-              <node concept="3clFbF" id="7rf49NglcFm" role="3cqZAp">
-                <node concept="2OqwBi" id="7rf49NglcJd" role="3clFbG">
-                  <node concept="Xjq3P" id="7rf49NglcFk" role="2Oq$k0" />
-                  <node concept="liA8E" id="7rf49NglcR4" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.AbstractSolver):void" resolve="registerSolver" />
-                    <node concept="10QFUN" id="7rf49Ngld7I" role="37wK5m">
-                      <node concept="3uibUv" id="7rf49Ngld7G" role="10QFUM">
-                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-                      </node>
-                      <node concept="37vLTw" id="7rf49Ngld7H" role="10QFUP">
-                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-                      </node>
-                    </node>
-                    <node concept="2ShNRf" id="7rf49NgldfZ" role="37wK5m">
-                      <node concept="1pGfFk" id="7rf49Ngm1TG" role="2ShVmc">
-                        <ref role="37wK5l" to="omn0:7rf49Nglkbs" resolve="NotSolver" />
-                        <node concept="Xjq3P" id="7rf49Ngm22f" role="37wK5m" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="7rf49NglcER" role="3cqZAp" />
-            </node>
-          </node>
           <node concept="3eNFk2" id="1ggxSI7qGPJ" role="3eNLev">
             <node concept="3clFbS" id="1ggxSI7qGPO" role="3eOfB_">
               <node concept="3clFbJ" id="1ggxSI7xGoB" role="3cqZAp">
@@ -1538,82 +1499,5 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="7rf49NgkbDQ">
-    <property role="TrG5h" value="NotPredicate" />
-    <node concept="2tJIrI" id="7rf49NgkbFl" role="jymVt" />
-    <node concept="3clFbW" id="7rf49NgkbFA" role="jymVt">
-      <node concept="37vLTG" id="7rf49NgkbFY" role="3clF46">
-        <property role="TrG5h" value="predicate" />
-        <node concept="3uibUv" id="7rf49NgkbGO" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7rf49NgkbFC" role="3clF45" />
-      <node concept="3Tm1VV" id="7rf49NgkbFD" role="1B3o_S" />
-      <node concept="3clFbS" id="7rf49NgkbFE" role="3clF47">
-        <node concept="XkiVB" id="7rf49Ngkc44" role="3cqZAp">
-          <ref role="37wK5l" node="6Kcfpq7B1f7" resolve="AbstractPredicate" />
-          <node concept="37vLTw" id="7rf49NgkchY" role="37wK5m">
-            <ref role="3cqZAo" node="7rf49NgkbFY" resolve="predicate" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7rf49NgkcJo" role="jymVt" />
-    <node concept="3clFb_" id="7rf49NgkcBx" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="symbol" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="7rf49NgkcBy" role="1B3o_S" />
-      <node concept="3uibUv" id="7rf49NgkfM6" role="3clF45">
-        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-      </node>
-      <node concept="3clFbS" id="7rf49NgkcBD" role="3clF47">
-        <node concept="3clFbF" id="7rf49Ngkfy1" role="3cqZAp">
-          <node concept="37vLTw" id="7rf49Ngkfy0" role="3clFbG">
-            <ref role="3cqZAo" node="7rf49Ngke3n" resolve="NOT_SYM" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7rf49NgkcBE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7rf49NgkbFq" role="jymVt" />
-    <node concept="Wx3nA" id="7rf49NgkcUE" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="NOT" />
-      <node concept="3Tm1VV" id="7rf49NgkiUD" role="1B3o_S" />
-      <node concept="17QB3L" id="7rf49Ngkdw6" role="1tU5fm" />
-      <node concept="Xl_RD" id="7rf49NgkdIJ" role="33vP2m">
-        <property role="Xl_RC" value="not" />
-      </node>
-    </node>
-    <node concept="Wx3nA" id="7rf49Ngke3n" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="NOT_SYM" />
-      <node concept="3Tm1VV" id="7rf49Ngkj0B" role="1B3o_S" />
-      <node concept="3uibUv" id="7rf49NgkecJ" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-      </node>
-      <node concept="2ShNRf" id="7rf49NgkeVS" role="33vP2m">
-        <node concept="1pGfFk" id="7rf49NgkfbA" role="2ShVmc">
-          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
-          <node concept="37vLTw" id="7rf49Ngkfhm" role="37wK5m">
-            <ref role="3cqZAo" node="7rf49NgkcUE" resolve="NOT" />
-          </node>
-          <node concept="3cmrfG" id="7rf49NgkfrU" role="37wK5m">
-            <property role="3cmrfH" value="1" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7rf49NgkcP8" role="jymVt" />
-    <node concept="3Tm1VV" id="7rf49NgkbDR" role="1B3o_S" />
-    <node concept="3uibUv" id="7rf49Ngkcpe" role="1zkMxy">
-      <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
-    </node>
-  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 2fb56416..1f77d606 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -3685,56 +3685,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7rf49Ngk4m7" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7rf49Ngk1cK" resolve="NotConstraint" />
-      <node concept="1Koe21" id="7rf49Ngk5aX" role="1lVwrX">
-        <node concept="3clFb_" id="7rf49Ngk5bf" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="3Tm1VV" id="7rf49Ngk6gP" role="1B3o_S" />
-          <node concept="3cqZAl" id="7rf49Ngk6gZ" role="3clF45" />
-          <node concept="3clFbS" id="7rf49Ngk6iv" role="3clF47">
-            <node concept="3clFbF" id="7rf49Ngk6iF" role="3cqZAp">
-              <node concept="2OqwBi" id="7rf49NgklTE" role="3clFbG">
-                <node concept="2OqwBi" id="7rf49Ngkktc" role="2Oq$k0">
-                  <node concept="2ShNRf" id="7rf49Ngk6iD" role="2Oq$k0">
-                    <node concept="1pGfFk" id="7rf49Ngkbxt" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
-                      <node concept="10M0yZ" id="7rf49NgkiJ_" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:7rf49NgkbDQ" resolve="NotPredicate" />
-                        <ref role="3cqZAo" to="cxk7:7rf49Ngke3n" resolve="NOT_SYM" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7rf49NgkkCA" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
-                    <node concept="10Nm6u" id="7rf49NgkkGz" role="37wK5m">
-                      <node concept="29HgVG" id="7rf49NgkkKY" role="lGtFl">
-                        <node concept="3NFfHV" id="7rf49NgkkKZ" role="3NFExx">
-                          <node concept="3clFbS" id="7rf49NgkkL0" role="2VODD2">
-                            <node concept="3clFbF" id="7rf49NgkkL6" role="3cqZAp">
-                              <node concept="2OqwBi" id="7rf49NgkkL1" role="3clFbG">
-                                <node concept="3TrEf2" id="7rf49NgkkL4" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:7rf49Ngk1Dz" resolve="predicate" />
-                                </node>
-                                <node concept="30H73N" id="7rf49NgkkL5" role="2Oq$k0" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="7rf49Ngkmgj" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
-                </node>
-                <node concept="raruj" id="7rf49NgkmtS" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="1pmfR0" id="4vbeH84MZvs">
     <property role="TrG5h" value="localvars_make_unique" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 4b42a806..d75aa30d 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -5329,25 +5329,6 @@
   <node concept="3p36aQ" id="4hPXq9JmeBm">
     <ref role="aqKnT" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
   </node>
-  <node concept="24kQdi" id="7rf49Ngk1D_">
-    <property role="3GE5qa" value="constraint" />
-    <ref role="1XX52x" to="wq2x:7rf49Ngk1cK" resolve="NotConstraint" />
-    <node concept="3EZMnI" id="7rf49Ngk1Ea" role="2wV5jI">
-      <node concept="PMmxH" id="7rf49Ngk1Ek" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="7rf49Ngk1Ep" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-      </node>
-      <node concept="3F1sOY" id="7rf49Ngk1EF" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7rf49Ngk1Dz" resolve="predicate" />
-      </node>
-      <node concept="3F0ifn" id="7rf49Ngk1Ex" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-      </node>
-      <node concept="l2Vlx" id="7rf49Ngk1Ed" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="2vGNdoJLd0e">
     <property role="3GE5qa" value="rule" />
     <ref role="1XX52x" to="wq2x:2vGNdoJLd0b" resolve="ConstraintReference" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 5dcf584a..2a9f473c 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1180,20 +1180,6 @@
       <ref role="20lvS9" to="5j4j:5lJXKARS0" resolve="TreeForm" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7rf49Ngk1cK">
-    <property role="EcuMT" value="8561079682350453552" />
-    <property role="3GE5qa" value="constraint" />
-    <property role="TrG5h" value="NotConstraint" />
-    <property role="34LRSv" value="not" />
-    <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
-    <node concept="1TJgyj" id="7rf49Ngk1Dz" role="1TKVEi">
-      <property role="IQ2ns" value="8561079682350455395" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="predicate" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="2vGNdoJLd0b">
     <property role="EcuMT" value="2876899482279399435" />
     <property role="3GE5qa" value="rule" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index d6c0a104..0e83d2af 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -2799,39 +2799,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="7rf49NgpNI2" role="3cqZAp">
-          <node concept="3clFbS" id="7rf49NgpNI3" role="3clFbx">
-            <node concept="3cpWs6" id="7rf49NgpNI4" role="3cqZAp">
-              <node concept="2ShNRf" id="7rf49NgpPss" role="3cqZAk">
-                <node concept="1pGfFk" id="7rf49NgpQeO" role="2ShVmc">
-                  <ref role="37wK5l" to="cxk7:7rf49NgkbFA" resolve="NotPredicate" />
-                  <node concept="10QFUN" id="7rf49NgpSHW" role="37wK5m">
-                    <node concept="3uibUv" id="7rf49NgpSHS" role="10QFUM">
-                      <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-                    </node>
-                    <node concept="AH0OO" id="7rf49NgpSHT" role="10QFUP">
-                      <node concept="3cmrfG" id="7rf49NgpSHU" role="AHEQo">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="37vLTw" id="7rf49NgpSHV" role="AHHXb">
-                        <ref role="3cqZAo" node="4sSe4$oM2EL" resolve="args" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="7rf49NgpNI9" role="3clFbw">
-            <node concept="10M0yZ" id="7rf49NgpNIa" role="3uHU7w">
-              <ref role="1PxDUh" to="cxk7:7rf49NgkbDQ" resolve="NotPredicate" />
-              <ref role="3cqZAo" to="cxk7:7rf49Ngke3n" resolve="NOT_SYM" />
-            </node>
-            <node concept="37vLTw" id="7rf49NgpNIb" role="3uHU7B">
-              <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
-            </node>
-          </node>
-        </node>
         <node concept="YS8fn" id="429xoypWfOD" role="3cqZAp">
           <node concept="2ShNRf" id="429xoypWg1a" role="YScLw">
             <node concept="1pGfFk" id="429xoypWgtn" role="2ShVmc">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
index 2cc1316c..ef66e8cb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
@@ -507,10 +507,6 @@
             <ref role="3cqZAo" to="cxk7:5uFPQ7C279$" resolve="FREE_SYM" />
             <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
           </node>
-          <node concept="10M0yZ" id="7rf49Ngo$U5" role="3g7hyw">
-            <ref role="1PxDUh" to="cxk7:7rf49NgkbDQ" resolve="NotPredicate" />
-            <ref role="3cqZAo" to="cxk7:7rf49Ngke3n" resolve="NOT_SYM" />
-          </node>
           <node concept="10M0yZ" id="1ggxSI7vXEc" role="3g7hyw">
             <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
             <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION0" resolve="EXPRESSION0" />