From edb2ceffc32673a2ed7c7fbf7d114464feb717b9 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 23 Dec 2015 14:38:23 +0100
Subject: [PATCH] Introduce PredicateInvocation

---
 .../mps/logic/reactor/constraint.mps          |  82 +++++++++++++
 .../mps/logic/builtin/unification.mps         | 108 ++++++++++++++++++
 .../jetbrains/mps/logic/builtin/var.mps       |  55 +++++++++
 3 files changed, 245 insertions(+)

diff --git a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps b/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps
index 9ac659eb..ddfbda69 100644
--- a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps
+++ b/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps
@@ -1244,6 +1244,23 @@
       <node concept="3Tm1VV" id="6Kcfpq7Bjgl" role="1B3o_S" />
       <node concept="3clFbS" id="6Kcfpq7Bjgm" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="49L2l3FhtYY" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3Fhu0j" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3clFbS" id="49L2l3Fhu0m" role="3clF47" />
+      <node concept="3Tm1VV" id="49L2l3Fhu0n" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3FhtZE" role="3clF45">
+        <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3Fhu2p" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3Fhu2o" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6Kcfpq7Bjku" role="jymVt" />
     <node concept="3Tm1VV" id="6Kcfpq7Bj7r" role="1B3o_S" />
     <node concept="3uibUv" id="5uFPQ7B_ama" role="3HQHJm">
@@ -2499,6 +2516,43 @@
     <node concept="3uibUv" id="4xBopTzr8gp" role="1zkMxy">
       <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
     </node>
+    <node concept="2tJIrI" id="49L2l3FhuMa" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3Fhu7i" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3Tm1VV" id="49L2l3Fhu7k" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3Fhu7l" role="3clF45">
+        <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3Fhu7m" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3Fhu7n" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="49L2l3Fhu7p" role="3clF47">
+        <node concept="3SKdUt" id="49L2l3Fhu$_" role="3cqZAp">
+          <node concept="3SKdUq" id="49L2l3Fhu$B" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="49L2l3FhudW" role="3cqZAp">
+          <node concept="2ShNRf" id="49L2l3FhueP" role="YScLw">
+            <node concept="1pGfFk" id="49L2l3Fhuwo" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+              <node concept="Xl_RD" id="49L2l3Fhuxr" role="37wK5m">
+                <property role="Xl_RC" value="not implemented" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="49L2l3Fhu_e" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3FhuPo" role="jymVt" />
     <node concept="312cEg" id="6X5F0Ngy7tS" role="jymVt">
       <property role="TrG5h" value="id" />
       <node concept="3Tm6S6" id="6X5F0Ngy7tT" role="1B3o_S" />
@@ -2507,5 +2561,33 @@
       </node>
     </node>
   </node>
+  <node concept="3HP615" id="49L2l3FhtS6">
+    <property role="TrG5h" value="PredicateInvocation" />
+    <node concept="2tJIrI" id="49L2l3FhtSo" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3FhtSL" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="predicate" />
+      <node concept="3clFbS" id="49L2l3FhtSO" role="3clF47" />
+      <node concept="3Tm1VV" id="49L2l3FhtSP" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3FhtS_" role="3clF45">
+        <ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3FhtT5" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3FhtTG" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="arguments" />
+      <node concept="3clFbS" id="49L2l3FhtTH" role="3clF47" />
+      <node concept="3Tm1VV" id="49L2l3FhtTI" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3FhtTJ" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+        <node concept="3qTvmN" id="49L2l3FhtTK" role="11_B2D" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3FhtSt" role="jymVt" />
+    <node concept="3Tm1VV" id="49L2l3FhtS7" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index 2a5b5bb9..cfe48df8 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -1212,6 +1212,43 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="49L2l3Fhvjr" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3Fhvlv" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3Tm1VV" id="49L2l3Fhvlw" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3Fhvlx" role="3clF45">
+        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3Fhvly" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3Fhvlz" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="49L2l3Fhvl$" role="3clF47">
+        <node concept="3SKdUt" id="49L2l3Fhvl_" role="3cqZAp">
+          <node concept="3SKdUq" id="49L2l3FhvlA" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="49L2l3FhvlB" role="3cqZAp">
+          <node concept="2ShNRf" id="49L2l3FhvlC" role="YScLw">
+            <node concept="1pGfFk" id="49L2l3FhvlD" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+              <node concept="Xl_RD" id="49L2l3FhvlE" role="37wK5m">
+                <property role="Xl_RC" value="not implemented" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="49L2l3FhvlF" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3Fhvk2" role="jymVt" />
     <node concept="3uibUv" id="4xBopTzmmAx" role="1zkMxy">
       <ref role="3uigEE" to="qrld:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
     </node>
@@ -1977,6 +2014,42 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4xBopTzop_B" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3FhuEm" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3Tm1VV" id="49L2l3FhuEn" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3FhuEo" role="3clF45">
+        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3FhuEp" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3FhuEq" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="49L2l3FhuEr" role="3clF47">
+        <node concept="3SKdUt" id="49L2l3FhuEs" role="3cqZAp">
+          <node concept="3SKdUq" id="49L2l3FhuEt" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="49L2l3FhuEu" role="3cqZAp">
+          <node concept="2ShNRf" id="49L2l3FhuEv" role="YScLw">
+            <node concept="1pGfFk" id="49L2l3FhuEw" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+              <node concept="Xl_RD" id="49L2l3FhuEx" role="37wK5m">
+                <property role="Xl_RC" value="not implemented" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="49L2l3FhuEy" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3FhuDv" role="jymVt" />
     <node concept="3Tm1VV" id="3HJTsBn4kkA" role="1B3o_S" />
     <node concept="3uibUv" id="4xBopTzozPs" role="1zkMxy">
       <ref role="3uigEE" to="qrld:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
@@ -2050,6 +2123,41 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4xBopTzs2O5" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3Fhu7i" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3Tm1VV" id="49L2l3Fhu7k" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3Fhu7l" role="3clF45">
+        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3Fhu7m" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3Fhu7n" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="49L2l3Fhu7p" role="3clF47">
+        <node concept="3SKdUt" id="49L2l3Fhu$_" role="3cqZAp">
+          <node concept="3SKdUq" id="49L2l3Fhu$B" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="49L2l3FhudW" role="3cqZAp">
+          <node concept="2ShNRf" id="49L2l3FhueP" role="YScLw">
+            <node concept="1pGfFk" id="49L2l3Fhuwo" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+              <node concept="Xl_RD" id="49L2l3Fhuxr" role="37wK5m">
+                <property role="Xl_RC" value="not implemented" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="49L2l3Fhu_e" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="6infEALAfes" role="1B3o_S" />
     <node concept="3uibUv" id="4xBopTzrP0O" role="1zkMxy">
       <ref role="3uigEE" to="qrld:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
index 0b5936f6..c668a9dd 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
@@ -10,6 +10,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.constraint)" />
     <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
+    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -18,6 +19,12 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
@@ -38,6 +45,9 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
@@ -82,12 +92,21 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
+        <property id="8355037393041754995" name="isNative" index="2aFKle" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
@@ -269,6 +288,42 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7ISVfSOZ4g" role="jymVt" />
+    <node concept="3clFb_" id="49L2l3Fhu7i" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="invocation" />
+      <node concept="3Tm1VV" id="49L2l3Fhu7k" role="1B3o_S" />
+      <node concept="3uibUv" id="49L2l3Fhu7l" role="3clF45">
+        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+      </node>
+      <node concept="37vLTG" id="49L2l3Fhu7m" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="49L2l3Fhu7n" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="49L2l3Fhu7p" role="3clF47">
+        <node concept="3SKdUt" id="49L2l3Fhu$_" role="3cqZAp">
+          <node concept="3SKdUq" id="49L2l3Fhu$B" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="49L2l3FhudW" role="3cqZAp">
+          <node concept="2ShNRf" id="49L2l3FhueP" role="YScLw">
+            <node concept="1pGfFk" id="49L2l3Fhuwo" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+              <node concept="Xl_RD" id="49L2l3Fhuxr" role="37wK5m">
+                <property role="Xl_RC" value="not implemented" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="49L2l3Fhu_e" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="49L2l3Fhv2Z" role="jymVt" />
     <node concept="312cEg" id="7ISVfSJpBL" role="jymVt">
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="7ISVfSJpBJ" role="1B3o_S" />