From fa1ba8a4c803c7a0580d2c44beebb880dba45aab Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 27 Jan 2013 21:05:25 -0500
Subject: [PATCH 001/288] make it simpler to customize `-run`

-run now takes a map of options. This is prep for search
 customization. Remove `*reify-vars*` dynamic var, it's now passed
 along as an option to `-run` option map. fix the other run macros to
 account for the new interface.

unlike occurs-check flag, we just check whether we need to reify
vars via checking for the :reify-vars flag in the meta field of the
Substitution. This is fine since we only check this at the end, not
all the time as we do w/ occurs-check.

change simple unifier code to always run with :reify-vars set to false
as that's rarely ever the desired behavior.

in `binding-map*` filter out vars that don't point to anything.

Update the tests to account for these changes.
---
 src/main/clojure/clojure/core/logic.clj       | 47 ++++++++++---------
 src/test/clojure/clojure/core/logic/tests.clj | 10 ++--
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3dd97f70..0acc85b9 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -5,7 +5,6 @@
   (:import [java.io Writer]
            [java.util UUID]))
 
-(def ^{:dynamic true} *reify-vars* true)
 (def ^{:dynamic true} *locals*)
 
 (def fk (Exception.))
@@ -444,7 +443,7 @@
 (defn -reify
   ([s v]
      (let [v (walk* s v)]
-       (walk* (-reify* empty-s v) v)))
+       (walk* (-reify* (with-meta empty-s (meta s)) v) v)))
   ([s v r]
      (let [v (walk* s v)]
        (walk* (-reify* r v) v))))
@@ -672,7 +671,8 @@
 
 (defn tabled-s
   ([] (tabled-s false))
-  ([oc] (Substitutions. {} nil (atom {}) (make-cs) nil #{} oc nil)))
+  ([oc] (Substitutions. {} nil (atom {}) (make-cs) nil #{} oc nil))
+  ([oc meta] (Substitutions. {} nil (atom {}) (make-cs) nil #{} oc meta)))
 
 (def empty-s (make-s))
 (def empty-f (fn []))
@@ -767,7 +767,7 @@
 
   IReifyTerm
   (reify-term [v s]
-    (if *reify-vars*
+    (if (-> s clojure.core/meta :reify-vars)
       (ext s v (reify-lvar-name s))
       (ext s v (:oname v))))
 
@@ -1284,33 +1284,35 @@
 
 (declare reifyg)
 
-(defmacro -run [oc n [x :as bindings] & goals]
+(defmacro -run [opts [x :as bindings] & goals]
   (if (> (count bindings) 1)
-    `(-run ~oc ~n [q#] (fresh ~bindings ~@goals (== q# ~bindings)))
-    `(let [xs# (take* (fn []
+    `(-run ~opts [q#] (fresh ~bindings ~@goals (== q# ~bindings)))
+    `(let [opts# ~opts
+           xs# (take* (fn []
                         ((fresh [~x]
                            ~@goals
                            (reifyg ~x))
-                         (tabled-s ~oc))))]
-       (if ~n
-         (take ~n xs#)
+                         (tabled-s (:occurs-check opts#)
+                            (merge {:reify-vars true} opts#)))))]
+       (if-let [n# (:n opts#)]
+         (take n# xs#)
          xs#))))
 
 (defmacro run
   "Executes goals until a maximum of n results are found."
-  [n & goals]
-  `(-run true ~n ~@goals))
+  [n bindings & goals]
+  `(-run {:occurs-check true :n ~n} ~bindings ~@goals))
 
 (defmacro run*
   "Executes goals until results are exhausted."
-  [& goals]
-  `(-run true false ~@goals))
+  [bindings & goals]
+  `(-run {:occurs-check true :n false} ~bindings ~@goals))
 
 (defmacro run-nc
   "Executes goals until a maximum of n results are found. Does not 
    occurs-check."
-  [& [n & goals]]
-  `(-run false ~n ~@goals))
+  [n bindings & goals]
+  `(-run {:occurs-check false :n ~n} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."
@@ -1419,7 +1421,7 @@
                     (fn [s [vs cs]]
                       (let [vs (if (seq? vs) vs (list vs))]
                         (queue s (unwrap (apply cs (map #(lvar % false) vs))))))
-                    empty-s (-> u meta ::when))]
+                    (with-meta empty-s {:reify-vars false}) (-> u meta ::when))]
        (first
          (take*
            (fn []
@@ -1444,11 +1446,12 @@
   ([u w]
      (let [lvars (merge (-> u meta :lvars)
                         (-> w meta :lvars))
-           s (unify empty-s u w)]
+           s (unify (with-meta empty-s {:reify-vars false}) u w)]
        (when s
-         (into {} (map (fn [[k v]]
-                         [k (-reify s v)])
-                       lvars)))))
+         (->> lvars
+           (filter (fn [[name var]] (not= (walk s var) var)))   
+           (map (fn [[name var]] [name (-reify s var)]))
+           (into {})))))
   ([u w & ts]
      (apply binding-map* (binding-map* u w) ts)))
 
@@ -2491,7 +2494,7 @@
    (enforce-constraints x)
    (fn [a]
      (let [v (walk* a x)
-           r (-reify* empty-s v)]
+           r (-reify* (with-meta empty-s (meta a)) v)]
        (if (zero? (count r))
          (choice (list v) empty-f)
          (let [v (walk* r v)]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index a95d4565..7494196d 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1167,7 +1167,7 @@
 
 (deftest test-unifier-4
   (is (= (unifier '(?x . ?y) '(1 . ?z))
-         (lcons 1 '_0))))
+         (lcons 1 '?z))))
 
 (deftest test-unifier-5
   (is (= (unifier '(?x 2 . ?y) '(1 2 3 4 5))
@@ -1212,7 +1212,7 @@
 
 (deftest test-binding-map-4
   (is (= (binding-map '(?x . ?y) '(1 . ?z))
-         '{?z _0, ?x 1, ?y _0})))
+         '{?x 1, ?y ?z})))
 
 (deftest test-binding-map-5
   (is (= (binding-map '(?x 2 . ?y) '(1 2 3 4 5))
@@ -1349,11 +1349,9 @@
 ;; Tickets
 
 (deftest test-31-unifier-associative
-  (is (= (binding [*reify-vars* false]
-           (unifier '{:a ?x} '{:a ?y} '{:a 5}))
+  (is (= (unifier '{:a ?x} '{:a ?y} '{:a 5})
          {:a 5}))
-  (is (= (binding [*reify-vars* false]
-           (unifier '{:a ?x} '{:a 5} '{:a ?y}))
+  (is (= (unifier '{:a ?x} '{:a 5} '{:a ?y})
          {:a 5})))
 
 (deftest test-34-unify-with-metadata

From f42ebd0f8e3243572e31541ee96642a5ae8c5984 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 28 Jan 2013 09:30:53 -0500
Subject: [PATCH 002/288] note todo on is macro

---
 src/main/clojure/clojure/core/logic.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 0acc85b9..8f40a665 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1512,6 +1512,8 @@
   `(project [~v]
      (== (~f ~v) true)))
 
+;; TODO: remove v argument - David
+
 (defmacro is
   "Set the value of a var to value of another var with the operation
    applied. Non-relational."

From cb1428e57f60e4aafe3e27f96c05e4fd6dcf2024 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 28 Jan 2013 20:39:31 -0500
Subject: [PATCH 003/288] missing key :oc

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 8f40a665..d1c09886 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -506,7 +506,7 @@
 
   clojure.lang.Associative
   (containsKey [this k]
-    (contains? #{:s :vs :cs :cq :cqs} k))
+    (contains? #{:s :vs :cs :cq :cqs :oc} k))
   (entryAt [this k]
     (case k
       :s   [:s s]

From ee5205e43800c4f0a968077c6c8e565576c9b861 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 28 Jan 2013 20:39:48 -0500
Subject: [PATCH 004/288] make `make-s` and `tabled-s` less tedious

---
 src/main/clojure/clojure/core/logic.clj | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index d1c09886..50c488a8 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -665,14 +665,17 @@
       (-> v :doms dom))))
 
 (defn- make-s
-  ([] (Substitutions. {} nil nil (make-cs) nil #{} true nil))
-  ([m] (Substitutions. m nil nil (make-cs) nil #{} true nil))
+  ([] (make-s {}))
+  ([m] (make-s m (make-cs)))
   ([m cs] (Substitutions. m nil nil cs nil #{} true nil)))
 
 (defn tabled-s
   ([] (tabled-s false))
-  ([oc] (Substitutions. {} nil (atom {}) (make-cs) nil #{} oc nil))
-  ([oc meta] (Substitutions. {} nil (atom {}) (make-cs) nil #{} oc meta)))
+  ([oc] (tabled-s oc nil))
+  ([oc meta]
+     (-> (with-meta (make-s) meta)
+       (assoc :oc oc)
+       (assoc :ts (atom {})))))
 
 (def empty-s (make-s))
 (def empty-f (fn []))

From c0a5ea982624c9e9af869be0b653bf83f60de062 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 28 Jan 2013 23:49:46 -0500
Subject: [PATCH 005/288] possible fix for LOGIC-109, namespace core.logic fns,
 fully qualify subst keyword

---
 src/main/clojure/clojure/core/logic.clj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 50c488a8..6848d119 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2911,21 +2911,21 @@
                    (reify
                      ~'clojure.lang.IFn
                      (~'invoke [this# a#]
-                       (let [[~@args :as args#] (map #(walk* a# %) ~args)
+                       (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
                              test# (do ~@body)]
                          (when test#
-                           ((remcg this#) a#))))
+                           ((clojure.core.logic/remcg this#) a#))))
                      clojure.core.logic/IConstraintOp
                      (~'rator [_#] '~name)
-                     (~'rands [_#] (filter lvar? (flatten ~args)))
+                     (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
                      clojure.core.logic/IReifiableConstraint
                      (~'reifyc [_# _# r# a#]
-                       (list '~name (map #(-reify r# %) ~args)))
+                       (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
                      clojure.core.logic/IRunnable
                      (~'runnable? [_# s#]
-                       (ground-term? ~args s#))
+                       (clojure.core.logic/ground-term? ~args s#))
                      clojure.core.logic/IConstraintWatchedStores
-                     (~'watched-stores [_#] #{::subst})))]
+                     (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
       (defn ~name ~args
         (cgoal (~-name ~@args))))))
 

From 7d5e0f2952d7135f2556fb2a4804e8cbd58a8e1a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 29 Jan 2013 20:51:12 -0500
Subject: [PATCH 006/288] support :as in run interface

You can now write the following

(run* [x y z :as q]
  ...)
---
 src/main/clojure/clojure/core/logic.clj       |  5 ++-
 src/main/clojure/clojure/core/logic/bench.clj | 38 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 6848d119..4f8f1413 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1289,7 +1289,10 @@
 
 (defmacro -run [opts [x :as bindings] & goals]
   (if (> (count bindings) 1)
-    `(-run ~opts [q#] (fresh ~bindings ~@goals (== q# ~bindings)))
+    (let [[rbindings as-key [as]] (partition-by #{:as} bindings)]
+      (if (seq as-key)
+        `(-run ~opts [~as] (fresh [~@rbindings] (== ~as [~@rbindings]) ~@goals))
+        `(-run ~opts [q#] (fresh ~bindings (== q# ~bindings) ~@goals))))
     `(let [opts# ~opts
            xs# (take* (fn []
                         ((fresh [~x]
diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 5c7d39b7..38c603d1 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -327,31 +327,27 @@
     a))
 
 (defn cryptarithfd-1 []
-  (run* [q]
-    (fresh [s e n d m o r y]
-      (== q [s e n d m o r y])
-      (fd/in s e n d m o r y (fd/interval 0 9))
-      (fd/distinct q)
-      (distribute q ::l/ff)
-      (fd/!= m 0) (fd/!= s 0)
-      (fd/eq
-        (=             (+ (* 1000 s) (* 100 e) (* 10 n) d
-                          (* 1000 m) (* 100 o) (* 10 r) e)
-           (+ (* 10000 m) (* 1000 o) (* 100 n) (* 10 e) y))))))
+  (run-nc* [s e n d m o r y :as q]
+    (fd/in s e n d m o r y (fd/interval 0 9))
+    (fd/distinct q)
+    (distribute q ::l/ff)
+    (fd/!= m 0) (fd/!= s 0)
+    (fd/eq
+      (=             (+ (* 1000 s) (* 100 e) (* 10 n) d
+                        (* 1000 m) (* 100 o) (* 10 r) e)
+         (+ (* 10000 m) (* 1000 o) (* 100 n) (* 10 e) y)))))
 
 ;; Bratko 3rd ed pg 343
 
 (defn cryptarithfd-2 []
-  (run* [q]
-    (fresh [d o n a l g e r b t]
-      (== q [d o n a l g e r b t])
-      (distribute q ::l/ff)
-      (fd/in d o n a l g e r b t (fd/interval 0 9))
-      (fd/distinct q)
-      (fd/eq
-        (= (+ (* 100000 d) (* 10000 o) (* 1000 n) (* 100 a) (* 10 l) d
-              (* 100000 g) (* 10000 e) (* 1000 r) (* 100 a) (* 10 l) d)
-           (+ (* 100000 r) (* 10000 o) (* 1000 b) (* 100 e) (* 10 r) t))))))
+  (run-nc* [d o n a l g e r b t :as q]
+    (distribute q ::l/ff)
+    (fd/in d o n a l g e r b t (fd/interval 0 9))
+    (fd/distinct q)
+    (fd/eq
+     (= (+ (* 100000 d) (* 10000 o) (* 1000 n) (* 100 a) (* 10 l) d
+           (* 100000 g) (* 10000 e) (* 1000 r) (* 100 a) (* 10 l) d)
+        (+ (* 100000 r) (* 10000 o) (* 1000 b) (* 100 e) (* 10 r) t)))))
 
 (comment
   ;; FIXME: we don't see as much propagation as Oz, why not?

From e40437a8615ad2f271cd90712a91f34eba4420d8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 30 Jan 2013 09:31:30 -0500
Subject: [PATCH 007/288] `everyg` second argument can now be a logic var

---
 src/main/clojure/clojure/core/logic.clj | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 4f8f1413..9523e30f 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1853,11 +1853,14 @@
   "A pseudo-relation that takes a coll and ensures that the goal g
    succeeds on every element of the collection."
   [g coll]
-  (if (seq coll)
-    (all
-     (g (first coll))
-     (everyg g (next coll)))
-    s#))
+  (fn [a]
+    (let [coll (walk a coll)]
+      (((fn everyg* [g coll]
+          (if (seq coll)
+            (all
+             (g (first coll))
+             (everyg* g (next coll)))
+            s#)) g coll) a))))
 
 ;; =============================================================================
 ;; Goal sugar syntax

From 9a90950746020570b1953f7c1d9d3b203cbd39b0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 30 Jan 2013 09:39:25 -0500
Subject: [PATCH 008/288] convert benchmarks to new run* style

---
 src/main/clojure/clojure/core/logic/bench.clj | 90 ++++++++-----------
 1 file changed, 39 insertions(+), 51 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 38c603d1..5ab4726c 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -423,17 +423,14 @@
       [(fd/+ y f x) (fd/< 1 f)])))
 
 (defn dinesmanfd []
-  (run* [q]
-    (let [[baker cooper fletcher miller smith :as vs] (lvars 5)]
-      (all
-       (== q vs)
-       (fd/distinct vs)
-       (everyg #(fd/in % (fd/interval 1 5)) vs)
-       (fd/!= baker 5) (fd/!= cooper 1)
-       (fd/!= fletcher 5) (fd/!= fletcher 1)
-       (fd/< cooper miller) 
-       (not-adjacento smith fletcher)
-       (not-adjacento fletcher cooper)))))
+  (run* [baker cooper fletcher miller smith :as vs]
+    (fd/distinct vs)
+    (everyg #(fd/in % (fd/interval 1 5)) vs)
+    (fd/!= baker 5) (fd/!= cooper 1)
+    (fd/!= fletcher 5) (fd/!= fletcher 1)
+    (fd/< cooper miller) 
+    (not-adjacento smith fletcher)
+    (not-adjacento fletcher cooper)))
 
 (defn sort-dwellers [[fa _] [fb _]]
   (cond (< fa fb) -1 (= fa fb) 0 :else 1))
@@ -459,26 +456,22 @@
 ;; Simple
 
 (defn simplefd []
-  (run* [q]
-    (fresh [x y]
-      (== q [x y])
-      (fd/in x y (fd/interval 0 9))
-      (fd/+ x y 9)
-      (fresh [p0 p1]
-        (fd/* 2 x p0)
-        (fd/* 4 y p1)
-        (fd/+ p0 p1 24)))))
+  (run* [x y]
+    (fd/in x y (fd/interval 0 9))
+    (fd/+ x y 9)
+    (fresh [p0 p1]
+      (fd/* 2 x p0)
+      (fd/* 4 y p1)
+      (fd/+ p0 p1 24))))
 
 ;; with fd/eq sugar
 
 (defn simple-fd-eq []
-  (run* [q]
-    (fresh [x y]
-      (fd/in x y (fd/interval 0 9))
-      (fd/eq
-        (= (+ x y) 9)
-        (= (+ (* x 2) (* y 4)) 24))
-      (== q [x y]))))
+  (run* [x y]
+    (fd/in x y (fd/interval 0 9))
+    (fd/eq
+     (= (+ x y) 9)
+     (= (+ (* x 2) (* y 4)) 24))))
 
 (comment
   ;; "Finite Domain Constraint Programming in Oz. A Tutorial." (Schulte & Smolka)
@@ -548,15 +541,13 @@
        (checko wr nsl nr n))))
 
 (defn matches [n]
-  (run 1 [q]
-    (fresh [a b c d]
-      (fd/in a b c d (fd/interval 1 n)) 
-      (fd/distinct [a b c d])
-      (== a 1)
-      (fd/<= a b) (fd/<= b c) (fd/<= c d)
-      (fd/eq (= (+ a b c d) n))
-      (checko [a b c d] () () n)
-      (== q [a b c d]))))
+  (run 1 [a b c d]
+    (fd/in a b c d (fd/interval 1 n)) 
+    (fd/distinct [a b c d])
+    (== a 1)
+    (fd/<= a b) (fd/<= b c) (fd/<= c d)
+    (fd/eq (= (+ a b c d) n))
+    (checko [a b c d] () () n)))
 
 (comment
   (time (doall (matches 40)))
@@ -830,25 +821,22 @@
   (dotimes [_ 5]
     (time
       (dotimes [_ 100]
-        (doall (sudokufd ciao)))))
-  )
+        (doall (sudokufd ciao))))))
 
 ;; From "Finite Domain Constraint Programming in Oz. A Tutorial" pg 22
 
 (defn safefd []
-  (run* [q]
-    (let [[c1 c2 c3 c4 c5 c6 c7 c8 c9 :as vs] (lvars 9)]
-      (all
-       (everyg #(fd/in % (fd/interval 1 9)) vs)
-       (== q vs)
-       (fd/distinct q)
-       (fd/eq
-         (= (- c4 c6) c7)
-         (= (* c1 c2 c3) (+ c8 c9))
-         (< (+ c2 c3 c6) c8)
-         (< c9 c8))
-       (everyg (fn [[v n]] (fd/!= v n))
-         (map vector vs (range 1 10)))))))
+  (run* [c1 c2 c3 c4 c5 c6 c7 c8 c9 :as vs]
+    (everyg #(fd/in % (fd/interval 1 9)) vs)
+    (fd/distinct vs)
+    (fd/eq
+     (= (- c4 c6) c7)
+     (= (* c1 c2 c3) (+ c8 c9))
+     (< (+ c2 c3 c6) c8)
+     (< c9 c8))
+    (project [vs]
+      (everyg (fn [[v n]] (fd/!= v n))
+        (map vector vs (range 1 10))))))
 
 (comment
   (time (safefd))

From 7d04a848eadc5967c6403b6243a515c896c21e6d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 30 Jan 2013 09:41:50 -0500
Subject: [PATCH 009/288] convert tests to the new style

---
 src/test/clojure/clojure/core/logic/tests.clj | 59 ++++++++-----------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 7494196d..396dd4b0 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2603,17 +2603,14 @@
       [(fd/+ y f x) (fd/< 1 f)])))
 
 (defn dinesmanfd []
-  (run* [q]
-    (let [[baker cooper fletcher miller smith :as vs] (lvars 5)]
-      (all
-       (== q vs)
-       (fd/distinct vs)
-       (everyg #(fd/in % (fd/interval 1 5)) vs)
-       (fd/!= baker 5) (fd/!= cooper 1)
-       (fd/!= fletcher 5) (fd/!= fletcher 1)
-       (fd/< cooper miller) 
-       (not-adjacento smith fletcher)
-       (not-adjacento fletcher cooper)))))
+  (run* [baker cooper fletcher miller smith :as vs]
+    (fd/distinct vs)
+    (everyg #(fd/in % (fd/interval 1 5)) vs)
+    (fd/!= baker 5) (fd/!= cooper 1)
+    (fd/!= fletcher 5) (fd/!= fletcher 1)
+    (fd/< cooper miller) 
+    (not-adjacento smith fletcher)
+    (not-adjacento fletcher cooper)))
 
 (deftest test-dinesmandfd []
   (is (= (dinesmanfd) '([3 2 4 5 1]))))
@@ -2642,15 +2639,13 @@
        (checko wr nsl nr n))))
 
 (defn matches [n]
-  (run 1 [q]
-    (fresh [a b c d]
-      (fd/in a b c d (fd/interval 1 n)) 
-      (fd/distinct [a b c d])
-      (== a 1)
-      (fd/<= a b) (fd/<= b c) (fd/<= c d)
-      (fd/eq (= (+ a b c d) n))
-      (checko [a b c d] () () n)
-      (== q [a b c d]))))
+  (run 1 [a b c d]
+    (fd/in a b c d (fd/interval 1 n)) 
+    (fd/distinct [a b c d])
+    (== a 1)
+    (fd/<= a b) (fd/<= b c) (fd/<= c d)
+    (fd/eq (= (+ a b c d) n))
+    (checko [a b c d] () () n)))
 
 (deftest test-matches
   (is (= (matches 40) '([1 3 9 27]))))
@@ -2723,19 +2718,17 @@
   (is (-> (sudokufd easy0) first verify)))
 
 (defn safefd []
-  (run* [q]
-    (let [[c1 c2 c3 c4 c5 c6 c7 c8 c9 :as vs] (lvars 9)]
-      (all
-       (everyg #(fd/in % (fd/interval 1 9)) vs)
-       (== q vs)
-       (fd/distinct q)
-       (fd/eq
-         (= (- c4 c6) c7)
-         (= (* c1 c2 c3) (+ c8 c9))
-         (< (+ c2 c3 c6) c8)
-         (< c9 c8))
-       (everyg (fn [[v n]] (fd/!= v n))
-         (map vector vs (range 1 10)))))))
+  (run* [c1 c2 c3 c4 c5 c6 c7 c8 c9 :as vs]
+    (everyg #(fd/in % (fd/interval 1 9)) vs)
+    (fd/distinct vs)
+    (fd/eq
+     (= (- c4 c6) c7)
+     (= (* c1 c2 c3) (+ c8 c9))
+     (< (+ c2 c3 c6) c8)
+     (< c9 c8))
+    (project [vs]
+      (everyg (fn [[v n]] (fd/!= v n))
+        (map vector vs (range 1 10))))))
 
 (deftest test-safefd
   (is (= (safefd)

From f015355c6cc375294c7b6a4b29565b62f0a68e27 Mon Sep 17 00:00:00 2001
From: "Kevin J. Lynagh" <kevin@keminglabs.com>
Date: Sun, 3 Feb 2013 21:04:00 -0800
Subject: [PATCH 010/288] Add `fnc` macro that defines anonymous constraints
 suitable for use with the unifier's :when map, rename `defc` to `defnc` for
 consistency.

---
 src/main/clojure/clojure/core/logic.clj       | 67 ++++++++++++-------
 src/test/clojure/clojure/core/logic/tests.clj | 25 +++++++
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 9523e30f..e49070f6 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2887,7 +2887,7 @@
   (cgoal (-featurec x (partial-map fs))))
 
 ;; =============================================================================
-;; defc
+;; defnc
 
 (defn ground-term? [x s]
   (letfn [(-ground-term? [x s]
@@ -2910,30 +2910,47 @@
 ;; consider ^:partial type hint for arguments
 ;; these argument only need to be partially instantiated
 
-(defmacro defc [name args & body]
-  (let [-name (symbol (str "-" name))]
-   `(let [~-name (fn ~-name
-                   [~@args]
-                   (reify
-                     ~'clojure.lang.IFn
-                     (~'invoke [this# a#]
-                       (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
-                             test# (do ~@body)]
-                         (when test#
-                           ((clojure.core.logic/remcg this#) a#))))
-                     clojure.core.logic/IConstraintOp
-                     (~'rator [_#] '~name)
-                     (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
-                     clojure.core.logic/IReifiableConstraint
-                     (~'reifyc [_# _# r# a#]
-                       (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
-                     clojure.core.logic/IRunnable
-                     (~'runnable? [_# s#]
-                       (clojure.core.logic/ground-term? ~args s#))
-                     clojure.core.logic/IConstraintWatchedStores
-                     (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
-      (defn ~name ~args
-        (cgoal (~-name ~@args))))))
+(defmacro fnc
+  "Define an anonymous constraint that can be used with the unifier:
+
+     (let [oddc (fnc [x] (odd? x))]
+
+       (unifier {:a '?a} {:a 1} :when {'?a oddc})
+         ;;=> {:a 1}
+
+       (unifier {:a '?a} {:a 2} :when {'?a oddc})
+         ;;=> nil
+     )
+
+  Use defnc to define a constraint and assign a toplevel var."
+  [args & body]
+  (let [name (gensym "constraint")
+        -name (symbol (str "-" name))]
+    `(letfn [(~name [~@args]
+               (cgoal (~-name ~@args)))
+             (~-name [~@args]
+               (reify
+                 ~'clojure.lang.IFn
+                 (~'invoke [this# a#]
+                   (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
+                         test# (do ~@body)]
+                     (when test#
+                       ((clojure.core.logic/remcg this#) a#))))
+                 clojure.core.logic/IConstraintOp
+                 (~'rator [_#] '~name)
+                 (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
+                 clojure.core.logic/IReifiableConstraint
+                 (~'reifyc [_# _# r# a#]
+                   (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
+                 clojure.core.logic/IRunnable
+                 (~'runnable? [_# s#]
+                   (clojure.core.logic/ground-term? ~args s#))
+                 clojure.core.logic/IConstraintWatchedStores
+                 (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
+       ~name)))
+
+(defmacro defnc [name args & body]
+  `(def ~name (fnc ~args ~@body)))
 
 ;; =============================================================================
 ;; Predicate Constraint
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 396dd4b0..3f8e50cd 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1197,6 +1197,31 @@
   (is (= (unifier '{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]})
          {:a [:b '(:c [:d {:e :e}])]})))
 
+;; -----------------------------------------------------------------------------
+;; Unifier with constraints
+
+(defnc evenc [x]
+  (even? x))
+
+(deftest test-unifier-constraints-1 ;;One var
+  (is (= (unifier '{:a ?a} {:a 2} :when {'?a evenc})
+         {:a 2}))
+  (is (= (unifier '{:a ?a} {:a 1} :when {'?a evenc})
+         nil)))
+
+(deftest test-unifier-constraints-2 ;;Two vars
+  (is (= (unifier '{:a ?a :b ?b} {:a 2 :b 2} :when {'?a evenc '?b evenc})
+         {:a 2 :b 2}))
+  (is (= (unifier '{:a ?a :b ?b} {:a 1 :b 2} :when {'?a evenc '?b evenc})
+         nil)))
+
+;;Anonymous constraints
+(deftest test-unifier-constraints-3 ;;One var
+  (is (= (unifier '{:a ?a} {:a 2} :when {'?a (fnc [x] (even? x))})
+         {:a 2}))
+  (is (= (unifier '{:a ?a} {:a 1} :when {'?a (fnc [x] (even? x))})
+         nil)))
+
 
 (deftest test-binding-map-1
   (is (= (binding-map '(?x ?y) '(1 2))

From ed260f36db8bf571ab5e35552156a809a7f5c776 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 4 Feb 2013 21:53:30 -0500
Subject: [PATCH 011/288] move protocols and interfaces to their own namespace
 so development is less tedious for all.

---
 src/main/clojure/clojure/core/logic.clj       | 232 ++----------------
 src/main/clojure/clojure/core/logic/fd.clj    |   5 +-
 .../clojure/clojure/core/logic/nominal.clj    |   6 +-
 .../clojure/clojure/core/logic/protocols.clj  | 211 ++++++++++++++++
 src/test/clojure/clojure/core/logic/tests.clj |   3 +-
 5 files changed, 235 insertions(+), 222 deletions(-)
 create mode 100644 src/main/clojure/clojure/core/logic/protocols.clj

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index e49070f6..0092ea2c 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1,9 +1,12 @@
 (ns clojure.core.logic
   (:refer-clojure :exclude [==])
+  (:use [clojure.core.logic.protocols])
   (:require [clojure.set :as set]
             [clojure.string :as string])
   (:import [java.io Writer]
-           [java.util UUID]))
+           [java.util UUID]
+           [clojure.core.logic.protocols
+            IBindable ITreeTerm IVar ITreeConstraint INonStorable]))
 
 (def ^{:dynamic true} *locals*)
 
@@ -27,205 +30,6 @@
 (defn record? [x]
   (instance? clojure.lang.IRecord x))
 
-;; =============================================================================
-;; Marker Interfaces
-
-(definterface IBindable)
-(definterface ITreeTerm)
-(definterface IVar)
-
-;; =============================================================================
-;; Utility Protocols
-
-(defprotocol IUninitialized
-  (-uninitialized [coll]))
-
-;; =============================================================================
-;; miniKanren Protocols
-
-;; -----------------------------------------------------------------------------
-;; Unification protocols for core Clojure types
-
-(defprotocol IUnifyTerms
-  (unify-terms [u v s]))
-
-(defprotocol IUnifyWithRecord
-  (unify-with-record [u v s]))
-
-(definterface INonStorable)
-
-(defn non-storable? [x]
-  (instance? INonStorable x))
-
-;; -----------------------------------------------------------------------------
-;; Utility protocols
-
-(defprotocol LConsSeq
-  (lfirst [this])
-  (lnext [this]))
-
-(defprotocol LConsPrint
-  (toShortString [this]))
-
-;; -----------------------------------------------------------------------------
-;; Substitution
-
-(defprotocol ISubstitutions
-  (ext-no-check [this x v])
-  (walk [this x]))
-
-;; -----------------------------------------------------------------------------
-;; Protocols for terms
-
-(defprotocol IReifyTerm
-  (reify-term [v s]))
-
-(defprotocol IWalkTerm
-  (walk-term [v f]))
-
-(defprotocol IOccursCheckTerm
-  (occurs-check-term [v x s]))
-
-(defprotocol IBuildTerm
-  (build-term [u s]))
-
-;; -----------------------------------------------------------------------------
-;; Goal protocols
-
-(defprotocol IBind
-  (bind [this g]))
-
-(defprotocol IMPlus
-  (mplus [a f]))
-
-(defprotocol ITake
-  (take* [a]))
-
-;; -----------------------------------------------------------------------------
-;; soft cut & committed choice protocols
-
-(defprotocol IIfA
-  (ifa [b gs c]))
-
-(defprotocol IIfU
-  (ifu [b gs c]))
-
-;; =============================================================================
-;; Rel protocols
-
-(defprotocol IRel
-  (setfn [this arity f])
-  (indexes-for [this arity])
-  (add-indexes [this arity index]))
-
-;; =============================================================================
-;; Tabling protocols
-
-(defprotocol ITabled
-  (-reify-tabled [this v])
-  (reify-tabled [this v])
-  (reuse [this argv cache start end])
-  (subunify [this arg ans]))
-
-(defprotocol ISuspendedStream
-  (ready? [this]))
-
-;; =============================================================================
-;; cKanren protocols
-
-(defprotocol ISubstitutionsCLP
-  (root-val [this x])
-  (root-var [this x])
-  (ext-run-cs [this x v])
-  (queue [this c])
-  (update-var [this x v]))
-
-;; -----------------------------------------------------------------------------
-;; Constraint Store
-
-(defprotocol IConstraintStore
-  (addc [this a c])
-  (updatec [this a c])
-  (remc [this a c])
-  (runc [this c state])
-  (constraints-for [this a x ws])
-  (migrate [this x root]))
-
-;; -----------------------------------------------------------------------------
-;; Generic constraint protocols
-
-(defprotocol IRunnable
-  (runnable? [c s]))
-
-(defprotocol IWithConstraintId
-  (-with-id [this id]))
-
-(defprotocol IConstraintId
-  (-id [this]))
-
-(defn id [c]
-  (if (instance? clojure.core.logic.IConstraintId c)
-    (-id c)
-    (-> c meta ::id)))
-
-(defn with-id [c id]
-  (if (instance? clojure.core.logic.IWithConstraintId c)
-    (-with-id c id)
-    (vary-meta c assoc ::id id)))
-
-(defprotocol IConstraintWatchedStores
-  (watched-stores [this]))
-
-(defprotocol IConstraintOp
-  (rator [this])
-  (rands [this]))
-
-(defprotocol IRelevant
-  (-relevant? [this s]))
-
-(defprotocol IRelevantVar
-  (-relevant-var? [this x]))
-
-(defprotocol IReifiableConstraint
-  (reifyc [this v r a]))
-
-(defn reifiable? [x]
-  (instance? clojure.core.logic.IReifiableConstraint x))
-
-(definterface IEnforceableConstraint)
-
-(defn enforceable? [x]
-  (instance? clojure.core.logic.IEnforceableConstraint x))
-
-(defprotocol IUnwrapConstraint
-  (unwrap [c]))
-
-(defprotocol IMergeDomains
-  (-merge-doms [a b]))
-
-(defprotocol IMemberCount
-  (member-count [this]))
-
-(defprotocol IForceAnswerTerm
-  (-force-ans [v x]))
-
-;; -----------------------------------------------------------------------------
-;; Tree Constraints
-
-(defprotocol IDisunifyTerms
-  (disunify-terms [u v s cs]))
-
-(definterface ITreeConstraint)
-
-(defn tree-constraint? [x]
-  (instance? clojure.core.logic.ITreeConstraint x))
-
-(defprotocol IPrefix
-  (prefix [this]))
-
-(defprotocol IWithPrefix
-  (with-prefix [this p]))
-
 ;; =============================================================================
 ;; Pair
 
@@ -316,7 +120,7 @@
 
   (updatec [this a c]
     (let [oc (cm (id c))
-          nkm (if (instance? clojure.core.logic.IRelevantVar c)
+          nkm (if (instance? clojure.core.logic.protocols.IRelevantVar c)
                 (reduce (fn [km x]
                           (if-not (-relevant-var? c x)
                             (dissoc km x)
@@ -730,7 +534,7 @@
   (toString [_] (str "<lvar:" name ">"))
 
   (equals [this o]
-    (and (instance? clojure.core.logic.IVar o)
+    (and (instance? IVar o)
       (identical? name (:name o))))
 
   (hashCode [_] hash)
@@ -809,14 +613,14 @@
   (.write writer (str "<lvar:" (:name x) ">")))
 
 (defn lvar? [x]
-  (instance? clojure.core.logic.IVar x))
+  (instance? IVar x))
 
 (defn lvars [n]
   (repeatedly n lvar))
 
 (defn bindable? [x]
   (or (lvar? x)
-    (instance? clojure.core.logic.IBindable x)))
+    (instance? IBindable x)))
 
 ;; =============================================================================
 ;; LCons
@@ -968,7 +772,7 @@
 
 (defn tree-term? [x]
   (or (coll? x)
-      (instance? clojure.core.logic.ITreeTerm x)))
+      (instance? ITreeTerm x)))
 
 ;; =============================================================================
 ;; Unification
@@ -1011,7 +815,7 @@
   clojure.lang.IPersistentMap
   (unify-terms [u v s]
     (cond
-      (instance? clojure.core.logic.IUnifyWithRecord v)
+      (instance? clojure.core.logic.protocols.IUnifyWithRecord v)
       (unify-with-record v u s)
 
       (map? v)
@@ -2390,7 +2194,7 @@
     (assoc a :cs (runc (:cs a) c false))))
 
 (defn irelevant? [c]
-  (instance? clojure.core.logic.IRelevant c))
+  (instance? clojure.core.logic.protocols.IRelevant c))
 
 (defn relevant? [c a]
   (let [id (id c)]
@@ -2807,9 +2611,6 @@
 ;; =============================================================================
 ;; Partial Maps
 
-(defprotocol IUnifyWithPMap
-  (unify-with-pmap [pmap u s]))
-
 (defn unify-with-pmap* [u v s]
   (loop [ks (keys u) s s]
     (if (seq ks)
@@ -2936,16 +2737,16 @@
                          test# (do ~@body)]
                      (when test#
                        ((clojure.core.logic/remcg this#) a#))))
-                 clojure.core.logic/IConstraintOp
+                 clojure.core.logic.protocols/IConstraintOp
                  (~'rator [_#] '~name)
                  (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
-                 clojure.core.logic/IReifiableConstraint
+                 clojure.core.logic.protocols/IReifiableConstraint
                  (~'reifyc [_# _# r# a#]
                    (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
-                 clojure.core.logic/IRunnable
+                 clojure.core.logic.protocols/IRunnable
                  (~'runnable? [_# s#]
                    (clojure.core.logic/ground-term? ~args s#))
-                 clojure.core.logic/IConstraintWatchedStores
+                 clojure.core.logic.protocols/IConstraintWatchedStores
                  (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
        ~name)))
 
@@ -2988,9 +2789,6 @@
 ;; =============================================================================
 ;; Deep Constraint
 
-(defprotocol IConstrainTree
-  (-constrain-tree [t fc s]))
-
 (declare treec)
 
 (extend-protocol IConstrainTree
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 6621f136..fd6ba70e 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -1,11 +1,12 @@
 (ns clojure.core.logic.fd
   (:refer-clojure :exclude [== < > <= >= + - * quot distinct])
-  (:use [clojure.core.logic :exclude [get-dom == != !=c] :as l])
+  (:use [clojure.core.logic :exclude [get-dom == != !=c] :as l]
+        [clojure.core.logic.protocols])
   (:require [clojure.set :as set]
             [clojure.string :as string])
   (:import [java.io Writer]
            [java.util UUID]
-           [clojure.core.logic IEnforceableConstraint]))
+           [clojure.core.logic.protocols IEnforceableConstraint]))
 
 (alias 'core 'clojure.core)
 
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 47532155..5989b51f 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -1,9 +1,11 @@
 (ns clojure.core.logic.nominal
   (:refer-clojure :exclude [== hash])
-  (:use [clojure.core.logic :exclude [fresh] :as l])
+  (:use [clojure.core.logic :exclude [fresh] :as l]
+        [clojure.core.logic.protocols])
   (:require [clojure.core.logic.fd :as fd])
   (:import [java.io Writer]
-           [clojure.core.logic LVar LCons IBindable ITreeTerm]))
+           [clojure.core.logic LVar LCons]
+           [clojure.core.logic.protocols IBindable ITreeTerm]))
 
 (def ^{:dynamic true} *reify-noms* true)
 
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
new file mode 100644
index 00000000..ac785f6b
--- /dev/null
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -0,0 +1,211 @@
+(ns clojure.core.logic.protocols)
+
+;; Marker Interfaces
+
+(definterface IBindable)
+(definterface ITreeTerm)
+(definterface IVar)
+
+;; =============================================================================
+;; Utility Protocols
+
+(defprotocol IUninitialized
+  (-uninitialized [coll]))
+
+;; =============================================================================
+;; miniKanren Protocols
+
+;; -----------------------------------------------------------------------------
+;; Unification protocols for core Clojure types
+
+(defprotocol IUnifyTerms
+  (unify-terms [u v s]))
+
+(defprotocol IUnifyWithRecord
+  (unify-with-record [u v s]))
+
+(definterface INonStorable)
+
+(defn non-storable? [x]
+  (instance? INonStorable x))
+
+;; -----------------------------------------------------------------------------
+;; Utility protocols
+
+(defprotocol LConsSeq
+  (lfirst [this])
+  (lnext [this]))
+
+(defprotocol LConsPrint
+  (toShortString [this]))
+
+;; -----------------------------------------------------------------------------
+;; Substitution
+
+(defprotocol ISubstitutions
+  (ext-no-check [this x v])
+  (walk [this x]))
+
+;; -----------------------------------------------------------------------------
+;; Protocols for terms
+
+(defprotocol IReifyTerm
+  (reify-term [v s]))
+
+(defprotocol IWalkTerm
+  (walk-term [v f]))
+
+(defprotocol IOccursCheckTerm
+  (occurs-check-term [v x s]))
+
+(defprotocol IBuildTerm
+  (build-term [u s]))
+
+;; -----------------------------------------------------------------------------
+;; Goal protocols
+
+(defprotocol IBind
+  (bind [this g]))
+
+(defprotocol IMPlus
+  (mplus [a f]))
+
+(defprotocol ITake
+  (take* [a]))
+
+;; -----------------------------------------------------------------------------
+;; soft cut & committed choice protocols
+
+(defprotocol IIfA
+  (ifa [b gs c]))
+
+(defprotocol IIfU
+  (ifu [b gs c]))
+
+;; =============================================================================
+;; Rel protocols
+
+(defprotocol IRel
+  (setfn [this arity f])
+  (indexes-for [this arity])
+  (add-indexes [this arity index]))
+
+;; =============================================================================
+;; Tabling protocols
+
+(defprotocol ITabled
+  (-reify-tabled [this v])
+  (reify-tabled [this v])
+  (reuse [this argv cache start end])
+  (subunify [this arg ans]))
+
+(defprotocol ISuspendedStream
+  (ready? [this]))
+
+;; =============================================================================
+;; cKanren protocols
+
+(defprotocol ISubstitutionsCLP
+  (root-val [this x])
+  (root-var [this x])
+  (ext-run-cs [this x v])
+  (queue [this c])
+  (update-var [this x v]))
+
+;; -----------------------------------------------------------------------------
+;; Constraint Store
+
+(defprotocol IConstraintStore
+  (addc [this a c])
+  (updatec [this a c])
+  (remc [this a c])
+  (runc [this c state])
+  (constraints-for [this a x ws])
+  (migrate [this x root]))
+
+;; -----------------------------------------------------------------------------
+;; Generic constraint protocols
+
+(defprotocol IRunnable
+  (runnable? [c s]))
+
+(defprotocol IWithConstraintId
+  (-with-id [this id]))
+
+(defprotocol IConstraintId
+  (-id [this]))
+
+(defn id [c]
+  (if (instance? clojure.core.logic.protocols.IConstraintId c)
+    (-id c)
+    (-> c meta ::id)))
+
+(defn with-id [c id]
+  (if (instance? clojure.core.logic.protocols.IWithConstraintId c)
+    (-with-id c id)
+    (vary-meta c assoc ::id id)))
+
+(defprotocol IConstraintWatchedStores
+  (watched-stores [this]))
+
+(defprotocol IConstraintOp
+  (rator [this])
+  (rands [this]))
+
+(defprotocol IRelevant
+  (-relevant? [this s]))
+
+(defprotocol IRelevantVar
+  (-relevant-var? [this x]))
+
+(defprotocol IReifiableConstraint
+  (reifyc [this v r a]))
+
+(defn reifiable? [x]
+  (instance? clojure.core.logic.protocols.IReifiableConstraint x))
+
+(definterface IEnforceableConstraint)
+
+(defn enforceable? [x]
+  (instance? clojure.core.logic.protocols.IEnforceableConstraint x))
+
+(defprotocol IUnwrapConstraint
+  (unwrap [c]))
+
+(defprotocol IMergeDomains
+  (-merge-doms [a b]))
+
+(defprotocol IMemberCount
+  (member-count [this]))
+
+(defprotocol IForceAnswerTerm
+  (-force-ans [v x]))
+
+;; -----------------------------------------------------------------------------
+;; Tree Constraints
+
+(defprotocol IDisunifyTerms
+  (disunify-terms [u v s cs]))
+
+(definterface ITreeConstraint)
+
+(defn tree-constraint? [x]
+  (instance? clojure.core.logic.protocols.ITreeConstraint x))
+
+(defprotocol IPrefix
+  (prefix [this]))
+
+(defprotocol IWithPrefix
+  (with-prefix [this p]))
+
+;; -----------------------------------------------------------------------------
+;; Partial Maps
+
+(defprotocol IUnifyWithPMap
+  (unify-with-pmap [pmap u s]))
+
+;; -----------------------------------------------------------------------------
+;; Deep constraints
+
+(defprotocol IConstrainTree
+  (-constrain-tree [t fc s]))
\ No newline at end of file
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 3f8e50cd..e73d7b02 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1,6 +1,7 @@
 (ns clojure.core.logic.tests
   (:refer-clojure :exclude [==])
-  (:use [clojure.core.logic :exclude [is] :as l]
+  (:use [clojure.core.logic.protocols]
+        [clojure.core.logic :exclude [is] :as l]
         clojure.test)
   (:require [clojure.core.logic.fd :as fd])
   (:require [clojure.pprint :as pp]))

From cba9a3e2878547b5bd7c60deb690e269ac1ed2c0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 4 Feb 2013 22:07:59 -0500
Subject: [PATCH 012/288] amend docstring for `fnc`

`fnc` constraints do not run until all their arguments are *fully*
ground. The docstring now states this.
---
 src/main/clojure/clojure/core/logic.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 0092ea2c..50b53008 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2723,6 +2723,8 @@
          ;;=> nil
      )
 
+  Note, the constraint will not run until all arguments are fully ground.
+
   Use defnc to define a constraint and assign a toplevel var."
   [args & body]
   (let [name (gensym "constraint")

From d902c19faf5571db960cc60f7922bdbbb2bebaa4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 4 Feb 2013 22:17:02 -0500
Subject: [PATCH 013/288] minor refactor of `fnc`

---
 src/main/clojure/clojure/core/logic.clj | 46 ++++++++++++-------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 50b53008..b2d66c5e 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2727,30 +2727,28 @@
 
   Use defnc to define a constraint and assign a toplevel var."
   [args & body]
-  (let [name (gensym "constraint")
-        -name (symbol (str "-" name))]
-    `(letfn [(~name [~@args]
-               (cgoal (~-name ~@args)))
-             (~-name [~@args]
-               (reify
-                 ~'clojure.lang.IFn
-                 (~'invoke [this# a#]
-                   (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
-                         test# (do ~@body)]
-                     (when test#
-                       ((clojure.core.logic/remcg this#) a#))))
-                 clojure.core.logic.protocols/IConstraintOp
-                 (~'rator [_#] '~name)
-                 (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
-                 clojure.core.logic.protocols/IReifiableConstraint
-                 (~'reifyc [_# _# r# a#]
-                   (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
-                 clojure.core.logic.protocols/IRunnable
-                 (~'runnable? [_# s#]
-                   (clojure.core.logic/ground-term? ~args s#))
-                 clojure.core.logic.protocols/IConstraintWatchedStores
-                 (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
-       ~name)))
+  (let [name (symbol (gensym "fnc"))]
+    `(fn ~args
+       (letfn [(~name [~@args]
+                 (reify
+                   ~'clojure.lang.IFn
+                   (~'invoke [this# a#]
+                     (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
+                           test# (do ~@body)]
+                       (when test#
+                         ((clojure.core.logic/remcg this#) a#))))
+                   clojure.core.logic.protocols/IConstraintOp
+                   (~'rator [_#] '~name)
+                   (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
+                   clojure.core.logic.protocols/IReifiableConstraint
+                   (~'reifyc [_# _# r# a#]
+                     (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
+                   clojure.core.logic.protocols/IRunnable
+                   (~'runnable? [_# s#]
+                     (clojure.core.logic/ground-term? ~args s#))
+                   clojure.core.logic.protocols/IConstraintWatchedStores
+                   (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
+         (cgoal (~name ~@args))))))
 
 (defmacro defnc [name args & body]
   `(def ~name (fnc ~args ~@body)))

From 5585a29942ec132bd32320ace6b7561abcf2548b Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 4 Feb 2013 22:22:49 -0500
Subject: [PATCH 014/288] more changes for protocols move

need to import protocols in clojure.core.logic.arithmetic. remove some
old debug code from bench.clj
---
 src/main/clojure/clojure/core/logic/arithmetic.clj |  3 ++-
 src/main/clojure/clojure/core/logic/bench.clj      | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/arithmetic.clj b/src/main/clojure/clojure/core/logic/arithmetic.clj
index 24a9d049..b6e6e9c7 100644
--- a/src/main/clojure/clojure/core/logic/arithmetic.clj
+++ b/src/main/clojure/clojure/core/logic/arithmetic.clj
@@ -1,6 +1,7 @@
 (ns clojure.core.logic.arithmetic
   (:refer-clojure :exclude [== = > < >= <=])
-  (:use clojure.core.logic))
+  (:use [clojure.core.logic.protocols]
+        [clojure.core.logic]))
 
 (defmacro = [x y]
   "Goal for testing whether x and y are equal. Non-relational."
diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 5ab4726c..42fe7e17 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -313,19 +313,6 @@
 ;; =============================================================================
 ;; Cryptarithmetic Puzzle
 
-(defn debug-doms []
-  (fn [a]
-    (let [s (:s a)]
-      (pp/pprint
-       (zipmap (keys s)
-         (map (fn [v]
-                (let [v (walk a v)]
-                  (if (lvar? v)
-                    (get-dom a v)
-                    v)))
-              (keys s)))))
-    a))
-
 (defn cryptarithfd-1 []
   (run-nc* [s e n d m o r y :as q]
     (fd/in s e n d m o r y (fd/interval 0 9))

From b785c87dea127a71ac4d0879a38aab6362d75899 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 4 Feb 2013 22:26:37 -0500
Subject: [PATCH 015/288] more protocol change tweaks

update datomic, flip order of protocol :use in fd.clj & nominal.clj
---
 src/main/clojure/clojure/core/logic/datomic.clj | 3 ++-
 src/main/clojure/clojure/core/logic/fd.clj      | 4 ++--
 src/main/clojure/clojure/core/logic/nominal.clj | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/datomic.clj b/src/main/clojure/clojure/core/logic/datomic.clj
index ed7be05f..f47c95ba 100644
--- a/src/main/clojure/clojure/core/logic/datomic.clj
+++ b/src/main/clojure/clojure/core/logic/datomic.clj
@@ -17,7 +17,8 @@
  (do
    (ns clojure.core.logic.datomic
      (:refer-clojure :exclude [==])
-     (:use clojure.core.logic
+     (:use [clojure.core.logic.protocols]
+           [clojure.core.logic]
            [datomic.api :only [db q] :as d]))
 
    (defn datom? [x]
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index fd6ba70e..617c5b19 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -1,7 +1,7 @@
 (ns clojure.core.logic.fd
   (:refer-clojure :exclude [== < > <= >= + - * quot distinct])
-  (:use [clojure.core.logic :exclude [get-dom == != !=c] :as l]
-        [clojure.core.logic.protocols])
+  (:use [clojure.core.logic.protocols]
+        [clojure.core.logic :exclude [get-dom == != !=c] :as l])
   (:require [clojure.set :as set]
             [clojure.string :as string])
   (:import [java.io Writer]
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 5989b51f..b28eec6a 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -1,7 +1,7 @@
 (ns clojure.core.logic.nominal
   (:refer-clojure :exclude [== hash])
-  (:use [clojure.core.logic :exclude [fresh] :as l]
-        [clojure.core.logic.protocols])
+  (:use [clojure.core.logic.protocols]
+        [clojure.core.logic :exclude [fresh] :as l])
   (:require [clojure.core.logic.fd :as fd])
   (:import [java.io Writer]
            [clojure.core.logic LVar LCons]

From 6d8d7c9fd43c092a0510ed4b6da2bb65496564d4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 6 Feb 2013 17:57:23 -0500
Subject: [PATCH 016/288] move simpler unifier code out

Put simple unifier code into its own namespace. `unifier` and its supporting
fns renamed to `unify` and `binding-map` and its supporting fns
renamed to `unifier`. This naming convention better reflects what they
do.

Update tests.
---
 src/main/clojure/clojure/core/logic.clj       | 127 -----------------
 .../clojure/clojure/core/logic/unifier.clj    | 129 ++++++++++++++++++
 src/test/clojure/clojure/core/logic/tests.clj |  51 +++----
 3 files changed, 155 insertions(+), 152 deletions(-)
 create mode 100644 src/main/clojure/clojure/core/logic/unifier.clj

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index b2d66c5e..a958c56f 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1167,133 +1167,6 @@
        ~@(map (partial trace-lvar a) lvars)
        ~a)))
 
-;; =============================================================================
-;; Easy Unification
-
-(defn- lvarq-sym? [s]
-  (and (symbol? s) (= (first (str s)) \?)))
-
-(defn- proc-lvar [lvar-expr store]
-  (let [v (if-let [u (@store lvar-expr)]
-            u
-            (lvar lvar-expr false))]
-    (swap! store conj [lvar-expr v])
-    v))
-
-(defn- lcons-expr? [expr]
-  (and (seq? expr) (some '#{.} (set expr))))
-
-(declare prep*)
-
-(defn- replace-lvar [store]
-  (fn [expr]
-    (if (lvarq-sym? expr)
-      (proc-lvar expr store)
-      (if (lcons-expr? expr)
-        (prep* expr store)
-        expr))))
-
-(defn- prep*
-  ([expr store] (prep* expr store false false))
-  ([expr store lcons?] (prep* expr store lcons? false))
-  ([expr store lcons? last?]
-     (let [expr (if (and last? (seq expr))
-                  (first expr)
-                  expr)]
-       (cond
-        (lvarq-sym? expr) (proc-lvar expr store)
-        (seq? expr) (if (or lcons? (lcons-expr? expr))
-                      (let [[f & n] expr
-                            skip (= f '.)
-                            tail (prep* n store lcons? skip)]
-                        (if skip
-                          tail
-                          (lcons (prep* f store) tail)))
-                      (doall (walk-term expr (replace-lvar store))))
-        :else expr))))
-
-(defn prep
-  "Prep a quoted expression. All symbols preceded by ? will
-  be replaced with logic vars."
-  [expr]
-  (let [lvars (atom {})
-        prepped (if (lcons-expr? expr)
-                  (prep* expr lvars true)
-                  (doall (walk-term expr (replace-lvar lvars))))]
-    (with-meta prepped {:lvars @lvars})))
-
-(declare fix-constraints)
-
-(defn unifier*
-  "Unify the terms u and w."
-  ([u w]
-     (let [init-s (reduce
-                    (fn [s [vs cs]]
-                      (let [vs (if (seq? vs) vs (list vs))]
-                        (queue s (unwrap (apply cs (map #(lvar % false) vs))))))
-                    (with-meta empty-s {:reify-vars false}) (-> u meta ::when))]
-       (first
-         (take*
-           (fn []
-             ((fresh [q]
-                (== u w) (== q u)
-                (fn [a]
-                  (fix-constraints a))
-                (reifyg q))
-              init-s))))))
-  ([u w & ts]
-     (if (some #{:when} ts)
-       (let [terms (take-while #(not= % :when) ts)
-             constraints (last ts)]
-         (reduce #(unifier* %1 %2)
-           (unifier* (vary-meta u assoc ::when constraints) w)
-           terms))
-       (apply unifier* (unifier* u w) ts))))
-
-(defn binding-map*
-  "Return the binding map that unifies terms u and w.
-  u and w should prepped terms."
-  ([u w]
-     (let [lvars (merge (-> u meta :lvars)
-                        (-> w meta :lvars))
-           s (unify (with-meta empty-s {:reify-vars false}) u w)]
-       (when s
-         (->> lvars
-           (filter (fn [[name var]] (not= (walk s var) var)))   
-           (map (fn [[name var]] [name (-reify s var)]))
-           (into {})))))
-  ([u w & ts]
-     (apply binding-map* (binding-map* u w) ts)))
-
-(defn unifier
-  "Unify the terms u and w. Will prep the terms."
-  ([u w]
-     {:pre [(not (lcons? u))
-            (not (lcons? w))]}
-     (let [up (vary-meta (prep u) merge (meta u))
-           wp (prep w)]
-       (unifier* up wp)))
-  ([u w & ts]
-     (if (some #{:when} ts)
-       (let [terms (take-while #(not= % :when) ts)
-             constraints (last ts)]
-         (reduce #(unifier %1 %2)
-           (unifier (vary-meta u assoc ::when constraints) w)
-           terms))
-       (apply unifier (unifier u w) ts))))
-
-(defn binding-map
-  "Return the binding map that unifies terms u and w.
-  Will prep the terms."
-  ([u w]
-     {:pre [(not (lcons? u))
-            (not (lcons? w))]}
-     (let [up (prep u)
-           wp (prep w)]
-       (binding-map* up wp)))
-  ([u w & ts]
-     (apply binding-map (binding-map u w) ts)))
-
 ;; =============================================================================
 ;; Non-relational goals
 
diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
new file mode 100644
index 00000000..dd0e6f1a
--- /dev/null
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -0,0 +1,129 @@
+(ns clojure.core.logic.unifier
+  (:refer-clojure :exclude [==])
+  (:use [clojure.core.logic.protocols]
+        [clojure.core.logic :exclude [unify] :as l]))
+
+;; =============================================================================
+;; Easy Unification
+
+(defn- lvarq-sym? [s]
+  (and (symbol? s) (= (first (str s)) \?)))
+
+(defn- proc-lvar [lvar-expr store]
+  (let [v (if-let [u (@store lvar-expr)]
+            u
+            (lvar lvar-expr false))]
+    (swap! store conj [lvar-expr v])
+    v))
+
+(defn- lcons-expr? [expr]
+  (and (seq? expr) (some '#{.} (set expr))))
+
+(declare prep*)
+
+(defn- replace-lvar [store]
+  (fn [expr]
+    (if (lvarq-sym? expr)
+      (proc-lvar expr store)
+      (if (lcons-expr? expr)
+        (prep* expr store)
+        expr))))
+
+(defn- prep*
+  ([expr store] (prep* expr store false false))
+  ([expr store lcons?] (prep* expr store lcons? false))
+  ([expr store lcons? last?]
+     (let [expr (if (and last? (seq expr))
+                  (first expr)
+                  expr)]
+       (cond
+        (lvarq-sym? expr) (proc-lvar expr store)
+        (seq? expr) (if (or lcons? (lcons-expr? expr))
+                      (let [[f & n] expr
+                            skip (= f '.)
+                            tail (prep* n store lcons? skip)]
+                        (if skip
+                          tail
+                          (lcons (prep* f store) tail)))
+                      (doall (walk-term expr (replace-lvar store))))
+        :else expr))))
+
+(defn prep
+  "Prep a quoted expression. All symbols preceded by ? will
+  be replaced with logic vars."
+  [expr]
+  (let [lvars (atom {})
+        prepped (if (lcons-expr? expr)
+                  (prep* expr lvars true)
+                  (doall (walk-term expr (replace-lvar lvars))))]
+    (with-meta prepped {:lvars @lvars})))
+
+(defn unify*
+  "Unify the terms u and w."
+  ([u w]
+     (let [init-s (reduce
+                    (fn [s [vs cs]]
+                      (let [vs (if (seq? vs) vs (list vs))]
+                        (queue s (unwrap (apply cs (map #(lvar % false) vs))))))
+                    (with-meta empty-s {:reify-vars false}) (-> u meta ::when))]
+       (first
+         (take*
+           (fn []
+             ((fresh [q]
+                (== u w) (== q u)
+                (fn [a]
+                  (fix-constraints a))
+                (reifyg q))
+              init-s))))))
+  ([u w & ts]
+     (if (some #{:when} ts)
+       (let [terms (take-while #(not= % :when) ts)
+             constraints (last ts)]
+         (reduce #(unify* %1 %2)
+           (unify* (vary-meta u assoc ::when constraints) w)
+           terms))
+       (apply unify* (unify* u w) ts))))
+
+(defn unifier*
+  "Return the binding map that unifies terms u and w.
+  u and w should prepped terms."
+  ([u w]
+     (let [lvars (merge (-> u meta :lvars)
+                        (-> w meta :lvars))
+           s (l/unify (with-meta empty-s {:reify-vars false}) u w)]
+       (when s
+         (->> lvars
+           (filter (fn [[name var]] (not= (walk s var) var)))   
+           (map (fn [[name var]] [name (-reify s var)]))
+           (into {})))))
+  ([u w & ts]
+     (apply unifier* (unifier* u w) ts)))
+
+(defn unify
+  "Unify the terms u and w. Will prep the terms."
+  ([u w]
+     {:pre [(not (lcons? u))
+            (not (lcons? w))]}
+     (let [up (vary-meta (prep u) merge (meta u))
+           wp (prep w)]
+       (unify* up wp)))
+  ([u w & ts]
+     (if (some #{:when} ts)
+       (let [terms (take-while #(not= % :when) ts)
+             constraints (last ts)]
+         (reduce #(unify %1 %2)
+           (unify (vary-meta u assoc ::when constraints) w)
+           terms))
+       (apply unify (unify u w) ts))))
+
+(defn unifier
+  "Return the binding map that unifies terms u and w.
+  Will prep the terms."
+  ([u w]
+     {:pre [(not (lcons? u))
+            (not (lcons? w))]}
+     (let [up (prep u)
+           wp (prep w)]
+       (unifier* up wp)))
+  ([u w & ts]
+     (apply unifier (unifier u w) ts)))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index e73d7b02..837bc184 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -4,6 +4,7 @@
         [clojure.core.logic :exclude [is] :as l]
         clojure.test)
   (:require [clojure.core.logic.fd :as fd])
+  (:require [clojure.core.logic.unifier :as u])
   (:require [clojure.pprint :as pp]))
 
 ;; =============================================================================
@@ -1155,47 +1156,47 @@
 ;; Unifier
 
 (deftest test-unifier-1
-  (is (= (unifier '(?x ?y) '(1 2))
+  (is (= (u/unify '(?x ?y) '(1 2))
          '(1 2))))
 
 (deftest test-unifier-2
-  (is (= (unifier '(?x ?y 3) '(1 2 ?z))
+  (is (= (u/unify '(?x ?y 3) '(1 2 ?z))
          '(1 2 3))))
 
 (deftest test-unifier-3
-  (is (= (unifier '[(?x . ?y) 3] [[1 2] 3])
+  (is (= (u/unify '[(?x . ?y) 3] [[1 2] 3])
          '[(1 2) 3])))
 
 (deftest test-unifier-4
-  (is (= (unifier '(?x . ?y) '(1 . ?z))
+  (is (= (u/unify '(?x . ?y) '(1 . ?z))
          (lcons 1 '?z))))
 
 (deftest test-unifier-5
-  (is (= (unifier '(?x 2 . ?y) '(1 2 3 4 5))
+  (is (= (u/unify '(?x 2 . ?y) '(1 2 3 4 5))
          '(1 2 3 4 5))))
 
 (deftest test-unifier-6
-  (is (= (unifier '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unify '(?x 2 . ?y) '(1 9 3 4 5))
          nil)))
 
 (deftest test-unifier-7
-  (is (= (unifier '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unify '(?x 2 . ?y) '(1 9 3 4 5))
          nil)))
 
 (deftest test-unifier-8 ;;nested maps
-  (is (= (unifier '{:a {:b ?b}} {:a {:b 1}})
+  (is (= (u/unify '{:a {:b ?b}} {:a {:b 1}})
          {:a {:b 1}})))
 
 (deftest test-unifier-9 ;;nested vectors
-  (is (= (unifier '[?a [?b ?c] :d] [:a [:b :c] :d])
+  (is (= (u/unify '[?a [?b ?c] :d] [:a [:b :c] :d])
          [:a [:b :c] :d])))
 
 (deftest test-unifier-10 ;;nested seqs
-  (is (= (unifier '(?a (?b ?c) :d) '(:a (:b :c) :d))
+  (is (= (u/unify '(?a (?b ?c) :d) '(:a (:b :c) :d))
          '(:a (:b :c) :d))))
 
 (deftest test-unifier-11 ;;all together now
-  (is (= (unifier '{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]})
+  (is (= (u/unify '{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]})
          {:a [:b '(:c [:d {:e :e}])]})))
 
 ;; -----------------------------------------------------------------------------
@@ -1205,47 +1206,47 @@
   (even? x))
 
 (deftest test-unifier-constraints-1 ;;One var
-  (is (= (unifier '{:a ?a} {:a 2} :when {'?a evenc})
+  (is (= (u/unify '{:a ?a} {:a 2} :when {'?a evenc})
          {:a 2}))
-  (is (= (unifier '{:a ?a} {:a 1} :when {'?a evenc})
+  (is (= (u/unify '{:a ?a} {:a 1} :when {'?a evenc})
          nil)))
 
 (deftest test-unifier-constraints-2 ;;Two vars
-  (is (= (unifier '{:a ?a :b ?b} {:a 2 :b 2} :when {'?a evenc '?b evenc})
+  (is (= (u/unify '{:a ?a :b ?b} {:a 2 :b 2} :when {'?a evenc '?b evenc})
          {:a 2 :b 2}))
-  (is (= (unifier '{:a ?a :b ?b} {:a 1 :b 2} :when {'?a evenc '?b evenc})
+  (is (= (u/unify '{:a ?a :b ?b} {:a 1 :b 2} :when {'?a evenc '?b evenc})
          nil)))
 
 ;;Anonymous constraints
 (deftest test-unifier-constraints-3 ;;One var
-  (is (= (unifier '{:a ?a} {:a 2} :when {'?a (fnc [x] (even? x))})
+  (is (= (u/unify '{:a ?a} {:a 2} :when {'?a (fnc [x] (even? x))})
          {:a 2}))
-  (is (= (unifier '{:a ?a} {:a 1} :when {'?a (fnc [x] (even? x))})
+  (is (= (u/unify '{:a ?a} {:a 1} :when {'?a (fnc [x] (even? x))})
          nil)))
 
 
 (deftest test-binding-map-1
-  (is (= (binding-map '(?x ?y) '(1 2))
+  (is (= (u/unifier '(?x ?y) '(1 2))
          '{?x 1 ?y 2})))
 
 (deftest test-binding-map-2
-  (is (= (binding-map '(?x ?y 3) '(1 2 ?z))
+  (is (= (u/unifier '(?x ?y 3) '(1 2 ?z))
          '{?x 1 ?y 2 ?z 3})))
 
 (deftest test-binding-map-3
-  (is (= (binding-map '[(?x . ?y) 3] [[1 2] 3])
+  (is (= (u/unifier '[(?x . ?y) 3] [[1 2] 3])
          '{?x 1 ?y (2)})))
 
 (deftest test-binding-map-4
-  (is (= (binding-map '(?x . ?y) '(1 . ?z))
+  (is (= (u/unifier '(?x . ?y) '(1 . ?z))
          '{?x 1, ?y ?z})))
 
 (deftest test-binding-map-5
-  (is (= (binding-map '(?x 2 . ?y) '(1 2 3 4 5))
+  (is (= (u/unifier '(?x 2 . ?y) '(1 2 3 4 5))
          '{?x 1 ?y (3 4 5)})))
 
 (deftest test-binding-map-6
-  (is (= (binding-map '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unifier '(?x 2 . ?y) '(1 9 3 4 5))
          nil)))
 
 ;; -----------------------------------------------------------------------------
@@ -1375,9 +1376,9 @@
 ;; Tickets
 
 (deftest test-31-unifier-associative
-  (is (= (unifier '{:a ?x} '{:a ?y} '{:a 5})
+  (is (= (u/unify '{:a ?x} '{:a ?y} '{:a 5})
          {:a 5}))
-  (is (= (unifier '{:a ?x} '{:a 5} '{:a ?y})
+  (is (= (u/unify '{:a ?x} '{:a 5} '{:a ?y})
          {:a 5})))
 
 (deftest test-34-unify-with-metadata

From 787ee23c9c5a92653174f7e1cf9df0312e00a5b2 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 14:13:38 -0500
Subject: [PATCH 017/288] support custom var reification

Can now set :reify-vars to a fn that takes a var and the reification
substitution map. This function should extend this map. Add test cases
for :reify-vars false and :reify-vars where the fn leaves the
reification map unextended allowing vars to pass through.
---
 src/main/clojure/clojure/core/logic.clj       |  9 ++++++---
 src/test/clojure/clojure/core/logic/tests.clj | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index a958c56f..620c84d4 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -574,9 +574,12 @@
 
   IReifyTerm
   (reify-term [v s]
-    (if (-> s clojure.core/meta :reify-vars)
-      (ext s v (reify-lvar-name s))
-      (ext s v (:oname v))))
+    (let [rf (-> s clojure.core/meta :reify-vars)]
+      (if (fn? rf)
+        (rf v s)
+        (if rf
+          (ext s v (reify-lvar-name s))
+          (ext s v (:oname v))))))
 
   IWalkTerm
   (walk-term [v f] (f v))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 837bc184..2a88ceae 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1199,6 +1199,21 @@
   (is (= (u/unify '{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]})
          {:a [:b '(:c [:d {:e :e}])]})))
 
+;; -----------------------------------------------------------------------------
+;; custom var reification
+
+(deftest test-reify-vars-false
+  (is (-run {:reify-vars false} [q]
+        (fresh [x]
+          (== q x)))
+      '(x)))
+
+(deftest test-custom-var-reifier-1
+  (let [x (lvar 'x)]
+    (is (= (-run {:reify-vars (fn [v rs] rs)} [q]
+             (== q x))
+           `(~x)))))
+
 ;; -----------------------------------------------------------------------------
 ;; Unifier with constraints
 

From 0dc4838df0067028e2929d0cc814072ca7a90441 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 14:41:35 -0500
Subject: [PATCH 018/288] new unifier interface

All the simple unifier fns now take either one or two arguments. In
the single arity case they take a seq of terms to unify. In the two
arity case they take an options map and the seq of terms.

Currenly options can contain a :when entry which is a map of vars to
constraints which should be applied to them.
---
 .../clojure/clojure/core/logic/unifier.clj    | 100 +++++++-----------
 src/test/clojure/clojure/core/logic/tests.clj |  51 +++++----
 2 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index dd0e6f1a..112ba6e3 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -59,71 +59,53 @@
     (with-meta prepped {:lvars @lvars})))
 
 (defn unify*
-  "Unify the terms u and w."
-  ([u w]
-     (let [init-s (reduce
+  "Unify the terms ts."
+  ([ts] (unify* {} ts))
+  ([opts ts]
+     (let [c-s (reduce
                     (fn [s [vs cs]]
                       (let [vs (if (seq? vs) vs (list vs))]
                         (queue s (unwrap (apply cs (map #(lvar % false) vs))))))
-                    (with-meta empty-s {:reify-vars false}) (-> u meta ::when))]
-       (first
-         (take*
-           (fn []
-             ((fresh [q]
-                (== u w) (== q u)
-                (fn [a]
-                  (fix-constraints a))
-                (reifyg q))
-              init-s))))))
-  ([u w & ts]
-     (if (some #{:when} ts)
-       (let [terms (take-while #(not= % :when) ts)
-             constraints (last ts)]
-         (reduce #(unify* %1 %2)
-           (unify* (vary-meta u assoc ::when constraints) w)
-           terms))
-       (apply unify* (unify* u w) ts))))
+                    (with-meta empty-s {:reify-vars (fn [v rs] rs)}) (:when opts))
+           -unify* (fn [init-s u w]
+                     (first
+                       (take*
+                         (fn []
+                           ((fresh [q]
+                              (== u w) (== q u)
+                              (fn [a]
+                                (fix-constraints a))
+                              (reifyg q))
+                            init-s)))))]
+       (-unify*
+          (vary-meta c-s assoc :reify-vars false)
+          (reduce #(-unify* c-s %1 %2) (butlast ts))
+          (last ts)))))
 
 (defn unifier*
-  "Return the binding map that unifies terms u and w.
-  u and w should prepped terms."
-  ([u w]
-     (let [lvars (merge (-> u meta :lvars)
-                        (-> w meta :lvars))
-           s (l/unify (with-meta empty-s {:reify-vars false}) u w)]
-       (when s
-         (->> lvars
-           (filter (fn [[name var]] (not= (walk s var) var)))   
-           (map (fn [[name var]] [name (-reify s var)]))
-           (into {})))))
-  ([u w & ts]
-     (apply unifier* (unifier* u w) ts)))
+  "Return the unifier that unifies terms ts.
+  All terms in ts should prepped terms."
+  ([ts] (unifier* {} ts))
+  ([opts ts]
+     (letfn [(-unifier* [u w]
+               (let [lvars (merge (-> u meta :lvars)
+                             (-> w meta :lvars))
+                     s (l/unify (with-meta empty-s {:reify-vars false}) u w)]
+                 (when s
+                   (->> lvars
+                        (filter (fn [[name var]] (not= (walk s var) var)))   
+                        (map (fn [[name var]] [name (-reify s var)]))
+                        (into {})))))]
+       (reduce -unifier* ts))))
 
 (defn unify
-  "Unify the terms u and w. Will prep the terms."
-  ([u w]
-     {:pre [(not (lcons? u))
-            (not (lcons? w))]}
-     (let [up (vary-meta (prep u) merge (meta u))
-           wp (prep w)]
-       (unify* up wp)))
-  ([u w & ts]
-     (if (some #{:when} ts)
-       (let [terms (take-while #(not= % :when) ts)
-             constraints (last ts)]
-         (reduce #(unify %1 %2)
-           (unify (vary-meta u assoc ::when constraints) w)
-           terms))
-       (apply unify (unify u w) ts))))
+  "Unify the terms ts returning a the value that represents their
+   unificaiton. Will prep the terms."
+  ([ts] (unify {} ts))
+  ([opts ts]
+     (unify* opts (map prep ts))))
 
 (defn unifier
-  "Return the binding map that unifies terms u and w.
-  Will prep the terms."
-  ([u w]
-     {:pre [(not (lcons? u))
-            (not (lcons? w))]}
-     (let [up (prep u)
-           wp (prep w)]
-       (unifier* up wp)))
-  ([u w & ts]
-     (apply unifier (unifier u w) ts)))
+  "Return the unifier for terms ts. Will prep the terms."
+  ([ts] (unifier {} ts))
+  ([opts ts] (unifier* opts (map prep ts))))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 2a88ceae..f9f7e314 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1156,47 +1156,47 @@
 ;; Unifier
 
 (deftest test-unifier-1
-  (is (= (u/unify '(?x ?y) '(1 2))
+  (is (= (u/unify ['(?x ?y) '(1 2)])
          '(1 2))))
 
 (deftest test-unifier-2
-  (is (= (u/unify '(?x ?y 3) '(1 2 ?z))
+  (is (= (u/unify ['(?x ?y 3) '(1 2 ?z)])
          '(1 2 3))))
 
 (deftest test-unifier-3
-  (is (= (u/unify '[(?x . ?y) 3] [[1 2] 3])
+  (is (= (u/unify ['[(?x . ?y) 3] [[1 2] 3]])
          '[(1 2) 3])))
 
 (deftest test-unifier-4
-  (is (= (u/unify '(?x . ?y) '(1 . ?z))
+  (is (= (u/unify ['(?x . ?y) '(1 . ?z)])
          (lcons 1 '?z))))
 
 (deftest test-unifier-5
-  (is (= (u/unify '(?x 2 . ?y) '(1 2 3 4 5))
+  (is (= (u/unify ['(?x 2 . ?y) '(1 2 3 4 5)])
          '(1 2 3 4 5))))
 
 (deftest test-unifier-6
-  (is (= (u/unify '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unify ['(?x 2 . ?y) '(1 9 3 4 5)])
          nil)))
 
 (deftest test-unifier-7
-  (is (= (u/unify '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unify ['(?x 2 . ?y) '(1 9 3 4 5)])
          nil)))
 
 (deftest test-unifier-8 ;;nested maps
-  (is (= (u/unify '{:a {:b ?b}} {:a {:b 1}})
+  (is (= (u/unify ['{:a {:b ?b}} {:a {:b 1}}])
          {:a {:b 1}})))
 
 (deftest test-unifier-9 ;;nested vectors
-  (is (= (u/unify '[?a [?b ?c] :d] [:a [:b :c] :d])
+  (is (= (u/unify ['[?a [?b ?c] :d] [:a [:b :c] :d]])
          [:a [:b :c] :d])))
 
 (deftest test-unifier-10 ;;nested seqs
-  (is (= (u/unify '(?a (?b ?c) :d) '(:a (:b :c) :d))
+  (is (= (u/unify ['(?a (?b ?c) :d) '(:a (:b :c) :d)])
          '(:a (:b :c) :d))))
 
 (deftest test-unifier-11 ;;all together now
-  (is (= (u/unify '{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]})
+  (is (= (u/unify ['{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]}])
          {:a [:b '(:c [:d {:e :e}])]})))
 
 ;; -----------------------------------------------------------------------------
@@ -1221,47 +1221,46 @@
   (even? x))
 
 (deftest test-unifier-constraints-1 ;;One var
-  (is (= (u/unify '{:a ?a} {:a 2} :when {'?a evenc})
+  (is (= (u/unify {:when {'?a evenc}} ['{:a ?a} {:a 2}])
          {:a 2}))
-  (is (= (u/unify '{:a ?a} {:a 1} :when {'?a evenc})
+  (is (= (u/unify {:when {'?a evenc}} ['{:a ?a} {:a 1}])
          nil)))
 
 (deftest test-unifier-constraints-2 ;;Two vars
-  (is (= (u/unify '{:a ?a :b ?b} {:a 2 :b 2} :when {'?a evenc '?b evenc})
+  (is (= (u/unify {:when {'?a evenc '?b evenc}} ['{:a ?a :b ?b} {:a 2 :b 2}])
          {:a 2 :b 2}))
-  (is (= (u/unify '{:a ?a :b ?b} {:a 1 :b 2} :when {'?a evenc '?b evenc})
+  (is (= (u/unify {:when {'?a evenc '?b evenc}} ['{:a ?a :b ?b} {:a 1 :b 2}])
          nil)))
 
 ;;Anonymous constraints
 (deftest test-unifier-constraints-3 ;;One var
-  (is (= (u/unify '{:a ?a} {:a 2} :when {'?a (fnc [x] (even? x))})
+  (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 2}])
          {:a 2}))
-  (is (= (u/unify '{:a ?a} {:a 1} :when {'?a (fnc [x] (even? x))})
+  (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 1}])
          nil)))
 
-
 (deftest test-binding-map-1
-  (is (= (u/unifier '(?x ?y) '(1 2))
+  (is (= (u/unifier ['(?x ?y) '(1 2)])
          '{?x 1 ?y 2})))
 
 (deftest test-binding-map-2
-  (is (= (u/unifier '(?x ?y 3) '(1 2 ?z))
+  (is (= (u/unifier ['(?x ?y 3) '(1 2 ?z)])
          '{?x 1 ?y 2 ?z 3})))
 
 (deftest test-binding-map-3
-  (is (= (u/unifier '[(?x . ?y) 3] [[1 2] 3])
+  (is (= (u/unifier ['[(?x . ?y) 3] [[1 2] 3]])
          '{?x 1 ?y (2)})))
 
 (deftest test-binding-map-4
-  (is (= (u/unifier '(?x . ?y) '(1 . ?z))
+  (is (= (u/unifier ['(?x . ?y) '(1 . ?z)])
          '{?x 1, ?y ?z})))
 
 (deftest test-binding-map-5
-  (is (= (u/unifier '(?x 2 . ?y) '(1 2 3 4 5))
+  (is (= (u/unifier ['(?x 2 . ?y) '(1 2 3 4 5)])
          '{?x 1 ?y (3 4 5)})))
 
 (deftest test-binding-map-6
-  (is (= (u/unifier '(?x 2 . ?y) '(1 9 3 4 5))
+  (is (= (u/unifier ['(?x 2 . ?y) '(1 9 3 4 5)])
          nil)))
 
 ;; -----------------------------------------------------------------------------
@@ -1391,9 +1390,9 @@
 ;; Tickets
 
 (deftest test-31-unifier-associative
-  (is (= (u/unify '{:a ?x} '{:a ?y} '{:a 5})
+  (is (= (u/unify ['{:a ?x} '{:a ?y} '{:a 5}])
          {:a 5}))
-  (is (= (u/unify '{:a ?x} '{:a 5} '{:a ?y})
+  (is (= (u/unify ['{:a ?x} '{:a 5} '{:a ?y}])
          {:a 5})))
 
 (deftest test-34-unify-with-metadata

From 495572deb0bfbe71c2fc1b348f1c904f6600f5c0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 14:51:03 -0500
Subject: [PATCH 019/288] formatting

---
 .../clojure/clojure/core/logic/unifier.clj    | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index 112ba6e3..f430b434 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -37,15 +37,19 @@
                   (first expr)
                   expr)]
        (cond
-        (lvarq-sym? expr) (proc-lvar expr store)
-        (seq? expr) (if (or lcons? (lcons-expr? expr))
-                      (let [[f & n] expr
-                            skip (= f '.)
-                            tail (prep* n store lcons? skip)]
-                        (if skip
-                          tail
-                          (lcons (prep* f store) tail)))
-                      (doall (walk-term expr (replace-lvar store))))
+         (lvarq-sym? expr)
+         (proc-lvar expr store)
+        
+         (seq? expr)
+         (if (or lcons? (lcons-expr? expr))
+           (let [[f & n] expr
+                 skip (= f '.)
+                 tail (prep* n store lcons? skip)]
+             (if skip
+               tail
+               (lcons (prep* f store) tail)))
+           (doall (walk-term expr (replace-lvar store))))
+         
         :else expr))))
 
 (defn prep
@@ -78,9 +82,9 @@
                               (reifyg q))
                             init-s)))))]
        (-unify*
-          (vary-meta c-s assoc :reify-vars false)
-          (reduce #(-unify* c-s %1 %2) (butlast ts))
-          (last ts)))))
+         (vary-meta c-s assoc :reify-vars false)
+         (reduce #(-unify* c-s %1 %2) (butlast ts))
+         (last ts)))))
 
 (defn unifier*
   "Return the unifier that unifies terms ts.
@@ -88,22 +92,22 @@
   ([ts] (unifier* {} ts))
   ([opts ts]
      (letfn [(-unifier* [u w]
-               (let [lvars (merge (-> u meta :lvars)
+               (let [lvars (merge
+                             (-> u meta :lvars)
                              (-> w meta :lvars))
                      s (l/unify (with-meta empty-s {:reify-vars false}) u w)]
                  (when s
                    (->> lvars
-                        (filter (fn [[name var]] (not= (walk s var) var)))   
-                        (map (fn [[name var]] [name (-reify s var)]))
-                        (into {})))))]
+                     (filter (fn [[name var]] (not= (walk s var) var)))   
+                     (map (fn [[name var]] [name (-reify s var)]))
+                     (into {})))))]
        (reduce -unifier* ts))))
 
 (defn unify
   "Unify the terms ts returning a the value that represents their
    unificaiton. Will prep the terms."
   ([ts] (unify {} ts))
-  ([opts ts]
-     (unify* opts (map prep ts))))
+  ([opts ts] (unify* opts (map prep ts))))
 
 (defn unifier
   "Return the unifier for terms ts. Will prep the terms."

From 3c98a765a92fa435b92d99d17592c5749351a72a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 16:01:29 -0500
Subject: [PATCH 020/288] fix bug in predc where we were not checking whether
 the pform was identical to the predicate in which case we don't want to call
 it.

---
 src/main/clojure/clojure/core/logic.clj       | 2 +-
 src/test/clojure/clojure/core/logic/tests.clj | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 620c84d4..5a075d1c 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2648,7 +2648,7 @@
        (rands [_] [x])
        IReifiableConstraint
        (reifyc [c v r a]
-         (if (fn? pform)
+         (if (and (not= p pform) (fn? pform))
            (pform c v r a)
            pform))
        IRunnable
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index f9f7e314..3b7fafd6 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2620,6 +2620,11 @@
              (== x "foo")))
         ())))
 
+(deftest test-predc-sans-pform
+  (is (= (run* [q]
+           (predc q symbol?))
+         (list (list '_0 ':- symbol?)))))
+
 (deftest test-predc-custom-reify-1
   (is (= (run* [q]
            (predc q number? (fn [c v r a] `(~'num ~(walk* r (walk* a q))))))

From d5e44c675a75b849631d49891e442d2addfe5d6c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 17:40:42 -0500
Subject: [PATCH 021/288] refactor the simple unifier in prep for handling sets
 and vectors of symbols as the keys of the :when constraint map

---
 .../clojure/clojure/core/logic/unifier.clj    | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index f430b434..a9030d12 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -62,25 +62,41 @@
                   (doall (walk-term expr (replace-lvar lvars))))]
     (with-meta prepped {:lvars @lvars})))
 
+(defn queue-constraints [s [vs cs]]
+  (cond
+    (vector? vs)
+    (queue s (unwrap (apply cs (map #(lvar % false) vs))))
+
+    (set? vs)
+    (queue s (unwrap (apply cs (map #(lvar % false) vs))))
+
+    (symbol? vs)
+    (queue s (unwrap (apply cs (map #(lvar % false) (list vs)))))
+
+    :else
+    (throw
+     (Exception.
+      (str "Only symbol, set of symbols, or vector of symbols allowed "
+           "on left hand side")))))
+
+(defn -unify* [init-s u w]
+  (first
+    (take*
+      (fn []
+        ((fresh [q]
+           (== u w) (== q u)
+           (fn [a]
+             (fix-constraints a))
+           (reifyg q))
+         init-s)))))
+
 (defn unify*
   "Unify the terms ts."
   ([ts] (unify* {} ts))
   ([opts ts]
-     (let [c-s (reduce
-                    (fn [s [vs cs]]
-                      (let [vs (if (seq? vs) vs (list vs))]
-                        (queue s (unwrap (apply cs (map #(lvar % false) vs))))))
-                    (with-meta empty-s {:reify-vars (fn [v rs] rs)}) (:when opts))
-           -unify* (fn [init-s u w]
-                     (first
-                       (take*
-                         (fn []
-                           ((fresh [q]
-                              (== u w) (== q u)
-                              (fn [a]
-                                (fix-constraints a))
-                              (reifyg q))
-                            init-s)))))]
+     (let [c-s (reduce queue-constraints
+                 (with-meta empty-s {:reify-vars (fn [v rs] rs)})
+                 (:when opts))]
        (-unify*
          (vary-meta c-s assoc :reify-vars false)
          (reduce #(-unify* c-s %1 %2) (butlast ts))

From b552e1e518f2bda21c55c99eee95cc98dd15c2dc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 17:49:07 -0500
Subject: [PATCH 022/288] handle basic set case and single constraint

---
 src/main/clojure/clojure/core/logic/unifier.clj | 8 ++++----
 src/test/clojure/clojure/core/logic/tests.clj   | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index a9030d12..e8d5fab4 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -62,16 +62,16 @@
                   (doall (walk-term expr (replace-lvar lvars))))]
     (with-meta prepped {:lvars @lvars})))
 
-(defn queue-constraints [s [vs cs]]
+(defn queue-constraints [s [vs c]]
   (cond
     (vector? vs)
-    (queue s (unwrap (apply cs (map #(lvar % false) vs))))
+    (queue s (unwrap (apply c (map #(lvar % false) vs))))
 
     (set? vs)
-    (queue s (unwrap (apply cs (map #(lvar % false) vs))))
+    (reduce (fn [s v] (queue s (unwrap (c (lvar v false))))) s vs)
 
     (symbol? vs)
-    (queue s (unwrap (apply cs (map #(lvar % false) (list vs)))))
+    (queue s (unwrap (apply c (map #(lvar % false) (list vs)))))
 
     :else
     (throw
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 3b7fafd6..e0eae422 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1232,6 +1232,12 @@
   (is (= (u/unify {:when {'?a evenc '?b evenc}} ['{:a ?a :b ?b} {:a 1 :b 2}])
          nil)))
 
+(deftest test-unifier-constraints-3
+  (is (= (u/unify {:when {'#{?a ?b} evenc}} ['{:a ?a :b ?b} {:a 2 :b 2}])
+         {:a 2 :b 2}))
+  (is (= (u/unify {:when {'#{?a ?b} evenc}} ['{:a ?a :b ?b} {:a 1 :b 2}])
+         nil)))
+
 ;;Anonymous constraints
 (deftest test-unifier-constraints-3 ;;One var
   (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 2}])

From 118b2a36dd56fa0e81bbb62f22fb0637d1343815 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 17:56:20 -0500
Subject: [PATCH 023/288] show set notation for :when plus vector of
 constraints

---
 src/main/clojure/clojure/core/logic/unifier.clj | 6 +++++-
 src/test/clojure/clojure/core/logic/tests.clj   | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index e8d5fab4..60af95ca 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -62,7 +62,7 @@
                   (doall (walk-term expr (replace-lvar lvars))))]
     (with-meta prepped {:lvars @lvars})))
 
-(defn queue-constraints [s [vs c]]
+(defn queue-constraint [s c vs]
   (cond
     (vector? vs)
     (queue s (unwrap (apply c (map #(lvar % false) vs))))
@@ -79,6 +79,10 @@
       (str "Only symbol, set of symbols, or vector of symbols allowed "
            "on left hand side")))))
 
+(defn queue-constraints [s [vs cs]]
+  (let [cs (if-not (sequential? cs) [cs] cs)]
+    (reduce (fn [s c] (queue-constraint s c vs)) s cs)))
+
 (defn -unify* [init-s u w]
   (first
     (take*
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index e0eae422..ceb7c383 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1238,6 +1238,15 @@
   (is (= (u/unify {:when {'#{?a ?b} evenc}} ['{:a ?a :b ?b} {:a 1 :b 2}])
          nil)))
 
+(defnc div3c [x]
+  (zero? (mod x 3)))
+
+(deftest test-unifier-constraints-4
+  (is (= (u/unify {:when {'#{?a ?b} [evenc div3c]}} ['{:a ?a :b ?b} {:a 6 :b 12}])
+         {:a 6 :b 12}))
+  (is (= (u/unify {:when {'#{?a ?b} [evenc div3c]}} ['{:a ?a :b ?b} {:a 2 :b 6}])
+         nil)))
+
 ;;Anonymous constraints
 (deftest test-unifier-constraints-3 ;;One var
   (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 2}])

From 0430e6e060ab49746e60eb582e4bc69534273c67 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 18:04:12 -0500
Subject: [PATCH 024/288] example showing you can constraint two vars together

---
 src/test/clojure/clojure/core/logic/tests.clj | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index ceb7c383..2e2c12c6 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1247,6 +1247,15 @@
   (is (= (u/unify {:when {'#{?a ?b} [evenc div3c]}} ['{:a ?a :b ?b} {:a 2 :b 6}])
          nil)))
 
+(defnc complexc [a b]
+  (and (even? a) (zero? (mod b 3))))
+
+(deftest test-unifier-constraints-5
+  (is (= (u/unify {:when {'[?a ?b] complexc}} ['{:a ?a :b ?b} {:a 2 :b 3}])
+         {:a 2 :b 3}))
+  (is (= (u/unify {:when {'[?a ?b] complexc}} ['{:a ?a :b ?b} {:a 2 :b 4}])
+         nil)))
+
 ;;Anonymous constraints
 (deftest test-unifier-constraints-3 ;;One var
   (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 2}])

From 662e1bc9d883615feebe50f4632a16381e8ee933 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 18:31:30 -0500
Subject: [PATCH 025/288] refactor a bit more, prep for :as support

---
 .../clojure/clojure/core/logic/unifier.clj    | 39 ++++++++++++++-----
 src/test/clojure/clojure/core/logic/tests.clj |  5 ++-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index 60af95ca..dd766b85 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -94,16 +94,20 @@
            (reifyg q))
          init-s)))))
 
+(defn init-s [opts s]
+  (let [s (reduce (fn [s [k v]] ((== k v) s)) s (:as opts))]
+    (reduce queue-constraints
+      (with-meta s {:reify-vars (fn [v rs] rs)})
+      (:when opts))))
+
 (defn unify*
   "Unify the terms ts."
   ([ts] (unify* {} ts))
   ([opts ts]
-     (let [c-s (reduce queue-constraints
-                 (with-meta empty-s {:reify-vars (fn [v rs] rs)})
-                 (:when opts))]
+     (let [init-s (init-s opts empty-s)]
        (-unify*
-         (vary-meta c-s assoc :reify-vars false)
-         (reduce #(-unify* c-s %1 %2) (butlast ts))
+         (vary-meta init-s assoc :reify-vars false)
+         (reduce #(-unify* init-s %1 %2) (butlast ts))
          (last ts)))))
 
 (defn unifier*
@@ -111,25 +115,40 @@
   All terms in ts should prepped terms."
   ([ts] (unifier* {} ts))
   ([opts ts]
-     (letfn [(-unifier* [u w]
+     (letfn [(-unifier* [s u w]
                (let [lvars (merge
                              (-> u meta :lvars)
                              (-> w meta :lvars))
-                     s (l/unify (with-meta empty-s {:reify-vars false}) u w)]
+                     s (l/unify (with-meta s {:reify-vars false}) u w)]
                  (when s
                    (->> lvars
                      (filter (fn [[name var]] (not= (walk s var) var)))   
                      (map (fn [[name var]] [name (-reify s var)]))
                      (into {})))))]
-       (reduce -unifier* ts))))
+       (let [init-s (init-s opts empty-s)]
+         (reduce #(-unifier* init-s %1 %2) ts)))))
 
 (defn unify
   "Unify the terms ts returning a the value that represents their
    unificaiton. Will prep the terms."
   ([ts] (unify {} ts))
-  ([opts ts] (unify* opts (map prep ts))))
+  ([opts ts]
+     (let [opts (if (contains? opts :as)
+                  (assoc opts :as
+                    (->> (:as opts)
+                      (map (fn [[k v]] [(lvar k false) (prep v)]))
+                      (into {})))
+                  opts)]
+       (unify* opts (map prep ts)))))
 
 (defn unifier
   "Return the unifier for terms ts. Will prep the terms."
   ([ts] (unifier {} ts))
-  ([opts ts] (unifier* opts (map prep ts))))
+  ([opts ts]
+     (let [opts (if (contains? opts :as)
+                  (assoc opts :as
+                    (->> (:as opts)
+                      (map (fn [[k v]] [(lvar k false) (prep v)]))
+                      (into {})))
+                  opts)]
+       (unifier* opts (map prep ts)))))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 2e2c12c6..8abc8e0a 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1256,8 +1256,11 @@
   (is (= (u/unify {:when {'[?a ?b] complexc}} ['{:a ?a :b ?b} {:a 2 :b 4}])
          nil)))
 
+;; (deftest test-unifier-as-1
+;;   (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '(1 2)]))))
+
 ;;Anonymous constraints
-(deftest test-unifier-constraints-3 ;;One var
+(deftest test-unifier-anon-constraints-3 ;;One var
   (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 2}])
          {:a 2}))
   (is (= (u/unify {:when {'?a (fnc [x] (even? x))}} ['{:a ?a} {:a 1}])

From 91756d5d922bd1c45eeb84323d7dcb8d2f350bac Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 18:40:55 -0500
Subject: [PATCH 026/288] first unifier :as tests, allow lvars to be terms to
 be unified

---
 src/main/clojure/clojure/core/logic/unifier.clj | 8 ++++++--
 src/test/clojure/clojure/core/logic/tests.clj   | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index dd766b85..e7b41d35 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -57,9 +57,13 @@
   be replaced with logic vars."
   [expr]
   (let [lvars (atom {})
-        prepped (if (lcons-expr? expr)
+        prepped (cond
+                  (lvarq-sym? expr) (lvar expr false)
+
+                  (lcons-expr? expr)
                   (prep* expr lvars true)
-                  (doall (walk-term expr (replace-lvar lvars))))]
+
+                  :else (doall (walk-term expr (replace-lvar lvars))))]
     (with-meta prepped {:lvars @lvars})))
 
 (defn queue-constraint [s c vs]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 8abc8e0a..586d39e5 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1256,8 +1256,9 @@
   (is (= (u/unify {:when {'[?a ?b] complexc}} ['{:a ?a :b ?b} {:a 2 :b 4}])
          nil)))
 
-;; (deftest test-unifier-as-1
-;;   (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '(1 2)]))))
+(deftest test-unifier-as-1
+  (is (= (u/unify {:as '{?x (?y ?z)}} ['?x '(1 2)])))
+  (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '((1 2))]))))
 
 ;;Anonymous constraints
 (deftest test-unifier-anon-constraints-3 ;;One var

From 25dc225a93cc238560cd8d14801f8ed0397663b9 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 18:46:40 -0500
Subject: [PATCH 027/288] use namespaced ::lvars when attaching metadata to
 terms

---
 src/main/clojure/clojure/core/logic/unifier.clj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index e7b41d35..c1168435 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -64,7 +64,7 @@
                   (prep* expr lvars true)
 
                   :else (doall (walk-term expr (replace-lvar lvars))))]
-    (with-meta prepped {:lvars @lvars})))
+    (with-meta prepped {::lvars @lvars})))
 
 (defn queue-constraint [s c vs]
   (cond
@@ -121,8 +121,8 @@
   ([opts ts]
      (letfn [(-unifier* [s u w]
                (let [lvars (merge
-                             (-> u meta :lvars)
-                             (-> w meta :lvars))
+                             (-> u meta ::lvars)
+                             (-> w meta ::lvars))
                      s (l/unify (with-meta s {:reify-vars false}) u w)]
                  (when s
                    (->> lvars

From e0e9fa8db008b0cf4b8b9c588e6826f0611eff97 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 7 Feb 2013 19:55:46 -0500
Subject: [PATCH 028/288] remove *reify-noms* dynamic var

Instead look for :reify-noms property on the meta of the substitution
map like we do for :reify-vars. Default to true.
---
 src/main/clojure/clojure/core/logic/nominal.clj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index b28eec6a..a618a1ab 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -7,8 +7,6 @@
            [clojure.core.logic LVar LCons]
            [clojure.core.logic.protocols IBindable ITreeTerm]))
 
-(def ^{:dynamic true} *reify-noms* true)
-
 ;; =============================================================================
 ;; Nominal unification with fresh, hash and tie.
 ;;
@@ -107,7 +105,7 @@
 
   IReifyTerm
   (reify-term [v s]
-    (ext s v (symbol (str (if *reify-noms* "a" (:oname v)) "_" (count s)))))
+    (ext s v (symbol (str (if (-> s meta (:reify-noms true)) "a" (:oname v)) "_" (count s)))))
 
   INomSwap
   (swap-noms [t swap s]

From f5af6b7fde65caba3efeb14d18fb470655f67a99 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 17:34:17 -0500
Subject: [PATCH 029/288] add constraint support to unifier, add tests

---
 src/main/clojure/clojure/core/logic/unifier.clj |  2 +-
 src/test/clojure/clojure/core/logic/tests.clj   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index c1168435..cc5af0cb 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -123,7 +123,7 @@
                (let [lvars (merge
                              (-> u meta ::lvars)
                              (-> w meta ::lvars))
-                     s (l/unify (with-meta s {:reify-vars false}) u w)]
+                     s (fix-constraints (l/unify (with-meta s {:reify-vars false}) u w))]
                  (when s
                    (->> lvars
                      (filter (fn [[name var]] (not= (walk s var) var)))   
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 586d39e5..5d149b83 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1291,6 +1291,18 @@
   (is (= (u/unifier ['(?x 2 . ?y) '(1 9 3 4 5)])
          nil)))
 
+(deftest test-binding-map-constraints-1
+  (is (= (u/unifier {:when {'?x evenc '?y div3c}} ['(?x ?y) '(2 6)])
+         '{?x 2 ?y 6}))
+  (is (= (u/unifier {:when {'?x div3c '? evenc}} ['(?x ?y) '(2 6)])
+         nil))
+  (is (= (u/unifier {:when {'[?x ?y] complexc}} ['(?x ?y) '(2 6)])
+         '{?x 2 ?y 6}))
+  (is (= (u/unifier {:when {'#{?x ?y} [evenc div3c]}} ['(?x ?y) '(6 12)])
+         '{?x 6 ?y 12}))
+  (is (= (u/unifier {:when {'#{?x ?y} [evenc div3c]}} ['(?x ?y) '(14 12)])
+         nil)))
+
 ;; -----------------------------------------------------------------------------
 ;; Occurs Check
 

From 1d9a83ec9420ed753f84535ad197c008f9dac66b Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 18:19:04 -0500
Subject: [PATCH 030/288] proper :as support for `unifier`

We now extract all ::lvar meta properties from terms in `unifier`,
`unifier*` now expects to get a map of lvar symbols to lvars in the
:lvars property of the opts argument. This could be further improved,
:lvars should be a set.
---
 src/main/clojure/clojure/core/logic/unifier.clj | 15 ++++++++-------
 src/test/clojure/clojure/core/logic/tests.clj   |  4 ++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index cc5af0cb..6d75811f 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -120,12 +120,9 @@
   ([ts] (unifier* {} ts))
   ([opts ts]
      (letfn [(-unifier* [s u w]
-               (let [lvars (merge
-                             (-> u meta ::lvars)
-                             (-> w meta ::lvars))
-                     s (fix-constraints (l/unify (with-meta s {:reify-vars false}) u w))]
+               (let [s (fix-constraints (l/unify (with-meta s {:reify-vars false}) u w))]
                  (when s
-                   (->> lvars
+                   (->> (:lvars opts)
                      (filter (fn [[name var]] (not= (walk s var) var)))   
                      (map (fn [[name var]] [name (-reify s var)]))
                      (into {})))))]
@@ -154,5 +151,9 @@
                     (->> (:as opts)
                       (map (fn [[k v]] [(lvar k false) (prep v)]))
                       (into {})))
-                  opts)]
-       (unifier* opts (map prep ts)))))
+                  opts)
+           ts' (map prep ts)
+           lvars (->> (concat ts' (map val (:as opts)))
+                   (map #(-> % meta ::lvars))
+                   (reduce merge))]
+       (unifier* (assoc opts :lvars lvars) (map prep ts)))))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 5d149b83..ccbe19fb 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1303,6 +1303,10 @@
   (is (= (u/unifier {:when {'#{?x ?y} [evenc div3c]}} ['(?x ?y) '(14 12)])
          nil)))
 
+(deftest test-binding-map-as-1
+  (is (= (u/unifier {:as {'?x '(?y ?z)}} '[(?x) ((1 2))])
+         '{?x (1 2) ?y 1 ?z 2})))
+
 ;; -----------------------------------------------------------------------------
 ;; Occurs Check
 

From 0fa6dd3925107cd387cb6854bfc09d28005275dc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 18:57:42 -0500
Subject: [PATCH 031/288] switch to sets for holding vars when prepping,
 related changes to `unifier` and `unifier*`

---
 src/main/clojure/clojure/core/logic/unifier.clj | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index 6d75811f..b1179e52 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -13,7 +13,7 @@
   (let [v (if-let [u (@store lvar-expr)]
             u
             (lvar lvar-expr false))]
-    (swap! store conj [lvar-expr v])
+    (swap! store conj lvar-expr)
     v))
 
 (defn- lcons-expr? [expr]
@@ -56,7 +56,7 @@
   "Prep a quoted expression. All symbols preceded by ? will
   be replaced with logic vars."
   [expr]
-  (let [lvars (atom {})
+  (let [lvars (atom #{})
         prepped (cond
                   (lvarq-sym? expr) (lvar expr false)
 
@@ -123,8 +123,9 @@
                (let [s (fix-constraints (l/unify (with-meta s {:reify-vars false}) u w))]
                  (when s
                    (->> (:lvars opts)
-                     (filter (fn [[name var]] (not= (walk s var) var)))   
-                     (map (fn [[name var]] [name (-reify s var)]))
+                     (map (fn [sym] [sym (lvar sym false)]))
+                     (filter (fn [[sym var]] (not= (walk s var) var)))   
+                     (map (fn [[sym var]] [sym (-reify s var)]))
                      (into {})))))]
        (let [init-s (init-s opts empty-s)]
          (reduce #(-unifier* init-s %1 %2) ts)))))
@@ -155,5 +156,5 @@
            ts' (map prep ts)
            lvars (->> (concat ts' (map val (:as opts)))
                    (map #(-> % meta ::lvars))
-                   (reduce merge))]
+                   (reduce into))]
        (unifier* (assoc opts :lvars lvars) (map prep ts)))))

From f035d01ea874660cb463c9774f677cf581dd6d3e Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 20:40:27 -0500
Subject: [PATCH 032/288] don't use bind or bind* in constraint code

---
 src/main/clojure/clojure/core/logic.clj | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 5a075d1c..fc514f10 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2128,10 +2128,10 @@
     (fn [a]
       (let [xcs (constraints-for cs a (first xs) ws)]
         (if (seq xcs)
-          (bind* a
+          ((composeg*
             (run-constraints xcs)
-            (run-constraints* (next xs) cs ws))
-          (bind a (run-constraints* (next xs) cs ws)))))))
+            (run-constraints* (next xs) cs ws)) a)
+          ((run-constraints* (next xs) cs ws) a))))))
 
 ;; TODO: we've hard coded finite domains here
 
@@ -2403,7 +2403,9 @@
         (if p
           (when-not (empty? p)
             #_((normalize-store (with-prefix this p)) a)
-            (bind* a (remcg this) (cgoal (!=c p))))
+            ((composeg*
+              (remcg this)
+              (cgoal (!=c p))) a))
           ((remcg this) a))))
     IPrefix
     (prefix [_] p)

From 449f55288ce8da0669e4b84225489e00fa5575d1 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 20:45:33 -0500
Subject: [PATCH 033/288] don't use `bind` or `bind*` in nominal constraints

---
 .../clojure/clojure/core/logic/nominal.clj    | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index a618a1ab..4a3a0133 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -45,7 +45,7 @@
               s (if (subst-val? rt) (ext-no-check s v rt) s)
               s (update-dom s v ::nom (fnil (fn [d] (conj d t)) #{}))
               s (update-dom s t ::nom (fnil (fn [d] (conj d v)) #{}))
-              s (bind s (suspc v t swap))]
+              s ((suspc v t swap) s)]
           [v s])
         (swap-noms t swap s))))
 
@@ -155,23 +155,23 @@
           (when (and
                   (not (and (lvar? x) (= x a)))
                   (tree-term? x) (not (tie? x)))
-            (bind* s
-                   (remcg c)
-                   (constrain-tree x
-                                   (fn [t s] (bind s (hash a t))))))
+            ((composeg*
+              (remcg c)
+              (constrain-tree x
+                (fn [t s] ((hash a t) s)))) s))
           (when (nom? a)
             (cond
               (and (tie? x)  (= (:binding-nom x) a))
-              (bind s (remcg c))
+              ((remcg c) s)
               (tree-term? x)
-              (bind* s
-                     (remcg c)
-                     (constrain-tree x
-                                     (fn [t s] (bind s (hash a t)))))
+              ((composeg* 
+                (remcg c)
+                (constrain-tree x
+                  (fn [t s] ((hash a t) s)))) s)
               (= x a)
               nil
               :else
-              (bind s (remcg c)))))))
+              ((remcg c) s))))))
     IConstraintOp
     (rator [_] `hash)
     (rands [_] [a x])
@@ -217,7 +217,7 @@
                     seen (clojure.set/union vs seen)]
                 (recur vs2 seen)))))
     (let [[t1 a] (swap-noms t1 swap a)]
-      (bind a (== t1 t2)))))
+      ((== t1 t2) a))))
 
 (defn -suspc
   [v1 v2 swap]
@@ -227,28 +227,28 @@
       (str "suspc" v1 v2 swap))
     clojure.lang.IFn
     (invoke [c a]
-      (bind* a
-             (remcg c)
-             (fn [a]
-               (let [t1 (walk a v1)
-                     t2 (walk a v2)]
-                 (cond
-                   (not (lvar? t1))
-                   (-do-suspc t1 t2 swap a)
-                   (not (lvar? t2))
-                   (-do-suspc t2 t1 swap a)
-                   (= t1 t2)
-                   (loop [a* swap
-                          a a]
-                     (if (empty? a*) a
-                         (recur (rest a*) (bind a (hash (first a*) t2)))))
-                   :else
-                   (let [d1 (get-dom-fd a t1)
-                         d2 (get-dom-fd a t2)]
-                     (bind* a
-                            (if (nil? d2) identity (fd/dom t1 d2))
-                            (if (nil? d1) identity (fd/dom t2 d1))
-                            (addcg c))))))))
+      ((composeg*
+        (remcg c)
+        (fn [a]
+          (let [t1 (walk a v1)
+                t2 (walk a v2)]
+            (cond
+              (not (lvar? t1))
+              (-do-suspc t1 t2 swap a)
+              (not (lvar? t2))
+              (-do-suspc t2 t1 swap a)
+              (= t1 t2)
+              (loop [a* swap
+                     a a]
+                (if (empty? a*) a
+                    (recur (rest a*) ((hash (first a*) t2) a))))
+              :else
+              (let [d1 (get-dom-fd a t1)
+                    d2 (get-dom-fd a t2)]
+                ((composeg*
+                  (if (nil? d2) identity (fd/dom t1 d2))
+                  (if (nil? d1) identity (fd/dom t2 d1))
+                  (addcg c)) a)))))) a))
     IConstraintOp
     (rator [_] `suspc)
     (rands [_] [v1 v2])
@@ -314,9 +314,9 @@
       (if (= (:binding-nom v) (:binding-nom u))
         (unify s (:body v) (:body u))
         (let [[t s] (swap-noms (:body v) [(:binding-nom v) (:binding-nom u)] s)]
-          (bind* s
+          ((composeg* 
             (hash (:binding-nom u) (:body v))
-            (== t (:body u)))))
+            (== t (:body u))) s)))
       :else nil))
 
   IReifyTerm

From 79092d49825b241c56cad2ea17c23c971773fa99 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 8 Feb 2013 22:43:39 -0500
Subject: [PATCH 034/288] minor nominal refactor, use threading macro -> to
 intermediates values in let binding.

---
 src/main/clojure/clojure/core/logic/nominal.clj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 4a3a0133..023e410e 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -42,10 +42,10 @@
       (if (lvar? t)
         (let [v (with-meta (lvar) (meta t))
               rt (root-val s t)
-              s (if (subst-val? rt) (ext-no-check s v rt) s)
-              s (update-dom s v ::nom (fnil (fn [d] (conj d t)) #{}))
-              s (update-dom s t ::nom (fnil (fn [d] (conj d v)) #{}))
-              s ((suspc v t swap) s)]
+              s (-> (if (subst-val? rt) (ext-no-check s v rt) s)
+                  (update-dom v ::nom (fnil (fn [d] (conj d t)) #{}))
+                  (update-dom t ::nom (fnil (fn [d] (conj d v)) #{}))
+                  ((suspc v t swap)))]
           [v s])
         (swap-noms t swap s))))
 

From 1d1724bc66b344551619c32331393a811fe7714a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 13 Feb 2013 15:55:52 -0500
Subject: [PATCH 035/288] LOGIC-111: conda regression

`conda` and `condu` implementations were both incorrect for the unit
case. Both now use `(reduce bind b gs)`. Added test for the regression.
---
 src/main/clojure/clojure/core/logic.clj       | 22 ++++++-------------
 src/test/clojure/clojure/core/logic/tests.clj |  8 +++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index fc514f10..33f27ca6 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1236,20 +1236,16 @@
 (extend-protocol IIfA
   nil
   (ifa [b gs c]
-       (when c
-         (force c)))
+    (when c
+      (force c)))
 
   Substitutions
   (ifa [b gs c]
-       (loop [b b [g0 & gr] gs]
-         (if g0
-           (when-let [b (g0 b)]
-             (recur b gr))
-           b)))
+    (reduce bind b gs))
 
   clojure.lang.Fn
   (ifa [b gs c]
-       (-inc (ifa (b) gs c)))
+    (-inc (ifa (b) gs c)))
 
   Choice
   (ifa [b gs c]
@@ -1258,16 +1254,12 @@
 (extend-protocol IIfU
   nil
   (ifu [b gs c]
-       (when c
-         (force c)))
+    (when c
+      (force c)))
 
   Substitutions
   (ifu [b gs c]
-    (loop [b b [g0 & gr] gs]
-      (if g0
-        (when-let [b (g0 b)]
-          (recur b gr))
-        b)))
+    (reduce bind b gs))
 
   clojure.lang.Fn
   (ifu [b gs c]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index ccbe19fb..f023207d 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1538,6 +1538,14 @@
            (== q (RecordTest. 1 2)))
          (list #clojure.core.logic.tests.RecordTest{:a 1, :b 2}))))
 
+(deftest test-111-conda-regression
+  (is (= (run* [x]
+           (conda 
+             [succeed
+              (project [x] succeed)
+              (project [x] succeed)]))
+         '(_0))))
+
 ;; =============================================================================
 ;; cKanren
 

From a4331c28a191978998657e809e847155e9534ac1 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 15 Feb 2013 19:22:55 -0500
Subject: [PATCH 036/288] bump nrepl

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index f3b27db1..c11b6d34 100644
--- a/project.clj
+++ b/project.clj
@@ -20,7 +20,7 @@
                  [org.clojure/google-closure-library "0.0-2029"]
                  [org.clojure/google-closure-library-third-party "0.0-2029"] 
                  [org.clojure/tools.macro "0.1.1"]
-                 [org.clojure/tools.nrepl "0.2.0-RC1"]
+                 [org.clojure/tools.nrepl "0.2.1"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
   :plugins [[lein-cljsbuild "0.2.9"]]
 

From 28c00138761fde433bc211dbb58c8f7cb873862b Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 15 Feb 2013 23:00:51 -0500
Subject: [PATCH 037/288] basic framework for entanglement in place

---
 src/main/clojure/clojure/core/logic.clj | 110 +++++++++++++++++-------
 1 file changed, 80 insertions(+), 30 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 33f27ca6..021f0921 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -175,8 +175,11 @@
 
 ;; =============================================================================
 ;; SubstValue
+;; v - the actual ground value of the var
+;; doms - the constraint domains assigned to the var
+;; eset - set of other vars this var is entangled with
 
-(defrecord SubstValue [v doms]
+(defrecord SubstValue [v doms eset]
   Object
   (toString [_]
     (str v)))
@@ -185,9 +188,9 @@
   (instance? SubstValue x))
 
 (defn subst-val
-  ([x] (SubstValue. x nil))
-  ([x doms] (SubstValue. x doms))
-  ([x doms _meta] (with-meta (SubstValue. x doms) _meta)))
+  ([x] (SubstValue. x nil nil))
+  ([x doms] (SubstValue. x doms nil))
+  ([x doms _meta] (with-meta (SubstValue. x doms nil) _meta)))
 
 (defmethod print-method SubstValue [x ^Writer writer]
   (.write writer (str (:v x))))
@@ -436,32 +439,62 @@
     (if (subst-val? v)
       (-> v meta attr))))
 
-(defn add-dom [s x dom domv]
-  (let [x (root-var s x)
-        v (root-val s x)]
-    (if (subst-val? v)
-      (update-var s x (assoc-dom v dom domv))
-      (let [v (if (lvar? v) ::unbound v)]
-        (ext-no-check s x (subst-val v {dom domv}))))))
-
-(defn update-dom [s x dom f]
-  (let [x (root-var s x)
-        v (root-val s x)
-        v (if (lvar? v)
-            (subst-val ::unbound)
-            v)
-        doms (:doms v)]
-    (update-var s x (assoc-dom v dom (f (get doms dom))))))
-
-(defn rem-dom [s x dom]
-  (let [x (root-var s x)
-        v (root-val s x)]
-    (if (subst-val? v)
-      (let [new-doms (dissoc (:doms v) dom)]
-        (if (and (zero? (count new-doms)) (not= (:v v) ::unbound))
-          (update-var s x (:v v))
-          (update-var s x (assoc v :doms new-doms))))
-      s)))
+(defn add-dom
+  ([s x dom domv]
+     (let [x (root-var s x)]
+       (add-dom s x dom domv nil)))
+  ([s x dom domv seenset]
+     (let [v (root-val s x)
+           s (if (subst-val? v)
+               (update-var s x (assoc-dom v dom domv))
+               (let [v (if (lvar? v) ::unbound v)]
+                 (ext-no-check s x (subst-val v {dom domv}))))]
+       (reduce
+         (fn [s y]
+           (if-not (contains? seenset y)
+             (add-dom s y dom domv (conj (or seenset #{}) x))
+             s))
+         s
+         (:eset v)))))
+
+(defn update-dom
+  ([s x dom f]
+     (let [x (root-var s x)]
+       (update-dom s x dom f nil)))
+  ([s x dom f seenset]
+     (let [v (root-val s x)
+           v (if (lvar? v)
+               (subst-val ::unbound)
+               v)
+           doms (:doms v)
+           s (update-var s x (assoc-dom v dom (f (get doms dom)))) dom f]
+       (reduce
+         (fn [s y]
+           (if-not (contains? seenset y)
+             (update-dom s y f (conj (or seenset #{} x)))
+             s))
+         s
+         (:eset v)))))
+
+(defn rem-dom
+  ([s x dom]
+     (let [x (root-var s x)]
+       (rem-dom s x dom nil)))
+  ([s x dom seenset]
+     (let [v (root-val s x)
+           s (if (subst-val? v)
+               (let [new-doms (dissoc (:doms v) dom)]
+                 (if (and (zero? (count new-doms)) (not= (:v v) ::unbound))
+                   (update-var s x (:v v))
+                   (update-var s x (assoc v :doms new-doms))))
+               s)]
+       (reduce
+         (fn [s y]
+           (if-not (contains? seenset y)
+             (rem-dom s y dom (conj (or seenset #{} x)))
+             s))
+         s
+         (:eset v)))))
 
 (defn get-dom [s x dom]
   (let [v (root-val s x)]
@@ -510,6 +543,23 @@
       (subst-val (:v root) doms
         (merge (meta x) (meta root))))))
 
+;; =============================================================================
+;; Entanglement
+
+(defn to-subst-val [v]
+  (if (subst-val? v)
+    v
+    (subst-val v)))
+
+(defn entangle [s x y]
+  (let [x  (root-var s x)
+        y  (root-var s y)
+        xv (to-subst-val (root-val s x))
+        yv (to-subst-val (root-val s y))]
+    (-> s
+      (update-var x (assoc xv :eset (conj (or (:eset xv) #{}) y)))
+      (update-var y (assoc yv :eset (conj (or (:eset yv) #{}) x))))))
+
 ;; =============================================================================
 ;; Logic Variables
 

From 5edbbf7bfd29be4b04f4d69d153e32a62153e3df Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 15 Feb 2013 23:20:17 -0500
Subject: [PATCH 038/288] entanglement add-dom case tests

---
 src/test/clojure/clojure/core/logic/tests.clj | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index f023207d..193af0bd 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2913,6 +2913,45 @@
                  `(~'hashc ~v ~(-reify a x r))))))
          '((_0 :- (hashc _0 _1))))))
 
+;; =============================================================================
+;; Entanglement
+
+(deftest test-entanglement-add-dom-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s
+             (entangle x y)
+             (add-dom x ::fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y ::fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-2
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s
+             (entangle x y)
+             (add-dom y ::fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-3
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle x y)
+              (entangle y z)
+              (add-dom x ::fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s z ::fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-4
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle x y)
+              (entangle y z)
+              (add-dom z ::fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::fd) (fd/domain 1 2 3)))))
+
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change
 

From bc58b73cddcb91f5d6051398c9afe051c78951e8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 15 Feb 2013 23:43:49 -0500
Subject: [PATCH 039/288] fix some bugs, update-dom case for entangled vars
 tests

---
 src/main/clojure/clojure/core/logic.clj       |  6 +-
 src/test/clojure/clojure/core/logic/tests.clj | 60 ++++++++++++++++---
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 021f0921..95db5443 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -467,11 +467,11 @@
                (subst-val ::unbound)
                v)
            doms (:doms v)
-           s (update-var s x (assoc-dom v dom (f (get doms dom)))) dom f]
+           s (update-var s x (assoc-dom v dom (f (get doms dom))))]
        (reduce
          (fn [s y]
            (if-not (contains? seenset y)
-             (update-dom s y f (conj (or seenset #{} x)))
+             (update-dom s y dom f (conj (or seenset #{}) x))
              s))
          s
          (:eset v)))))
@@ -491,7 +491,7 @@
        (reduce
          (fn [s y]
            (if-not (contains? seenset y)
-             (rem-dom s y dom (conj (or seenset #{} x)))
+             (rem-dom s y dom (conj (or seenset #{}) x))
              s))
          s
          (:eset v)))))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 193af0bd..c52fac80 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2921,16 +2921,16 @@
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (add-dom x ::fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s y ::fd) (fd/domain 1 2 3)))))
+             (add-dom x :l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y :l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-2
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (add-dom y ::fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s x ::fd) (fd/domain 1 2 3)))))
+             (add-dom y :l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x :l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-3
   (let [x (lvar 'x)
@@ -2939,8 +2939,8 @@
         s (-> empty-s
               (entangle x y)
               (entangle y z)
-              (add-dom x ::fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s z ::fd) (fd/domain 1 2 3)))))
+              (add-dom x :l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s z :l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-4
   (let [x (lvar 'x)
@@ -2949,8 +2949,52 @@
         s (-> empty-s
               (entangle x y)
               (entangle y z)
-              (add-dom z ::fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s x ::fd) (fd/domain 1 2 3)))))
+              (add-dom z :l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x :l/fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s
+             (entangle x y)
+             (add-dom x :l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y :l/fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-update-dom-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s
+             (entangle x y)
+             (update-dom x :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s y :l/nom) #{:foo}))))
+
+(deftest test-entanglement-update-dom-2
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s
+             (entangle x y)
+             (update-dom y :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s x :l/nom) #{:foo}))))
+
+(deftest test-entanglement-update-dom-3
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+             (entangle x y)
+             (entangle y z)
+             (update-dom x :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s z :l/nom) #{:foo}))))
+
+(deftest test-entanglement-update-dom-4
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle x y)
+              (entangle y z)
+              (update-dom z :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s x :l/nom) #{:foo}))))
 
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change

From c918df2d619b564ec0351bcde67d24ab3d0b7fe2 Mon Sep 17 00:00:00 2001
From: "Kevin J. Lynagh" <kevin@keminglabs.com>
Date: Sat, 9 Feb 2013 20:34:42 -0800
Subject: [PATCH 040/288] Factor out map `IUnifyWithTerms` implementation to
 `unify-with-map*` function.

This makes it easier for consumers to extend map-like unification to their own records without copy/pasting.
---
 src/main/clojure/clojure/core/logic.clj | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 33f27ca6..09e04165 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -800,6 +800,18 @@
     (lcons? v) (unify-terms v u s)
     :else nil))
 
+(defn unify-with-map* [u v s]
+  (when (= (count u) (count v))
+    (loop [ks (keys u) s s]
+      (if (seq ks)
+        (let [kf (first ks)
+              vf (get v kf ::not-found)]
+          (when-not (= vf ::not-found)
+            (if-let [s (unify s (get u kf) vf)]
+              (recur (next ks) s)
+              nil)))
+        s))))
+
 (extend-protocol IUnifyTerms
   nil
   (unify-terms [u v s]
@@ -822,16 +834,8 @@
       (unify-with-record v u s)
 
       (map? v)
-      (when (= (count u) (count v))
-        (loop [ks (keys u) s s]
-          (if (seq ks)
-            (let [kf (first ks)
-                  vf (get v kf ::not-found)]
-              (when-not (= vf ::not-found)
-                (if-let [s (unify s (get u kf) vf)]
-                  (recur (next ks) s)
-                  nil)))
-            s)))
+      (unify-with-map* u v s)
+      
       :else nil)))
 
 ;; =============================================================================

From d811a2e29baf1cea8291589fdad8b5b9f8181c82 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 16 Feb 2013 12:46:34 -0500
Subject: [PATCH 041/288] fixup tests

---
 src/test/clojure/clojure/core/logic/tests.clj | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index c52fac80..a9ea9fb1 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2921,16 +2921,16 @@
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (add-dom x :l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s y :l/fd) (fd/domain 1 2 3)))))
+             (add-dom x ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y ::l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-2
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (add-dom y :l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s x :l/fd) (fd/domain 1 2 3)))))
+             (add-dom y ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-3
   (let [x (lvar 'x)
@@ -2939,8 +2939,8 @@
         s (-> empty-s
               (entangle x y)
               (entangle y z)
-              (add-dom x :l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s z :l/fd) (fd/domain 1 2 3)))))
+              (add-dom x ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s z ::l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-4
   (let [x (lvar 'x)
@@ -2949,23 +2949,23 @@
         s (-> empty-s
               (entangle x y)
               (entangle y z)
-              (add-dom z :l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s x :l/fd) (fd/domain 1 2 3)))))
+              (add-dom z ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-add-dom-1
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (add-dom x :l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s y :l/fd) (fd/domain 1 2 3)))))
+             (add-dom x ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y ::l/fd) (fd/domain 1 2 3)))))
 
 (deftest test-entanglement-update-dom-1
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (update-dom x :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+             (update-dom x ::l/nom (fnil (fn [d] (conj d :foo)) #{})))]
     (is (= (get-dom s y :l/nom) #{:foo}))))
 
 (deftest test-entanglement-update-dom-2
@@ -2973,8 +2973,8 @@
         y (lvar 'y)
         s (-> empty-s
              (entangle x y)
-             (update-dom y :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
-    (is (= (get-dom s x :l/nom) #{:foo}))))
+             (update-dom y ::l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s x ::l/nom) #{:foo}))))
 
 (deftest test-entanglement-update-dom-3
   (let [x (lvar 'x)
@@ -2983,8 +2983,8 @@
         s (-> empty-s
              (entangle x y)
              (entangle y z)
-             (update-dom x :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
-    (is (= (get-dom s z :l/nom) #{:foo}))))
+             (update-dom x ::l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s z ::l/nom) #{:foo}))))
 
 (deftest test-entanglement-update-dom-4
   (let [x (lvar 'x)
@@ -2993,8 +2993,15 @@
         s (-> empty-s
               (entangle x y)
               (entangle y z)
-              (update-dom z :l/nom (fnil (fn [d] (conj d :foo)) #{})))]
-    (is (= (get-dom s x :l/nom) #{:foo}))))
+              (update-dom z ::l/nom (fnil (fn [d] (conj d :foo)) #{})))]
+    (is (= (get-dom s x ::l/nom) #{:foo}))))
+
+(deftest test-entanglement-fd-in-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        s (-> empty-s (entangle x y))
+        s (((fd/in x (fd/domain 1 2 3)) s))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change

From 82d1deaad894c1e50a699b459a46371f9f056240 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 16 Feb 2013 12:47:53 -0500
Subject: [PATCH 042/288] fix typo

---
 src/test/clojure/clojure/core/logic/tests.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index a9ea9fb1..0f687d2e 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2966,7 +2966,7 @@
         s (-> empty-s
              (entangle x y)
              (update-dom x ::l/nom (fnil (fn [d] (conj d :foo)) #{})))]
-    (is (= (get-dom s y :l/nom) #{:foo}))))
+    (is (= (get-dom s y ::l/nom) #{:foo}))))
 
 (deftest test-entanglement-update-dom-2
   (let [x (lvar 'x)

From 4799fc88271e6ce508492a996ce5e206d619d651 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 16 Feb 2013 14:00:42 -0500
Subject: [PATCH 043/288] remove custom SubstValue printing, makes debugging
 painful

---
 src/main/clojure/clojure/core/logic.clj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 33f27ca6..eb781fd7 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -189,9 +189,6 @@
   ([x doms] (SubstValue. x doms))
   ([x doms _meta] (with-meta (SubstValue. x doms) _meta)))
 
-(defmethod print-method SubstValue [x ^Writer writer]
-  (.write writer (str (:v x))))
-
 ;; =============================================================================
 ;; Substitutions
 

From c307401c04cbb52956c2c97bbf9288f3a093f622 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 16 Feb 2013 21:37:20 -0500
Subject: [PATCH 044/288] remove redundant test

---
 src/test/clojure/clojure/core/logic/tests.clj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 0f687d2e..06ff3326 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2952,14 +2952,6 @@
               (add-dom z ::l/fd (fd/domain 1 2 3)))]
     (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
-(deftest test-entanglement-add-dom-1
-  (let [x (lvar 'x)
-        y (lvar 'y)
-        s (-> empty-s
-             (entangle x y)
-             (add-dom x ::l/fd (fd/domain 1 2 3)))]
-    (is (= (get-dom s y ::l/fd) (fd/domain 1 2 3)))))
-
 (deftest test-entanglement-update-dom-1
   (let [x (lvar 'x)
         y (lvar 'y)

From 940228e8f47a4f1e8160f0f0e3e8b1b273dd70de Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 16 Feb 2013 21:40:13 -0500
Subject: [PATCH 045/288] tests checking that entanglement works even with
 aliased vars

---
 src/test/clojure/clojure/core/logic/tests.clj | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 06ff3326..5b3e3d31 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2952,6 +2952,26 @@
               (add-dom z ::l/fd (fd/domain 1 2 3)))]
     (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
+(deftest test-entanglement-add-dom-root-var-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (unify x y)
+              (entangle x z)
+              (add-dom z ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-root-var-2
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (unify y x)
+              (entangle x z)
+              (add-dom z ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
+
 (deftest test-entanglement-update-dom-1
   (let [x (lvar 'x)
         y (lvar 'y)

From b98c210cebc24682d9d71cbdc52e865b28833a0d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Feb 2013 13:15:22 -0500
Subject: [PATCH 046/288] clojure.core.logic.nominal.Tie can be implemented as
 a record

---
 .../clojure/clojure/core/logic/nominal.clj    | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 023e410e..5856ae7f 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -280,33 +280,9 @@
 
 (declare tie)
 
-(deftype Tie [binding-nom body _meta]
+(defrecord Tie [binding-nom body]
   ITreeTerm
 
-  Object
-  (toString [_]
-    (str "<tie:" binding-nom "." body ">"))
-  (hashCode [_]
-    (.hashCode body))
-  (equals [this o]
-    (and (.. this getClass (isInstance o))
-         (and (= binding-nom (:binding-nom o)) (= body (:body o)))))
-
-  clojure.lang.IObj
-  (withMeta [this new-meta]
-    (Tie. binding-nom body _meta))
-  (meta [this]
-    _meta)
-
-  clojure.lang.ILookup
-  (valAt [this k]
-    (.valAt this k nil))
-  (valAt [_ k not-found]
-    (case k
-      :binding-nom binding-nom
-      :body body
-      not-found))
-
   IUnifyTerms
   (unify-terms [v u s]
     (cond
@@ -351,7 +327,7 @@
         s])))
 
 (defn tie [binding-nom body]
-  (Tie. binding-nom body nil))
+  (Tie. binding-nom body))
 
 (defn tie? [x]
   (instance? clojure.core.logic.nominal.Tie x))

From 83e9cdb4247893ef0a8dbdefe61aebdca0163dbf Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 19 Feb 2013 20:38:24 -0500
Subject: [PATCH 047/288] LOGIC-115: fd/in with singleton domains fails

Change `dom` so that if given a singleton domain we don't bother
adding the domain constraint.
---
 src/main/clojure/clojure/core/logic/fd.clj    | 3 ++-
 src/test/clojure/clojure/core/logic/tests.clj | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 617c5b19..e630d14e 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -657,7 +657,8 @@
   (fn [a]
     ((composeg
       (process-dom x dom)
-      (if (nil? (get-dom a x))
+      (if (and (nil? (get-dom a x))
+               (not (singleton-dom? dom)))
         (domc x)
         identity)) a)))
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index f023207d..93034854 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1546,6 +1546,11 @@
               (project [x] succeed)]))
          '(_0))))
 
+(deftest test-115-singleton-doms
+  (is (= (run* [q]
+           (fd/in q (fd/interval 3 3)))
+         '(3))))
+
 ;; =============================================================================
 ;; cKanren
 

From 57eec1946ded6aeb207b501a4545a5ea241e7704 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 22 Feb 2013 19:01:58 -0500
Subject: [PATCH 048/288] update project.clj for ClojureScript. clean up
 declares a bit after running into a ClojureScript declare bug.

---
 project.clj                           | 28 ++++++++++++++-------------
 src/main/clojure/cljs/core/logic.cljs |  7 +------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/project.clj b/project.clj
index c11b6d34..b45aec95 100644
--- a/project.clj
+++ b/project.clj
@@ -16,21 +16,23 @@
                  ]
   :test-paths ["src/test/clojure"]
   :dependencies [[org.clojure/clojure "1.5.0-RC1"]
-                 [org.clojure/clojurescript "0.0-1535"]
-                 [org.clojure/google-closure-library "0.0-2029"]
-                 [org.clojure/google-closure-library-third-party "0.0-2029"] 
+                 [org.clojure/clojurescript "0.0-1586"]
                  [org.clojure/tools.macro "0.1.1"]
                  [org.clojure/tools.nrepl "0.2.1"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
-  :plugins [[lein-cljsbuild "0.2.9"]]
 
+  :plugins [[lein-cljsbuild "0.3.0"]]
 
-  :cljsbuild {:builds {:test-simp {:source-path "src/test/cljs"
-                                   :compiler {:optimizations :simple
-                                              :pretty-print true
-                                              :static-fns true
-                                              :output-to "tests.js"}}
-                       :test-adv {:source-path "src/test/cljs"
-                                  :compiler {:optimizations :advanced
-                                             :pretty-print true
-                                             :output-to "tests.js"}}}})
+  :cljsbuild
+  {:builds
+   [{:id "simple"
+     :source-paths ["src/test/cljs"]
+     :compiler {:optimizations :simple
+                :pretty-print true
+                :static-fns true
+                :output-to "tests.js"}}
+    {:id "adv"
+     :source-paths ["src/test/cljs"]
+     :compiler {:optimizations :advanced
+                :pretty-print true
+                :output-to "tests.js"}}]})
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 9713fe81..6c3ef7c7 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -100,12 +100,7 @@
   (-reify* [this v])
   (-reify [this v]))
 
-(declare empty-s)
-(declare choice)
-(declare lvar)
-(declare lvar?)
-(declare pair)
-(declare lcons)
+(declare empty-s choice lvar lvar? lcons)
 
 (def not-found (js-obj))
 

From f9f53f5733f4ff138ef0b25187370630e8fa322c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 22 Feb 2013 19:43:35 -0500
Subject: [PATCH 049/288] update CLJS port so for symbol change. Use non-native
 type-hint instead of type specific stuff.

---
 src/main/clojure/cljs/core/logic.cljs    | 25 +++++++++++-------------
 src/test/cljs/cljs/core/logic/tests.cljs |  5 +++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 6c3ef7c7..173bb3d5 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -106,12 +106,11 @@
 
 (defn assq
   "Similar to Scheme assq, xs must be a List of Pairs"
-  [k ^cljs.core/List xs]
-  (loop [xs (-seq xs)]
+  [k ^not-native xs]
+  (loop [^not-native xs (-seq xs)]
     (if (nil? xs)
       not-found
-      (let [^cljs.core/List xs xs
-            x (-first xs)
+      (let [x (-first xs)
             lhs (.-lhs x)]
         (if (identical? k lhs)
           (.-rhs x)
@@ -260,9 +259,7 @@
 (defn lvar
   ([] (lvar 'gen))
   ([name]
-     (let [name (js* "~{} + '_' + ~{}"
-                     (.substring name 2 (.-length name))
-                     (swap! lvar-sym-counter inc))]
+     (let [name (str name "_" (swap! lvar-sym-counter inc))]
        (LVar. name nil))))
 
 (defn ^boolean lvar? [x]
@@ -461,16 +458,16 @@
   (-unify-with-seq [v u s] false)
 
   default
-  (-unify-with-seq [v u s]
+  (-unify-with-seq [^not-native v ^not-native u ^not-native s]
     (if (sequential? v)
-      (loop [u u v v s s]
-        (if (seq u)
-          (if (seq v)
-            (if-let [s (-unify s (first u) (first v))]
-              (recur (next u) (next v) s)
+      (loop [^not-native u (-seq u) ^not-native v (-seq v) s s]
+        (if-not (nil? u)
+          (if-not (nil? v)
+            (if-let [s (-unify s (-first u) (-first v))]
+              (recur (-next u) (-next v) s)
               false)
             false)
-          (if (seq v) false s)))
+          (if-not (nil? v) false s)))
       false)))
 
 ;; -----------------------------------------------------------------------------
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index 8afcd1ab..3bef300d 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -992,8 +992,9 @@
 (println (pr-str (run 1 [q] (zebrao q))))
 
 (binding [*occurs-check* false]
-  (dotimes [_ 5]
-    (time (run 1 [q] (zebrao q)))))
+  (time
+    (dotimes [_ 1000]
+      (run 1 [q] (zebrao q)))))
 
 (println (pr-str
           (run 10 [q]

From c534d759024d508bf2393b029f36dbc4cd77d585 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 25 Feb 2013 15:39:03 -0500
Subject: [PATCH 050/288] some more not-native type hints. Need to avoid nil
 punning in unification of sequential types.

---
 src/main/clojure/cljs/core/logic.cljs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 173bb3d5..a8fba399 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -320,7 +320,7 @@
   IUnifyWithObject
   (-unify-with-object [v u s] false)
   IUnifyWithLSeq
-  (-unify-with-lseq [v u s]
+  (-unify-with-lseq [^not-native v ^not-native u ^not-native s]
     (loop [u u v v s s]
       (if (lvar? u)
         (-unify s u v)
@@ -436,13 +436,13 @@
   (-unify-with-lseq [v u s] false)
 
   default
-  (-unify-with-lseq [v u s]
-    (if (sequential? v)
-      (loop [u u v v s s]
-        (if (seq v)
+  (-unify-with-lseq [v ^not-native u ^not-native s]
+    (if (and (sequential? v) (not (nil? v)))
+      (loop [u u ^not-native v (-seq v) s s]
+        (if-not (nil? v)
           (if (lcons? u)
-            (if-let [s (-unify s (-lfirst u) (first v))]
-              (recur (-lnext u) (next v) s)
+            (if-let [s (-unify s (-lfirst u) (-first v))]
+              (recur (-lnext u) (-next v) s)
               false)
             (-unify s u v))
           (if (lvar? u)
@@ -459,13 +459,14 @@
 
   default
   (-unify-with-seq [^not-native v ^not-native u ^not-native s]
-    (if (sequential? v)
+    (if (and (sequential? v) (not (nil? v)))
       (loop [^not-native u (-seq u) ^not-native v (-seq v) s s]
         (if-not (nil? u)
           (if-not (nil? v)
-            (if-let [s (-unify s (-first u) (-first v))]
-              (recur (-next u) (-next v) s)
-              false)
+            (let [s (-unify s (-first u) (-first v))]
+              (if-not (false? s)
+                (recur (-next u) (-next v) s)
+                false))
             false)
           (if-not (nil? v) false s)))
       false)))

From 6bb29f96854a9739bafcc84938bd30f899f52a27 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Feb 2013 09:02:43 -0500
Subject: [PATCH 051/288] remove set unifiction from CLJS core.logic

---
 src/main/clojure/cljs/core/logic.cljs    | 58 +-----------------------
 src/test/cljs/cljs/core/logic/tests.cljs | 55 ----------------------
 2 files changed, 2 insertions(+), 111 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index a8fba399..a3bc5222 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -29,9 +29,6 @@
 (defprotocol IUnifyWithMap
   (-unify-with-map [v u s]))
 
-(defprotocol IUnifyWithSet
-  (-unify-with-set [v u s]))
-
 (defprotocol IReifyTerm
   (-reify-term [v s]))
 
@@ -242,9 +239,6 @@
   IUnifyWithMap
   (-unify-with-map [v u s]
     (-ext s v u))
-  IUnifyWithSet
-  (-unify-with-set [v u s]
-    (-ext s v u))
   IReifyTerm
   (-reify-term [v s]
     (-ext s v (-reify-lvar-name s)))
@@ -336,8 +330,6 @@
     (-unify-with-lseq u v s))
   IUnifyWithMap
   (-unify-with-map [v u s] false)
-  IUnifyWithSet
-  (-unify-with-set [v u s] false)
   IReifyTerm
   (-reify-term [v s]
     (loop [v v s s]
@@ -390,11 +382,7 @@
 
   PersistentHashMap
   (-unify-terms [u v s]
-    (-unify-with-map v u s))
-  
-  PersistentHashSet
-  (-unify-terms [u v s]
-    (-unify-with-set v u s)))
+    (-unify-with-map v u s)))
 
 ;; -----------------------------------------------------------------------------
 ;; Unify nil with X
@@ -509,41 +497,6 @@
   (-unify-with-map [v u s]
     (unify-with-map* v u s)))
 
-;; -----------------------------------------------------------------------------
-;; Unify IPersistentSet with X
-
-(extend-protocol IUnifyWithSet
-  nil
-  (-unify-with-set [v u s] false)
-
-  default
-  (-unify-with-set [v u s] false)
-
-  PersistentHashSet
-  (-unify-with-set [v u s]
-    (loop [u u v v ulvars [] umissing []]
-      (if (seq u)
-        (if (seq v)
-          (let [uf (first u)]
-            (if (lvar? uf)
-              (recur (disj u uf) v (conj ulvars uf) umissing)
-              (if (contains? v uf)
-                (recur (disj u uf) (disj v uf) ulvars umissing)
-                (recur (disj u uf) v ulvars (conj umissing uf)))))
-          false)
-        (if (seq v)
-          (if (seq ulvars)
-            (loop [v v vlvars [] vmissing []]
-              (if (seq v)
-                (let [vf (first v)]
-                  (if (lvar? vf)
-                    (recur (disj v vf) (conj vlvars vf) vmissing)
-                    (recur (disj v vf) vlvars (conj vmissing vf))))
-                (-unify s (concat ulvars umissing)
-                        (concat vmissing vlvars))))
-            false)
-          s)))))
-
 ;; =============================================================================
 ;; Reification
 
@@ -591,14 +544,7 @@
   (-walk-term [v s] (walk-term-map* v s))
 
   PersistentHashMap
-  (-walk-term [v s] (walk-term-map* v s))
-
-  PersistentHashSet
-  (-walk-term [v s]
-    (loop [v v r {}]
-      (if (seq v)
-        (recur (next v) (conj r (-walk* s (first v))))
-        r))))
+  (-walk-term [v s] (walk-term-map* v s)))
 
 ;; =============================================================================
 ;; Occurs Check Term
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index 3bef300d..25b2e39a 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -316,61 +316,6 @@
 
 (assert (= (-unify empty-s {} #{}) false))
 
-;; -----------------------------------------------------------------------------
-;; unify with set
-
-(println "unify with set")
-
-(assert (= (-unify empty-s #{} 1) false))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x #{})]
-  (assert (= (-unify empty-s #{} x) os)))
-
-(let [x (lvar 'x)]
-  (assert (= (-unify empty-s #{} (lcons 1 x)) false)))
-
-(assert (= (-unify empty-s #{} '()) false))
-
-(assert (= (-unify empty-s #{} {}) false))
-
-(assert (= (-unify empty-s #{} #{}) empty-s))
-
-(assert (= (-unify empty-s #{} #{1}) false))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x 1)]
-  (assert (= (-unify empty-s #{x} #{1}) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      os (-> empty-s
-             (-ext-no-check x 2)
-             (-ext-no-check y 1))]
-  (assert (= (-unify empty-s #{1 x} #{2 y}) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      os (-> empty-s
-             (-ext-no-check x 2)
-             (-ext-no-check y 1))]
-  (assert (= (-unify empty-s #{x 1} #{2 y}) os)))
-
-(let [a (lvar 'a)
-      b (lvar 'b)
-      c (lvar 'c)
-      d (lvar 'd)
-      s (.-s (-unify empty-s #{a b 3 4 5} #{1 2 3 c d}))]
-  (assert (and (= (count s) 4)
-               (= (set (map #(.-lhs %) s)) #{a b c d})
-               (= (set (map #(.-rhs %) s)) #{1 2 4 5}))))
-
-(let [a (lvar 'a)
-      b (lvar 'b)
-      c (lvar 'c)
-      d (lvar 'd)]
-  (assert (= (-unify empty-s #{a b 9 4 5} #{1 2 3 c d}) false)))
-
 ;; =============================================================================
 ;; walk
 

From eb13bb95b398d754238164bfff27792dec068cea Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Feb 2013 10:19:10 -0500
Subject: [PATCH 052/288] we now have explicit failure in CLJS core.logic, no
 perf hit.

---
 src/main/clojure/cljs/core/logic.cljs       | 108 +++++++++++++-------
 src/main/clojure/cljs/core/logic/macros.clj |   2 +-
 src/test/cljs/cljs/core/logic/tests.cljs    |  84 +++++++--------
 3 files changed, 112 insertions(+), 82 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index a3bc5222..9169d00f 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -97,7 +97,7 @@
   (-reify* [this v])
   (-reify [this v]))
 
-(declare empty-s choice lvar lvar? lcons)
+(declare empty-s choice lvar lvar? lcons fail)
 
 (def not-found (js-obj))
 
@@ -131,7 +131,7 @@
   
   (-ext [this u v]
     (if (and *occurs-check* (-occurs-check this u v))
-      nil
+      (fail this)
       (-ext-no-check this u v)))
 
   (-ext-no-check [this u v]
@@ -266,7 +266,7 @@
   (-lfirst [this])
   (-lnext [this]))
 
-(declare lcons?)
+(declare lcons? failed?)
 
 (defn lcons-pr-seq [x]
   (cond
@@ -310,9 +310,9 @@
   (-unify-terms [u v s]
     (-unify-with-lseq v u s))
   IUnifyWithNil
-  (-unify-with-nil [v u s] false)
+  (-unify-with-nil [v u s] (fail s))
   IUnifyWithObject
-  (-unify-with-object [v u s] false)
+  (-unify-with-object [v u s] (fail s))
   IUnifyWithLSeq
   (-unify-with-lseq [^not-native v ^not-native u ^not-native s]
     (loop [u u v v s s]
@@ -320,16 +320,19 @@
         (-unify s u v)
         (cond
          (lvar? v) (-unify s v u)
+
          (and (lcons? u) (lcons? v))
-           (if-let [s (-unify s (-lfirst u) (-lfirst v))]
+         (let [s (-unify s (-lfirst u) (-lfirst v))]
+           (if-not (failed? s)
              (recur (-lnext u) (-lnext v) s)
-             false)
+             s))
+         
          :else (-unify s u v)))))
   IUnifyWithSequential
   (-unify-with-seq [v u s]
     (-unify-with-lseq u v s))
   IUnifyWithMap
-  (-unify-with-map [v u s] false)
+  (-unify-with-map [v u s] (fail s))
   IReifyTerm
   (-reify-term [v s]
     (loop [v v s s]
@@ -392,18 +395,18 @@
   (-unify-with-nil [v u s] s)
 
   default
-  (-unify-with-nil [v u s] false))
+  (-unify-with-nil [v u s] (fail s)))
 
 ;; -----------------------------------------------------------------------------
 ;; Unify Object with X
 
 (extend-protocol IUnifyWithObject
   nil
-  (-unify-with-object [v u s] false)
+  (-unify-with-object [v u s] (fail s))
 
   default
   (-unify-with-object [v u s]
-    (if (= u v) s false)))
+    (if (= u v) s (fail s))))
 
 ;; -----------------------------------------------------------------------------
 ;; Unify LVar with X
@@ -421,7 +424,7 @@
 
 (extend-protocol IUnifyWithLSeq
   nil
-  (-unify-with-lseq [v u s] false)
+  (-unify-with-lseq [v u s] (fail s))
 
   default
   (-unify-with-lseq [v ^not-native u ^not-native s]
@@ -429,21 +432,22 @@
       (loop [u u ^not-native v (-seq v) s s]
         (if-not (nil? v)
           (if (lcons? u)
-            (if-let [s (-unify s (-lfirst u) (-first v))]
-              (recur (-lnext u) (-next v) s)
-              false)
+            (let [s (-unify s (-lfirst u) (-first v))]
+              (if-not (failed? s)
+                (recur (-lnext u) (-next v) s)
+                s))
             (-unify s u v))
           (if (lvar? u)
             (-unify s u '())
-            false)))
-      false)))
+            (fail s))))
+      (fail s))))
 
 ;; -----------------------------------------------------------------------------
 ;; Unify Sequential with X
 
 (extend-protocol IUnifyWithSequential
   nil
-  (-unify-with-seq [v u s] false)
+  (-unify-with-seq [v u s] (fail s))
 
   default
   (-unify-with-seq [^not-native v ^not-native u ^not-native s]
@@ -452,12 +456,12 @@
         (if-not (nil? u)
           (if-not (nil? v)
             (let [s (-unify s (-first u) (-first v))]
-              (if-not (false? s)
+              (if-not (failed? s)
                 (recur (-next u) (-next v) s)
-                false))
-            false)
-          (if-not (nil? v) false s)))
-      false)))
+                s))
+            (fail s))
+          (if-not (nil? v) (fail s) s)))
+      (fail s))))
 
 ;; -----------------------------------------------------------------------------
 ;; Unify IPersistentMap with X
@@ -466,24 +470,25 @@
 
 (defn unify-with-map* [v u s]
   (if-not (cljs.core/== (count v) (count u))
-    false
+    (fail s)
     (loop [ks (seq (keys u)) s s]
       (if ks
         (let [kf (first ks)
               vf (get v kf not-found)]
           (if (identical? vf not-found)
-            false
-            (if-let [s (-unify s (get u kf) vf)]
-              (recur (next ks) s)
-              false)))
+            (fail s)
+            (let [s (-unify s (get u kf) vf)]
+              (if-not (failed? s)
+                (recur (next ks) s)
+                (fail s)))))
         s))))
 
 (extend-protocol IUnifyWithMap
   nil
-  (-unify-with-map [v u s] false)
+  (-unify-with-map [v u s] (fail s))
 
   default
-  (-unify-with-map [v u s] false)
+  (-unify-with-map [v u s] (fail s))
 
   ObjMap
   (-unify-with-map [v u s]
@@ -626,6 +631,20 @@
   ITake
   (-take* [this] (lazy-seq (-take* (f)))))
 
+;; -----------------------------------------------------------------------------
+;; Fail
+
+(deftype Fail [a]
+  IBind
+  (-bind [this g] this)
+  IMPlus
+  (-mplus [this fp] fp)
+  ITake
+  (-take* [this] ()))
+
+(defn failed? [x]
+  (instance? Fail x))
+
 ;; =============================================================================
 ;; Syntax
 
@@ -635,7 +654,7 @@
 
 (defn fail
   "A goal that always fails."
-  [a] nil)
+  [a] (Fail. a))
 
 (def s# succeed)
 
@@ -652,6 +671,11 @@
 
 (extend-protocol IIfA
   nil
+  (-ifa [b gs c]
+       (when c
+         (force c)))
+
+  Fail
   (-ifa [b gs c]
        (when c
          (force c))))
@@ -660,7 +684,12 @@
   nil
   (-ifu [b gs c]
        (when c
-         (force c))))
+         (force c)))
+
+  Fail
+  (-ifu [b gs c]
+    (when c
+      (force c))))
 
 (extend-type Substitutions
   IIfA
@@ -767,10 +796,11 @@
         (let [kf (first ks)
               uf (get u kf ::not-found)]
           (if (= uf ::not-found)
-            nil
-            (if-let [s (-unify s (get v kf) uf)]
-              (recur (next ks) s)
-              nil)))
+            (fail s)
+            (let [s (-unify s (get v kf) uf)]
+              (if-not (failed? s)
+                (recur (next ks) s)
+                s))))
         s)))
 
   IUnifyWithPMap
@@ -791,10 +821,10 @@
 
 (extend-protocol IUnifyWithPMap
   nil
-  (unify-with-pmap [v u s] nil)
+  (unify-with-pmap [v u s] (fail s))
 
   js/Object
-  (unify-with-pmap [v u s] nil)
+  (unify-with-pmap [v u s] (fail s))
 
   cljs.core.logic.LVar
   (unify-with-pmap [v u s]
@@ -906,7 +936,7 @@
      (let [lvars (merge (-> u meta :lvars)
                         (-> w meta :lvars))
            s (unify empty-s u w)]
-       (when s
+       (when-not (failed? s)
          (into {} (map (fn [[k v]]
                          [k (-reify s v)])
                        lvars)))))
diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index 26293668..be2f5e05 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -42,7 +42,7 @@
   [u v]
   `(fn [a#]
      (if-let [b# (cljs.core.logic/-unify a# ~u ~v)]
-       b# nil)))
+       b# (cljs.core.logic/fail a#))))
 
 (defmacro conde
   "Logical disjunction of the clauses. The first goal in
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index 25b2e39a..fdaa4f0c 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -10,7 +10,7 @@
     :only [pair lvar lcons -unify -ext-no-check -walk -walk*
            -reify-lvar-name empty-s to-s succeed fail s# u# conso
            nilo firsto resto emptyo appendo membero *occurs-check*
-           unifier, binding-map, partial-map]]))
+           unifier binding-map partial-map failed?]]))
 
 (defn js-print [& args]
   (if (js* "typeof console != 'undefined'")
@@ -33,7 +33,7 @@
 (let [x (lvar 'x)]
   (assert (false? (= (pair x nil) (pair nil x)))))
 
-(assert (= (-unify empty-s nil 1) false))
+(assert (failed? (-unify empty-s nil 1)))
 
 (let [x (lvar 'x)
       a (-ext-no-check empty-s x nil)
@@ -41,41 +41,41 @@
   (assert (= a b)))
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s nil (lcons 1 x)) false)))
+  (assert (failed? (-unify empty-s nil (lcons 1 x)))))
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s nil {}) false)))
+  (assert (failed? (-unify empty-s nil {}))))
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s nil #{}) false)))
+  (assert (failed? (-unify empty-s nil #{}))))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with object
 
 (println "unify with object")
 
-(assert (= (-unify empty-s 1 nil) false))
+(assert (failed? (-unify empty-s 1 nil)))
 (assert (= (-unify empty-s 1 1) empty-s))
 (assert (= (-unify empty-s :foo :foo) empty-s))
 (assert (= (-unify empty-s 'foo 'foo) empty-s))
 (assert (= (-unify empty-s "foo" "foo") empty-s))
-(assert (= (-unify empty-s 1 2) false))
-(assert (= (-unify empty-s 2 1) false))
-(assert (= (-unify empty-s :foo :bar) false))
-(assert (= (-unify empty-s 'foo 'bar) false))
-(assert (= (-unify empty-s "foo" "bar") false))
+(assert (failed? (-unify empty-s 1 2)))
+(assert (failed? (-unify empty-s 2 1)))
+(assert (failed? (-unify empty-s :foo :bar)))
+(assert (failed? (-unify empty-s 'foo 'bar)))
+(assert (failed? (-unify empty-s "foo" "bar")))
 
 (let [x (lvar 'x)
       os (-ext-no-check empty-s x 1)]
   (assert (= (-unify empty-s 1 x) os)))
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s 1 (lcons 1 'x)) false)))
+  (assert (failed? (-unify empty-s 1 (lcons 1 'x)))))
 
-(assert (= (-unify empty-s 1 '()) false))
-(assert (= (-unify empty-s 1 '[]) false))
-(assert (= (-unify empty-s 1 {}) false))
-(assert (= (-unify empty-s 1 #{}) false))
+(assert (failed? (-unify empty-s 1 '())))
+(assert (failed? (-unify empty-s 1 '[])))
+(assert (failed? (-unify empty-s 1 {})))
+(assert (failed? (-unify empty-s 1 #{})))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with lvar
@@ -135,7 +135,7 @@
 (println "unify with lcons")
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s (lcons 1 x) 1) false)))
+  (assert (failed? (-unify empty-s (lcons 1 x) 1))))
 
 (let [x (lvar 'x)
       y (lvar 'y)
@@ -176,13 +176,13 @@
       y (lvar 'y)
       lc1 (lcons 1 (lcons 2 x))
       lc2 (lcons 1 (lcons 3 (lcons 4 y)))]
-  (assert (= (-unify empty-s lc1 lc2) false)))
+  (assert (failed? (-unify empty-s lc1 lc2))))
 
 (let [x (lvar 'x)
       y (lvar 'y)
       lc2 (lcons 1 (lcons 2 x))
       lc1 (lcons 1 (lcons 3 (lcons 4 y)))]
-  (assert (= (-unify empty-s lc1 lc2) false)))
+  (assert (failed? (-unify empty-s lc1 lc2))))
 
 (let [x (lvar 'x)
       y (lvar 'y)
@@ -215,23 +215,23 @@
 (let [x (lvar 'x)
       lc1 (lcons 1 (lcons 3 x))
       l1 '(1 2 3 4)]
-  (assert (= (-unify empty-s lc1 l1) false)))
+  (assert (failed? (-unify empty-s lc1 l1))))
 
 (let [x (lvar 'x)
       lc1 (lcons 1 (lcons 2 x))
       l1 '(1 3 4 5)]
-  (assert (= (-unify empty-s lc1 l1) false)))
+  (assert (failed? (-unify empty-s lc1 l1))))
 
-(assert (= (-unify empty-s (lcons 1 (lvar 'x)) {}) false))
-(assert (= (-unify empty-s (lcons 1 (lvar 'x)) #{}) false))
+(assert (failed? (-unify empty-s (lcons 1 (lvar 'x)) {})))
+(assert (failed? (-unify empty-s (lcons 1 (lvar 'x)) #{})))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with sequential
 
 (println "unify with sequential")
 
-(assert (= (-unify empty-s '() 1) false))
-(assert (= (-unify empty-s [] 1) false))
+(assert (failed? (-unify empty-s '() 1)))
+(assert (failed? (-unify empty-s [] 1)))
 
 (let [x (lvar 'x)
       os (-ext-no-check empty-s x [])]
@@ -255,18 +255,18 @@
       os (-ext-no-check empty-s x 2)]
   (assert (= (-unify empty-s `(1 ~x 3) `(1 2 3)) os)))
 
-(assert (= (-unify empty-s [1 2] [1 2 3]) false))
-(assert (= (-unify empty-s '(1 2) [1 2 3]) false))
-(assert (= (-unify empty-s [1 2 3] [3 2 1]) false))
+(assert (failed? (-unify empty-s [1 2] [1 2 3])))
+(assert (failed? (-unify empty-s '(1 2) [1 2 3])))
+(assert (failed? (-unify empty-s [1 2 3] [3 2 1])))
 (assert (= (-unify empty-s '() '()) empty-s))
-(assert (= (-unify empty-s '() '(1)) false))
-(assert (= (-unify empty-s '(1) '()) false))
+(assert (failed? (-unify empty-s '() '(1))))
+(assert (failed? (-unify empty-s '(1) '())))
 (assert (= (-unify empty-s [[1 2]] [[1 2]]) empty-s))
-(assert (= (-unify empty-s [[1 2]] [[2 1]]) false))
+(assert (failed? (-unify empty-s [[1 2]] [[2 1]])))
 
 (let [x (lvar 'x)
       os (-ext-no-check empty-s x 1)]
-  (assert (= (-unify empty-s [[x 2]] [[1 2]]) os))) ;; false
+  (assert (= (-unify empty-s [[x 2]] [[1 2]]) os)))
 
 (let [x (lvar 'x)
       os (-ext-no-check empty-s x [1 2])]
@@ -279,29 +279,29 @@
              (-ext-no-check x 'b))]
   (assert (= (-unify empty-s ['a x] [y 'b]) os)))
 
-(assert (= (-unify empty-s [] {}) false))
-(assert (= (-unify empty-s '() {}) false))
-(assert (= (-unify empty-s [] #{}) false))
-(assert (= (-unify empty-s '() #{}) false))
+(assert (failed? (-unify empty-s [] {})))
+(assert (failed? (-unify empty-s '() {})))
+(assert (failed? (-unify empty-s [] #{})))
+(assert (failed? (-unify empty-s '() #{})))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with map
 
 (println "unify with map")
 
-(assert (= (-unify empty-s {} 1) false))
+(assert (failed? (-unify empty-s {} 1)))
 
 (let [x (lvar 'x)
       os (-ext-no-check empty-s x {})]
   (assert (= (-unify empty-s {} x) os)))
 
 (let [x (lvar 'x)]
-  (assert (= (-unify empty-s {} (lcons 1 x)) false)))
+  (assert (failed? (-unify empty-s {} (lcons 1 x)))))
 
-(assert (= (-unify empty-s {} '()) false))
+(assert (failed? (-unify empty-s {} '())))
 (assert (= (-unify empty-s {} {}) empty-s))
 (assert (= (-unify empty-s {1 2 3 4} {1 2 3 4}) empty-s))
-(assert (= (-unify empty-s {1 2} {1 2 3 4}) false))
+(assert (failed? (-unify empty-s {1 2} {1 2 3 4})))
 
 (let [x (lvar 'x)
       m1 {1 2 3 4}
@@ -312,9 +312,9 @@
 (let [x (lvar 'x)
       m1 {1 2 3 4}
       m2 {1 4 3 x}]
-  (assert (= (-unify empty-s m1 m2) false)))
+  (assert (failed? (-unify empty-s m1 m2))))
 
-(assert (= (-unify empty-s {} #{}) false))
+(assert (failed? (-unify empty-s {} #{})))
 
 ;; =============================================================================
 ;; walk

From 9ab1163945180dea9f030f102b6dce12c803c2e4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 27 Feb 2013 09:45:30 -0500
Subject: [PATCH 053/288] allow `fixc` in the 4 argument case to take a
 runnable predicate

---
 src/main/clojure/clojure/core/logic.clj | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 43f703a9..b275fcf7 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2694,26 +2694,29 @@
     (-constrain-tree t fc a)))
 
 (defn -fixc
-  [x f reifier]
-  (reify
-    clojure.lang.IFn
-    (invoke [this a]
-      (let [x (walk a x)]
-        ((composeg (f x a reifier) (remcg this)) a)))
-    IConstraintOp
-    (rator [_] `fixc)
-    (rands [_] [x])
-    IReifiableConstraint
-    (reifyc [c v r a]
-      (if (fn? reifier)
-        (reifier c x v r a)
-        (let [x (walk* r x)]
-          `(fixc ~x ~reifier))))
-    IRunnable
-    (runnable? [_ a]
-      (not (lvar? (walk a x))))
-    IConstraintWatchedStores
-    (watched-stores [this] #{::subst})))
+  ([x f reifier] (-fixc x f nil reifier))
+  ([x f runnable reifier]
+     (reify
+       clojure.lang.IFn
+       (invoke [this a]
+         (let [x (walk a x)]
+           ((composeg (f x a reifier) (remcg this)) a)))
+       IConstraintOp
+       (rator [_] `fixc)
+       (rands [_] [x])
+       IReifiableConstraint
+       (reifyc [c v r a]
+         (if (fn? reifier)
+           (reifier c x v r a)
+           (let [x (walk* r x)]
+             `(fixc ~x ~reifier))))
+       IRunnable
+       (runnable? [_ a]
+         (if (fn? runnable)
+           (runnable x a)
+           (not (lvar? (walk a x)))))
+       IConstraintWatchedStores
+       (watched-stores [this] #{::subst}))))
 
 (defn fixc [x f reifier]
   (cgoal (-fixc x f reifier)))

From dd488f90d3f83b420ef47b1ccc052d59391ef882 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 27 Feb 2013 10:02:41 -0500
Subject: [PATCH 054/288] forgot to fix `fixc` api, we only deal with `-fixc`

---
 src/main/clojure/clojure/core/logic.clj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index b275fcf7..4066a2b2 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2718,8 +2718,10 @@
        IConstraintWatchedStores
        (watched-stores [this] #{::subst}))))
 
-(defn fixc [x f reifier]
-  (cgoal (-fixc x f reifier)))
+(defn fixc
+  ([x f reifier] (fixc x f nil reifier))
+  ([x f runnable reifier]
+     (cgoal (-fixc x f runnable reifier))))
 
 (defn treec [x fc reifier]
   (fixc x

From 756771aa990c5b6284595036de231398ee4819ca Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 27 Feb 2013 10:20:26 -0500
Subject: [PATCH 055/288] allow `fixc` to take rands. x can be a vector values
 in this case.

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 4066a2b2..3f64890d 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2703,7 +2703,7 @@
            ((composeg (f x a reifier) (remcg this)) a)))
        IConstraintOp
        (rator [_] `fixc)
-       (rands [_] [x])
+       (rands [_] (if (vector? x) x [x]))
        IReifiableConstraint
        (reifyc [c v r a]
          (if (fn? reifier)

From 374a8f4edf9603787b2d0153abd06c4256248fdc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 27 Feb 2013 12:45:35 -0500
Subject: [PATCH 056/288] treec should take a constriant which checks every
 node, not just leaves

---
 src/main/clojure/clojure/core/logic.clj       |  6 ++--
 src/test/clojure/clojure/core/logic/tests.clj | 29 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3f64890d..2ffab1d7 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2727,8 +2727,10 @@
   (fixc x
     (fn loop [t a reifier]
       (if (tree-term? t)
-        (constrain-tree t
-          (fn [t a] ((fixc t loop reifier) a)))
+        (composeg*
+          (fc t)
+          (constrain-tree t
+            (fn [t a] ((fixc t loop reifier) a))))
         (fc t)))
     reifier))
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 93034854..4e8e2735 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2861,50 +2861,55 @@
 ;; =============================================================================
 ;; Deep Constraints
 
+(defn is-number? [x]
+  (if-not (tree-term? x)
+    (number? x)
+    true))
+
 (deftest test-treec-1
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [x y]
              (== q [x [2 3 y]])
              (== x 1)))
-         '(([1 [2 3 _0]] :- (clojure.core.logic/fixc _0 clojure.core/number?)))))
+         '(([1 [2 3 _0]] :- (clojure.core.logic/fixc _0 is-number?)))))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [x y]
              (== q [x [2 3 y]])
              (== x 1)
              (== y 'foo)))
          ()))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [z]
              (== q {:x {:y z}})))
-         '(({:x {:y _0}} :- (clojure.core.logic/fixc _0 clojure.core/number?)))))
+         '(({:x {:y _0}} :- (clojure.core.logic/fixc _0 is-number?)))))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [z]
              (== q {:x {:y z}})
              (== z 1)))
          '({:x {:y 1}})))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [z]
              (== q {:x {:y z}})
              (== z 'foo)))
          ()))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [x]
              (== q (llist 1 2 x))))
-         [[(llist 1 2 '_0) ':- '(clojure.core.logic/fixc _0 clojure.core/number?)]]))
+         [[(llist 1 2 '_0) ':- '(clojure.core.logic/fixc _0 is-number?)]]))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [x]
              (== q (llist 1 2 x))
              (== x '(3))))
          '((1 2 3))))
   (is (= (run* [q]
-           (treec q #(predc % number?) `number?)
+           (treec q #(predc % is-number?) 'is-number?)
            (fresh [x]
              (== q (llist 1 2 x))
              (== x '(foo))))
@@ -2913,7 +2918,7 @@
 (deftest test-treec-custom-reify-1
   (is (= (run* [q]
            (fresh [x]
-             (treec q #(predc % number?)
+             (treec q #(predc % is-number?)
                (fn [c _ v r a]
                  `(~'hashc ~v ~(-reify a x r))))))
          '((_0 :- (hashc _0 _1))))))

From 07cc13e1e8ec1c4d8f5d28dbc708fd8ce27fd144 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 14:23:04 -0500
Subject: [PATCH 057/288] fix to-subst-val, should be ::unbound

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 9e21c401..bbbf40d7 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -546,7 +546,7 @@
 (defn to-subst-val [v]
   (if (subst-val? v)
     v
-    (subst-val v)))
+    (subst-val ::unbound)))
 
 (defn entangle [s x y]
   (let [x  (root-var s x)

From c9fe68e30e453d2ad65f8c9d193c745fac637c49 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 14:23:17 -0500
Subject: [PATCH 058/288] add some more entanglement tests

---
 src/test/clojure/clojure/core/logic/tests.clj | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index fbf3cce3..ee339b67 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2952,6 +2952,39 @@
               (add-dom x ::l/fd (fd/domain 1 2 3)))]
     (is (= (get-dom s z ::l/fd) (fd/domain 1 2 3)))))
 
+(deftest test-entanglement-add-dom-one-root-1
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle y x)
+              (entangle z x)
+              (add-dom x ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s y ::l/fd) (fd/domain 1 2 3)))
+    (is (= (get-dom s z ::l/fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-one-root-2
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle y x)
+              (entangle z x)
+              (add-dom y ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))
+    (is (= (get-dom s z ::l/fd) (fd/domain 1 2 3)))))
+
+(deftest test-entanglement-add-dom-one-root-3
+  (let [x (lvar 'x)
+        y (lvar 'y)
+        z (lvar 'z)
+        s (-> empty-s
+              (entangle y x)
+              (entangle z x)
+              (add-dom z ::l/fd (fd/domain 1 2 3)))]
+    (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))
+    (is (= (get-dom s y ::l/fd) (fd/domain 1 2 3)))))
+
 (deftest test-entanglement-add-dom-4
   (let [x (lvar 'x)
         y (lvar 'y)

From 5689d8e6842806b3a617000c8302157aaf7bb61f Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 16:34:04 -0500
Subject: [PATCH 059/288] fix subst-val to accept eset

---
 src/main/clojure/clojure/core/logic.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index bbbf40d7..c965858a 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -190,7 +190,8 @@
 (defn subst-val
   ([x] (SubstValue. x nil nil))
   ([x doms] (SubstValue. x doms nil))
-  ([x doms _meta] (with-meta (SubstValue. x doms nil) _meta)))
+  ([x doms _meta] (with-meta (SubstValue. x doms nil) _meta))
+  ([x doms eset _meta] (with-meta (SubstValue. x doms eset) _meta)))
 
 ;; =============================================================================
 ;; Substitutions

From 15302ffb3e9a851bd3dc132075760a50f9173eff Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 17:05:40 -0500
Subject: [PATCH 060/288] merge-subst-vals -> merge-with-root. this fn now
 returns substitutions in prep for entanglement related changes.

---
 src/main/clojure/clojure/core/logic.clj | 38 +++++++++++++------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index c965858a..3c1bd2c4 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -526,20 +526,25 @@
   (fn [a]
     (vary-meta a assoc k v)))
 
-(defn merge-subst-vals [x root]
-  (let [doms (loop [xd (seq (:doms x)) rd (:doms root) r {}]
-               (if xd
-                 (let [[xk xv] (first xd)]
-                   (if-let [[_ rv] (find rd xk)]
-                     (let [nd (-merge-doms xv rv)]
-                       (when nd
-                         (recur (next xd) (dissoc rd xk)
-                           (assoc r xk nd))))
-                     (recur (next xd) rd (assoc r xk xv))))
-                 (merge r rd)))]
-    (when doms
-      (subst-val (:v root) doms
-        (merge (meta x) (meta root))))))
+(defn merge-with-root [s x root]
+  (let [xv    (root-val s x)
+        rootv (root-val s root)
+        eset  (set/union (:eset rootv) (:eset xv))
+        doms  (loop [xd (seq (:doms xv)) rd (:doms rootv) r {}]
+                (if xd
+                  (let [[xk xv] (first xd)]
+                    (if-let [[_ rv] (find rd xk)]
+                      (let [nd (-merge-doms xv rv)]
+                        (when nd
+                          (recur (next xd) (dissoc rd xk)
+                            (assoc r xk nd))))
+                      (recur (next xd) rd (assoc r xk xv))))
+                  (merge r rd)))
+        nv    (when doms
+                (subst-val (:v rootv) doms eset
+                  (merge (meta xv) (meta rootv))))]
+    (when nv
+      (ext-no-check s root nv))))
 
 ;; =============================================================================
 ;; Entanglement
@@ -599,10 +604,7 @@
           (let [[root other] repoint
                 s (assoc s :cs (migrate (:cs s) other root))
                 s (if (-> other clojure.core/meta ::unbound)
-                    (when-let [nsv (merge-subst-vals
-                                    (root-val s other)
-                                    (root-val s root))]
-                      (ext-no-check s root nsv))
+                    (merge-with-root s other root)
                     s)]
             (when s
               (ext-no-check s other root)))

From 4a2d6881bf130801ea38ce4e4123fefdf38b0fc7 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 17:08:24 -0500
Subject: [PATCH 061/288] because of var repointing eset may not reflect
 latest, account for this when updating entangled vars.

---
 src/main/clojure/clojure/core/logic.clj | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3c1bd2c4..187baef6 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -449,9 +449,10 @@
                  (ext-no-check s x (subst-val v {dom domv}))))]
        (reduce
          (fn [s y]
-           (if-not (contains? seenset y)
-             (add-dom s y dom domv (conj (or seenset #{}) x))
-             s))
+           (let [y (root-var s y)]
+             (if-not (contains? seenset y)
+               (add-dom s y dom domv (conj (or seenset #{}) x))
+               s)))
          s
          (:eset v)))))
 
@@ -468,9 +469,10 @@
            s (update-var s x (assoc-dom v dom (f (get doms dom))))]
        (reduce
          (fn [s y]
-           (if-not (contains? seenset y)
-             (update-dom s y dom f (conj (or seenset #{}) x))
-             s))
+           (let [y (root-var s y)]
+             (if-not (contains? seenset y)
+               (update-dom s y dom f (conj (or seenset #{}) x))
+               s)))
          s
          (:eset v)))))
 
@@ -488,9 +490,10 @@
                s)]
        (reduce
          (fn [s y]
-           (if-not (contains? seenset y)
-             (rem-dom s y dom (conj (or seenset #{}) x))
-             s))
+           (let [y (root-var s y)]
+             (if-not (contains? seenset y)
+               (rem-dom s y dom (conj (or seenset #{}) x))
+               s)))
          s
          (:eset v)))))
 

From 1d322b049da11b04898e237ae635639d3c085f44 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 17:35:17 -0500
Subject: [PATCH 062/288] thread substitutions through merge-with-root loop

---
 src/main/clojure/clojure/core/logic.clj | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 187baef6..c8eb8d47 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -533,19 +533,19 @@
   (let [xv    (root-val s x)
         rootv (root-val s root)
         eset  (set/union (:eset rootv) (:eset xv))
-        doms  (loop [xd (seq (:doms xv)) rd (:doms rootv) r {}]
-                (if xd
-                  (let [[xk xv] (first xd)]
-                    (if-let [[_ rv] (find rd xk)]
-                      (let [nd (-merge-doms xv rv)]
-                        (when nd
-                          (recur (next xd) (dissoc rd xk)
-                            (assoc r xk nd))))
-                      (recur (next xd) rd (assoc r xk xv))))
-                  (merge r rd)))
-        nv    (when doms
-                (subst-val (:v rootv) doms eset
-                  (merge (meta xv) (meta rootv))))]
+        [doms s] (loop [xd (seq (:doms xv)) rd (:doms rootv) r {} s s]
+                   (if xd
+                     (let [[xk xv] (first xd)]
+                       (if-let [[_ rv] (find rd xk)]
+                         (let [nd (-merge-doms xv rv)]
+                           (when nd
+                             (recur (next xd) (dissoc rd xk)
+                               (assoc r xk nd) s)))
+                         (recur (next xd) rd (assoc r xk xv) s)))
+                     [(merge r rd) s]))
+        nv (when doms
+             (subst-val (:v rootv) doms eset
+               (merge (meta xv) (meta rootv))))]
     (when nv
       (ext-no-check s root nv))))
 

From 042df7265951c55aa19a7b934d829985778512e9 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 18:51:30 -0500
Subject: [PATCH 063/288] full support for entanglement. merge-with-root now
 ensures that any vars entangled by the root and the repointed var will have
 their domains updated to the merged domains of the root. we could probably
 make this a bit more efficient but this is enough to remove any reference
 from nominal.clj of FD or any other constraint domain like it.

---
 src/main/clojure/clojure/core/logic.clj       | 49 ++++++++++++++-----
 .../clojure/clojure/core/logic/nominal.clj    | 15 ++----
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index c8eb8d47..3cf7bf36 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -529,25 +529,52 @@
   (fn [a]
     (vary-meta a assoc k v)))
 
+;; NOTE: this may result in some redundant computations
+;; in particular complex nominal logic programs that involve
+;; FD and other similar constraint domains - David
+
+(defn merge-doms [s x doms]
+  (let [xdoms (:doms (root-val s x))]
+    (loop [doms (seq doms) s s]
+      (if doms
+        (let [[dom domv] (first doms)]
+          (let [xdomv (get xdoms dom ::not-found)
+                ndomv (if (= xdomv ::not-found)
+                        domv
+                        (-merge-doms domv xdomv))]
+            (when ndomv
+              (recur (next doms)
+                (add-dom s x dom ndomv #{})))))
+        s))))
+
+(defn update-eset [s doms eset]
+  (loop [eset (seq eset) s s]
+    (if eset
+      (when-let [s (merge-doms s (root-var s (first eset)) doms)]
+        (recur (next eset) s))
+      s)))
+
 (defn merge-with-root [s x root]
   (let [xv    (root-val s x)
         rootv (root-val s root)
         eset  (set/union (:eset rootv) (:eset xv))
-        [doms s] (loop [xd (seq (:doms xv)) rd (:doms rootv) r {} s s]
-                   (if xd
-                     (let [[xk xv] (first xd)]
-                       (if-let [[_ rv] (find rd xk)]
-                         (let [nd (-merge-doms xv rv)]
-                           (when nd
-                             (recur (next xd) (dissoc rd xk)
-                               (assoc r xk nd) s)))
-                         (recur (next xd) rd (assoc r xk xv) s)))
-                     [(merge r rd) s]))
+        doms (loop [xd (seq (:doms xv)) rd (:doms rootv) r {}]
+               (if xd
+                 (let [[xk xv] (first xd)]
+                   (if-let [[_ rv] (find rd xk)]
+                     (let [nd (-merge-doms xv rv)]
+                       (when nd
+                         (recur (next xd)
+                           (dissoc rd xk) (assoc r xk nd))))
+                     (recur (next xd) rd (assoc r xk xv))))
+                 (merge r rd)))
         nv (when doms
              (subst-val (:v rootv) doms eset
                (merge (meta xv) (meta rootv))))]
     (when nv
-      (ext-no-check s root nv))))
+      (-> s
+        (ext-no-check root nv)
+        (update-eset doms eset)))))
 
 ;; =============================================================================
 ;; Entanglement
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 5856ae7f..ec2170c5 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -2,7 +2,6 @@
   (:refer-clojure :exclude [== hash])
   (:use [clojure.core.logic.protocols]
         [clojure.core.logic :exclude [fresh] :as l])
-  (:require [clojure.core.logic.fd :as fd])
   (:import [java.io Writer]
            [clojure.core.logic LVar LCons]
            [clojure.core.logic.protocols IBindable ITreeTerm]))
@@ -43,6 +42,7 @@
         (let [v (with-meta (lvar) (meta t))
               rt (root-val s t)
               s (-> (if (subst-val? rt) (ext-no-check s v rt) s)
+                  (entangle t v)  
                   (update-dom v ::nom (fnil (fn [d] (conj d t)) #{}))
                   (update-dom t ::nom (fnil (fn [d] (conj d v)) #{}))
                   ((suspc v t swap)))]
@@ -242,13 +242,7 @@
                      a a]
                 (if (empty? a*) a
                     (recur (rest a*) ((hash (first a*) t2) a))))
-              :else
-              (let [d1 (get-dom-fd a t1)
-                    d2 (get-dom-fd a t2)]
-                ((composeg*
-                  (if (nil? d2) identity (fd/dom t1 d2))
-                  (if (nil? d1) identity (fd/dom t2 d1))
-                  (addcg c)) a)))))) a))
+              :else ((addcg c) a))))) a))
     IConstraintOp
     (rator [_] `suspc)
     (rands [_] [v1 v2])
@@ -267,10 +261,9 @@
     (runnable? [_ a]
       (let [t1 (walk a v1)
             t2 (walk a v2)]
-        (or (not (lvar? t1)) (not (lvar? t2)) (= t1 t2)
-            (not= (get-dom-fd a t1) (get-dom-fd a t2)))))
+        (or (not (lvar? t1)) (not (lvar? t2)) (= t1 t2))))
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst ::l/fd})))
+    (watched-stores [this] #{::l/subst})))
 
 (defn suspc [v1 v2 swap]
   (cgoal (-suspc v1 v2 swap)))

From c95da907c4b2a5e6f62cb6c0200f690d441c29dc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Feb 2013 20:05:51 -0500
Subject: [PATCH 064/288] quick fix, don't penalize update-dom usage in
 nominal.clj. It's not clear to me that ::nom information needs to be in the
 var dom info.

---
 src/main/clojure/clojure/core/logic.clj        | 18 ++++++++++--------
 .../clojure/clojure/core/logic/nominal.clj     |  6 ++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3cf7bf36..ab0e9711 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -467,14 +467,16 @@
                v)
            doms (:doms v)
            s (update-var s x (assoc-dom v dom (f (get doms dom))))]
-       (reduce
-         (fn [s y]
-           (let [y (root-var s y)]
-             (if-not (contains? seenset y)
-               (update-dom s y dom f (conj (or seenset #{}) x))
-               s)))
-         s
-         (:eset v)))))
+       (if (not= seenset ::no-prop)
+         (reduce
+           (fn [s y]
+             (let [y (root-var s y)]
+               (if-not (contains? seenset y)
+                 (update-dom s y dom f (conj (or seenset #{}) x))
+                 s)))
+           s
+           (:eset v))
+         s))))
 
 (defn rem-dom
   ([s x dom]
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index ec2170c5..5ab95e8e 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -43,8 +43,10 @@
               rt (root-val s t)
               s (-> (if (subst-val? rt) (ext-no-check s v rt) s)
                   (entangle t v)  
-                  (update-dom v ::nom (fnil (fn [d] (conj d t)) #{}))
-                  (update-dom t ::nom (fnil (fn [d] (conj d v)) #{}))
+                  (update-dom v ::nom
+                    (fnil (fn [d] (conj d t)) #{}) ::l/no-prop)
+                  (update-dom t ::nom
+                    (fnil (fn [d] (conj d v)) #{}) ::l/no-prop)
                   ((suspc v t swap)))]
           [v s])
         (swap-noms t swap s))))

From add53916659b519d02808e7de43f8483d04af937 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 1 Mar 2013 09:59:19 -0500
Subject: [PATCH 065/288] add note about eset propagation, it's exponential.

---
 src/main/clojure/clojure/core/logic.clj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index ab0e9711..df62a0dc 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -533,7 +533,10 @@
 
 ;; NOTE: this may result in some redundant computations
 ;; in particular complex nominal logic programs that involve
-;; FD and other similar constraint domains - David
+;; FD and other similar constraint domains.
+;; In nominal programs like quine generation we actually see
+;; exponential behavior, so we'll probably want to revisit
+;; this code at some point - David
 
 (defn merge-doms [s x doms]
   (let [xdoms (:doms (root-val s x))]

From ecab274556feaf4ab08ce23d219e2083d5181dfd Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 2 Mar 2013 14:50:43 -0500
Subject: [PATCH 066/288] DRY

---
 src/main/clojure/clojure/core/logic.clj | 44 ++++++++++---------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index df62a0dc..a3f13fde 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -437,6 +437,18 @@
     (if (subst-val? v)
       (-> v meta attr))))
 
+(defn sync-eset [s v seenset f]
+  (if (not= seenset ::no-prop)
+    (reduce
+      (fn [s y]
+        (let [y (root-var s y)]
+          (if-not (contains? seenset y)
+            (f s y)
+            s)))
+      s
+      (:eset v))
+    s))
+
 (defn add-dom
   ([s x dom domv]
      (let [x (root-var s x)]
@@ -447,14 +459,8 @@
                (update-var s x (assoc-dom v dom domv))
                (let [v (if (lvar? v) ::unbound v)]
                  (ext-no-check s x (subst-val v {dom domv}))))]
-       (reduce
-         (fn [s y]
-           (let [y (root-var s y)]
-             (if-not (contains? seenset y)
-               (add-dom s y dom domv (conj (or seenset #{}) x))
-               s)))
-         s
-         (:eset v)))))
+       (sync-eset s v seenset
+         (fn [s y] (add-dom s y dom domv (conj (or seenset #{}) x)))))))
 
 (defn update-dom
   ([s x dom f]
@@ -467,16 +473,8 @@
                v)
            doms (:doms v)
            s (update-var s x (assoc-dom v dom (f (get doms dom))))]
-       (if (not= seenset ::no-prop)
-         (reduce
-           (fn [s y]
-             (let [y (root-var s y)]
-               (if-not (contains? seenset y)
-                 (update-dom s y dom f (conj (or seenset #{}) x))
-                 s)))
-           s
-           (:eset v))
-         s))))
+       (sync-eset s v seenset
+         (fn [s y] (update-dom s y dom f (conj (or seenset #{}) x)))))))
 
 (defn rem-dom
   ([s x dom]
@@ -490,14 +488,8 @@
                    (update-var s x (:v v))
                    (update-var s x (assoc v :doms new-doms))))
                s)]
-       (reduce
-         (fn [s y]
-           (let [y (root-var s y)]
-             (if-not (contains? seenset y)
-               (rem-dom s y dom (conj (or seenset #{}) x))
-               s)))
-         s
-         (:eset v)))))
+       (sync-eset s v seenset
+         (fn [s y] (rem-dom s y dom (conj (or seenset #{}) x)))))))
 
 (defn get-dom [s x dom]
   (let [v (root-val s x)]

From 2c1069e2a429f0eeb8f6c61b2b5d631a25a9e4fd Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 10 Mar 2013 14:23:48 -0400
Subject: [PATCH 067/288] minor cleanup around monadic protocols for nil

---
 src/main/clojure/clojure/core/logic.clj | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index a3f13fde..c3b4161f 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1076,16 +1076,12 @@
 ;; -----------------------------------------------------------------------------
 ;; MZero
 
-(extend-protocol IBind
-  nil
-  (bind [_ g] nil))
-
-(extend-protocol IMPlus
-  nil
-  (mplus [_ f] (f)))
-
-(extend-protocol ITake
-  nil
+(extend-type nil
+  IBind
+  (bind [_ g] nil)
+  IMPlus
+  (mplus [_ f] (f))
+  ITake
   (take* [_] '()))
 
 ;; -----------------------------------------------------------------------------

From 1f9718e0dba82e1da38b504afe5a5c1a8ff5a542 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 12:02:52 +0100
Subject: [PATCH 068/288] Fix copy-term.

- build-term for vars seemed out-of-date,
- build-term needs to be implemented for all collections (including
  vectors), not just seq.
---
 src/main/clojure/clojure/core/logic.clj       |  7 ++--
 src/test/clojure/clojure/core/logic/tests.clj | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index c3b4161f..9ad19072 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -667,14 +667,11 @@
   IBuildTerm
   (build-term [u s]
     (let [m (:s s)
-          l (:l s)
           cs (:cs s)
           lv (lvar 'ignore) ]
       (if (contains? m u)
         s
-        (make-s (assoc m u lv)
-                (cons (Pair. u lv) l)
-                cs)))))
+        (make-s (assoc m u lv) cs)))))
 
 (defn lvar
   ([]
@@ -1012,7 +1009,7 @@
   Object
   (build-term [u s] s)
 
-  clojure.lang.ISeq
+  clojure.lang.IPersistentCollection
   (build-term [u s]
     (reduce build s u)))
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index ee339b67..925e4c20 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -799,6 +799,38 @@
                [(== false r) s#])))
          (into #{} '(tea cup)))))
 
+;; -----------------------------------------------------------------------------
+;; copy-term
+
+(deftest test-copy-term-1
+  (is (= (run* [q]
+           (fresh [a b]
+             (copy-term a b)
+             (== q [a b])))
+        '([_0 _1])))
+  (is (= (run* [q]
+           (fresh [a b]
+             (copy-term `(~a) `(~b))
+             (== q [a b])))
+        '([_0 _1])))
+  (is (= (run* [q]
+           (fresh [a b]
+             (copy-term [a] [b])
+             (== q [a b])))
+        '([_0 _1])))
+  (is (= (run* [q]
+           (fresh [a b c]
+             (copy-term [a] c)
+             (== [b] c)
+             (== q [a b])))
+        '([_0 _1])))
+  (is (= (run* [q]
+           (fresh [a b c d]
+             (== c 1)
+             (copy-term [a c] [b d])
+             (== q [a b d])))
+        '([_0 _1 1]))))
+
 ;; -----------------------------------------------------------------------------
 ;; disequality
 

From 37de27c132648c1e986ab2b45db7ea6145a2268b Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 11 Mar 2013 09:16:47 -0400
Subject: [PATCH 069/288] remove stray field access

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 9ad19072..df7fd4a7 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1978,7 +1978,7 @@
   (-reify-tabled [this v]
     (let [v (walk this v)]
       (cond
-       (lvar? v) (ext-no-check this v (lvar (count (.s this))))
+       (lvar? v) (ext-no-check this v (lvar (count (:s this))))
        (coll? v) (-reify-tabled
                    (-reify-tabled this (first v))
                    (next v))

From 47f786cf9cc999ee7a6e97550cef0229be6b8cce Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 18:08:48 +0100
Subject: [PATCH 070/288] minor audit: swap-noms shouldn't overwrite metadata
 on noms

---
 src/main/clojure/clojure/core/logic/nominal.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 5ab95e8e..b977f14a 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -111,8 +111,7 @@
 
   INomSwap
   (swap-noms [t swap s]
-    [(with-meta (nom-swap t swap) (meta t))
-      s]))
+    [(nom-swap t swap) s]))
 
 (defn nom [lvar]
   (Nom. lvar))

From 43d325bd8e3770f3483cc8be7d332adfae3a6a96 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 18:28:24 +0100
Subject: [PATCH 071/288] Minor refactoring of nom/hash (no semantics change).

---
 .../clojure/clojure/core/logic/nominal.clj    | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index b977f14a..0271c41d 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -150,29 +150,26 @@
       (str a "#" x))
     clojure.lang.IFn
     (invoke [c s]
-      (let [a (walk s a)
-            x (walk s x)]
-        (if (lvar? a)
-          (when (and
-                  (not (and (lvar? x) (= x a)))
-                  (tree-term? x) (not (tie? x)))
-            ((composeg*
-              (remcg c)
-              (constrain-tree x
-                (fn [t s] ((hash a t) s)))) s))
-          (when (nom? a)
-            (cond
-              (and (tie? x)  (= (:binding-nom x) a))
-              ((remcg c) s)
-              (tree-term? x)
-              ((composeg* 
-                (remcg c)
-                (constrain-tree x
-                  (fn [t s] ((hash a t) s)))) s)
-              (= x a)
-              nil
-              :else
-              ((remcg c) s))))))
+      ((composeg
+         (fn [s]
+           (let [a (walk s a)
+                 x (walk s x)]
+             (cond
+               (and (lvar? a) (lvar? x) (= x a))
+               nil
+               (and (nom? a) (nom? x) (= x a))
+               nil
+               (and (not (lvar? a)) (not (nom? a)))
+               nil
+               (and (nom? a) (tie? x) (= (:binding-nom x) a))
+               s
+               (and (tree-term? x) (or (not (tie? x)) (nom? a)))
+               ((constrain-tree x
+                  (fn [t s] ((hash a t) s))) s)
+               :else
+               s)))
+         (remcg c))
+        s))
     IConstraintOp
     (rator [_] `hash)
     (rands [_] [a x])

From a01760bc95294bbd48fd99f8794176c96b915883 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 21:22:48 +0100
Subject: [PATCH 072/288] Reify constraints without duplicates.

---
 src/main/clojure/clojure/core/logic.clj        |  3 ++-
 .../clojure/core/logic/nominal/tests.clj       | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index df7fd4a7..56e0bd9c 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2241,7 +2241,8 @@
         rcs (->> (vals (:cm cs))
                  (filter reifiable?)
                  (map #(reifyc % v r a))
-                 (filter #(not (nil? %))))]
+                 (filter #(not (nil? %)))
+                 (into #{}))]
     (if (empty? rcs)
       (choice (list v) empty-f)
       (choice (list `(~v :- ~@rcs)) empty-f))))
diff --git a/src/test/clojure/clojure/core/logic/nominal/tests.clj b/src/test/clojure/clojure/core/logic/nominal/tests.clj
index e8d86926..c09f1229 100644
--- a/src/test/clojure/clojure/core/logic/nominal/tests.clj
+++ b/src/test/clojure/clojure/core/logic/nominal/tests.clj
@@ -139,7 +139,7 @@
                (== [a b x y] q))))
         '([a_0 a_1 a_0 a_1]
           ([a_0 a_1 _2 _3] :- (swap [a_0 a_1] _2 _3))
-          ([a_0 a_1 _2 _3] :- a_0#_3 (swap [a_1 a_0] _2 _3)))))
+          ([a_0 a_1 _2 _3] :- (swap [a_1 a_0] _2 _3) a_0#_3))))
   (is (= (run* [q]
            (fresh [bx by]
              (nom/fresh [x y]
@@ -486,3 +486,19 @@
                (== x y)
                (== z x))))
         '(_0))))
+
+(deftest test-no-dup-reified-freshness-constraints
+  (is (= (run* [q]
+           (fresh [x y]
+             (nom/fresh [a b]
+               (== (nom/tie a x) (nom/tie b y))
+               (== [a b x y] q)
+               (== x y))))
+        '(([a_0 a_1 _2 _2] :- a_1#_2 a_0#_2))))
+  (is (= (run* [q]
+           (fresh [x]
+             (nom/fresh [a]
+               (nom/hash a x)
+               (nom/hash a x)
+               (== q [x a]))))
+        '(([_0 a_1] :- a_1#_0)))))

From 432872a1290263aa4fba870586e547ac4a5f3e30 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 22:16:02 +0100
Subject: [PATCH 073/288] The ::nom and entanglement information is redundant.

---
 src/main/clojure/clojure/core/logic/nominal.clj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 0271c41d..df5f9bcb 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -43,10 +43,6 @@
               rt (root-val s t)
               s (-> (if (subst-val? rt) (ext-no-check s v rt) s)
                   (entangle t v)  
-                  (update-dom v ::nom
-                    (fnil (fn [d] (conj d t)) #{}) ::l/no-prop)
-                  (update-dom t ::nom
-                    (fnil (fn [d] (conj d v)) #{}) ::l/no-prop)
                   ((suspc v t swap)))]
           [v s])
         (swap-noms t swap s))))
@@ -211,7 +207,7 @@
               :else
               (let [vs2 (apply clojure.set/union
                           (map (fn [x] (if (nil? x) #{} x))
-                            (map #(get-dom a % ::nom) vs)))
+                            (map #(:eset (root-val a %)) vs)))
                     seen (clojure.set/union vs seen)]
                 (recur vs2 seen)))))
     (let [[t1 a] (swap-noms t1 swap a)]

From 7cc6179e3c9f71b873e92f78117ba764aa3db4b9 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 22:30:34 +0100
Subject: [PATCH 074/288] no ::nom dom ==> no need for -merge-doms

---
 src/main/clojure/clojure/core/logic/nominal.clj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index df5f9bcb..8428b4c0 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -63,11 +63,6 @@
           s])
       [t s])))
 
-(extend-protocol IMergeDomains
-  clojure.lang.IPersistentSet
-  (-merge-doms [a b]
-    (clojure.set/union a b)))
-
 ;; =============================================================================
 ;; Nom
 

From 09b2326c734979389c093d7f32e5bd618740718b Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 23:21:25 +0100
Subject: [PATCH 075/288] a few little cleanups

---
 .../clojure/clojure/core/logic/nominal.clj    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 8428b4c0..fbdb9f21 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -141,7 +141,8 @@
       (str a "#" x))
     clojure.lang.IFn
     (invoke [c s]
-      ((composeg
+      ((composeg*
+         (remcg c)
          (fn [s]
            (let [a (walk s a)
                  x (walk s x)]
@@ -158,9 +159,7 @@
                ((constrain-tree x
                   (fn [t s] ((hash a t) s))) s)
                :else
-               s)))
-         (remcg c))
-        s))
+               s)))) s))
     IConstraintOp
     (rator [_] `hash)
     (rands [_] [a x])
@@ -200,11 +199,9 @@
               (some #(occurs-check a % t1) vs)
               false
               :else
-              (let [vs2 (apply clojure.set/union
-                          (map (fn [x] (if (nil? x) #{} x))
-                            (map #(:eset (root-val a %)) vs)))
-                    seen (clojure.set/union vs seen)]
-                (recur vs2 seen)))))
+              (recur
+                (reduce (fn [s0 s1] (clojure.set/union s0 (:eset (root-val a s1)))) #{} vs)
+                (clojure.set/union vs seen)))))
     (let [[t1 a] (swap-noms t1 swap a)]
       ((== t1 t2) a))))
 
@@ -226,12 +223,11 @@
               (-do-suspc t1 t2 swap a)
               (not (lvar? t2))
               (-do-suspc t2 t1 swap a)
-              (= t1 t2)
+              :else ;; (= t1 t2)
               (loop [a* swap
-                     a a]
+                      a a]
                 (if (empty? a*) a
-                    (recur (rest a*) ((hash (first a*) t2) a))))
-              :else ((addcg c) a))))) a))
+                  (recur (rest a*) ((hash (first a*) t2) a)))))))) a))
     IConstraintOp
     (rator [_] `suspc)
     (rands [_] [v1 v2])

From 62504c732f970941ab8255faeba3f63fba74e1e2 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Mon, 11 Mar 2013 23:25:08 +0100
Subject: [PATCH 076/288] whitespace changes

---
 src/main/clojure/clojure/core/logic/nominal.clj | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index fbdb9f21..b0f1fd4c 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -59,8 +59,7 @@
     (if (seq t)
       (let [[tfirst s] (swap-noms (first t) swap s)
             [tnext s] (swap-noms (next t) swap s)]
-        [(with-meta (cons tfirst tnext) (meta t))
-          s])
+        [(with-meta (cons tfirst tnext) (meta t)) s])
       [t s])))
 
 ;; =============================================================================
@@ -225,7 +224,7 @@
               (-do-suspc t2 t1 swap a)
               :else ;; (= t1 t2)
               (loop [a* swap
-                      a a]
+                     a a]
                 (if (empty? a*) a
                   (recur (rest a*) ((hash (first a*) t2) a)))))))) a))
     IConstraintOp
@@ -301,8 +300,7 @@
   INomSwap
   (swap-noms [t swap s]
     (let [[tbody s] (swap-noms (:body t) swap s)]
-      [(with-meta (tie (nom-swap (:binding-nom t) swap) tbody) (meta t))
-        s])))
+      [(with-meta (tie (nom-swap (:binding-nom t) swap) tbody) (meta t)) s])))
 
 (defn tie [binding-nom body]
   (Tie. binding-nom body))

From 6b518ad5c65eebf7869fdc3c8310b87210d01708 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 12 Mar 2013 00:14:59 -0400
Subject: [PATCH 077/288] update project.clj

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b45aec95..a94389c3 100644
--- a/project.clj
+++ b/project.clj
@@ -15,7 +15,7 @@
                  ;"clojurescript/src/cljs"
                  ]
   :test-paths ["src/test/clojure"]
-  :dependencies [[org.clojure/clojure "1.5.0-RC1"]
+  :dependencies [[org.clojure/clojure "1.5.1"]
                  [org.clojure/clojurescript "0.0-1586"]
                  [org.clojure/tools.macro "0.1.1"]
                  [org.clojure/tools.nrepl "0.2.1"]

From 11d2dd55b04a98f42b95410b684982723c11e0dd Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Tue, 12 Mar 2013 08:59:05 +0100
Subject: [PATCH 078/288] for consistency, fix pretty printing of ties

---
 src/main/clojure/clojure/core/logic/nominal.clj | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index b0f1fd4c..9c06548d 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -2,6 +2,7 @@
   (:refer-clojure :exclude [== hash])
   (:use [clojure.core.logic.protocols]
         [clojure.core.logic :exclude [fresh] :as l])
+  (:require [clojure.pprint :as pp])
   (:import [java.io Writer]
            [clojure.core.logic LVar LCons]
            [clojure.core.logic.protocols IBindable ITreeTerm]))
@@ -309,5 +310,16 @@
   (instance? clojure.core.logic.nominal.Tie x))
 
 (defmethod print-method Tie [x ^Writer writer]
-  (.write writer (str " [" (:binding-nom x) "] "))
+  (.write writer "[")
+  (print-method (:binding-nom x) writer)
+  (.write writer "] ")
   (print-method (:body x) writer))
+
+(defn- pprint-tie [x]
+  (pp/pprint-logical-block
+    (.write ^Writer *out* "[")
+    (pp/write-out (:binding-nom x))
+    (.write ^Writer *out* "] ")
+    (pp/write-out (:body x))))
+
+(. pp/simple-dispatch addMethod Tie pprint-tie)

From 8af0f45f8d1cb515ec7a00e5acd751562a31bb37 Mon Sep 17 00:00:00 2001
From: amin <nada.amin@epfl.ch>
Date: Tue, 12 Mar 2013 11:50:17 +0100
Subject: [PATCH 079/288] LOGIC-119: quick fix to ensure disunify on maps can
 deal with non-map other.

---
 src/main/clojure/clojure/core/logic.clj       |  2 +-
 .../clojure/core/logic/nominal/tests.clj      | 19 +++++++++++++++++++
 src/test/clojure/clojure/core/logic/tests.clj |  5 +++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 56e0bd9c..e91531cc 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2408,7 +2408,7 @@
 
   clojure.lang.IPersistentMap
   (disunify-terms [u v s cs]
-    (if (= (count u) (count v))
+    (if (and (map? v) (= (count u) (count v)))
       (loop [ks (seq (keys u)) cs cs]
         (if ks
           (let [kf (first ks)
diff --git a/src/test/clojure/clojure/core/logic/nominal/tests.clj b/src/test/clojure/clojure/core/logic/nominal/tests.clj
index c09f1229..eeeb5db5 100644
--- a/src/test/clojure/clojure/core/logic/nominal/tests.clj
+++ b/src/test/clojure/clojure/core/logic/nominal/tests.clj
@@ -502,3 +502,22 @@
                (nom/hash a x)
                (== q [x a]))))
         '(([_0 a_1] :- a_1#_0)))))
+
+(deftest test-logic-119-tie-disequality-1
+  (is (= (run* [q]
+           (nom/fresh [a]
+             (!= (nom/tie a a) 'foo)))
+        '(_0)))
+  (is (= (run* [q]
+           (nom/fresh [a]
+             (!= (nom/tie a a) (nom/tie a a))))
+        '()))
+  (is (= (run* [q]
+           (nom/fresh [a b]
+             (!= (nom/tie a a) (nom/tie a b))))
+        '(_0)))
+  (comment ;; this one will be tricky to get right.
+    (is (= (run* [q]
+             (nom/fresh [a b]
+               (!= (nom/tie a a) (nom/tie b b))))
+          '()))))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 925e4c20..ac7b3fcf 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1042,6 +1042,11 @@
              (== x [1 w])
              (== y [2 z])))
         '(_0))))
+
+(deftest test-logic-119-disequality-1
+  (is (= (run* [q]
+           (!= {1 2 3 4} 'foo))
+        '(_0))))
 ;; -----------------------------------------------------------------------------
 ;; tabled
 

From 62897f3369fa836456b6f5cd551dd710c5b68ee4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 12 Mar 2013 09:47:14 -0400
Subject: [PATCH 080/288] first pass at new table cache type. nondeterminism
 and general bad behavior in tabling results from the `(first ansv*)` line in
 the implementation of `reuse` - there's no guarantee what that will return
 for sets. Ooops.

---
 src/main/clojure/clojure/core/logic.clj | 65 ++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 56e0bd9c..07eacfe1 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1914,7 +1914,68 @@
 
 ;; -----------------------------------------------------------------------------
 ;; Data Structures
-;; (atom #{}) is cache, waiting streams are PersistentVectors
+;; waiting streams are PersistentVectors
+
+;; Cache
+;; ansl - ans list, for calculating the fixpoint
+;; anss - cached answer set, for quickly checking whether an answer term
+;;        is already in the cache
+
+(deftype Cache [ansl anss _meta]
+  Object
+  (equals [this other]
+    (and (instance? Cache other)
+      (let [^Cache other other]
+        (identical? ansl (.ansl other)))))
+  (toString [_]
+    (str "<cache:" (pr-str ansl) ">"))
+
+  clojure.lang.IObj
+  (meta [_] _meta)
+  (withMeta [_ new-meta]
+    (Cache. ansl anss new-meta))
+
+  clojure.lang.IPersistentSet
+  (disjoin [_ k]
+    (Cache. (filter #(= % k)) (disj anss k) _meta))
+  (contains [_ k]
+    (let [^clojure.lang.IPersistentSet anss anss]
+      (.contains anss k)))
+  (get [_ k]
+    (let [^clojure.lang.IPersistentSet anss anss]
+      (if (.contains anss)
+        k)))
+
+  clojure.lang.Seqable
+  (seq [_]
+    ansl)
+  
+  clojure.lang.ISeq
+  (first [_]
+    (first ansl))
+  (more [_]
+    (let [f (first ansl)]
+      (Cache. (rest ansl) (disj anss f) _meta)))
+  (next [_]
+    (let [ansl (next ansl)]
+      (if ansl
+        (let [f (first ansl)]
+          (Cache. ansl (disj anss f) _meta)))))
+
+  clojure.lang.IPersistentCollection
+  (cons [_ x]
+    (Cache. (cons x ansl) (conj anss x) _meta))
+  (empty [_]
+    (Cache. nil nil nil))
+  (equiv [this other]
+    (.equals this other))
+  (count [_]
+    (clojure.core/count ansl)))
+
+(defn cache [] (Cache. () #{} nil))
+
+(defmethod print-method Cache [x ^Writer writer]
+  (.write writer (str x)))
 
 (deftype SuspendedStream [cache ansv* f]
   clojure.lang.ILookup
@@ -2003,7 +2064,7 @@
                   [(make-suspended-stream cache start
                      (fn [] (reuse this argv cache @cache (count start))))]
                   ;; we have answer terms to reuse in the cache
-                  (let [ans (first ansv*)]
+                  (let [ans (first ansv*)] ;; FIXME: sets are unordered! - David
                     (Choice. (subunify this argv (reify-tabled this ans))
                       (fn [] (reuse-loop (disj ansv* ans)))))))]
         (reuse-loop start))))

From 53cbfca4b7062e09d7c7ff43fccec70e46d36ea1 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 13 Mar 2013 09:50:02 -0400
Subject: [PATCH 081/288] LOGIC-112: Incorrect results with tabled resolution

The bug was introduced when we switched the answer cache to sets. In
`reuse` we were calling `first` on the set which of course won't
work.

We not have an `AnswerCache` type. This holds both the list of answers
for determining the fixpoint as well as the answers as a set for
quickly determining whether we've already cached an answer.

The additionally memory overhead does make it desirable to have more
sharing of tabled information between answer caches.
---
 src/main/clojure/clojure/core/logic.clj       | 96 ++++++-------------
 .../clojure/clojure/core/logic/protocols.clj  |  4 +
 2 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 07eacfe1..13fa3478 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1916,80 +1916,46 @@
 ;; Data Structures
 ;; waiting streams are PersistentVectors
 
-;; Cache
+;; AnswerCache
 ;; ansl - ans list, for calculating the fixpoint
 ;; anss - cached answer set, for quickly checking whether an answer term
 ;;        is already in the cache
 
-(deftype Cache [ansl anss _meta]
+(deftype AnswerCache [ansl anss _meta]
   Object
-  (equals [this other]
-    (and (instance? Cache other)
-      (let [^Cache other other]
-        (identical? ansl (.ansl other)))))
-  (toString [_]
-    (str "<cache:" (pr-str ansl) ">"))
+  (toString [this]
+    (str "<answer-cache:" (pr-str ansl) ">"))
 
   clojure.lang.IObj
   (meta [_] _meta)
   (withMeta [_ new-meta]
-    (Cache. ansl anss new-meta))
-
-  clojure.lang.IPersistentSet
-  (disjoin [_ k]
-    (Cache. (filter #(= % k)) (disj anss k) _meta))
-  (contains [_ k]
-    (let [^clojure.lang.IPersistentSet anss anss]
-      (.contains anss k)))
-  (get [_ k]
-    (let [^clojure.lang.IPersistentSet anss anss]
-      (if (.contains anss)
-        k)))
-
-  clojure.lang.Seqable
-  (seq [_]
-    ansl)
-  
-  clojure.lang.ISeq
-  (first [_]
-    (first ansl))
-  (more [_]
-    (let [f (first ansl)]
-      (Cache. (rest ansl) (disj anss f) _meta)))
-  (next [_]
-    (let [ansl (next ansl)]
-      (if ansl
-        (let [f (first ansl)]
-          (Cache. ansl (disj anss f) _meta)))))
-
-  clojure.lang.IPersistentCollection
-  (cons [_ x]
-    (Cache. (cons x ansl) (conj anss x) _meta))
-  (empty [_]
-    (Cache. nil nil nil))
-  (equiv [this other]
-    (.equals this other))
-  (count [_]
-    (clojure.core/count ansl)))
-
-(defn cache [] (Cache. () #{} nil))
-
-(defmethod print-method Cache [x ^Writer writer]
-  (.write writer (str x)))
+    (AnswerCache. ansl anss new-meta))
 
-(deftype SuspendedStream [cache ansv* f]
   clojure.lang.ILookup
   (valAt [this k]
     (.valAt this k nil))
   (valAt [this k not-found]
     (case k
-      :cache cache
-      :ansv* ansv*
-      :f f
+      :ansl ansl
+      :anss anss
       not-found))
+
+  IAnswerCache
+  (-add [this x]
+    (AnswerCache. (conj ansl x) (conj anss x) _meta))
+  (-cached? [_ x]
+    (let [^clojure.lang.IPersistentSet anss anss]
+      (.contains anss x))))
+
+(defn answer-cache [] (AnswerCache. () #{} nil))
+
+(defmethod print-method AnswerCache [x ^Writer writer]
+  (.write writer (str x)))
+
+(defrecord SuspendedStream [cache ansv* f]
   ISuspendedStream
   (ready? [this]
-    (not= @cache ansv*)))
+    (not= (:ansl @cache) ansv*)))
 
 (defn make-suspended-stream [cache ansv* f]
   (SuspendedStream. cache ansv* f))
@@ -2053,20 +2019,20 @@
 
   ;; argv are the actual parameters passed to a goal. cache
   ;; is the cache from the table for reified argv. on initial
-  ;; call start is nil and end nil - so internally they will be
-  ;; initialized to the contents of the cache & 0
+  ;; call start and end are nil - so internally they will be
+  ;; initialized to the contents of the cache & 0 respectively
   (reuse [this argv cache start end]
-    (let [start (or start @cache)
+    (let [start (or start (:ansl @cache))
           end   (or end 0)]
       (letfn [(reuse-loop [ansv*]
                 (if (= (count ansv*) end)
                   ;; we've run out of answers terms to reuse in the cache
                   [(make-suspended-stream cache start
-                     (fn [] (reuse this argv cache @cache (count start))))]
+                     (fn [] (reuse this argv cache (:ansl @cache) (count start))))]
                   ;; we have answer terms to reuse in the cache
                   (let [ans (first ansv*)] ;; FIXME: sets are unordered! - David
                     (Choice. (subunify this argv (reify-tabled this ans))
-                      (fn [] (reuse-loop (disj ansv* ans)))))))]
+                      (fn [] (reuse-loop (rest ansv*)))))))]
         (reuse-loop start))))
 
   ;; unify an argument with an answer from a cache
@@ -2121,12 +2087,12 @@
   [argv cache]
   (fn [a]
     (let [rargv (-reify a argv)]
-      (when-not (contains? @cache rargv)
+      (when-not (-cached? @cache rargv)
         (swap! cache
           (fn [cache]
-            (if (contains? cache rargv)
+            (if (-cached? cache rargv)
               cache
-              (conj cache (reify-tabled a argv)))))
+              (-add cache (reify-tabled a argv)))))
         a))))
 
 ;; -----------------------------------------------------------------------------
@@ -2157,7 +2123,7 @@
                               (fn [table#]
                                 (if (contains? table# key#)
                                   table#
-                                  (assoc table# key# (atom #{})))))
+                                  (assoc table# key# (atom (answer-cache))))))
                      cache# (get table# key#)]
                  ((fresh []
                     ~@grest
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index ac785f6b..6231f4d7 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -102,6 +102,10 @@
 (defprotocol ISuspendedStream
   (ready? [this]))
 
+(defprotocol IAnswerCache
+  (-add [this x])
+  (-cached? [this x]))
+
 ;; =============================================================================
 ;; cKanren protocols
 

From af5bdc25eabf3903f896373ee7e2b49e0b6cdbeb Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 13 Mar 2013 09:55:15 -0400
Subject: [PATCH 082/288] optimization

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index f6427ea5..33e3b366 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1955,7 +1955,7 @@
 (defrecord SuspendedStream [cache ansv* f]
   ISuspendedStream
   (ready? [this]
-    (not= (:ansl @cache) ansv*)))
+    (not (identical? (:ansl @cache) ansv*))))
 
 (defn make-suspended-stream [cache ansv* f]
   (SuspendedStream. cache ansv* f))

From cfcb90a89ce1dcad62e4f0d394e72f09da3febe0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 13 Mar 2013 10:00:35 -0400
Subject: [PATCH 083/288] include 112 test case

---
 src/test/clojure/clojure/core/logic/tests.clj | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index ac7b3fcf..d4d0d55a 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1588,6 +1588,68 @@
            (fd/in q (fd/interval 3 3)))
          '(3))))
 
+(def patho-112
+  (tabled
+    [graph start end]
+    (conde
+      [(== start end)]
+      [(fresh [?via ?vias]
+         (project [start graph]
+           (== ?vias  ((:successors graph) start)))
+         (membero ?via ?vias)
+         (patho-112 graph ?via end))])))
+
+(defn solve-goals [graph curr end goals]
+  (all
+    (project [goals]
+      ;;when there are no more goals we are done
+      (conde [(== true
+                (empty? goals)) 
+               (== curr end)]
+        ;;there are still goals left
+        ;;solve the first and recursive call
+        [(== false (empty? goals))
+          (fresh [goal tail via]
+            (== goal (first goals))
+            (== tail (rest goals))
+            (project [goal]
+              (goal graph curr via)
+              (solve-goals graph via end tail)))]))))
+
+(def foo :foo)
+(def bar :bar)
+(def baz :baz)
+(def quux :quux)
+
+(defn to-node [node]
+  (cond
+    (= node foo)
+    (seq (list bar))
+    (= node bar)
+    (seq (list baz))
+    (= node baz)
+    (seq (list quux))))
+
+(def graph { :successors to-node })
+
+(defn test-1 []
+  (run* [?result]
+    (fresh [?start ?end]
+      (== ?start foo)
+      (== ?end quux)
+      (solve-goals graph ?start ?end
+        (seq (list patho-112
+               (fn [graph current next]
+                 (all
+                   (== ?result current)
+                   ;;(trace-lvars "current" current)
+                   (== current next)))
+               patho-112))))))
+
+(deftest test-112-tabling
+  (is (= (test-1)
+         '(:foo :bar :baz :quux))))
+
 ;; =============================================================================
 ;; cKanren
 

From 666170cf6ecd5ae35409da4613f56124df77d29f Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 13 Mar 2013 12:29:53 -0400
Subject: [PATCH 084/288] bump version

---
 CHANGES.md  | 17 +++++++++++++++++
 README.md   |  2 +-
 project.clj |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ee133348..9aeee955 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+From 0.8.0-rc2 to 0.8.0-rc3
+====
+
+Bug Fixes
+----
+* LOGIC-119: fix disunify for maps
+* LOGIC-112: fix tabling
+* LOGIC-115: fix fd/in on singleton domains
+* LOGIC-111: fix conda regression
+* LOGIC-109: fix namespaced keyword issue in defc macro
+* copy-term fixed
+
+Enhancements
+----
+* nominal no longer depends on fd
+* ClojureScript version performance enhancements
+
 From 0.8.0-rc1 to 0.8.0-rc2
 ====
 
diff --git a/README.md b/README.md
index ccb22537..aefcb309 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest beta: 0.8.0-rc2
+Latest release candidate: 0.8.0-rc3
 
 Latest stable release: 0.7.5
 
diff --git a/project.clj b/project.clj
index a94389c3..953c7ef2 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.0-rc3-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.0-rc4-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From 3f87dccae72624724ca1f12061c62e411da7ca01 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Wed, 13 Mar 2013 11:39:05 -0500
Subject: [PATCH 085/288] [maven-release-plugin] prepare release
 core.logic-0.8.0-rc3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fa3b21c0..bd266b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.0-rc3-SNAPSHOT</version>
+  <version>0.8.0-rc3</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From d3dbd0c258b4133cc533b01ea4e37f7dc5da22ce Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Wed, 13 Mar 2013 11:39:05 -0500
Subject: [PATCH 086/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bd266b84..5cecf4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.0-rc3</version>
+  <version>0.8.0-rc4-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From ea4b1e99702dc3d1afced4e3c21281db9e7e8a27 Mon Sep 17 00:00:00 2001
From: David Nolen <davidnolen@Davids-MacBook-Air.local>
Date: Sun, 17 Mar 2013 12:31:13 -0400
Subject: [PATCH 087/288] 0.8.0

---
 CHANGES.md | 5 +++++
 README.md  | 8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9aeee955..3cc0a3aa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+From 0.8.0-rc3 to 0.8.0
+====
+
+No changes
+
 From 0.8.0-rc2 to 0.8.0-rc3
 ====
 
diff --git a/README.md b/README.md
index aefcb309..0be56220 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest release candidate: 0.8.0-rc3
-
-Latest stable release: 0.7.5
+Latest stable release: 0.8.0
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -40,7 +38,7 @@ Latest stable release: 0.7.5
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.7.5"]
+[org.clojure/core.logic "0.8.0"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -49,7 +47,7 @@ Latest stable release: 0.7.5
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.7.5</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 

From 0a629f288124fba246f3d511f6e9d5490fc0eee2 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 17 Mar 2013 11:33:05 -0500
Subject: [PATCH 088/288] [maven-release-plugin] prepare release
 core.logic-0.8.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5cecf4d0..b4fd7486 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.0-rc4-SNAPSHOT</version>
+  <version>0.8.0</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From e874f5ca2bdf9a164545b867bdfa82ee5b43b58f Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 17 Mar 2013 11:33:05 -0500
Subject: [PATCH 089/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b4fd7486..71053c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.0</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From 2bf23fd1ea64966bae094c9f634dfb21ddd386d1 Mon Sep 17 00:00:00 2001
From: Jonas Enlund <jonas.enlund@gmail.com>
Date: Sat, 16 Mar 2013 08:28:44 +0200
Subject: [PATCH 090/288] walk-term for ISeqs should not be lazy, refs #121

Attach metadata only to terms that support it, refs #120

lvars-store should be a map and not a set, refs #122

Tests for LOGIC-120, LOGIC-121 and LOGIC-122
---
 src/main/clojure/clojure/core/logic.clj         |  8 ++++----
 src/main/clojure/clojure/core/logic/unifier.clj | 14 ++++++++------
 src/test/clojure/clojure/core/logic/tests.clj   | 11 ++++++++++-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 33e3b366..21bb583a 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -950,10 +950,10 @@
   (walk-term [v f] (f v))
 
   clojure.lang.ISeq
-  (walk-term [v f]
-    (with-meta
-      (map #(walk-term (f %) f) v)
-      (meta v)))
+   (walk-term [v f]
+     (with-meta
+       (doall (map #(walk-term (f %) f) v))
+       (meta v)))
 
   clojure.lang.IPersistentVector
   (walk-term [v f]
diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index b1179e52..00b982e7 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -13,7 +13,7 @@
   (let [v (if-let [u (@store lvar-expr)]
             u
             (lvar lvar-expr false))]
-    (swap! store conj lvar-expr)
+    (swap! store assoc lvar-expr v)
     v))
 
 (defn- lcons-expr? [expr]
@@ -48,7 +48,7 @@
              (if skip
                tail
                (lcons (prep* f store) tail)))
-           (doall (walk-term expr (replace-lvar store))))
+           (walk-term expr (replace-lvar store)))
          
         :else expr))))
 
@@ -56,15 +56,17 @@
   "Prep a quoted expression. All symbols preceded by ? will
   be replaced with logic vars."
   [expr]
-  (let [lvars (atom #{})
+  (let [lvars (atom {})
         prepped (cond
-                  (lvarq-sym? expr) (lvar expr false)
+                  (lvarq-sym? expr) (proc-lvar expr lvars)
 
                   (lcons-expr? expr)
                   (prep* expr lvars true)
 
-                  :else (doall (walk-term expr (replace-lvar lvars))))]
-    (with-meta prepped {::lvars @lvars})))
+                  :else (walk-term expr (replace-lvar lvars)))]
+    (if (instance? clojure.lang.IMeta prepped)
+      (with-meta prepped {::lvars (keys @lvars)})
+      prepped)))
 
 (defn queue-constraint [s c vs]
   (cond
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index d4d0d55a..94b24529 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1236,6 +1236,9 @@
   (is (= (u/unify ['{:a [?b (?c [?d {:e ?e}])]} {:a [:b '(:c [:d {:e :e}])]}])
          {:a [:b '(:c [:d {:e :e}])]})))
 
+(deftest test-unifier-12
+  (is (= (u/unify '[?x 1]) 1)))
+
 ;; -----------------------------------------------------------------------------
 ;; custom var reification
 
@@ -1295,7 +1298,9 @@
 
 (deftest test-unifier-as-1
   (is (= (u/unify {:as '{?x (?y ?z)}} ['?x '(1 2)])))
-  (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '((1 2))]))))
+  (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '((1 2))])))
+  (is (= (u/unify {:as '{?x (?y ?y)}} '[[?y ?x] [1 (1 1)]]) 
+         '[1 (1 1)])))
 
 ;;Anonymous constraints
 (deftest test-unifier-anon-constraints-3 ;;One var
@@ -1328,6 +1333,10 @@
   (is (= (u/unifier ['(?x 2 . ?y) '(1 9 3 4 5)])
          nil)))
 
+(deftest test-binding-map-7
+  (is (= (u/unifier '[((?x ?y)) ((1 2))])
+         '{?x 1 ?y 2})))
+
 (deftest test-binding-map-constraints-1
   (is (= (u/unifier {:when {'?x evenc '?y div3c}} ['(?x ?y) '(2 6)])
          '{?x 2 ?y 6}))

From 7e4d0b6b71707e248fd4d0de3f6c090b50a18624 Mon Sep 17 00:00:00 2001
From: David Nolen <davidnolen@Davids-MacBook-Air.local>
Date: Sun, 17 Mar 2013 18:28:17 -0500
Subject: [PATCH 091/288] LOGIC-116: In `migrate` the root may not have an
 entry in `km`, we need to return the empty set in that case, otherwise will
 we'll call into on nil which defaults to a seq causing the set only
 operations like `disj` to fail.

---
 src/main/clojure/clojure/core/logic.clj       |  2 +-
 src/test/clojure/clojure/core/logic/tests.clj | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 21bb583a..f68663b5 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -152,7 +152,7 @@
 
   (migrate [this x root]
     (let [xcs    (km x)
-          rootcs (km root)
+          rootcs (km root #{})
           nkm    (assoc (dissoc km x) root (into rootcs xcs))]
       (ConstraintStore. nkm cm cid running)))
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 94b24529..190b3e61 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1659,6 +1659,74 @@
   (is (= (test-1)
          '(:foo :bar :baz :quux))))
 
+(defne lefto
+  "x appears to the left of y in collection l."
+  [x y l]
+  ([_ _ [x . tail]] (membero y tail))
+  ([_ _ [_ . tail]] (lefto x y tail)))
+
+(defn rule-1 [answers]
+  (fresh [c1 r1 c2 r2]
+    (membero [:landon (lvar) c1 r1] answers)
+    (membero [:jason (lvar) c2 r2] answers)
+    (conde
+      [(== r1 7.5)
+        (== c2 :mozzarella)]
+      [(== r2 7.5)
+        (== c1 :mozzarella)])))
+
+(defn rule-2 [answers]
+  (membero [(lvar) :fortune :blue-cheese (lvar)] answers))
+
+(defn rule-3 [answers]
+  (fresh [s1 s2]
+    (== [(lvar) :vogue (lvar) (lvar)] s1)
+    (== [(lvar) (lvar) :muenster (lvar)] s2)
+    (membero s1 answers)
+    (membero s2 answers)
+    (!= s1 s2)))
+
+(defn rule-4 [answers]
+  (permuteo [[(lvar) :fortune (lvar) (lvar)]
+              [:landon (lvar) (lvar) (lvar)]
+              [(lvar) (lvar) (lvar) 5]
+              [(lvar) (lvar) :mascarpone (lvar)]
+              [(lvar) :vogue (lvar) (lvar)]]
+    answers))
+
+(defn rule-6 [answers]
+  (fresh [r1 r2]
+    (membero [(lvar) :cosmopolitan (lvar) r1] answers)
+    (membero [(lvar) (lvar) :mascarpone r2] answers)
+    (lefto r1 r2 [5 6 7 7.5 8.5])))
+
+(defn rule-9 [answers]
+  (fresh [r1 r2]
+    (membero [(lvar) :time (lvar) r1] answers)
+    (membero [:landon (lvar) (lvar) r2] answers)
+    (lefto r1 r2 [5 6 7 7.5 8.5])))
+
+(defn rule-0 [answers]
+  (fresh [s]
+    (== [:amaya (lvar) (lvar) (lvar)] s)
+    (membero s answers)))
+
+(deftest test-116-constraint-store-migrate
+  (is (= (first
+           (run 1 [answers]
+             (rule-0 answers)
+             (rule-1 answers)
+             (rule-2 answers)
+             (rule-3 answers)
+             (rule-4 answers)
+             (rule-6 answers)
+             (rule-9 answers)))
+        '([:amaya :fortune :blue-cheese _0]
+          [:landon :cosmopolitan :muenster 7.5]
+          [:jason :vogue :mozzarella 5]
+          [_1 :time :mascarpone 5]
+          [_2 :vogue :mascarpone 8.5]))))
+
 ;; =============================================================================
 ;; cKanren
 

From 07292792bec2694dafd4bf62b1c96580d5d270d3 Mon Sep 17 00:00:00 2001
From: David Nolen <davidnolen@Davids-MacBook-Air.local>
Date: Sun, 17 Mar 2013 18:46:25 -0500
Subject: [PATCH 092/288] LOGIC-71: fixed unifier reify vars issue some time
 ago. Documenting the fix with a test.

---
 src/test/clojure/clojure/core/logic/tests.clj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 190b3e61..3e819221 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1727,6 +1727,10 @@
           [_1 :time :mascarpone 5]
           [_2 :vogue :mascarpone 8.5]))))
 
+(deftest test-71-simple-unifier-reify-vars
+  (is (= (u/unify {} '[(?x) (?x) (1)])
+         '(1))))
+
 ;; =============================================================================
 ;; cKanren
 

From c37212270688b1bdbbca7fb81c1fc52062b24139 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Mar 2013 18:51:03 -0500
Subject: [PATCH 093/288] LOGIC-36: another old unifier issue since resolved in
 0.8.0. Adding a test to document.

---
 src/test/clojure/clojure/core/logic/tests.clj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 3e819221..29a08cca 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1728,9 +1728,13 @@
           [_2 :vogue :mascarpone 8.5]))))
 
 (deftest test-71-simple-unifier-reify-vars
-  (is (= (u/unify {} '[(?x) (?x) (1)])
+  (is (= (u/unify '[(?x) (?x) (1)])
          '(1))))
 
+(deftest test-36-unifier-behavior
+  (is (= (u/unifier ['(?x ?y) '(?y ?x)])
+         '{?x ?y})))
+
 ;; =============================================================================
 ;; cKanren
 

From ae66b6fe7ff36b9fbb82edad7d227ecadd4e4af4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Mar 2013 17:06:57 -0700
Subject: [PATCH 094/288] LOGIC-83: fix typo in test

---
 src/test/clojure/clojure/core/logic/tests.clj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 29a08cca..c3f04860 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1141,20 +1141,21 @@
          '(1))))
 
 (defrel rel2 ^:index e ^:index a ^:index v)
+
 (facts rel2 [[:e1 :a1 :v1]
              [:e1 :a2 :v2]])
+
 (retractions rel2 [[:e1 :a1 :v1]
                    [:e1 :a1 :v1]
                    [:e1 :a2 :v2]])
 
 (deftest rel2-dup-retractions
   (is (= (run* [out]
-               (fresh [e a v]
-                      (rel2 e :a1 :v1)
-                      (rel2 e a v)
-                      (== [e a v] out))))
-      '()))
-
+           (fresh [e a v]
+             (rel2 e :a1 :v1)
+             (rel2 e a v)
+             (== [e a v] out)))
+        '())))
 
 ;; -----------------------------------------------------------------------------
 ;; nil in collection

From d5eda7d7f89443b449d7955a76e72828561082f6 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Mar 2013 17:49:29 -0700
Subject: [PATCH 095/288] LOGIC-108: recursive featurec. Add protocol IFeature.
 Implementers should return something which can optional unify in the manner
 of partial-map. Extend IPersistentHashMap to IFeature. Add test cases
 demonstrating recursive behavior.

---
 src/main/clojure/clojure/core/logic.clj           | 14 +++++++++++++-
 src/main/clojure/clojure/core/logic/protocols.clj |  8 +++++++-
 src/test/clojure/clojure/core/logic/tests.clj     | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index f68663b5..33b3bc6c 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2629,6 +2629,10 @@
 (defn partial-map? [x]
   (instance? PMap x))
 
+(extend-type clojure.lang.IPersistentMap
+  IFeature
+  (-feature [x] (partial-map x)))
+
 (defn -featurec
   [x fs]
   (reify
@@ -2651,13 +2655,21 @@
     IConstraintWatchedStores
     (watched-stores [this] #{::subst})))
 
+(defn ->feature [x]
+  (-feature
+    (walk-term x
+      (fn [y]
+        (if (tree-term? y)
+          (->feature y)
+          y)))))
+
 (defn featurec
   "Ensure that a map contains at least the key-value pairs
   in the map fs. fs must be partially instantiated - that is, 
   it may contain values which are logic variables to support 
   feature extraction."
   [x fs]
-  (cgoal (-featurec x (partial-map fs))))
+  (cgoal (-featurec x (->feature fs))))
 
 ;; =============================================================================
 ;; defnc
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index 6231f4d7..ec0c1f67 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -212,4 +212,10 @@
 ;; Deep constraints
 
 (defprotocol IConstrainTree
-  (-constrain-tree [t fc s]))
\ No newline at end of file
+  (-constrain-tree [t fc s]))
+
+;; -----------------------------------------------------------------------------
+;; Features
+
+(defprotocol IFeature
+  (-feature [x]))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index c3f04860..059fbcea 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1736,6 +1736,20 @@
   (is (= (u/unifier ['(?x ?y) '(?y ?x)])
          '{?x ?y})))
 
+(deftest test-108-recursive-features
+  (is (= (run* [x y]
+           (featurec x {:foo {:bar y}})
+           (== x {:foo {:bar 1}}))
+        '([{:foo {:bar 1}} 1])))
+  (is (= (run* [x y]
+           (featurec x {:foo {:bar y}})
+           (== x {:foo {:bar 1 :woz 2}}))
+        '([{:foo {:bar 1 :woz 2}} 1])))
+  (is (= (run* [x y]
+           (featurec x {:foo {:bar y}})
+           (== x {:foo {:baz 1}}))
+        '())))
+
 ;; =============================================================================
 ;; cKanren
 

From 5f9d6024e49371035b96f7d780f3d5fdb524747b Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Mar 2013 17:57:44 -0700
Subject: [PATCH 096/288] 0.8.1

---
 CHANGES.md  | 12 ++++++++++++
 README.md   |  6 +++---
 project.clj |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3cc0a3aa..78064a1b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,15 @@
+From 0.8.0 to 0.8.1
+====
+
+Enhancements
+----
+* LOGIC-108: recursive featurec now supported
+
+Bug Fixes
+----
+* LOGIC-83: old typo in test
+* LOGIC-116: fix bug in ConstraintStore migrate
+
 From 0.8.0-rc3 to 0.8.0
 ====
 
diff --git a/README.md b/README.md
index 0be56220..b046c469 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.0
+Latest stable release: 0.8.1
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.0
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.0"]
+[org.clojure/core.logic "0.8.1"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.0
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.0</version>
+  <version>0.8.1</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index 953c7ef2..b4561489 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.0-rc4-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.2-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From 62ca1abb9c5b64e91dc50420ab78e0a840d97e16 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 17 Mar 2013 20:00:35 -0500
Subject: [PATCH 097/288] [maven-release-plugin] prepare release
 core.logic-0.8.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71053c54..29e9921c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.1-SNAPSHOT</version>
+  <version>0.8.1</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From 61b519ab1b281e6ca3f6025d240520049b7e5e3e Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 17 Mar 2013 20:00:35 -0500
Subject: [PATCH 098/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 29e9921c..c520a76b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.1</version>
+  <version>0.8.2-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From 9e6352e09c67ebdbc377e76584ecddcad839a4a0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 17 Mar 2013 18:14:29 -0700
Subject: [PATCH 099/288] add some missing changes

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 78064a1b..41bd4cc8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Bug Fixes
 ----
 * LOGIC-83: old typo in test
 * LOGIC-116: fix bug in ConstraintStore migrate
+* LOGIC-120/121/122: bugs around the simple unifier
 
 From 0.8.0-rc3 to 0.8.0
 ====

From e20055817d8002835927bf230f026c085c6537b2 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 24 Mar 2013 13:43:34 -0400
Subject: [PATCH 100/288] add underscores in named lvars so it's easier to see
 the original name

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 33b3bc6c..36d09179 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -682,7 +682,7 @@
   ([name gensym]
      (let [oname name
            name (if gensym
-                  (str name (. clojure.lang.RT (nextID)))
+                  (str name "__" (. clojure.lang.RT (nextID)))
                   (str name))]
        (LVar. name oname (.hashCode name) nil))))
 

From 9eeebde34cc8d348301b20a2ff1f776aa88fda96 Mon Sep 17 00:00:00 2001
From: Ryan Senior <senior.ryan@gmail.com>
Date: Sun, 24 Mar 2013 00:26:52 -0500
Subject: [PATCH 101/288] Added arch friends puzzle, shows a problem with
 argument order and fd/!=

---
 src/test/clojure/clojure/core/logic/tests.clj | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 059fbcea..c4e8c2c2 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3318,3 +3318,40 @@
   (let [x (lvar 'x)
         s (update-dom empty-s x ::nom (fnil (fn [d] (conj d '(swap x y))) []))]
     (is (= (get-dom s x ::nom) '[(swap x y)]))))
+
+(deftest test-arch-friends-problem
+  (let [expected [{:wedges 2,
+                    :flats 4,
+                    :pumps 1,
+                    :sandals 3,
+                    :foot-farm 2,
+                    :heels-in-a-hand-cart 4,
+                    :shoe-palace 1,
+                    :tootsies 3}]]
+    (is (= expected
+           (run* [q]
+             (fresh [wedges flats pumps sandals
+                     ff hh sp tt pumps+1]
+               (fd/in wedges flats pumps sandals
+                      ff hh sp tt pumps+1 (fd/interval 1 4))
+               (fd/distinct [wedges flats pumps sandals])
+               (fd/distinct [ff hh sp tt])
+               (fd/== flats hh)
+               (fd/+ pumps 1 pumps+1)
+
+               ;;Flipping the order of pumps+1 and tt causes this
+               ;;test to pass.  Moving the fd/!= call after the
+               ;;(fd/== ff 2) or (fd/+ sp 2 sandals) call also
+               ;;causes it to pass (fd/!= argument order doesn't matter)
+               (fd/!= pumps+1 tt)
+               
+               (fd/== ff 2)
+               (fd/+ sp 2 sandals)
+               (== q {:wedges wedges
+                      :flats flats
+                      :pumps pumps
+                      :sandals sandals
+                      :foot-farm ff
+                      :heels-in-a-hand-cart hh
+                      :shoe-palace sp
+                      :tootsies tt})))))))

From ce323c9bb85e080211eddfb7203a34104c62dee3 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 24 Mar 2013 15:47:25 -0400
Subject: [PATCH 102/288] LOGIC-124: fix disjoint?* bug uncovered by Ryan
 Senior's test case. Add additional disjoint tests.

---
 src/main/clojure/clojure/core/logic/fd.clj    | 25 +++---
 src/test/clojure/clojure/core/logic/tests.clj | 82 ++++++++++---------
 2 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index e630d14e..b0d8be3d 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -466,18 +466,19 @@
 (defn disjoint?* [is js]
   (if (disjoint? (interval (lb is) (ub is))
                  (interval (lb js) (ub js)))
-      true
-      (let [d0 (intervals is)
-            d1 (intervals js)]
-        (loop [d0 d0 d1 d1]
-          (if (nil? d0)
-            true
-            (let [i (first d0)
-                  j (first d1)]
-              (cond
-               (or (interval-< i j) (disjoint? i j)) (recur (next d0) d1)
-               (interval-> i j) (recur d0 (next d1))
-               :else false)))))))
+    true
+    (let [d0 (intervals is)
+          d1 (intervals js)]
+      (loop [d0 d0 d1 d1]
+        (if (or (nil? d0) (nil? d1))
+          true
+          (let [i (first d0)
+                j (first d1)]
+            (cond
+              (interval-< i j) (recur (next d0) d1)
+              (interval-> i j) (recur d0 (next d1))
+              (disjoint? i j)  (recur (next d0) d1)
+              :else false)))))))
 
 (declare normalize-intervals singleton-dom? multi-interval)
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index c4e8c2c2..9dbc883b 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1750,6 +1750,51 @@
            (== x {:foo {:baz 1}}))
         '())))
 
+(deftest test-disjoint-logic-124
+  (is (false? (fd/disjoint?
+               (fd/interval 2 4)
+               (fd/multi-interval 1 (fd/interval 3 4)))))
+  (is (false? (fd/disjoint?
+               (fd/multi-interval 1 (fd/interval 3 4))
+               (fd/interval 2 4)))))
+
+(deftest test-arch-friends-problem
+  (let [expected [{:wedges 2,
+                    :flats 4,
+                    :pumps 1,
+                    :sandals 3,
+                    :foot-farm 2,
+                    :heels-in-a-hand-cart 4,
+                    :shoe-palace 1,
+                    :tootsies 3}]]
+    (is (= expected
+           (run* [q]
+             (fresh [wedges flats pumps sandals
+                     ff hh sp tt pumps+1]
+               (fd/in wedges flats pumps sandals
+                      ff hh sp tt pumps+1 (fd/interval 1 4))
+               (fd/distinct [wedges flats pumps sandals])
+               (fd/distinct [ff hh sp tt])
+               (fd/== flats hh)
+               (fd/+ pumps 1 pumps+1)
+
+               ;;Flipping the order of pumps+1 and tt causes this
+               ;;test to pass.  Moving the fd/!= call after the
+               ;;(fd/== ff 2) or (fd/+ sp 2 sandals) call also
+               ;;causes it to pass (fd/!= argument order doesn't matter)
+               (fd/!= pumps+1 tt)
+               
+               (fd/== ff 2)
+               (fd/+ sp 2 sandals)
+               (== q {:wedges wedges
+                      :flats flats
+                      :pumps pumps
+                      :sandals sandals
+                      :foot-farm ff
+                      :heels-in-a-hand-cart hh
+                      :shoe-palace sp
+                      :tootsies tt})))))))
+
 ;; =============================================================================
 ;; cKanren
 
@@ -3318,40 +3363,3 @@
   (let [x (lvar 'x)
         s (update-dom empty-s x ::nom (fnil (fn [d] (conj d '(swap x y))) []))]
     (is (= (get-dom s x ::nom) '[(swap x y)]))))
-
-(deftest test-arch-friends-problem
-  (let [expected [{:wedges 2,
-                    :flats 4,
-                    :pumps 1,
-                    :sandals 3,
-                    :foot-farm 2,
-                    :heels-in-a-hand-cart 4,
-                    :shoe-palace 1,
-                    :tootsies 3}]]
-    (is (= expected
-           (run* [q]
-             (fresh [wedges flats pumps sandals
-                     ff hh sp tt pumps+1]
-               (fd/in wedges flats pumps sandals
-                      ff hh sp tt pumps+1 (fd/interval 1 4))
-               (fd/distinct [wedges flats pumps sandals])
-               (fd/distinct [ff hh sp tt])
-               (fd/== flats hh)
-               (fd/+ pumps 1 pumps+1)
-
-               ;;Flipping the order of pumps+1 and tt causes this
-               ;;test to pass.  Moving the fd/!= call after the
-               ;;(fd/== ff 2) or (fd/+ sp 2 sandals) call also
-               ;;causes it to pass (fd/!= argument order doesn't matter)
-               (fd/!= pumps+1 tt)
-               
-               (fd/== ff 2)
-               (fd/+ sp 2 sandals)
-               (== q {:wedges wedges
-                      :flats flats
-                      :pumps pumps
-                      :sandals sandals
-                      :foot-farm ff
-                      :heels-in-a-hand-cart hh
-                      :shoe-palace sp
-                      :tootsies tt})))))))

From fcfe17f829d6e7d0cc6ce813ddbab451ca64066d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 24 Mar 2013 15:52:53 -0400
Subject: [PATCH 103/288] remove stale comments

---
 src/test/clojure/clojure/core/logic/tests.clj | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 9dbc883b..38a5cfc1 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1758,7 +1758,7 @@
                (fd/multi-interval 1 (fd/interval 3 4))
                (fd/interval 2 4)))))
 
-(deftest test-arch-friends-problem
+(deftest test-arch-friends-problem-logic-124
   (let [expected [{:wedges 2,
                     :flats 4,
                     :pumps 1,
@@ -1777,13 +1777,7 @@
                (fd/distinct [ff hh sp tt])
                (fd/== flats hh)
                (fd/+ pumps 1 pumps+1)
-
-               ;;Flipping the order of pumps+1 and tt causes this
-               ;;test to pass.  Moving the fd/!= call after the
-               ;;(fd/== ff 2) or (fd/+ sp 2 sandals) call also
-               ;;causes it to pass (fd/!= argument order doesn't matter)
                (fd/!= pumps+1 tt)
-               
                (fd/== ff 2)
                (fd/+ sp 2 sandals)
                (== q {:wedges wedges

From 5d7b4207179d7ce5b656f70e49c47e7d42af537a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 25 Mar 2013 20:55:31 -0400
Subject: [PATCH 104/288] 0.8.2

---
 CHANGES.md  | 7 +++++++
 README.md   | 6 +++---
 project.clj | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 41bd4cc8..5639cf35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+From 0.8.1 to 0.8.2
+====
+
+Bug Fixes
+----
+* LOGIC-124: fix disjoint?* bug
+
 From 0.8.0 to 0.8.1
 ====
 
diff --git a/README.md b/README.md
index b046c469..24bac49f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.1
+Latest stable release: 0.8.2
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.1
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.1"]
+[org.clojure/core.logic "0.8.2"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.1
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.1</version>
+  <version>0.8.2</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index b4561489..34114045 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.2-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.3-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From c5fcafad7e18223c0e9c9a721d2beb878c64312b Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Mon, 25 Mar 2013 23:45:41 -0500
Subject: [PATCH 105/288] [maven-release-plugin] prepare release
 core.logic-0.8.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c520a76b..54135721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.2-SNAPSHOT</version>
+  <version>0.8.2</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From b0637ab42ed4c7b4856226b24cc085b07faa5b3f Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Mon, 25 Mar 2013 23:45:42 -0500
Subject: [PATCH 106/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54135721..9af35d65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.2</version>
+  <version>0.8.3-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From 8098ae12427c184c217f4ebef7edc86310df3075 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Mar 2013 01:07:11 -0400
Subject: [PATCH 107/288] tweak

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 24bac49f..16b712e3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 core.logic
 ====
 
-A logic programming library for Clojure & ClojureScript. core.logic offers Prolog-like relational programming, constraint logic programming, and nominal logic programming for Clojure. At its heart is an original implementation of miniKanren as described in William Byrd's dissertation [Relational Programming in miniKanren: Techniques, Applications, and Implementations](http://pqdtopen.proquest.com/#abstract?dispub=3380156) as well as the extensions described in [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and [alphaKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It is designed to be easily extended to forms of logic programming beyond the ones provided.
+A logic programming library for Clojure & ClojureScript. core.logic offers Prolog-like relational programming, constraint logic programming, and nominal logic programming for Clojure. At its heart is an original implementation of miniKanren as described in William Byrd's dissertation [Relational Programming in miniKanren: Techniques, Applications, and Implementations](http://pqdtopen.proquest.com/#abstract?dispub=3380156) as well as the extensions described in [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and [αKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It is designed to be easily extended to forms of logic programming beyond the ones provided.
 
 Reasoned Schemer
 ----

From 52eec3b04c2b785c84bed81671db80c2163c4967 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Mar 2013 23:29:15 -0400
Subject: [PATCH 108/288] LOGIC-126: bad fd/* fd/+ from StackOverflow

The issue is that it's possible for a var to have both a value and
domain. Previously get-dom *always* returned the domain, this
permitted an the undesirable situation that constraints checked against
the domain and not the actual value.

Now the fundamental get-dom always return the value if the var has one
over the domain (it continues to return nil in the unfound case, which
will likely change). After auditing the fd code it's clear that the
primary use of get-dom was the desire to get the actual value or the
domain. The only place where we don't do this is domc. domc has to
reach into the implementation. This is OK for now, I'd like to see
how CLP(Set) and other constraint domains play out.

We tweaked resolve-storable-dom in the singleton case. We only run
constraints if the var doesn't have a binding (we wouldn't have made
it this far if it had). This prevents I believe the bad behavior we
seen in the past when flipping walk/get-dom in let-dom.

let-dom now just uses get-dom, no separate walk. Added note in
distintc why we need both get-dom and walk there.

Overall we're getting closer, but I think further simplifications and
improvment can be made.
---
 src/main/clojure/clojure/core/logic.clj       | 15 +++++++++------
 src/main/clojure/clojure/core/logic/fd.clj    | 15 +++++++++++----
 src/test/clojure/clojure/core/logic/tests.clj | 10 ++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 36d09179..3dc22d71 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -493,8 +493,14 @@
 
 (defn get-dom [s x dom]
   (let [v (root-val s x)]
-    (if (subst-val? v)
-      (-> v :doms dom))))
+    (cond
+      (subst-val? v) (let [v' (:v v)]
+                       (if (not= v' ::unbound)
+                         v'
+                         (-> v :doms dom)))
+      (not (lvar? v)) v
+      ;; :else ::no-dom ;; NOTE: this doesn't work, some assumptions about nil - David
+      )))
 
 (defn- make-s
   ([] (make-s {}))
@@ -2310,10 +2316,7 @@
 (defmacro let-dom
   [a vars & body]
   (let [get-var-dom (fn [a [v b]]
-                      `(~b (let [v# (walk ~a ~v)]
-                             (if (lvar? v#)
-                               (get-dom-fd ~a v#)
-                               v#))))]
+                      `(~b (get-dom-fd ~a ~v)))]
    `(let [~@(mapcat (partial get-var-dom a) (partition 2 vars))]
       ~@body)))
 
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index b0d8be3d..babcb7e0 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -627,7 +627,10 @@
 (defn resolve-storable-dom
   [a x dom]
   (if (singleton-dom? dom)
-    (ext-run-cs (rem-dom a x ::l/fd) x dom)
+    (let [xv (walk a x)]
+      (if (lvar? xv)
+        (ext-run-cs (rem-dom a x ::l/fd) x dom)
+        a))
     (ext-dom-fd a x dom)))
 
 (defn update-var-dom
@@ -712,14 +715,16 @@
     IEnforceableConstraint
     clojure.lang.IFn
     (invoke [this s]
-      (when (member? (get-dom s x) (walk s x))
-        (rem-dom s x ::l/fd)))
+      (let [dom (-> (root-val s x) :doms ::l/fd)]
+        (when (member? dom (walk s x))
+          (rem-dom s x ::l/fd))))
     IConstraintOp
     (rator [_] `domc)
     (rands [_] [x])
     IRelevant
     (-relevant? [this s]
-      (not (nil? (get-dom s x))))
+      (let [dom (-> (root-val s x) :doms ::l/fd)]
+        (not (nil? dom))))
     IRunnable
     (runnable? [this s]
       (not (lvar? (walk s x))))
@@ -1026,6 +1031,8 @@
           (loop [y* (seq y*) s s]
             (if y*
               (let [y (first y*)
+                    ;; NOTE: we can't just get-dom because get-dom
+                    ;; return nil, walk returns the var - David
                     v (or (get-dom s y) (walk s y))
                     s (if-not (lvar? v)
                         (cond
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 38a5cfc1..8bbf5bae 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1789,6 +1789,16 @@
                       :shoe-palace sp
                       :tootsies tt})))))))
 
+(deftest test-126-times-plus
+  (is (= (set
+           (run* [q]
+             (fresh [x y p]
+               (fd/in x y (fd/interval 1 38))
+               (fd/* x y p)
+               (fd/+ p 2 40)
+               (== q [x y]))))
+        #{[1 38] [38 1] [2 19] [19 2]})))
+
 ;; =============================================================================
 ;; cKanren
 

From cc235a734870752f2eac03948ccc86d01756653f Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 28 Mar 2013 23:39:45 -0400
Subject: [PATCH 109/288] 0.8.3

---
 CHANGES.md  | 7 +++++++
 README.md   | 6 +++---
 project.clj | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5639cf35..e7eae2ab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+From 0.8.2 to 0.8.3
+====
+
+Bug Fixes
+----
+* LOGIC-126: bad fd/+ fd/* interaction from StackOverflow
+
 From 0.8.1 to 0.8.2
 ====
 
diff --git a/README.md b/README.md
index 16b712e3..71d5d514 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.2
+Latest stable release: 0.8.3
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.2
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.2"]
+[org.clojure/core.logic "0.8.3"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.2
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.2</version>
+  <version>0.8.3</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index 34114045..26ec4f95 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.3-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.4-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From 44cd03a3aacb8be57fee21f9a6253936bfa5e82f Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 28 Mar 2013 22:41:08 -0500
Subject: [PATCH 110/288] [maven-release-plugin] prepare release
 core.logic-0.8.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9af35d65..ba25f3ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.3-SNAPSHOT</version>
+  <version>0.8.3</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From cc0b4abfc9f480b25a1c8f57c2e05bcf697a9985 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 28 Mar 2013 22:41:08 -0500
Subject: [PATCH 111/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba25f3ff..8f60be42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 

From 8d7578fe80a65916012f77b31e416d32068129e0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 29 Mar 2013 19:36:07 -0400
Subject: [PATCH 112/288] update note, I don't believe that `get-dom` need
 return a not-found value.

---
 src/main/clojure/clojure/core/logic.clj | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3dc22d71..fac316a8 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -491,6 +491,12 @@
        (sync-eset s v seenset
          (fn [s y] (rem-dom s y dom (conj (or seenset #{}) x)))))))
 
+;; NOTE: I don't think we need to bother returning ::not-dom or some other
+;; not found value. Assume the case where the var is bound to nil in 
+;; the substitution where the var has a domain. That the var is member
+;; will be verified by domc or something similar. The case where the var
+;; is nil and has no domain is trivial.
+
 (defn get-dom [s x dom]
   (let [v (root-val s x)]
     (cond
@@ -498,9 +504,7 @@
                        (if (not= v' ::unbound)
                          v'
                          (-> v :doms dom)))
-      (not (lvar? v)) v
-      ;; :else ::no-dom ;; NOTE: this doesn't work, some assumptions about nil - David
-      )))
+      (not (lvar? v)) v)))
 
 (defn- make-s
   ([] (make-s {}))

From 1f5ab9f24831b223f0eb25cef8c6b5ea556a6581 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 31 Mar 2013 15:45:56 -0400
Subject: [PATCH 113/288] add magic-square to bench.clj

---
 src/main/clojure/clojure/core/logic/bench.clj | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 42fe7e17..568b0b6e 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -845,4 +845,59 @@
     (time
       (dotimes [_ 100] 
         (doall (safefd)))))
-  )
\ No newline at end of file
+  )
+
+;; Magic Squares
+
+(defn magic-grid [n]
+  (repeatedly (* n n) lvar))
+
+(defn magic-cols [n grid]
+  (apply map list (partition n grid)))
+
+(defn magic-diag [n rows]
+  (first
+    (reduce
+      (fn [[r n] xs]
+        [(conj r (nth xs n)) (inc n)])
+      [[] 0]
+      rows)))
+
+(defn magic-sum [ls res]
+  (conde
+    [(== ls []) (== res 0)]
+    [(== ls [res])]
+    [(fresh [h t inter]
+       (conso h t ls)
+       (fd/+ h inter res)
+       (magic-sum t inter))]))
+
+(defn magic [n]
+  (let [g     (magic-grid n)
+        nums  (range 1 (inc (* n n)))
+        ndom  (fd/interval 1 (* n n))
+        lsum  (/ (apply + nums) n)
+        rows  (partition n g)
+        lines (concat
+                [(magic-diag n rows)
+                 (magic-diag n (map reverse rows))]
+                rows
+                (magic-cols n g))]
+    (run* [q]
+      (== q g)
+      (everyg #(fd/in % ndom) q)
+      (distribute q ::l/ff)
+      (fd/distinct q)
+      (everyg #(magic-sum % lsum) lines))))
+
+(comment
+  (dotimes [_ 5]
+    (time
+      (dotimes [_ 10]
+        (doall (take 1 (magic 3))))))
+
+  (dotimes [_ 5]
+    (time
+      (dotimes [_ 10]
+        (doall (take 1 (magic 3))))))
+  )

From 47b1a4cde60cb7936b06dbad9145da6d81e0207c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 31 Mar 2013 15:47:15 -0400
Subject: [PATCH 114/288] change iterations

---
 src/main/clojure/clojure/core/logic/bench.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 568b0b6e..4aa06a56 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -898,6 +898,6 @@
 
   (dotimes [_ 5]
     (time
-      (dotimes [_ 10]
-        (doall (take 1 (magic 3))))))
+      (dotimes [_ 1]
+        (doall (take 1 (magic 4))))))
   )

From de7bf568b901d48eab65258ac06847b9af7212df Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 3 Apr 2013 20:02:55 -0400
Subject: [PATCH 115/288] domain? as currently used unnecessary. let-dom always
 returns nil when a var has no domain. simplify.

---
 src/main/clojure/clojure/core/logic/fd.clj    | 56 ++++++-------------
 src/test/clojure/clojure/core/logic/tests.clj | 12 ++--
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index babcb7e0..a70a37c3 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -20,16 +20,6 @@
 (defprotocol IIntervals
   (intervals [this]))
 
-(defprotocol IFiniteDomain
-  (domain? [this]))
-
-(extend-protocol IFiniteDomain
-  nil
-  (domain? [x] false)
-
-  Object
-  (domain? [x] false))
-
 (defprotocol ISortedDomain
   (drop-one [this])
   (drop-before [this n])
@@ -112,9 +102,6 @@
   (keep-before [this n]
     (apply domain (take-while #(core/< % n) s)))
 
-  IFiniteDomain
-  (domain? [_] true)
-
   ISet
   (member? [this n]
     (if (s n) true false))
@@ -198,9 +185,6 @@
        (when (clojure.core/< this# n#)
          this#))
 
-     IFiniteDomain
-     (~'domain? [this#] true)
-
      ISet
      (~'member? [this# that#]
        (if (integer? that#)
@@ -281,9 +265,6 @@
      (core/> n _ub) this
      :else (interval _lb (dec n))))
 
-  IFiniteDomain
-  (domain? [_] true)
-
   ISet
   (member? [this n]
     (and (core/>= n _lb) (core/<= n _ub)))
@@ -553,9 +534,6 @@
           (when (pos? (count r))
             (apply multi-interval r))))))
 
-  IFiniteDomain
-  (domain? [_] true)
-
   ISet
   (member? [this n]
     (if (some #(member? % n) is)
@@ -757,7 +735,7 @@
     IRunnable
     (runnable? [this s]
       (let-dom s [u du v dv]
-        (and (domain? du) (domain? dv))))
+        (and du dv)))
     IConstraintWatchedStores
     (watched-stores [this]
       #{::l/subst ::l/fd})))
@@ -790,13 +768,13 @@
     IRelevant
     (-relevant? [this s]
       (let-dom s [u du v dv]
-        (not (and (domain? du) (domain? dv) (disjoint? du dv)))))
+        (not (and du dv (disjoint? du dv)))))
     IRunnable
     (runnable? [this s]
       (let-dom s [u du v dv]
         ;; we are runnable if du and dv both have domains
         ;; and at least du or dv has a singleton domain
-        (and (domain? du) (domain? dv)
+        (and du dv
              (or (singleton-dom? du)
                  (singleton-dom? dv)))))
     IConstraintWatchedStores
@@ -826,13 +804,13 @@
     IRelevant
     (-relevant? [this s]
       (let-dom s [u du v dv]
-       (if (and (domain? du) (domain dv))
+        (if (and du dv)
          (not (interval-<= du dv))
          true)))
     IRunnable
     (runnable? [this s]
       (let-dom s [u du v dv]
-        (and (domain? du) (domain? dv))))
+        (and du dv)))
     IConstraintWatchedStores
     (watched-stores [this]
       #{::l/subst ::l/fd})))
@@ -881,13 +859,13 @@
     clojure.lang.IFn
     (invoke [this s]
       (let-dom s [u du v dv w dw]
-        (let [[wmin wmax] (if (domain? dw)
+        (let [[wmin wmax] (if dw
                             (bounds dw)
                             [(core/+ (lb du) (lb dv)) (core/+ (ub du) (ub dv))])
-              [umin umax] (if (domain? du)
+               [umin umax] (if du
                             (bounds du)
                             [(core/- (lb dw) (ub dv)) (core/- (ub dw) (lb dv))])
-              [vmin vmax] (if (domain? dv)
+               [vmin vmax] (if dv
                             (bounds dv)
                             [(core/- (lb dw) (ub du)) (core/- (ub dw) (lb du))])]
           ((composeg*
@@ -913,9 +891,9 @@
       ;; this is to support eqfd
       (let-dom s [u du v dv w dw]
         (cond
-          (domain? du) (or (domain? dv) (domain? dw))
-          (domain? dv) (or (domain? du) (domain? dw))
-          (domain? dw) (or (domain? du) (domain? dv))
+          du (or dv dw)
+          dv (or du dw)
+          dw (or du dv)
           :else false)))
     IConstraintWatchedStores
     (watched-stores [this]
@@ -957,14 +935,14 @@
      clojure.lang.IFn
      (invoke [this s]
        (let-dom s [u du v dv w dw]
-         (let [[wmin wmax] (if (domain? dw)
+         (let [[wmin wmax] (if dw
                              (bounds dw)
                              [(core/* (lb du) (lb dv)) (core/* (ub du) (ub dv))])
-               [umin umax] (if (domain? du)
+                [umin umax] (if du
                              (bounds du)
                              [(safe-div (ub dv) (lb dw) (lb dw) :lower)
                               (safe-div (lb dv) (lb dw) (ub dw) :upper)])
-               [vmin vmax] (if (domain? dv)
+                [vmin vmax] (if dv
                              (bounds dv)
                              [(safe-div (ub du) (lb dw) (lb dw) :lower)
                               (safe-div (lb du) (lb dw) (ub dw) :upper)])
@@ -995,9 +973,9 @@
        ;; this is to support eqfd
        (let-dom s [u du v dv w dw]
          (cond
-          (domain? du) (or (domain? dv) (domain? dw))
-          (domain? dv) (or (domain? du) (domain? dw))
-          (domain? dw) (or (domain? du) (domain? dv))
+           du (or dv dw)
+           dv (or du dw)
+           dw (or du dv)
           :else false)))
      IConstraintWatchedStores
      (watched-stores [this]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 8bbf5bae..585da819 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2198,8 +2198,8 @@
            [u w]))
     (is (= (rator c)
            'clojure.core.logic.fd/==))
-    (is (false? (runnable? c empty-s)))
-    (is (true? (relevant? c empty-s)))))
+    (is (not (runnable? c empty-s)))
+    (is (relevant? c empty-s))))
 
 (deftest test-make-fdc-prim-2
   (let [u (lvar 'u)
@@ -2210,8 +2210,8 @@
            [u w]))
     (is (= (rator c)
            'clojure.core.logic.fd/+))
-    (is (false? (runnable? c empty-s)))
-    (is (true? (relevant? c empty-s)))))
+    (is (not (runnable? c empty-s)))
+    (is (relevant? c empty-s))))
 
 (deftest test-make-fdc-1
   (let [u (lvar 'u)
@@ -2222,8 +2222,8 @@
            [u w]))
     (is (= (rator c)
            `fd/+))
-    (is (false? (runnable? c empty-s)))
-    (is (true? (relevant? c empty-s)))))
+    (is (not (runnable? c empty-s)))
+    (is (relevant? c empty-s))))
 
 (deftest test-addc-1
   (let [u (lvar 'u)

From a890c272c73280d4655934b1a2a7a538fb065d14 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 3 Apr 2013 20:45:23 -0400
Subject: [PATCH 116/288] rename protocols to FD in prep for unified CLJ/CLJS
 codebase.

---
 src/main/clojure/clojure/core/logic/fd.clj    | 271 +++++++++---------
 src/test/clojure/clojure/core/logic/tests.clj | 182 ++++++------
 2 files changed, 226 insertions(+), 227 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index a70a37c3..4e72bc1c 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -14,22 +14,22 @@
 ;; Finite domain protocol types
 
 (defprotocol IInterval
-  (lb [this])
-  (ub [this]))
+  (-lb [this])
+  (-ub [this]))
 
 (defprotocol IIntervals
-  (intervals [this]))
+  (-intervals [this]))
 
 (defprotocol ISortedDomain
-  (drop-one [this])
-  (drop-before [this n])
-  (keep-before [this n]))
+  (-drop-one [this])
+  (-drop-before [this n])
+  (-keep-before [this n]))
 
 (defprotocol ISet
-  (member? [this n])
-  (disjoint? [this that])
-  (intersection [this that])
-  (difference [this that]))
+  (-member? [this n])
+  (-disjoint? [this that])
+  (-intersection [this that])
+  (-difference [this that]))
 
 (declare domain sorted-set->domain
          difference* intersection* disjoint?*
@@ -37,19 +37,19 @@
          interval multi-interval)
 
 (defn bounds [i]
-  (pair (lb i) (ub i)))
+  (pair (-lb i) (-ub i)))
 
 (defn interval-< [i j]
-  (core/< (ub i) (lb j)))
+  (core/< (-ub i) (-lb j)))
 
 (defn interval-<= [i j]
-  (core/<= (ub i) (lb j)))
+  (core/<= (-ub i) (-lb j)))
 
 (defn interval-> [i j]
-  (core/> (lb i) (ub j)))
+  (core/> (-lb i) (-ub j)))
 
 (defn interval->= [i j]
-  (core/>= (lb i) (ub j)))
+  (core/>= (-lb i) (-ub j)))
 
 ;; FiniteDomain
 ;; -----
@@ -84,11 +84,11 @@
   (member-count [this] (count s))
 
   IInterval
-  (lb [_] min)
-  (ub [_] max)
+  (-lb [_] min)
+  (-ub [_] max)
 
   ISortedDomain
-  (drop-one [_]
+  (-drop-one [_]
     (let [s (disj s min)
           c (count s)]
       (cond
@@ -96,17 +96,17 @@
        (core/> c 1) (FiniteDomain. s (first s) max)
        :else nil)))
 
-  (drop-before [_ n]
+  (-drop-before [_ n]
     (apply domain (drop-while #(core/< % n) s)))
 
-  (keep-before [this n]
+  (-keep-before [this n]
     (apply domain (take-while #(core/< % n) s)))
 
   ISet
-  (member? [this n]
+  (-member? [this n]
     (if (s n) true false))
 
-  (disjoint? [this that]
+  (-disjoint? [this that]
     (cond
      (integer? that)
        (if (s that) false true)
@@ -117,16 +117,16 @@
          :else (empty? (set/intersection s (:s that))))
      :else (disjoint?* this that)))
 
-  (intersection [this that]
+  (-intersection [this that]
     (cond
      (integer? that)
-       (when (member? this that) that)
+       (when (-member? this that) that)
      (instance? FiniteDomain that)
        (sorted-set->domain (set/intersection s (:s that)))
      :else
        (intersection* this that)))
 
-  (difference [this that]
+  (-difference [this that]
     (cond
      (integer? that)
        (sorted-set->domain (disj s that))
@@ -136,11 +136,11 @@
        (difference* this that)))
 
   IIntervals
-  (intervals [_] (seq s))
+  (-intervals [_] (seq s))
 
   IMergeDomains
   (-merge-doms [this that]
-    (intersection this that)))
+    (-intersection this that)))
 
 (defn finite-domain? [x]
   (instance? FiniteDomain x))
@@ -171,45 +171,44 @@
      (~'member-count [this#] 1)
 
      IInterval
-     (~'lb [this#] this#)
-     (~'ub [this#] this#)
-     (~'bounds [this#] (pair this# this#))
+     (~'-lb [this#] this#)
+     (~'-ub [this#] this#)
 
      ISortedDomain
-     (~'drop-one [this#]
+     (~'-drop-one [this#]
        nil)
-     (~'drop-before [this# n#]
+     (~'-drop-before [this# n#]
        (when (clojure.core/>= this# n#)
          this#))
-     (~'keep-before [this# n#]
+     (~'-keep-before [this# n#]
        (when (clojure.core/< this# n#)
          this#))
 
      ISet
-     (~'member? [this# that#]
+     (~'-member? [this# that#]
        (if (integer? that#)
          (= this# that#)
-         (member? that# this#)))
-     (~'disjoint? [this# that#]
+         (-member? that# this#)))
+     (~'-disjoint? [this# that#]
        (if (integer? that#)
          (not= this# that#)
-         (disjoint? that# this#)))
-     (~'intersection [this# that#]
+         (-disjoint? that# this#)))
+     (~'-intersection [this# that#]
        (cond
         (integer? that#) (when (= this# that#)
                            this#)
-        (interval? that#) (intersection that# this#)
+        (interval? that#) (-intersection that# this#)
         :else (intersection* this# that#)))
-     (~'difference [this# that#]
+     (~'-difference [this# that#]
        (cond
         (integer? that#) (if (= this# that#)
                            nil
                            this#)
-        (interval? that#) (difference that# this#)
+        (interval? that#) (-difference that# this#)
         :else (difference* this# that#)))
 
      IIntervals
-     (~'intervals [this#]
+     (~'-intervals [this#]
        (list this#))))
 
 (extend-to-fd java.lang.Byte)
@@ -225,54 +224,54 @@
 ;; -----
 ;; Type optimized for interval arithmetic. Only stores bounds.
 ;;
-;; _lb - lower bound
-;; _ub - upper bound
+;; lb - lower bound
+;; ub - upper bound
 
-(deftype IntervalFD [_lb _ub]
+(deftype IntervalFD [lb ub]
   Object
   (equals [_ o]
     (if (instance? IntervalFD o)
-      (and (= _lb (lb o))
-           (= _ub (ub o)))
+      (and (= lb (-lb o))
+           (= ub (-ub o)))
       false))
 
   (toString [this]
     (pr-str this))
 
   IMemberCount
-  (member-count [this] (inc (core/- _ub _lb)))
+  (member-count [this] (inc (core/- ub lb)))
 
   IInterval
-  (lb [_] _lb)
-  (ub [_] _ub)
+  (-lb [_] lb)
+  (-ub [_] ub)
 
   ISortedDomain
-  (drop-one [_]
-    (let [nlb (inc _lb)]
-      (when (core/<= nlb _ub)
-        (interval nlb _ub))))
+  (-drop-one [_]
+    (let [nlb (inc lb)]
+      (when (core/<= nlb ub)
+        (interval nlb ub))))
 
-  (drop-before [this n]
+  (-drop-before [this n]
     (cond
-     (= n _ub) n
-     (core/< n _lb) this
-     (core/> n _ub) nil
-     :else (interval n _ub)))
+     (= n ub) n
+     (core/< n lb) this
+     (core/> n ub) nil
+     :else (interval n ub)))
 
-  (keep-before [this n]
+  (-keep-before [this n]
     (cond
-     (core/<= n _lb) nil
-     (core/> n _ub) this
-     :else (interval _lb (dec n))))
+     (core/<= n lb) nil
+     (core/> n ub) this
+     :else (interval lb (dec n))))
 
   ISet
-  (member? [this n]
-    (and (core/>= n _lb) (core/<= n _ub)))
+  (-member? [this n]
+    (and (core/>= n lb) (core/<= n ub)))
 
-  (disjoint? [this that]
+  (-disjoint? [this that]
     (cond
      (integer? that)
-     (not (member? this that))
+     (not (-member? this that))
 
      (interval? that)
      (let [i this
@@ -284,17 +283,17 @@
 
      :else (disjoint?* this that)))
 
-  (intersection [this that]
+  (-intersection [this that]
     (cond
      (integer? that)
-     (if (member? this that)
+     (if (-member? this that)
        that
        nil)
 
      (interval? that)
      (let [i this j that
-           imin (lb i) imax (ub i)
-           jmin (lb j) jmax (ub j)]
+           imin (-lb i) imax (-ub i)
+           jmin (-lb j) jmax (-ub j)]
        (cond
         (core/< imax jmin) nil
         (core/< jmax imin) nil
@@ -310,21 +309,21 @@
 
      :else (intersection* this that)))
 
-  (difference [this that]
+  (-difference [this that]
     (cond
      (integer? that)
      (cond
-      (= _lb that) (interval (inc _lb) _ub)
-      (= _ub that) (interval _lb (dec _ub))
-      :else (if (member? this that)
-              (multi-interval (interval _lb (dec that))
-                              (interval (inc that) _ub))
+      (= lb that) (interval (inc lb) ub)
+      (= ub that) (interval lb (dec ub))
+      :else (if (-member? this that)
+              (multi-interval (interval lb (dec that))
+                              (interval (inc that) ub))
               this))
      
      (interval? that)
      (let [i this j that
-           imin (lb i) imax (ub i)
-           jmin (lb j) jmax (ub j)]
+           imin (-lb i) imax (-ub i)
+           jmin (-lb j) jmax (-ub j)]
        (cond
         (core/> jmin imax) i
         (and (core/<= jmin imin)
@@ -341,18 +340,18 @@
      :else (difference* this that)))
 
   IIntervals
-  (intervals [this]
+  (-intervals [this]
     (list this))
 
   IMergeDomains
   (-merge-doms [this that]
-    (intersection this that)))
+    (-intersection this that)))
 
 (defn interval? [x]
   (instance? IntervalFD x))
 
 (defmethod print-method IntervalFD [x ^Writer writer]
-  (.write writer (str "<interval:" (lb x) ".." (ub x) ">")))
+  (.write writer (str "<interval:" (-lb x) ".." (-ub x) ">")))
 
 (defn interval
   "Construct an interval for an assignment to a var. intervals may
@@ -365,7 +364,7 @@
        (IntervalFD. lb ub))))
 
 (defn intersection* [is js]
-  (loop [is (seq (intervals is)) js (seq (intervals js)) r []]
+  (loop [is (seq (-intervals is)) js (seq (-intervals js)) r []]
     (if (and is js)
       (let [i (first is)
             j (first js)]
@@ -404,7 +403,7 @@
       (apply multi-interval r))))
 
 (defn difference* [is js]
-    (loop [is (seq (intervals is)) js (seq (intervals js)) r []]
+    (loop [is (seq (-intervals is)) js (seq (-intervals js)) r []]
       (if is
         (if js
           (let [i (first is)
@@ -445,11 +444,11 @@
         (apply multi-interval r))))
 
 (defn disjoint?* [is js]
-  (if (disjoint? (interval (lb is) (ub is))
-                 (interval (lb js) (ub js)))
+  (if (-disjoint? (interval (-lb is) (-ub is))
+                 (interval (-lb js) (-ub js)))
     true
-    (let [d0 (intervals is)
-          d1 (intervals js)]
+    (let [d0 (-intervals is)
+          d1 (-intervals js)]
       (loop [d0 d0 d1 d1]
         (if (or (nil? d0) (nil? d1))
           true
@@ -458,7 +457,7 @@
             (cond
               (interval-< i j) (recur (next d0) d1)
               (interval-> i j) (recur d0 (next d1))
-              (disjoint? i j)  (recur (next d0) d1)
+              (-disjoint? i j)  (recur (next d0) d1)
               :else false)))))))
 
 (declare normalize-intervals singleton-dom? multi-interval)
@@ -490,7 +489,7 @@
             [jmin jmax] (bounds j)]
         (if (and (= min jmin) (= max jmax))
           (let [is (normalize-intervals is)
-                js (normalize-intervals (intervals j))]
+                js (normalize-intervals (-intervals j))]
             (= is js))
           false))
       false))
@@ -500,34 +499,34 @@
     (reduce core/+ 0 (map member-count is)))
 
   IInterval
-  (lb [_] min)
-  (ub [_] max)
+  (-lb [_] min)
+  (-ub [_] max)
 
   ISortedDomain
-  (drop-one [_]
+  (-drop-one [_]
     (let [i (first is)]
       (if (singleton-dom? i)
         (let [nis (rest is)]
-          (MultiIntervalFD. (lb (first nis)) max nis))
-        (let [ni (drop-one i)]
-          (MultiIntervalFD. (lb ni) max (cons ni (rest is)))))))
+          (MultiIntervalFD. (-lb (first nis)) max nis))
+        (let [ni (-drop-one i)]
+          (MultiIntervalFD. (-lb ni) max (cons ni (rest is)))))))
 
-  (drop-before [_ n]
+  (-drop-before [_ n]
     (let [is (seq is)]
       (loop [is is r []]
         (if is
-          (let [i (drop-before (first is) n)]
+          (let [i (-drop-before (first is) n)]
             (if i
               (recur (next is) (conj r i))
               (recur (next is) r)))
           (when (pos? (count r))
             (apply multi-interval r))))))
 
-  (keep-before [_ n]
+  (-keep-before [_ n]
     (let [is (seq is)]
       (loop [is is r []]
         (if is
-          (let [i (keep-before (first is) n)]
+          (let [i (-keep-before (first is) n)]
             (if i
               (recur (next is) (conj r i))
               (recur (next is) r)))
@@ -535,24 +534,24 @@
             (apply multi-interval r))))))
 
   ISet
-  (member? [this n]
-    (if (some #(member? % n) is)
+  (-member? [this n]
+    (if (some #(-member? % n) is)
       true
       false))
-  (disjoint? [this that]
+  (-disjoint? [this that]
     (disjoint?* this that))
-  (intersection [this that]
+  (-intersection [this that]
     (intersection* this that))
-  (difference [this that]
+  (-difference [this that]
     (difference* this that))
 
   IIntervals
-  (intervals [this]
+  (-intervals [this]
     (seq is))
 
   IMergeDomains
   (-merge-doms [this that]
-    (intersection this that)))
+    (-intersection this that)))
 
 ;; union where possible
 (defn normalize-intervals [is]
@@ -560,10 +559,10 @@
             (if (zero? (count r))
               (conj r i)
               (let [j (peek r)
-                    jmax (ub j)
-                    imin (lb i)]
+                    jmax (-ub j)
+                    imin (-lb i)]
                 (if (core/<= (dec imin) jmax)
-                  (conj (pop r) (interval (lb j) (ub i)))
+                  (conj (pop r) (interval (-lb j) (-ub i)))
                   (conj r i)))))
           [] is))
 
@@ -572,10 +571,10 @@
   ([i0] i0)
   ([i0 i1]
      (let [is [i0 i1]]
-       (MultiIntervalFD. (reduce min (map lb is)) (reduce max (map ub is)) is)))
+       (MultiIntervalFD. (reduce min (map -lb is)) (reduce max (map -ub is)) is)))
   ([i0 i1 & ir]
      (let [is (into [] (concat (list i0 i1) ir))]
-       (MultiIntervalFD. (reduce min (map lb is)) (reduce max (map ub is)) is))))
+       (MultiIntervalFD. (reduce min (map -lb is)) (reduce max (map -ub is)) is))))
 
 (defmethod print-method MultiIntervalFD [x ^Writer writer]
   (.write writer (str "<intervals:" (apply pr-str (:is x)) ">")))
@@ -615,7 +614,7 @@
   [a x dom]
   (let [domp (get-dom a x)]
     (if domp
-      (let [i (intersection dom domp)]
+      (let [i (-intersection dom domp)]
         (when i
           (resolve-storable-dom a x i)))
       (resolve-storable-dom a x dom))))
@@ -628,7 +627,7 @@
     (when dom
       (cond
        (lvar? x) (update-var-dom a x dom)
-       (member? dom x) a
+       (-member? dom x) a
        :else nil))))
 
 (declare domc)
@@ -669,11 +668,11 @@
             (when is
               (let [i (first is)]
                 (lazy-seq
-                 (cons (lb i)
-                       (if-let [ni (drop-one i)]
+                 (cons (-lb i)
+                       (if-let [ni (-drop-one i)]
                          (to-vals* (cons ni (next is)))
                          (to-vals* (next is))))))))]
-    (to-vals* (seq (intervals dom)))))
+    (to-vals* (seq (-intervals dom)))))
 
 (extend-protocol IForceAnswerTerm
   FiniteDomain
@@ -694,7 +693,7 @@
     clojure.lang.IFn
     (invoke [this s]
       (let [dom (-> (root-val s x) :doms ::l/fd)]
-        (when (member? dom (walk s x))
+        (when (-member? dom (walk s x))
           (rem-dom s x ::l/fd))))
     IConstraintOp
     (rator [_] `domc)
@@ -718,7 +717,7 @@
     clojure.lang.IFn
     (invoke [this s]
       (let-dom s [u du v dv]
-        (let [i (intersection du dv)]
+        (let [i (-intersection du dv)]
           ((composeg
             (process-dom u i)
             (process-dom v i)) s))))
@@ -756,11 +755,11 @@
          (and (singleton-dom? du)
               (singleton-dom? dv)
               (= du dv)) nil
-         (disjoint? du dv) s
+         (-disjoint? du dv) s
          (singleton-dom? du)
-         (when-let [vdiff (difference dv du)]
+         (when-let [vdiff (-difference dv du)]
            ((process-dom v vdiff) s))
-         :else (when-let [udiff (difference du dv)]
+         :else (when-let [udiff (-difference du dv)]
                  ((process-dom u udiff) s)))))
     IConstraintOp
     (rator [_] `!=)
@@ -768,7 +767,7 @@
     IRelevant
     (-relevant? [this s]
       (let-dom s [u du v dv]
-        (not (and du dv (disjoint? du dv)))))
+        (not (and du dv (-disjoint? du dv)))))
     IRunnable
     (runnable? [this s]
       (let-dom s [u du v dv]
@@ -793,11 +792,11 @@
     clojure.lang.IFn
     (invoke [this s]
       (let-dom s [u du v dv]
-        (let [umin (lb du)
-              vmax (ub dv)]
+        (let [umin (-lb du)
+              vmax (-ub dv)]
          ((composeg*
-           (process-dom u (keep-before du (inc vmax)))
-           (process-dom v (drop-before dv umin))) s))))
+           (process-dom u (-keep-before du (inc vmax)))
+           (process-dom v (-drop-before dv umin))) s))))
     IConstraintOp
     (rator [_] `<=)
     (rands [_] [u v])
@@ -861,13 +860,13 @@
       (let-dom s [u du v dv w dw]
         (let [[wmin wmax] (if dw
                             (bounds dw)
-                            [(core/+ (lb du) (lb dv)) (core/+ (ub du) (ub dv))])
+                            [(core/+ (-lb du) (-lb dv)) (core/+ (-ub du) (-ub dv))])
                [umin umax] (if du
                             (bounds du)
-                            [(core/- (lb dw) (ub dv)) (core/- (ub dw) (lb dv))])
+                            [(core/- (-lb dw) (-ub dv)) (core/- (-ub dw) (-lb dv))])
                [vmin vmax] (if dv
                             (bounds dv)
-                            [(core/- (lb dw) (ub du)) (core/- (ub dw) (lb du))])]
+                            [(core/- (-lb dw) (-ub du)) (core/- (-ub dw) (-lb du))])]
           ((composeg*
             (process-dom w (interval (core/+ umin vmin) (core/+ umax vmax)))
             (process-dom u (interval (core/- wmin vmax) (core/- wmax vmin)))
@@ -937,15 +936,15 @@
        (let-dom s [u du v dv w dw]
          (let [[wmin wmax] (if dw
                              (bounds dw)
-                             [(core/* (lb du) (lb dv)) (core/* (ub du) (ub dv))])
+                             [(core/* (-lb du) (-lb dv)) (core/* (-ub du) (-ub dv))])
                 [umin umax] (if du
                              (bounds du)
-                             [(safe-div (ub dv) (lb dw) (lb dw) :lower)
-                              (safe-div (lb dv) (lb dw) (ub dw) :upper)])
+                             [(safe-div (-ub dv) (-lb dw) (-lb dw) :lower)
+                              (safe-div (-lb dv) (-lb dw) (-ub dw) :upper)])
                 [vmin vmax] (if dv
                              (bounds dv)
-                             [(safe-div (ub du) (lb dw) (lb dw) :lower)
-                              (safe-div (lb du) (lb dw) (ub dw) :upper)])
+                             [(safe-div (-ub du) (-lb dw) (-lb dw) :lower)
+                              (safe-div (-lb du) (-lb dw) (-ub dw) :upper)])
                wi (interval (core/* umin vmin) (core/* umax vmax))
                ui (interval (safe-div vmax umin wmin :lower)
                             (safe-div vmin umax wmax :upper))
@@ -1015,7 +1014,7 @@
                     s (if-not (lvar? v)
                         (cond
                           (= x v) nil
-                          (member? v x) ((process-dom y (difference v x)) s)
+                          (-member? v x) ((process-dom y (-difference v x)) s)
                           :else s)
                         s)]
                 (when s
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 585da819..23061164 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1751,10 +1751,10 @@
         '())))
 
 (deftest test-disjoint-logic-124
-  (is (false? (fd/disjoint?
+  (is (false? (fd/-disjoint?
                (fd/interval 2 4)
                (fd/multi-interval 1 (fd/interval 3 4)))))
-  (is (false? (fd/disjoint?
+  (is (false? (fd/-disjoint?
                (fd/multi-interval 1 (fd/interval 3 4))
                (fd/interval 2 4)))))
 
@@ -1832,53 +1832,53 @@
     (is (= (:ws s) {}))))
 
 (deftest test-keep-before-1 []
-  (is (= (fd/keep-before (fd/interval 1 10) 5)
+  (is (= (fd/-keep-before (fd/interval 1 10) 5)
          (fd/interval 1 4)))
-  (is (= (fd/keep-before (fd/interval 5 10) 5)
+  (is (= (fd/-keep-before (fd/interval 5 10) 5)
          nil))
-  (is (= (fd/keep-before (fd/interval 5 10) 6)
+  (is (= (fd/-keep-before (fd/interval 5 10) 6)
          5))
-  (is (= (fd/keep-before (fd/interval 5 10) 10)
+  (is (= (fd/-keep-before (fd/interval 5 10) 10)
          (fd/interval 5 9))))
 
 (deftest test-drop-before-1 []
-  (is (= (fd/drop-before (fd/interval 5 10) 4)
+  (is (= (fd/-drop-before (fd/interval 5 10) 4)
          (fd/interval 5 10)))
-  (is (= (fd/drop-before (fd/interval 1 10) 5)
+  (is (= (fd/-drop-before (fd/interval 1 10) 5)
          (fd/interval 5 10)))
-  (is (= (fd/drop-before (fd/interval 5 10) 5)
+  (is (= (fd/-drop-before (fd/interval 5 10) 5)
          (fd/interval 5 10)))
-  (is (= (fd/drop-before (fd/interval 5 10) 6)
+  (is (= (fd/-drop-before (fd/interval 5 10) 6)
          (fd/interval 6 10)))
-  (is (= (fd/drop-before (fd/interval 5 10) 10)
+  (is (= (fd/-drop-before (fd/interval 5 10) 10)
          10))
-  (is (= (fd/drop-before (fd/interval 5 10) 11)
+  (is (= (fd/-drop-before (fd/interval 5 10) 11)
          nil)))
 
 (deftest test-keep-before-2 []
-  (is (= (fd/keep-before 1 3)
+  (is (= (fd/-keep-before 1 3)
          1))
-  (is (= (fd/keep-before 1 2)
+  (is (= (fd/-keep-before 1 2)
          1))
-  (is (= (fd/keep-before 1 1)
+  (is (= (fd/-keep-before 1 1)
          nil)))
 
 (deftest test-drop-before-2 []
-  (is (= (fd/drop-before 1 3)
+  (is (= (fd/-drop-before 1 3)
          nil))
-  (is (= (fd/drop-before 1 2)
+  (is (= (fd/-drop-before 1 2)
          nil))
-  (is (= (fd/drop-before 1 1)
+  (is (= (fd/-drop-before 1 1)
          1))
-  (is (= (fd/drop-before 1 0)
+  (is (= (fd/-drop-before 1 0)
          1)))
 
 (deftest test-drop-before-mi-1 []
-  (is (= (fd/drop-before (fd/multi-interval 2 4) (fd/lb 3))
+  (is (= (fd/-drop-before (fd/multi-interval 2 4) (fd/-lb 3))
          4)))
 
 (deftest test-keep-before-mi-2 []
-  (is (= (fd/keep-before (fd/multi-interval 2 4) (fd/lb 3))
+  (is (= (fd/-keep-before (fd/multi-interval 2 4) (fd/-lb 3))
          2)))
 
 (deftest test-singleton-interval
@@ -1893,106 +1893,106 @@
   (is (fd/interval-> (fd/interval 11 20) 1)))
 
 (deftest test-member?-ss-1
-  (is (true? (fd/member? 1 1))))
+  (is (true? (fd/-member? 1 1))))
 
 (deftest test-member?-ss-2
-  (is (false? (fd/member? 1 2))))
+  (is (false? (fd/-member? 1 2))))
 
 (deftest test-disjoint?-ss-1
-  (is (false? (fd/disjoint? 1 1))))
+  (is (false? (fd/-disjoint? 1 1))))
 
 (deftest test-disjoint?-ss-2
-  (is (true? (fd/disjoint? 1 2))))
+  (is (true? (fd/-disjoint? 1 2))))
 
 (deftest test-difference-ss-1
-  (is (= (fd/difference 1 1)
+  (is (= (fd/-difference 1 1)
          nil)))
 
 (deftest test-difference-ss-2
-  (is (= (fd/difference 1 2)
+  (is (= (fd/-difference 1 2)
          1)))
 
 (deftest test-intersection-ss-1
-  (is (= (fd/intersection 1 1)
+  (is (= (fd/-intersection 1 1)
          1)))
 
 (deftest test-intersection-ss-2
-  (is (= (fd/intersection 1 2)
+  (is (= (fd/-intersection 1 2)
          nil)))
 
 (deftest test-member?-is-1
-  (is (true? (fd/member? (fd/interval 1 10) 1))))
+  (is (true? (fd/-member? (fd/interval 1 10) 1))))
 
 (deftest test-member?-si-1
-  (is (true? (fd/member? 1 (fd/interval 1 10)))))
+  (is (true? (fd/-member? 1 (fd/interval 1 10)))))
 
 (deftest test-disjoint?-is-1
-  (is (true? (fd/disjoint? (fd/interval 1 10) 11))))
+  (is (true? (fd/-disjoint? (fd/interval 1 10) 11))))
 
 (deftest test-disjoint?-si-1
-  (is (true? (fd/disjoint? 11 (fd/interval 1 10)))))
+  (is (true? (fd/-disjoint? 11 (fd/interval 1 10)))))
 
 (deftest test-intersection-is-1
-  (is (= (fd/intersection (fd/interval 1 6) 1)
+  (is (= (fd/-intersection (fd/interval 1 6) 1)
          1)))
 
 (deftest test-intersection-si-1
-  (is (= (fd/intersection 1 (fd/interval 1 6))
+  (is (= (fd/-intersection 1 (fd/interval 1 6))
          1)))
 
 (deftest test-difference-is-1
-  (let [mi (fd/difference (fd/interval 1 10) 5)]
-    (is (= (first (fd/intervals mi)) (fd/interval 1 4)))
-    (is (= (second (fd/intervals mi)) (fd/interval 6 10)))))
+  (let [mi (fd/-difference (fd/interval 1 10) 5)]
+    (is (= (first (fd/-intervals mi)) (fd/interval 1 4)))
+    (is (= (second (fd/-intervals mi)) (fd/interval 6 10)))))
 
 (deftest test-difference-si-1
-  (let [mi (fd/difference 5 (fd/interval 1 10))]
-    (is (= (first (fd/intervals mi)) (fd/interval 1 4)))
-    (is (= (second (fd/intervals mi)) (fd/interval 6 10)))))
+  (let [mi (fd/-difference 5 (fd/interval 1 10))]
+    (is (= (first (fd/-intervals mi)) (fd/interval 1 4)))
+    (is (= (second (fd/-intervals mi)) (fd/interval 6 10)))))
 
 (deftest test-intersection-ii-1
-  (is (= (fd/intersection (fd/interval 1 6) (fd/interval 5 10))
+  (is (= (fd/-intersection (fd/interval 1 6) (fd/interval 5 10))
          (fd/interval 5 6))))
 
 (deftest test-intersection-ii-2
-  (is (= (fd/intersection (fd/interval 5 10) (fd/interval 1 6))
+  (is (= (fd/-intersection (fd/interval 5 10) (fd/interval 1 6))
          (fd/interval 5 6))))
 
 (deftest test-difference-ii-1
-  (is (= (fd/difference (fd/interval 1 6) (fd/interval 5 10))
+  (is (= (fd/-difference (fd/interval 1 6) (fd/interval 5 10))
          (fd/interval 1 4))))
 
 (deftest test-difference-ii-2
-  (is (= (fd/difference (fd/interval 1 4) (fd/interval 5 10))
+  (is (= (fd/-difference (fd/interval 1 4) (fd/interval 5 10))
          (fd/interval 1 4))))
 
 (deftest test-difference-ii-3
-  (is (= (fd/difference (fd/interval 5 10) (fd/interval 1 4))
+  (is (= (fd/-difference (fd/interval 5 10) (fd/interval 1 4))
          (fd/interval 5 10))))
 
 (deftest test-difference-ii-4
-  (is (= (fd/difference (fd/interval 1 10) (fd/interval 1 10))
+  (is (= (fd/-difference (fd/interval 1 10) (fd/interval 1 10))
          nil)))
 
 (deftest test-difference-ii-5
-  (is (= (fd/difference (fd/interval 2 9) (fd/interval 1 10))
+  (is (= (fd/-difference (fd/interval 2 9) (fd/interval 1 10))
          nil)))
 
 (deftest test-disjoint?-ii-1
-  (is (false? (fd/disjoint? (fd/interval 1 6) (fd/interval 5 10))))
-  (is (false? (fd/disjoint? (fd/interval 5 10) (fd/interval 1 6))))
-  (is (true? (fd/disjoint? (fd/interval 1 6) (fd/interval 10 16))))
-  (is (true? (fd/disjoint? (fd/interval 10 16) (fd/interval 1 6)))))
+  (is (false? (fd/-disjoint? (fd/interval 1 6) (fd/interval 5 10))))
+  (is (false? (fd/-disjoint? (fd/interval 5 10) (fd/interval 1 6))))
+  (is (true? (fd/-disjoint? (fd/interval 1 6) (fd/interval 10 16))))
+  (is (true? (fd/-disjoint? (fd/interval 10 16) (fd/interval 1 6)))))
 
 (deftest test-member?-mimi-1
-  (is (false? (fd/member? 20 (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
-  (is (false? (fd/member? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) 20))))
+  (is (false? (fd/-member? 20 (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
+  (is (false? (fd/-member? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) 20))))
 
 (deftest test-disjoint?-mimi-1
-  (is (true? (fd/disjoint? 20 (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
-  (is (true? (fd/disjoint? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) 20)))
-  (is (true? (fd/disjoint? (fd/interval 20 30) (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
-  (is (true? (fd/disjoint? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) (fd/interval 20 30)))))
+  (is (true? (fd/-disjoint? 20 (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
+  (is (true? (fd/-disjoint? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) 20)))
+  (is (true? (fd/-disjoint? (fd/interval 20 30) (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)))))
+  (is (true? (fd/-disjoint? (fd/multi-interval (fd/interval 1 3) 5 (fd/interval 7 10)) (fd/interval 20 30)))))
 
 (deftest test-equals-mi
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 6 10))
@@ -2005,19 +2005,19 @@
 (deftest test-intersection-mimi-1
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 6 10))
         mi1 (fd/multi-interval (fd/interval 9 13) (fd/interval 17 20))]
-    (is (= (fd/intersection mi0 mi1) (fd/interval 9 10)))
-    (is (= (fd/intersection mi1 mi0) (fd/interval 9 10)))))
+    (is (= (fd/-intersection mi0 mi1) (fd/interval 9 10)))
+    (is (= (fd/-intersection mi1 mi0) (fd/interval 9 10)))))
 
 (deftest test-intersection-mimi-2
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 6 10))]
-    (is (= (fd/intersection mi0 7) 7))
-    (is (= (fd/intersection 7 mi0) 7))))
+    (is (= (fd/-intersection mi0 7) 7))
+    (is (= (fd/-intersection 7 mi0) 7))))
 
 ;; |-----| 
 ;;   |-----|
 (deftest test-intersection-mimi-3
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
-    (is (= (fd/intersection mi0 (fd/interval 3 8))
+    (is (= (fd/-intersection mi0 (fd/interval 3 8))
            (fd/multi-interval (fd/interval 3 4) (fd/interval 7 8))))))
 
 ;; |-----|
@@ -2025,7 +2025,7 @@
 (deftest test-intersection-mimi-4
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))
         mi1 (fd/multi-interval (fd/interval 2 3) (fd/interval 6 9))]
-    (is (= (fd/intersection mi0 mi1)
+    (is (= (fd/-intersection mi0 mi1)
            (fd/multi-interval (fd/interval 2 3) (fd/interval 7 9))))))
 
 ;;   |-----|
@@ -2033,7 +2033,7 @@
 (deftest test-intersection-mimi-5
   (let [mi0 (fd/multi-interval (fd/interval 4 8) (fd/interval 12 16))
         mi1 (fd/multi-interval (fd/interval 1 5) (fd/interval 7 15))]
-    (is (= (fd/intersection mi0 mi1)
+    (is (= (fd/-intersection mi0 mi1)
            (fd/multi-interval (fd/interval 4 5) (fd/interval 7 8) (fd/interval 12 15))))))
 
 ;;  |---|
@@ -2041,14 +2041,14 @@
 (deftest test-intersection-mimi-6
   (let [mi0 (fd/multi-interval (fd/interval 1 3) (fd/interval 5 6) (fd/interval 8 10))
         mi1 (fd/multi-interval (fd/interval 1 3) (fd/interval 4 7) (fd/interval 8 10))]
-    (is (= (fd/intersection mi0 mi1)
+    (is (= (fd/-intersection mi0 mi1)
            (fd/multi-interval (fd/interval 1 3) (fd/interval 5 6) (fd/interval 8 10))))))
 
 ;; |---|  |---|
 ;; |-------|
 (deftest test-intersection-mimi-7
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
-    (is (= (fd/intersection mi0 (fd/interval 1 8))
+    (is (= (fd/-intersection mi0 (fd/interval 1 8))
            (fd/multi-interval (fd/interval 1 4) (fd/interval 7 8))))))
 
 ;; |--------| |--|
@@ -2056,32 +2056,32 @@
 (deftest test-intersection-mimi-8
   (let [mi0 (fd/multi-interval (fd/interval 1 7) (fd/interval 9 10))
         mi1 (fd/multi-interval (fd/interval 1 3) (fd/interval 6 11))]
-    (is (= (fd/intersection mi0 mi1)
+    (is (= (fd/-intersection mi0 mi1)
            (fd/multi-interval (fd/interval 1 3) (fd/interval 6 7) (fd/interval 9 10))))))
 
 ;; -----------------------------------------------------------------------------
-;; MultiFd/IntervalFD Fd/Difference
+;; MultiFd/IntervalFD Fd/-Difference
 
 ;; |---| |---|
 ;;         |---| |---|
 (deftest test-difference-mimi-1
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 6 10))
         mi1 (fd/multi-interval (fd/interval 9 13) (fd/interval 17 20))]
-    (is (= (fd/difference mi0 mi1)
+    (is (= (fd/-difference mi0 mi1)
            (fd/multi-interval (fd/interval 1 4) (fd/interval 6 8))))))
 
 ;; |---|  |---|
 ;;         N      
 (deftest test-difference-mis-1
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
-    (is (= (fd/difference mi0 8)
+    (is (= (fd/-difference mi0 8)
            (fd/multi-interval (fd/interval 1 4) 7 (fd/interval 9 10))))))
 
 ;;       N
 ;; |---|   |---|
 (deftest test-difference-smi-2
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 6 10))]
-    (is (= (fd/difference 5 mi0) 5))))
+    (is (= (fd/-difference 5 mi0) 5))))
 
 ;; |---|   |---|
 ;;   |-------|
@@ -2090,9 +2090,9 @@
 ;; |---|   |---|
 (deftest test-difference-mii-1
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
-    (is (= (fd/difference mi0 (fd/interval 3 8))
+    (is (= (fd/-difference mi0 (fd/interval 3 8))
            (fd/multi-interval (fd/interval 1 2) (fd/interval 9 10))))
-    (is (= (fd/difference (fd/interval 3 8) mi0)
+    (is (= (fd/-difference (fd/interval 3 8) mi0)
            (fd/interval 5 6)))))
 
 ;; |---|  |---|
@@ -2100,14 +2100,14 @@
 (deftest test-difference-mimi-2
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))
         mi1 (fd/multi-interval (fd/interval 1 8) (fd/interval 10 13))]
-    (is (= (fd/difference mi0 mi1) 9))))
+    (is (= (fd/-difference mi0 mi1) 9))))
 
 ;;  |----| |-------|
 ;; |----|    |---|
 (deftest test-difference-mimi-3
   (let [mi0 (fd/multi-interval (fd/interval 3 6) (fd/interval 9 15))
         mi1 (fd/multi-interval (fd/interval 1 4) (fd/interval 10 12))]
-    (is (= (fd/difference mi0 mi1)
+    (is (= (fd/-difference mi0 mi1)
            (fd/multi-interval (fd/interval 5 6) 9 (fd/interval 13 15))))))
 
 ;;   |---|     |---|
@@ -2115,22 +2115,22 @@
 (deftest test-difference-mimi-4
   (let [mi0 (fd/multi-interval (fd/interval 3 6) (fd/interval 15 20))
         mi1 (fd/multi-interval (fd/interval 1 6) (fd/interval 10 13))]
-    (is (= (fd/difference mi0 mi1)
+    (is (= (fd/-difference mi0 mi1)
            (fd/interval 15 20)))))
 
 (deftest test-fd-1
   (let [d (fd/domain 1 2 3)]
-    (is (= (fd/lb d) 1))
-    (is (= (fd/ub d) 3))))
+    (is (= (fd/-lb d) 1))
+    (is (= (fd/-ub d) 3))))
 
 (deftest test-normalize-intervals-1
   (let [d (fd/domain 1 2 3)]
-    (is (= (fd/normalize-intervals (fd/intervals d))
+    (is (= (fd/normalize-intervals (fd/-intervals d))
            [(fd/interval 1 3)]))))
 
 (deftest test-normalize-intervals-2
   (let [d (fd/multi-interval (fd/interval 1 4) 5 (fd/interval 6 10))]
-    (is (= (fd/normalize-intervals (fd/intervals d))
+    (is (= (fd/normalize-intervals (fd/-intervals d))
            [(fd/interval 1 10)]))))
 
 (deftest test-dom-interval-and-number-1
@@ -2290,34 +2290,34 @@
 
 (deftest test-multi-interval-1
   (let [mi (fd/multi-interval (fd/interval 1 3) (fd/interval 7 10))]
-    (is (= 1 (fd/lb mi)))
-    (is (= 10 (fd/ub mi)))))
+    (is (= 1 (fd/-lb mi)))
+    (is (= 10 (fd/-ub mi)))))
 
 (deftest test-run-constraints*
   (is (= (run-constraints* [] [] ::l/subst) s#)))
 
 (deftest test-drop-one-1
-  (is (= (:s (fd/drop-one (fd/domain 1 2 3)))
+  (is (= (:s (fd/-drop-one (fd/domain 1 2 3)))
          #{2 3})))
 
 (deftest test-drop-one-2
-  (is (= (fd/drop-one (fd/domain 1))
+  (is (= (fd/-drop-one (fd/domain 1))
          nil)))
 
 (deftest test-drop-one-3
-  (is (= (fd/drop-one 1)
+  (is (= (fd/-drop-one 1)
          nil)))
 
 (deftest test-drop-one-4
-  (is (= (fd/drop-one (fd/interval 1 10))
+  (is (= (fd/-drop-one (fd/interval 1 10))
          (fd/interval 2 10))))
 
 (deftest test-drop-one-5
-  (is (= (fd/drop-one (fd/interval 1 1))
+  (is (= (fd/-drop-one (fd/interval 1 1))
          nil)))
 
 (deftest test-drop-one-6
-  (is (= (fd/drop-one (fd/multi-interval (fd/interval 1 10) (fd/interval 15 20)))
+  (is (= (fd/-drop-one (fd/multi-interval (fd/interval 1 10) (fd/interval 15 20)))
          (fd/multi-interval (fd/interval 2 10) (fd/interval 15 20)))))
 
 (deftest test-to-vals-1
@@ -2412,11 +2412,11 @@
            (fd/interval 2 10)))))
 
 (deftest test-boundary-interval-1
-  (is (fd/difference (fd/interval 1 10) 1)
+  (is (fd/-difference (fd/interval 1 10) 1)
       (fd/interval 2 10)))
 
 (deftest test-boundary-interval-1
-  (is (fd/difference (fd/interval 1 10) 10)
+  (is (fd/-difference (fd/interval 1 10) 10)
       (fd/interval 1 9)))
 
 (deftest test-process-imi-1

From 7891002dbccf99de259739a3bd7e3d98d4edb1dd Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 9 Apr 2013 21:26:31 +0200
Subject: [PATCH 117/288] fix bug from Zurich talk, simple equation example
 could not have the fd/in expression come last because of a bug in domc.

---
 src/main/clojure/clojure/core/logic/fd.clj    |  6 ++++--
 src/test/clojure/clojure/core/logic/tests.clj | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 4e72bc1c..3e724618 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -693,8 +693,10 @@
     clojure.lang.IFn
     (invoke [this s]
       (let [dom (-> (root-val s x) :doms ::l/fd)]
-        (when (-member? dom (walk s x))
-          (rem-dom s x ::l/fd))))
+        (if dom
+          (when (-member? dom (walk s x))
+            (rem-dom s x ::l/fd))
+          s)))
     IConstraintOp
     (rator [_] `domc)
     (rands [_] [x])
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 23061164..b1e47bda 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1799,6 +1799,17 @@
                (== q [x y]))))
         #{[1 38] [38 1] [2 19] [19 2]})))
 
+(deftest test-simplefd-in-last
+  (is (= (run* [q]
+           (fresh [x y z p0 p1]
+             (== q [x y])
+             (fd/+ x y 9)
+             (fd/* x 2 p0)
+             (fd/* y 4 p1)
+             (fd/+ p0 p1 24)
+             (fd/in x y z (fd/interval 0 9))))
+         '([6 3]))))
+
 ;; =============================================================================
 ;; cKanren
 

From d73c836c0d4bab2af12b4bdedb31daad4a661fb6 Mon Sep 17 00:00:00 2001
From: Jiri Marsik <jiri.marsik89@gmail.com>
Date: Wed, 3 Apr 2013 11:20:34 +0200
Subject: [PATCH 118/288] Fixed LOGIC-127, nom swapping now preserves vectors
 and maps

Signed-off-by: amin <nada.amin@epfl.ch>
---
 src/main/clojure/clojure/core/logic/nominal.clj      | 12 +++++++++++-
 .../clojure/clojure/core/logic/nominal/tests.clj     |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 9c06548d..e24c3eb1 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -61,7 +61,17 @@
       (let [[tfirst s] (swap-noms (first t) swap s)
             [tnext s] (swap-noms (next t) swap s)]
         [(with-meta (cons tfirst tnext) (meta t)) s])
-      [t s])))
+      [t s]))
+
+  clojure.lang.IPersistentVector
+  (swap-noms [t swap s]
+    (let [[ts s] (swap-noms (seq t) swap s)]
+      [(vec ts) s]))
+
+  clojure.lang.IPersistentMap
+  (swap-noms [t swap s]
+    (let [[tkvs s] (swap-noms (seq t) swap s)]
+      [(into {} tkvs) s])))
 
 ;; =============================================================================
 ;; Nom
diff --git a/src/test/clojure/clojure/core/logic/nominal/tests.clj b/src/test/clojure/clojure/core/logic/nominal/tests.clj
index eeeb5db5..25f5373c 100644
--- a/src/test/clojure/clojure/core/logic/nominal/tests.clj
+++ b/src/test/clojure/clojure/core/logic/nominal/tests.clj
@@ -521,3 +521,11 @@
              (nom/fresh [a b]
                (!= (nom/tie a a) (nom/tie b b))))
           '()))))
+
+(deftest test-logic-127-nomswap-maps
+  (is (= (run* [q]
+           (fresh [body]
+             (nom/fresh [a b]
+               (== (nom/tie a {:k a}) (nom/tie b body))
+               (== {:k q} body))))
+        '(a_0))))

From f329cfc6a9544859629275a59c30cef0ab3cedea Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 19 Apr 2013 18:34:06 -0400
Subject: [PATCH 119/288] refactor constraints to use IConstraintStep, this way
 we can avoid unnecessary calls to `get-dom` while retaining the flexibility
 to call `-runnable?`, `-entailed?`, and constraint invocation in whatever
 order we please.

refactor protocols to use ClojureScript style naming convention - this
is prep for eventual unification of the two code bases.
---
 src/main/clojure/clojure/core/logic.clj       | 276 ++++++-----
 src/main/clojure/clojure/core/logic/fd.clj    | 436 +++++++++---------
 .../clojure/clojure/core/logic/nominal.clj    | 153 +++---
 .../clojure/clojure/core/logic/protocols.clj  |  49 +-
 .../clojure/clojure/core/logic/unifier.clj    |   6 +-
 src/test/clojure/clojure/core/logic/tests.clj |  40 +-
 6 files changed, 484 insertions(+), 476 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index fac316a8..2d301274 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -82,7 +82,7 @@
 (declare lvar? bindable? add-var)
 
 (defn var-rands [a c]
-  (->> (rands c)
+  (->> (-rands c)
     (map #(root-var a %))
     (filter lvar?)
     (into [])))
@@ -120,9 +120,9 @@
 
   (updatec [this a c]
     (let [oc (cm (id c))
-          nkm (if (instance? clojure.core.logic.protocols.IRelevantVar c)
+          nkm (if (instance? clojure.core.logic.protocols.IEntailedVar c)
                 (reduce (fn [km x]
-                          (if-not (-relevant-var? c x)
+                          (if (-entailed-var? c x)
                             (dissoc km x)
                             km))
                         km (var-rands a oc))
@@ -148,7 +148,7 @@
 
   (constraints-for [this a x ws]
     (when-let [ids (get km (root-var a x))]
-      (filter #((watched-stores %) ws) (map cm (remove running ids)))))
+      (filter #((-watched-stores %) ws) (map cm (remove running ids)))))
 
   (migrate [this x root]
     (let [xcs    (km x)
@@ -2172,22 +2172,24 @@
   (fn [a]
     (assoc a :cs (runc (:cs a) c false))))
 
-(defn irelevant? [c]
-  (instance? clojure.core.logic.protocols.IRelevant c))
+(defn ientailed? [c]
+  (instance? clojure.core.logic.protocols.IEntailed c))
 
-(defn relevant? [c a]
+(defn entailed? [c c' a]
   (let [id (id c)]
     (and (or ((-> a :cs :cm) id)
              (nil? id))
-         (-relevant? c a))))
+         (-entailed? c'))))
 
 (defn run-constraint [c]
   (fn [a]
-    (if (or (not (irelevant? c)) (relevant? c a))
-      (if (runnable? c a)
-        ((composeg* (runcg c) c (stopcg c)) a)
-        a)
-      ((remcg c) a))))
+    (let [c' (-step c a)]
+      (if (or (not (ientailed? c'))
+              (not (entailed? c c' a)))
+        (if (-runnable? c')
+          ((composeg* (runcg c) c' (stopcg c)) a)
+          a)
+        ((remcg c) a)))))
 
 ;; TODO NOW: try an implementation that allows constraints
 ;; to run roughly in the order they normaly would. reverse
@@ -2277,7 +2279,7 @@
   (let [cs  (:cs  a)
         rcs (->> (vals (:cm cs))
                  (filter reifiable?)
-                 (map #(reifyc % v r a))
+                 (map #(-reifyc % v r a))
                  (filter #(not (nil? %)))
                  (into #{}))]
     (if (empty? rcs)
@@ -2300,14 +2302,17 @@
   (reify
     clojure.lang.IFn
     (invoke [_ a]
-      (if (runnable? c a)
-        (when-let [a (c a)]
-          (if (and (irelevant? c) (relevant? c a))
-            ((addcg c) a)
-            a))
-        ((addcg c) a)))
+      (let [c' (-step c a)]
+        (if (-runnable? c')
+          (when-let [a (c' a)]
+            (let [c' (-step c a)]
+              (if (and (ientailed? c')
+                       (not (entailed? c c' a)))
+                ((addcg c) a)
+                a)))
+          ((addcg c) a))))
     IUnwrapConstraint
-    (unwrap [_] c)))
+    (-unwrap [_] c)))
 
 ;; TODO: this stuff needs to be moved into fd - David
 
@@ -2327,7 +2332,7 @@
 (defn sort-by-member-count [a]
   (fn [x y]
     (let-dom a [x dx y dy]
-      (< (member-count dx) (member-count dy)))))
+      (< (-member-count dx) (-member-count dy)))))
 
 (defn sort-by-strategy [v x a]
   (case (-> x meta ::strategy)
@@ -2406,24 +2411,24 @@
          (if (identical? u v)
            cs
            (if (and (not (lvar? u)) (lvar? v))
-             (disunify-terms v u s cs)
-             (disunify-terms u v s cs)))))))
+             (-disunify-terms v u s cs)
+             (-disunify-terms u v s cs)))))))
 
 (extend-protocol IDisunifyTerms
   nil
-  (disunify-terms [u v s cs]
+  (-disunify-terms [u v s cs]
     (if-not (nil? v) nil cs))
 
   Object
-  (disunify-terms [u v s cs]
+  (-disunify-terms [u v s cs]
     (if-not (= u v) nil cs))
 
   LVar
-  (disunify-terms [u v s {pc :prefixc :as cs}]
+  (-disunify-terms [u v s {pc :prefixc :as cs}]
     (assoc cs :prefixc (assoc pc u v)))
 
   clojure.lang.Sequential
-  (disunify-terms [u v s cs]
+  (-disunify-terms [u v s cs]
     (if (sequential? v)
       (loop [u (seq u) v (seq v) cs cs]
         (if u
@@ -2441,7 +2446,7 @@
       nil))
 
   clojure.lang.IPersistentMap
-  (disunify-terms [u v s cs]
+  (-disunify-terms [u v s cs]
     (if (and (map? v) (= (count u) (count v)))
       (loop [ks (seq (keys u)) cs cs]
         (if ks
@@ -2482,76 +2487,54 @@
 
 (declare normalize-store ground-term?)
 
-(defn !=c
-  [p]
+(defn !=c [p]
   (reify
     ITreeConstraint
-    clojure.lang.IFn
-    (invoke [this a]
-      (let [p (loop [sp (seq p) p p]
-                (if sp
-                  (let [[x v] (first sp)
-                        ;; TODO: this seems expensive to walk* both sides
-                        ;; and run an equality test there must be a better
-                        ;; way - David
-                        xv (walk* a x)
-                        vv (walk* a v)]
-                    (cond
-                      (= xv vv) (recur (next sp) (dissoc p x))
-                      (nil? (unify a xv vv)) nil
-                      :else (recur (next sp) (assoc (dissoc p x) xv vv))))
-                  p))]
-        (if p
-          (when-not (empty? p)
-            #_((normalize-store (with-prefix this p)) a)
-            ((composeg*
-              (remcg this)
-              (cgoal (!=c p))) a))
-          ((remcg this) a))))
+    IConstraintStep
+    (-step [this s]
+      (reify
+        clojure.lang.IFn
+        (invoke [_ s]
+          (let [p (loop [sp (seq p) p p]
+                    (if sp
+                      (let [[x v] (first sp)
+                             ;; TODO: this seems expensive to walk* both sides
+                             ;; and run an equality test there must be a better
+                             ;; way - David
+                             xv (walk* s x)
+                             vv (walk* s v)]
+                        (cond
+                          (= xv vv) (recur (next sp) (dissoc p x))
+                          (nil? (unify s xv vv)) nil
+                          :else (recur (next sp) (assoc (dissoc p x) xv vv))))
+                      p))]
+            (if p
+              (when-not (empty? p)
+                ((composeg*
+                   (remcg this)
+                   (cgoal (!=c p))) s))
+              ((remcg this) s))))
+        IRunnable
+        (-runnable? [_]
+          (some #(not= (walk s %) %) (recover-vars p)))
+        IEntailed
+        (-entailed? [_]
+          (empty? p))))
     IPrefix
-    (prefix [_] p)
+    (-prefix [_] p)
     IWithPrefix
-    (with-prefix [_ p] (!=c p))
+    (-with-prefix [_ p] (!=c p))
     IReifiableConstraint
-    (reifyc [this v r a]
+    (-reifyc [this v r a]
       (let [p* (-reify a (map (fn [[lhs rhs]] `(~lhs ~rhs)) p) r)]
         (if (empty? p*)
           '()
           `(~'!= ~@p*))))
     IConstraintOp
-    (rator [_] `!=)
-    (rands [_] (seq (recover-vars p)))
-    IRunnable
-    (runnable? [this s]
-      (some #(not= (walk s %) %) (recover-vars p)))
-    IRelevant
-    (-relevant? [this s]
-      (not (empty? p)))
+    (-rator [_] `!=)
+    (-rands [_] (seq (recover-vars p)))
     IConstraintWatchedStores
-    (watched-stores [this] #{::subst})))
-
-#_(defn normalize-store [c]
-  (fn [a]
-    (let [p (prefix c)
-          cid (id c)
-          cs (:cs a)
-          cids (->> (seq (recover-vars p))
-                    (mapcat (:km cs))
-                    (remove nil?)
-                    (into #{}))
-          neqcs (->> (seq cids)
-                     (map (:cm cs))
-                     (filter tree-constraint?)
-                     (remove #(= (id %) cid)))]
-      (loop [a a neqcs (seq neqcs)]
-        (if neqcs
-          (let [oc (first neqcs)
-                pp (prefix oc)]
-            (cond
-             (prefix-subsumes? pp p) ((remcg c) a)
-             (prefix-subsumes? p pp) (recur (assoc a :cs (remc cs a oc)) (next neqcs))
-             :else (recur a (next neqcs))))
-          ((updatecg c) a))))))
+    (-watched-stores [this] #{::subst})))
 
 (defn !=
   "Disequality constraint. Ensures that u and v will never
@@ -2643,24 +2626,27 @@
 (defn -featurec
   [x fs]
   (reify
-    clojure.lang.IFn
-    (invoke [this a]
-      ((composeg
-        (== fs x)
-        (remcg this)) a))
+    IConstraintStep
+    (-step [this s]
+      (reify
+        clojure.lang.IFn
+        (invoke [_ s]
+          ((composeg
+             (== fs x)
+             (remcg this)) s))
+        IRunnable
+        (-runnable? [_]
+          (not (lvar? (walk s x))))))
     IConstraintOp
-    (rator [_] `featurec)
-    (rands [_] [x])
+    (-rator [_] `featurec)
+    (-rands [_] [x])
     IReifiableConstraint
-    (reifyc [_ v r a]
+    (-reifyc [_ v r a]
       (let [fs (into {} fs)
             r  (-reify* r (walk* a fs))]
         `(featurec ~(walk* r x) ~(walk* r fs))))
-    IRunnable
-    (runnable? [_ a]
-      (not (lvar? (walk a x))))
     IConstraintWatchedStores
-    (watched-stores [this] #{::subst})))
+    (-watched-stores [this] #{::subst})))
 
 (defn ->feature [x]
   (-feature
@@ -2722,23 +2708,26 @@
     `(fn ~args
        (letfn [(~name [~@args]
                  (reify
-                   ~'clojure.lang.IFn
-                   (~'invoke [this# a#]
-                     (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
-                           test# (do ~@body)]
-                       (when test#
-                         ((clojure.core.logic/remcg this#) a#))))
+                   clojure.core.logic.protocols/IConstraintStep
+                   (-step [this# a#]
+                     (reify
+                       ~'clojure.lang.IFn
+                       (~'invoke [_# a#]
+                         (let [[~@args :as args#] (map #(clojure.core.logic/walk* a# %) ~args)
+                                test# (do ~@body)]
+                           (when test#
+                             ((clojure.core.logic/remcg this#) a#))))
+                       clojure.core.logic.protocols/IRunnable
+                       (~'-runnable? [_#]
+                         (clojure.core.logic/ground-term? ~args a#))))
                    clojure.core.logic.protocols/IConstraintOp
-                   (~'rator [_#] '~name)
-                   (~'rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
+                   (~'-rator [_#] '~name)
+                   (~'-rands [_#] (filter clojure.core.logic/lvar? (flatten ~args)))
                    clojure.core.logic.protocols/IReifiableConstraint
-                   (~'reifyc [_# _# r# a#]
+                   (~'-reifyc [_# _# r# a#]
                      (list '~name (map #(clojure.core.logic/-reify r# %) ~args)))
-                   clojure.core.logic.protocols/IRunnable
-                   (~'runnable? [_# s#]
-                     (clojure.core.logic/ground-term? ~args s#))
                    clojure.core.logic.protocols/IConstraintWatchedStores
-                   (~'watched-stores [_#] #{:clojure.core.logic/subst})))]
+                   (~'-watched-stores [_#] #{:clojure.core.logic/subst})))]
          (cgoal (~name ~@args))))))
 
 (defmacro defnc [name args & body]
@@ -2751,26 +2740,29 @@
   ([x p] (-predc x p p))
   ([x p pform]
      (reify
-       clojure.lang.IFn
-       (invoke [this a]
-         (let [x (walk a x)]
-           (when (p x)
-             ((remcg this) a))))
+       IConstraintStep
+       (-step [this s]
+         (reify
+           clojure.lang.IFn
+           (invoke [_ s]
+             (let [x (walk s x)]
+               (when (p x)
+                 ((remcg this) s))))
+           IRunnable
+           (-runnable? [_]
+             (not (lvar? (walk s x))))))
        IConstraintOp
-       (rator [_] (if (seq? pform)
+       (-rator [_] (if (seq? pform)
                     `(predc ~pform)
                     `predc))
-       (rands [_] [x])
+       (-rands [_] [x])
        IReifiableConstraint
-       (reifyc [c v r a]
+       (-reifyc [c v r s]
          (if (and (not= p pform) (fn? pform))
-           (pform c v r a)
+           (pform c v r s)
            pform))
-       IRunnable
-       (runnable? [_ a]
-         (not (lvar? (walk a x))))
        IConstraintWatchedStores
-       (watched-stores [this] #{::subst}))))
+       (-watched-stores [this] #{::subst}))))
 
 (defn predc
   ([x p] (predc x p p))
@@ -2817,26 +2809,29 @@
   ([x f reifier] (-fixc x f nil reifier))
   ([x f runnable reifier]
      (reify
-       clojure.lang.IFn
-       (invoke [this a]
-         (let [x (walk a x)]
-           ((composeg (f x a reifier) (remcg this)) a)))
+       IConstraintStep
+       (-step [this s]
+         (let [xv (walk s x)]
+           (reify
+             clojure.lang.IFn
+             (invoke [_ s]
+               ((composeg (f xv s reifier) (remcg this)) s))
+             IRunnable
+             (-runnable? [_]
+               (if (fn? runnable)
+                 (runnable x s)
+                 (not (lvar? xv)))))))
        IConstraintOp
-       (rator [_] `fixc)
-       (rands [_] (if (vector? x) x [x]))
+       (-rator [_] `fixc)
+       (-rands [_] (if (vector? x) x [x]))
        IReifiableConstraint
-       (reifyc [c v r a]
+       (-reifyc [c v r s]
          (if (fn? reifier)
-           (reifier c x v r a)
+           (reifier c x v r s)
            (let [x (walk* r x)]
              `(fixc ~x ~reifier))))
-       IRunnable
-       (runnable? [_ a]
-         (if (fn? runnable)
-           (runnable x a)
-           (not (lvar? (walk a x)))))
        IConstraintWatchedStores
-       (watched-stores [this] #{::subst}))))
+       (-watched-stores [this] #{::subst}))))
 
 (defn fixc
   ([x f reifier] (fixc x f nil reifier))
@@ -2863,3 +2858,4 @@
         :else fail))
     (fn [_ v _ r a]
       `(seqc ~(-reify a v r)))))
+
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 3e724618..7dff857b 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -65,7 +65,7 @@
   Object
   (equals [this that]
     (if (finite-domain? that)
-      (if (= (member-count this) (member-count that))
+      (if (= (-member-count this) (-member-count that))
         (= s (:s that))
         false)
       false))
@@ -81,7 +81,7 @@
       not-found))
 
   IMemberCount
-  (member-count [this] (count s))
+  (-member-count [this] (count s))
 
   IInterval
   (-lb [_] min)
@@ -168,7 +168,7 @@
 (defmacro extend-to-fd [t]
   `(extend-type ~t
      IMemberCount
-     (~'member-count [this#] 1)
+     (~'-member-count [this#] 1)
 
      IInterval
      (~'-lb [this#] this#)
@@ -239,7 +239,7 @@
     (pr-str this))
 
   IMemberCount
-  (member-count [this] (inc (core/- ub lb)))
+  (-member-count [this] (inc (core/- ub lb)))
 
   IInterval
   (-lb [_] lb)
@@ -495,8 +495,9 @@
       false))
 
   IMemberCount
-  (member-count [this]
-    (reduce core/+ 0 (map member-count is)))
+  (-member-count [this]
+    ;; NOTE: ugly hack around http://dev.clojure.org/jira/browse/CLJ-1202 - David
+    (reduce core/+ 0 (map #(-member-count %) is)))
 
   IInterval
   (-lb [_] min)
@@ -690,25 +691,28 @@
 (defn -domc [x]
   (reify
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
-      (let [dom (-> (root-val s x) :doms ::l/fd)]
-        (if dom
-          (when (-member? dom (walk s x))
-            (rem-dom s x ::l/fd))
-          s)))
+    IConstraintStep
+    (-step [this s]
+      (let [xv (walk s x)
+            xd (-> (root-val s x) :doms ::l/fd)]
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (if xd
+              (when (-member? xd xv)
+                (rem-dom s x ::l/fd))
+              s))
+          IEntailed
+          (-entailed? [_]
+            (nil? xd))
+          IRunnable
+          (-runnable? [_]
+            (not (lvar? xv))))))
     IConstraintOp
-    (rator [_] `domc)
-    (rands [_] [x])
-    IRelevant
-    (-relevant? [this s]
-      (let [dom (-> (root-val s x) :doms ::l/fd)]
-        (not (nil? dom))))
-    IRunnable
-    (runnable? [this s]
-      (not (lvar? (walk s x))))
+    (-rator [_] `domc)
+    (-rands [_] [x])
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst})))
+    (-watched-stores [this] #{::l/subst})))
 
 (defn domc [x]
   (cgoal (-domc x)))
@@ -716,29 +720,29 @@
 (defn ==c [u v]
   (reify
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
+    IConstraintStep
+    (-step [this s]
       (let-dom s [u du v dv]
-        (let [i (-intersection du dv)]
-          ((composeg
-            (process-dom u i)
-            (process-dom v i)) s))))
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (let [i (-intersection du dv)]
+              ((composeg
+                 (process-dom u i)
+                 (process-dom v i)) s)))
+          IEntailed
+          (-entailed? [_]
+            (and (singleton-dom? du)
+                 (singleton-dom? dv)
+                 (= du dv)))
+          IRunnable
+          (-runnable? [_]
+            (and du dv)))))
     IConstraintOp
-    (rator [_] `==)
-    (rands [_] [u v])
-    IRelevant
-    (-relevant? [this s]
-      (let-dom s [u du v dv]
-        (cond
-         (not (singleton-dom? du)) true
-         (not (singleton-dom? dv)) true
-         :else (not= du dv))))
-    IRunnable
-    (runnable? [this s]
-      (let-dom s [u du v dv]
-        (and du dv)))
+    (-rator [_] `==)
+    (-rands [_] [u v])
     IConstraintWatchedStores
-    (watched-stores [this]
+    (-watched-stores [this]
       #{::l/subst ::l/fd})))
 
 (defn ==
@@ -750,36 +754,32 @@
 (defn !=c [u v]
   (reify 
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
+    IConstraintStep
+    (-step [this s]
       (let-dom s [u du v dv]
-        (cond
-         (and (singleton-dom? du)
-              (singleton-dom? dv)
-              (= du dv)) nil
-         (-disjoint? du dv) s
-         (singleton-dom? du)
-         (when-let [vdiff (-difference dv du)]
-           ((process-dom v vdiff) s))
-         :else (when-let [udiff (-difference du dv)]
-                 ((process-dom u udiff) s)))))
+        (let [su? (singleton-dom? du)
+              sv? (singleton-dom? dv)]
+          (reify
+            clojure.lang.IFn
+            (invoke [_ s]
+              (cond
+                (and su? sv? (= du dv)) nil
+                (-disjoint? du dv) s
+                su? (when-let [vdiff (-difference dv du)]
+                      ((process-dom v vdiff) s))
+                :else (when-let [udiff (-difference du dv)]
+                        ((process-dom u udiff) s))))
+            IEntailed
+            (-entailed? [_]
+              (and du dv (-disjoint? du dv)))
+            IRunnable
+            (-runnable? [_]
+              (and du dv (or su? sv?)))))))
     IConstraintOp
-    (rator [_] `!=)
-    (rands [_] [u v])
-    IRelevant
-    (-relevant? [this s]
-      (let-dom s [u du v dv]
-        (not (and du dv (-disjoint? du dv)))))
-    IRunnable
-    (runnable? [this s]
-      (let-dom s [u du v dv]
-        ;; we are runnable if du and dv both have domains
-        ;; and at least du or dv has a singleton domain
-        (and du dv
-             (or (singleton-dom? du)
-                 (singleton-dom? dv)))))
+    (-rator [_] `!=)
+    (-rands [_] [u v])
     IConstraintWatchedStores
-    (watched-stores [this]
+    (-watched-stores [this]
       #{::l/subst ::l/fd}))) 
 
 (defn !=
@@ -791,29 +791,28 @@
 (defn <=c [u v]
   (reify 
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
+    IConstraintStep
+    (-step [this s]
       (let-dom s [u du v dv]
-        (let [umin (-lb du)
-              vmax (-ub dv)]
-         ((composeg*
-           (process-dom u (-keep-before du (inc vmax)))
-           (process-dom v (-drop-before dv umin))) s))))
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (let [umin (-lb du)
+                  vmax (-ub dv)]
+              ((composeg*
+                 (process-dom u (-keep-before du (inc vmax)))
+                 (process-dom v (-drop-before dv umin))) s)))
+          IEntailed
+          (-entailed? [_]
+            (and du dv (interval-<= du dv)))
+          IRunnable
+          (-runnable? [_]
+            (and du dv)))))
     IConstraintOp
-    (rator [_] `<=)
-    (rands [_] [u v])
-    IRelevant
-    (-relevant? [this s]
-      (let-dom s [u du v dv]
-        (if (and du dv)
-         (not (interval-<= du dv))
-         true)))
-    IRunnable
-    (runnable? [this s]
-      (let-dom s [u du v dv]
-        (and du dv)))
+    (-rator [_] `<=)
+    (-rands [_] [u v])
     IConstraintWatchedStores
-    (watched-stores [this]
+    (-watched-stores [this]
       #{::l/subst ::l/fd})))
 
 (defn <=
@@ -857,47 +856,45 @@
 (defn +c [u v w]
   (reify 
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
+    IConstraintStep
+    (-step [this s]
       (let-dom s [u du v dv w dw]
-        (let [[wmin wmax] (if dw
-                            (bounds dw)
-                            [(core/+ (-lb du) (-lb dv)) (core/+ (-ub du) (-ub dv))])
-               [umin umax] (if du
-                            (bounds du)
-                            [(core/- (-lb dw) (-ub dv)) (core/- (-ub dw) (-lb dv))])
-               [vmin vmax] (if dv
-                            (bounds dv)
-                            [(core/- (-lb dw) (-ub du)) (core/- (-ub dw) (-lb du))])]
-          ((composeg*
-            (process-dom w (interval (core/+ umin vmin) (core/+ umax vmax)))
-            (process-dom u (interval (core/- wmin vmax) (core/- wmax vmin)))
-            (process-dom v (interval (core/- wmin umax) (core/- wmax umin)))
-            (+c-guard u v w))
-           s))))
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (let [[wmin wmax] (if dw
+                                (bounds dw)
+                                [(core/+ (-lb du) (-lb dv)) (core/+ (-ub du) (-ub dv))])
+                  [umin umax] (if du
+                                (bounds du)
+                                [(core/- (-lb dw) (-ub dv)) (core/- (-ub dw) (-lb dv))])
+                  [vmin vmax] (if dv
+                                (bounds dv)
+                                [(core/- (-lb dw) (-ub du)) (core/- (-ub dw) (-lb du))])]
+              ((composeg*
+                 (process-dom w (interval (core/+ umin vmin) (core/+ umax vmax)))
+                 (process-dom u (interval (core/- wmin vmax) (core/- wmax vmin)))
+                 (process-dom v (interval (core/- wmin umax) (core/- wmax umin)))
+                 (+c-guard u v w))
+                s)))
+          IEntailed
+          (-entailed? [_]
+            (and (singleton-dom? du)
+                 (singleton-dom? dv)
+                 (singleton-dom? dw)
+                 (= (core/+ du dv) dw)))
+          IRunnable
+          (-runnable? [_]
+            (cond
+              du (or dv dw)
+              dv (or du dw)
+              dw (or du dv)
+              :else false)))))
     IConstraintOp
-    (rator [_] `+)
-    (rands [_] [u v w])
-    IRelevant
-    (-relevant? [this s]
-      (let-dom s [u du v dv w dw]
-        (cond
-         (not (singleton-dom? du)) true
-         (not (singleton-dom? dv)) true
-         (not (singleton-dom? dw)) true
-         :else (not= (core/+ du dv) dw))))
-    IRunnable
-    (runnable? [this s]
-      ;; we want to run even if w doesn't have a domain
-      ;; this is to support eqfd
-      (let-dom s [u du v dv w dw]
-        (cond
-          du (or dv dw)
-          dv (or du dw)
-          dw (or du dv)
-          :else false)))
+    (-rator [_] `+)
+    (-rands [_] [u v w])
     IConstraintWatchedStores
-    (watched-stores [this]
+    (-watched-stores [this]
       #{::l/subst ::l/fd})))
 
 (defn +
@@ -933,53 +930,51 @@
                   :upper q))))]
    (reify
      IEnforceableConstraint
-     clojure.lang.IFn
-     (invoke [this s]
+     IConstraintStep
+     (-step [this s]
        (let-dom s [u du v dv w dw]
-         (let [[wmin wmax] (if dw
-                             (bounds dw)
-                             [(core/* (-lb du) (-lb dv)) (core/* (-ub du) (-ub dv))])
-                [umin umax] (if du
-                             (bounds du)
-                             [(safe-div (-ub dv) (-lb dw) (-lb dw) :lower)
-                              (safe-div (-lb dv) (-lb dw) (-ub dw) :upper)])
-                [vmin vmax] (if dv
-                             (bounds dv)
-                             [(safe-div (-ub du) (-lb dw) (-lb dw) :lower)
-                              (safe-div (-lb du) (-lb dw) (-ub dw) :upper)])
-               wi (interval (core/* umin vmin) (core/* umax vmax))
-               ui (interval (safe-div vmax umin wmin :lower)
-                            (safe-div vmin umax wmax :upper))
-               vi (interval (safe-div umax vmin wmin :lower)
-                            (safe-div umin vmax wmax :upper))]
-           ((composeg*
-             (process-dom w wi)
-             (process-dom u ui)
-             (process-dom v vi)
-             (*c-guard u v w)) s))))
+         (reify
+           clojure.lang.IFn
+           (invoke [_ s]
+             (let [[wmin wmax] (if dw
+                                 (bounds dw)
+                                 [(core/* (-lb du) (-lb dv)) (core/* (-ub du) (-ub dv))])
+                   [umin umax] (if du
+                                 (bounds du)
+                                 [(safe-div (-ub dv) (-lb dw) (-lb dw) :lower)
+                                  (safe-div (-lb dv) (-lb dw) (-ub dw) :upper)])
+                   [vmin vmax] (if dv
+                                 (bounds dv)
+                                 [(safe-div (-ub du) (-lb dw) (-lb dw) :lower)
+                                  (safe-div (-lb du) (-lb dw) (-ub dw) :upper)])
+                    wi (interval (core/* umin vmin) (core/* umax vmax))
+                    ui (interval (safe-div vmax umin wmin :lower)
+                         (safe-div vmin umax wmax :upper))
+                    vi (interval (safe-div umax vmin wmin :lower)
+                         (safe-div umin vmax wmax :upper))]
+               ((composeg*
+                  (process-dom w wi)
+                  (process-dom u ui)
+                  (process-dom v vi)
+                  (*c-guard u v w)) s)))
+           IEntailed
+           (-entailed? [_]
+             (and (singleton-dom? du)
+                  (singleton-dom? dv)
+                  (singleton-dom? dw)
+                  (= (core/* du dv) dw)))
+           IRunnable
+           (-runnable? [_]
+             (cond
+               du (or dv dw)
+               dv (or du dw)
+               dw (or du dv)
+               :else false)))))
      IConstraintOp
-     (rator [_] `*)
-     (rands [_] [u v w])
-     IRelevant
-     (-relevant? [this s]
-       (let-dom s [u du v dv w dw]
-         (cond
-          (not (singleton-dom? du)) true
-          (not (singleton-dom? dv)) true
-          (not (singleton-dom? dw)) true
-          :else (not= (core/* du dv) dw))))
-     IRunnable
-     (runnable? [this s]
-       ;; we want to run even if w doesn't have a domain
-       ;; this is to support eqfd
-       (let-dom s [u du v dv w dw]
-         (cond
-           du (or dv dw)
-           dv (or du dw)
-           dw (or du dv)
-          :else false)))
+     (-rator [_] `*)
+     (-rands [_] [u v w])
      IConstraintWatchedStores
-     (watched-stores [this]
+     (-watched-stores [this]
        #{::l/subst ::l/fd}))))
 
 (defn *
@@ -1003,35 +998,36 @@
   [x y* n*]
   (reify
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
+    IConstraintStep
+    (-step [this s]
       (let [x (walk s x)]
-        (when-not (n* x)
-          (loop [y* (seq y*) s s]
-            (if y*
-              (let [y (first y*)
-                    ;; NOTE: we can't just get-dom because get-dom
-                    ;; return nil, walk returns the var - David
-                    v (or (get-dom s y) (walk s y))
-                    s (if-not (lvar? v)
-                        (cond
-                          (= x v) nil
-                          (-member? v x) ((process-dom y (-difference v x)) s)
-                          :else s)
-                        s)]
-                (when s
-                  (recur (next y*) s)))
-              ((remcg this) s))))))
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (when-not (n* x)
+              (loop [y* (seq y*) s s]
+                (if y*
+                  (let [y (first y*)
+                        ;; NOTE: we can't just get-dom because get-dom
+                        ;; return nil, walk returns the var - David
+                        v (or (get-dom s y) (walk s y))
+                        s (if-not (lvar? v)
+                            (cond
+                              (= x v) nil
+                              (-member? v x) ((process-dom y (-difference v x)) s)
+                              :else s)
+                            s)]
+                    (when s
+                      (recur (next y*) s)))
+                  ((remcg this) s)))))
+          IRunnable
+          (-runnable? [_]
+            (singleton-dom? x)))))
     IConstraintOp
-    (rator [_] `-distinct)
-    (rands [_] [x])
-    IRunnable
-    (runnable? [this s]
-      ;; we can only run if x is is bound to
-      ;; a single value
-      (singleton-dom? (walk s x)))
+    (-rator [_] `-distinct)
+    (-rands [_] [x])
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst})))
+    (-watched-stores [this] #{::l/subst})))
 
 (defn -distinct [x y* n*]
   (cgoal (-distinctc x y* n*)))
@@ -1056,29 +1052,31 @@
   [v*]
   (reify
     IEnforceableConstraint
-    clojure.lang.IFn
-    (invoke [this s]
-      (let [v* (walk s v*)
-            {x* true n* false} (group-by lvar? v*)
-            n* (sort core/< n*)]
-        (when (list-sorted? core/< n*)
-          (let [x* (into #{} x*)
-                n* (into (sorted-set) n*)]
-            (loop [xs (seq x*) s s]
-              (if xs
-                (let [x (first xs)]
-                  (when-let [s ((-distinct x (disj x* x) n*) s)]
-                    (recur (next xs) s)))
-                ((remcg this) s)))))))
-    IConstraintOp
-    (rator [_] `distinct)
-    (rands [_] [v*])
-    IRunnable
-    (runnable? [this s]
+    IConstraintStep
+    (-step [this s]
       (let [v* (walk s v*)]
-        (not (lvar? v*))))
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            (let [{x* true n* false} (group-by lvar? v*)
+                  n* (sort core/< n*)]
+              (when (list-sorted? core/< n*)
+                (let [x* (into #{} x*)
+                       n* (into (sorted-set) n*)]
+                  (loop [xs (seq x*) s s]
+                    (if xs
+                      (let [x (first xs)]
+                        (when-let [s ((-distinct x (disj x* x) n*) s)]
+                          (recur (next xs) s)))
+                      ((remcg this) s)))))))
+          IRunnable
+          (-runnable? [_]
+            (not (lvar? v*))))))
+    IConstraintOp
+    (-rator [_] `distinct)
+    (-rands [_] [v*])
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst})))
+    (-watched-stores [this] #{::l/subst})))
 
 (defn distinct
   "A finite domain constraint that will guarantee that 
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index e24c3eb1..6f572977 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -143,56 +143,51 @@
 
 (declare tie? hash)
 
-(defn- -hash
-  [a x]
+(defn- -hash [a x]
   (reify
     Object
     (toString [_]
       (str a "#" x))
-    clojure.lang.IFn
-    (invoke [c s]
-      ((composeg*
-         (remcg c)
-         (fn [s]
-           (let [a (walk s a)
-                 x (walk s x)]
-             (cond
-               (and (lvar? a) (lvar? x) (= x a))
-               nil
-               (and (nom? a) (nom? x) (= x a))
-               nil
-               (and (not (lvar? a)) (not (nom? a)))
-               nil
-               (and (nom? a) (tie? x) (= (:binding-nom x) a))
-               s
-               (and (tree-term? x) (or (not (tie? x)) (nom? a)))
-               ((constrain-tree x
-                  (fn [t s] ((hash a t) s))) s)
-               :else
-               s)))) s))
+    IConstraintStep
+    (-step [this s]
+      (let [a (walk s a)
+            x (walk s x)]
+        (reify
+          clojure.lang.IFn
+          (invoke [_ s]
+            ((composeg*
+               (remcg this)
+               (fn [s]
+                 (cond
+                   (and (lvar? a) (lvar? x) (= x a)) nil
+                   (and (nom? a) (nom? x) (= x a)) nil
+                   (and (not (lvar? a)) (not (nom? a))) nil
+                   (and (nom? a) (tie? x) (= (:binding-nom x) a)) s
+                   (and (tree-term? x)
+                        (or (not (tie? x)) (nom? a)))
+                     ((constrain-tree x
+                        (fn [t s] ((hash a t) s))) s)
+                   :else s))) s))
+          IRunnable
+          (-runnable? [_]
+            (if (lvar? a)
+              (or (and (lvar? x) (= x a))
+                  (and (tree-term? x) (not (tie? x))))
+              (or (not (nom? a))
+                  (not (lvar? x))))))))
     IConstraintOp
-    (rator [_] `hash)
-    (rands [_] [a x])
+    (-rator [_] `hash)
+    (-rands [_] [a x])
     IReifiableConstraint
-    (reifyc [_ v r s]
+    (-reifyc [_ v r s]
       (let [x (walk* r (walk* s x))
             a (walk* r (walk* s a))]
         ;; Filter constraints unrelated to reified variables.
         (when (and (symbol? a) (empty? (->> (list x) flatten (filter lvar?))))
           (symbol (str a "#" x)))))
-    IRunnable
-    (runnable? [_ s]
-      (let [a (walk s a)
-            x (walk s x)]
-        (if (lvar? a)
-          (or
-           (and (lvar? x) (= x a))
-           (and (tree-term? x) (not (tie? x))))
-          (or
-           (not (nom? a))
-           (not (lvar? x))))))
+    
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst})))
+    (-watched-stores [this] #{::l/subst})))
 
 (defn hash [a t]
   (cgoal (-hash a t)))
@@ -201,48 +196,51 @@
 ;; Suspensions as constraints
 
 (defn- -do-suspc [t1 t2 swap a]
-  (when (loop [vs #{t2} seen #{}]
-          (let [vs (clojure.set/difference vs seen)]
-            (cond
-              (empty? vs)
-              true
-              (some #(occurs-check a % t1) vs)
-              false
-              :else
-              (recur
-                (reduce (fn [s0 s1] (clojure.set/union s0 (:eset (root-val a s1)))) #{} vs)
-                (clojure.set/union vs seen)))))
-    (let [[t1 a] (swap-noms t1 swap a)]
-      ((== t1 t2) a))))
-
-(defn -suspc
-  [v1 v2 swap]
+  (let [x (loop [vs #{t2} seen #{}]
+            (let [vs (clojure.set/difference vs seen)]
+              (cond
+                (empty? vs) true
+                (some #(occurs-check a % t1) vs) false
+                :else (recur
+                        (reduce
+                          (fn [s0 s1]
+                            (clojure.set/union s0 (:eset (root-val a s1))))
+                          #{} vs)
+                        (clojure.set/union vs seen)))))]
+    (when x
+      (let [[t1 a] (swap-noms t1 swap a)]
+        ((== t1 t2) a)))))
+
+(defn -suspc [v1 v2 swap]
   (reify
     Object
     (toString [_]
       (str "suspc" v1 v2 swap))
-    clojure.lang.IFn
-    (invoke [c a]
-      ((composeg*
-        (remcg c)
-        (fn [a]
-          (let [t1 (walk a v1)
-                t2 (walk a v2)]
-            (cond
-              (not (lvar? t1))
-              (-do-suspc t1 t2 swap a)
-              (not (lvar? t2))
-              (-do-suspc t2 t1 swap a)
-              :else ;; (= t1 t2)
-              (loop [a* swap
-                     a a]
-                (if (empty? a*) a
-                  (recur (rest a*) ((hash (first a*) t2) a)))))))) a))
+    IConstraintStep
+    (-step [this a]
+      (let [t1 (walk a v1)
+            t2 (walk a v2)]
+        (reify
+          clojure.lang.IFn
+          (invoke [_ a]
+            ((composeg*
+               (remcg this)
+               (fn [a]
+                 (cond
+                   (not (lvar? t1)) (-do-suspc t1 t2 swap a)
+                   (not (lvar? t2)) (-do-suspc t2 t1 swap a)
+                   :else ;; (= t1 t2)
+                   (loop [a* swap a a]
+                     (if (empty? a*) a
+                       (recur (rest a*) ((hash (first a*) t2) a))))))) a))
+          IRunnable
+          (-runnable? [_]
+            (or (not (lvar? t1)) (not (lvar? t2)) (= t1 t2))))))
     IConstraintOp
-    (rator [_] `suspc)
-    (rands [_] [v1 v2])
+    (-rator [_] `suspc)
+    (-rands [_] [v1 v2])
     IReifiableConstraint
-    (reifyc [c v r a]
+    (-reifyc [c v r a]
       (let [t1 (walk* r (walk* a v1))
             t2 (walk* r (walk* a v2))
             swap (walk* r swap)]
@@ -252,13 +250,8 @@
                 (symbol? (first swap))
                 (symbol? (second swap)))
           `(~'swap ~swap ~t1 ~t2))))
-    IRunnable
-    (runnable? [_ a]
-      (let [t1 (walk a v1)
-            t2 (walk a v2)]
-        (or (not (lvar? t1)) (not (lvar? t2)) (= t1 t2))))
     IConstraintWatchedStores
-    (watched-stores [this] #{::l/subst})))
+    (-watched-stores [this] #{::l/subst})))
 
 (defn suspc [v1 v2 swap]
   (cgoal (-suspc v1 v2 swap)))
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index ec0c1f67..d80ef334 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -130,14 +130,29 @@
 ;; -----------------------------------------------------------------------------
 ;; Generic constraint protocols
 
+;; Step, update the constraint with latest domain information
+
+(defprotocol IConstraintStep
+  (-step [c s]))
+
+;; the following assume implementation of -step
+
 (defprotocol IRunnable
-  (runnable? [c s]))
+  (-runnable? [c]))
+
+(defprotocol IEntailed
+  (-entailed? [c]))
+
+(defprotocol IEntailedVar
+  (-entailed-var? [c x]))
+
+;; Contraint reflection protocols
 
 (defprotocol IWithConstraintId
-  (-with-id [this id]))
+  (-with-id [c id]))
 
 (defprotocol IConstraintId
-  (-id [this]))
+  (-id [c]))
 
 (defn id [c]
   (if (instance? clojure.core.logic.protocols.IConstraintId c)
@@ -150,20 +165,14 @@
     (vary-meta c assoc ::id id)))
 
 (defprotocol IConstraintWatchedStores
-  (watched-stores [this]))
+  (-watched-stores [c]))
 
 (defprotocol IConstraintOp
-  (rator [this])
-  (rands [this]))
-
-(defprotocol IRelevant
-  (-relevant? [this s]))
-
-(defprotocol IRelevantVar
-  (-relevant-var? [this x]))
+  (-rator [c])
+  (-rands [c]))
 
 (defprotocol IReifiableConstraint
-  (reifyc [this v r a]))
+  (-reifyc [c v r a]))
 
 (defn reifiable? [x]
   (instance? clojure.core.logic.protocols.IReifiableConstraint x))
@@ -173,14 +182,18 @@
 (defn enforceable? [x]
   (instance? clojure.core.logic.protocols.IEnforceableConstraint x))
 
+;; cgoal
+
 (defprotocol IUnwrapConstraint
-  (unwrap [c]))
+  (-unwrap [c]))
+
+;; generic domain related protocols
 
 (defprotocol IMergeDomains
   (-merge-doms [a b]))
 
 (defprotocol IMemberCount
-  (member-count [this]))
+  (-member-count [dom]))
 
 (defprotocol IForceAnswerTerm
   (-force-ans [v x]))
@@ -189,7 +202,7 @@
 ;; Tree Constraints
 
 (defprotocol IDisunifyTerms
-  (disunify-terms [u v s cs]))
+  (-disunify-terms [u v s cs]))
 
 (definterface ITreeConstraint)
 
@@ -197,10 +210,10 @@
   (instance? clojure.core.logic.protocols.ITreeConstraint x))
 
 (defprotocol IPrefix
-  (prefix [this]))
+  (-prefix [c]))
 
 (defprotocol IWithPrefix
-  (with-prefix [this p]))
+  (-with-prefix [c p]))
 
 ;; -----------------------------------------------------------------------------
 ;; Partial Maps
diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index 00b982e7..222d0345 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -71,13 +71,13 @@
 (defn queue-constraint [s c vs]
   (cond
     (vector? vs)
-    (queue s (unwrap (apply c (map #(lvar % false) vs))))
+    (queue s (-unwrap (apply c (map #(lvar % false) vs))))
 
     (set? vs)
-    (reduce (fn [s v] (queue s (unwrap (c (lvar v false))))) s vs)
+    (reduce (fn [s v] (queue s (-unwrap (c (lvar v false))))) s vs)
 
     (symbol? vs)
-    (queue s (unwrap (apply c (map #(lvar % false) (list vs)))))
+    (queue s (-unwrap (apply c (map #(lvar % false) (list vs)))))
 
     :else
     (throw
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index b1e47bda..9c650b72 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2204,37 +2204,45 @@
 (deftest test-make-fdc-prim-1
   (let [u (lvar 'u)
         w (lvar 'w)
-        c (fd/==c u w)]
+        c (fd/==c u w)
+        c' (-step c empty-s)]
     (is (= (var-rands empty-s c)
            [u w]))
-    (is (= (rator c)
+    (is (= (-rator c)
            'clojure.core.logic.fd/==))
-    (is (not (runnable? c empty-s)))
-    (is (relevant? c empty-s))))
+    (is (not (-runnable? c')))
+    (is (not (-entailed? c')))))
 
 (deftest test-make-fdc-prim-2
   (let [u (lvar 'u)
         v 1
         w (lvar 'w)
-        c (fd/+c u v w)]
+        c (fd/+c u v w)
+        c' (-step c empty-s)]
     (is (= (var-rands empty-s c)
            [u w]))
-    (is (= (rator c)
+    (is (= (-rator c)
            'clojure.core.logic.fd/+))
-    (is (not (runnable? c empty-s)))
-    (is (relevant? c empty-s))))
+    (is (not (-runnable? c')))
+    (is (not (-entailed? c')))))
+
+(deftest test-entailed-1
+  (let [c (fd/+c 1 2 3)
+        c' (-step c empty-s)]
+    (is (true? (-entailed? c')))))
 
 (deftest test-make-fdc-1
   (let [u (lvar 'u)
         v 1
         w (lvar 'w)
-        c (fd/+c u v w)]
+        c (fd/+c u v w)
+        c' (-step c empty-s)]
     (is (= (var-rands empty-s c)
            [u w]))
-    (is (= (rator c)
+    (is (= (-rator c)
            `fd/+))
-    (is (not (runnable? c empty-s)))
-    (is (relevant? c empty-s))))
+    (is (not (-runnable? c')))
+    (is (not (-entailed? c')))))
 
 (deftest test-addc-1
   (let [u (lvar 'u)
@@ -2716,15 +2724,15 @@
   (let [x (lvar 'x)
         y (lvar 'y)
         c (!=c (list (pair x 1) (pair y 2)))
-        c (with-prefix c (list (pair x 1)))]
-    (is (= (prefix c)
+        c (-with-prefix c (list (pair x 1)))]
+    (is (= (-prefix c)
            (list (pair x 1))))))
 
 (deftest test-!=-1 []
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x y) empty-s)]
-    (is (= (prefix ((:cm (:cs s)) 0)) {x y}))))
+    (is (= (-prefix ((:cm (:cs s)) 0)) {x y}))))
 
 (deftest test-!=-2 []
   (let [x (lvar 'x)
@@ -2768,7 +2776,7 @@
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x 1) empty-s)]
-    (is (= (prefix ((:cm (:cs s)) 0)) {x 1}))))
+    (is (= (-prefix ((:cm (:cs s)) 0)) {x 1}))))
 
 #_(deftest test-normalize-store []
   (let [x (lvar 'x)

From eef3217be1ab366b807a62ddebc417c0801a9b3c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 19 Apr 2013 20:06:32 -0400
Subject: [PATCH 120/288] refactor to minizime calls to `get-dom` in FD code

---
 src/main/clojure/clojure/core/logic/fd.clj    | 117 ++++++++----------
 src/test/clojure/clojure/core/logic/tests.clj |   4 +-
 2 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 7dff857b..9aba4940 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -592,9 +592,8 @@
     x))
 
 (defn ext-dom-fd
-  [a x dom]
-  (let [domp (get-dom a x)
-        a    (add-dom a x ::l/fd dom)]
+  [a x dom domp]
+  (let [a (add-dom a x ::l/fd dom)]
     (if (not= domp dom)
       ((run-constraints* [x] (:cs a) ::l/fd) a)
       a)))
@@ -603,31 +602,24 @@
   (integer? x))
 
 (defn resolve-storable-dom
-  [a x dom]
+  [a x dom domp]
   (if (singleton-dom? dom)
     (let [xv (walk a x)]
       (if (lvar? xv)
         (ext-run-cs (rem-dom a x ::l/fd) x dom)
         a))
-    (ext-dom-fd a x dom)))
-
-(defn update-var-dom
-  [a x dom]
-  (let [domp (get-dom a x)]
-    (if domp
-      (let [i (-intersection dom domp)]
-        (when i
-          (resolve-storable-dom a x i)))
-      (resolve-storable-dom a x dom))))
+    (ext-dom-fd a x dom domp)))
 
 (defn process-dom
   "If x is a var we update its domain. If it's an integer
-   we check that it's a member of the given domain."
-  [x dom]
+   we check that it's a member of the given domain. dom is
+   then new domain, it should have already been calculated from
+   domp which was the previous domain."
+  [x dom domp]
   (fn [a]
     (when dom
       (cond
-       (lvar? x) (update-var-dom a x dom)
+       (lvar? x) (resolve-storable-dom a x dom domp)
        (-member? dom x) a
        :else nil))))
 
@@ -637,12 +629,16 @@
   "Assign a var x a domain."
   [x dom]
   (fn [a]
-    ((composeg
-      (process-dom x dom)
-      (if (and (nil? (get-dom a x))
-               (not (singleton-dom? dom)))
-        (domc x)
-        identity)) a)))
+    (let [domp (get-dom a x)
+          dom  (if domp
+                 (-intersection dom domp)
+                 dom)]
+      ((composeg
+         (process-dom x dom domp)
+         (if (and (nil? domp)
+                  (not (singleton-dom? dom)))
+           (domc x)
+           identity)) a))))
 
 (defmacro in
   "Assign vars to domain. The domain must come last."
@@ -728,8 +724,8 @@
           (invoke [_ s]
             (let [i (-intersection du dv)]
               ((composeg
-                 (process-dom u i)
-                 (process-dom v i)) s)))
+                 (process-dom u i du)
+                 (process-dom v i dv)) s)))
           IEntailed
           (-entailed? [_]
             (and (singleton-dom? du)
@@ -766,9 +762,9 @@
                 (and su? sv? (= du dv)) nil
                 (-disjoint? du dv) s
                 su? (when-let [vdiff (-difference dv du)]
-                      ((process-dom v vdiff) s))
+                      ((process-dom v vdiff dv) s))
                 :else (when-let [udiff (-difference du dv)]
-                        ((process-dom u udiff) s))))
+                        ((process-dom u udiff du) s))))
             IEntailed
             (-entailed? [_]
               (and du dv (-disjoint? du dv)))
@@ -800,8 +796,8 @@
             (let [umin (-lb du)
                   vmax (-ub dv)]
               ((composeg*
-                 (process-dom u (-keep-before du (inc vmax)))
-                 (process-dom v (-drop-before dv umin))) s)))
+                 (process-dom u (-keep-before du (inc vmax)) du)
+                 (process-dom v (-drop-before dv umin) dv)) s)))
           IEntailed
           (-entailed? [_]
             (and du dv (interval-<= du dv)))
@@ -845,14 +841,6 @@
 ;; the constraint in the body again which were trying to get
 ;; away from
 
-(defn +c-guard [u v w]
-  (fn [s]
-    (let-dom s [u du v dv w dw]
-      (if (every? singleton-dom? [du dv dw])
-        (when (= (core/+ du dv) dw)
-          s)
-        s))))
-
 (defn +c [u v w]
   (reify 
     IEnforceableConstraint
@@ -870,13 +858,20 @@
                                 [(core/- (-lb dw) (-ub dv)) (core/- (-ub dw) (-lb dv))])
                   [vmin vmax] (if dv
                                 (bounds dv)
-                                [(core/- (-lb dw) (-ub du)) (core/- (-ub dw) (-lb du))])]
-              ((composeg*
-                 (process-dom w (interval (core/+ umin vmin) (core/+ umax vmax)))
-                 (process-dom u (interval (core/- wmin vmax) (core/- wmax vmin)))
-                 (process-dom v (interval (core/- wmin umax) (core/- wmax umin)))
-                 (+c-guard u v w))
-                s)))
+                                [(core/- (-lb dw) (-ub du)) (core/- (-ub dw) (-lb du))])
+                  wi (interval (core/+ umin vmin) (core/+ umax vmax))
+                  ui (interval (core/- wmin vmax) (core/- wmax vmin))
+                  vi (interval (core/- wmin umax) (core/- wmax umin))]
+              (when-let [wi (if (and wi dw) (-intersection wi dw) wi)]
+                (when-let [ui (if (and ui du) (-intersection ui du) ui)]
+                  (when-let [vi (if (and vi dv) (-intersection vi dv) vi)]
+                    (when (or (not (every? singleton-dom? [wi ui vi]))
+                              (core/= (core/+ ui vi) wi))
+                      ((composeg*
+                         (process-dom w wi dw)
+                         (process-dom u ui du)
+                         (process-dom v vi dv))
+                        s)))))))
           IEntailed
           (-entailed? [_]
             (and (singleton-dom? du)
@@ -910,14 +905,6 @@
 ;; TODO NOW: we run into trouble with division this is why
 ;; simplefd in bench.clj needs map-sum when it should not
 
-(defn *c-guard [u v w]
-  (fn [s]
-    (let-dom s [u du v dv w dw]
-      (if (every? singleton-dom? [du dv dw])
-        (when (= (core/* du dv) dw)
-          s)
-        s))))
-
 (defn *c [u v w]
   (letfn [(safe-div [n c a t]
             (if (zero? n)
@@ -947,16 +934,20 @@
                                  (bounds dv)
                                  [(safe-div (-ub du) (-lb dw) (-lb dw) :lower)
                                   (safe-div (-lb du) (-lb dw) (-ub dw) :upper)])
-                    wi (interval (core/* umin vmin) (core/* umax vmax))
-                    ui (interval (safe-div vmax umin wmin :lower)
-                         (safe-div vmin umax wmax :upper))
-                    vi (interval (safe-div umax vmin wmin :lower)
-                         (safe-div umin vmax wmax :upper))]
-               ((composeg*
-                  (process-dom w wi)
-                  (process-dom u ui)
-                  (process-dom v vi)
-                  (*c-guard u v w)) s)))
+                   wi (interval (core/* umin vmin) (core/* umax vmax))
+                   ui (interval (safe-div vmax umin wmin :lower)
+                                (safe-div vmin umax wmax :upper))
+                   vi (interval (safe-div umax vmin wmin :lower)
+                                (safe-div umin vmax wmax :upper))]
+               (when-let [wi (if (and wi dw) (-intersection wi dw) wi)]
+                 (when-let [ui (if (and ui du) (-intersection ui du) ui)]
+                   (when-let [vi (if (and vi dv) (-intersection vi dv) vi)]
+                     (when (or (not (every? singleton-dom? [wi ui vi]))
+                               (core/= (core/* ui vi) wi))
+                       ((composeg*
+                          (process-dom w wi dw)
+                          (process-dom u ui du)
+                          (process-dom v vi dv)) s)))))))
            IEntailed
            (-entailed? [_]
              (and (singleton-dom? du)
@@ -1014,7 +1005,7 @@
                         s (if-not (lvar? v)
                             (cond
                               (= x v) nil
-                              (-member? v x) ((process-dom y (-difference v x)) s)
+                              (-member? v x) ((process-dom y (-difference v x) v) s)
                               :else s)
                             s)]
                     (when s
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 9c650b72..54b55ad5 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2180,12 +2180,12 @@
 
 (deftest test-process-dom-1
   (let [x (lvar 'x)
-        s ((fd/process-dom x 1) empty-s)]
+        s ((fd/process-dom x 1 1) empty-s)]
     (is (= (walk s x) 1))))
 
 (deftest test-process-dom-2
   (let [x (lvar 'x)
-        s ((fd/process-dom x (fd/interval 1 10)) empty-s)]
+        s ((fd/process-dom x (fd/interval 1 10) (fd/interval 1 10)) empty-s)]
     (is (= (fd/get-dom s x) (fd/interval 1 10)))))
 
 (deftest test-dom-1

From 0eb9be6f0bd1e705eedb11a9bae9af99336d59cf Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 19 Apr 2013 22:52:08 -0400
Subject: [PATCH 121/288] document perf improvements. Approaching 0.8.0 alpha
 performance on sudoku if we avoid distribution step for the easy ones.

---
 src/main/clojure/clojure/core/logic/bench.clj | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 4aa06a56..623722ed 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -343,7 +343,7 @@
 
   (time (cryptarithfd-1))
 
-  ;; ~1200ms, a little bit slower w/ distribute step
+  ;; ~1050ms, a little bit slower w/ distribute step
   (dotimes [_ 5]
     (time
      (dotimes [_ 100] 
@@ -356,7 +356,7 @@
        (doall (cryptarithfd-1)))))
 
   ;; WORKS: takes a long time ([5 2 6 4 8 1 9 7 3 0])
-  ;; 1.9s now
+  ;; ~1.3s now
   (dotimes [_ 5]
     (time (doall (cryptarithfd-2))))
   )
@@ -430,7 +430,7 @@
 (comment
   (time (doall (dinesmanfd)))
   ;; close to 2X faster than Petite Chez
-  ;; ~2800ms
+  ;; ~1942ms
   (dotimes [_ 5]
     (time
      (dotimes [_ 1000]
@@ -539,7 +539,7 @@
 (comment
   (time (doall (matches 40)))
 
-  ;; ~7500-8000ms
+  ;; ~6.3s
   (dotimes [_ 5]
     (time
      (dotimes [_ 1000]
@@ -585,7 +585,7 @@
             sq1 sq2 sq3 sq4])))))
 
 (comment
-  ;; 2100ms
+  ;; 1.9s
   (dotimes [_ 10]
     (time
      (dotimes [_ 1e3] 
@@ -630,7 +630,7 @@
         sqs  (->squares rows)]
     (run-nc 1 [q]
       (== q vars)
-      (distribute q ::l/ff)
+      ;;(distribute q ::l/ff)
       (everyg #(fd/in % (fd/domain 1 2 3 4 5 6 7 8 9)) vars)
       (init vars hints)
       (everyg fd/distinct rows)
@@ -704,13 +704,13 @@
 
   (-> (sudokufd easy0) first verify)
 
-  ;; ~1600ms
+  ;; ~900ms w/o distribute
   (dotimes [_ 5]
     (time
      (dotimes [_ 100]
        (doall (sudokufd easy0)))))
 
-  ;; ~2800ms
+  ;; ~1000ms w/o distribute
   (dotimes [_ 5]
     (time
      (dotimes [_ 100]
@@ -730,10 +730,8 @@
      0 0 0  0 0 0  0 0 0
      0 0 0  0 0 0  0 0 0])
 
-  ;; ~14.2s
-  ;; this one behaves very badly w/ distribute
-  ;; it would be very interesting to determine why
-  (time (sudokufd hard0))
+  ;; ~5.2s w/o distribute
+  (time (doall (sudokufd hard0)))
 
   (-> (sudokufd hard0) first verify)
 
@@ -757,12 +755,12 @@
      0 5 0  1 0 0  0 0 0])
 
   ;; ~50ms
-  (time (sudokufd hard1))
+  (time (doall (sudokufd hard1)))
 
   (-> (sudokufd hard1) first verify)
 
-  ;; 3-3.4s seconds w/o distribute
-  ;; < 400ms w/ distribute, 10X faster
+  ;; ~2.5 seconds w/o distribute
+  ;; < 260ms w/ distribute, nearly 10X faster
   (dotimes [_ 5]
     (time
      (dotimes [_ 10]
@@ -782,7 +780,7 @@
      0 0 7  0 0 0  0 0 5
      0 0 0  0 0 0  0 9 8])
 
-  ;; 1.2s w/ distribute
+  ;; ~.9s w/ distribute
   (time (doall (sudokufd hard2)))
 
   (-> (sudokufd hard2) first print-solution)
@@ -804,11 +802,13 @@
      0 0 0  0 0 0  0 0 5
      0 3 4  0 9 0  7 1 0])
 
-  ;; ~2700ms
+  ;; ~13ms w/o distribute
+  ;; ~18ms w/ distribute
   (dotimes [_ 5]
     (time
       (dotimes [_ 100]
-        (doall (sudokufd ciao))))))
+        (doall (sudokufd ciao)))))
+  )
 
 ;; From "Finite Domain Constraint Programming in Oz. A Tutorial" pg 22
 
@@ -840,7 +840,7 @@
         (< c9 c8)))
     (safefd))
 
-  ;; 2300ms
+  ;; ~2300ms
   (dotimes [_ 5]
     (time
       (dotimes [_ 100] 
@@ -891,11 +891,13 @@
       (everyg #(magic-sum % lsum) lines))))
 
 (comment
+  ;; ~420ms
   (dotimes [_ 5]
     (time
       (dotimes [_ 10]
         (doall (take 1 (magic 3))))))
 
+  ;; ~670ms
   (dotimes [_ 5]
     (time
       (dotimes [_ 1]

From 647b777c84b71614e928cc4c0e8c6d6c09bf4ffc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 22 Apr 2013 09:40:27 -0400
Subject: [PATCH 122/288] add JaCoP sudoku example

---
 src/main/clojure/clojure/core/logic/bench.clj | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 4aa06a56..86d50cfd 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -808,7 +808,27 @@
   (dotimes [_ 5]
     (time
       (dotimes [_ 100]
-        (doall (sudokufd ciao))))))
+        (doall (sudokufd ciao)))))
+
+  (def jacop
+    [0 1 0  4 2 0  0 0 5 
+     0 0 2  0 7 1  0 3 9  
+     0 0 0  0 0 0  0 4 0 
+          
+     2 0 7  1 0 0  0 0 6  
+     0 0 0  0 4 0  0 0 0 
+     6 0 0  0 0 7  4 0 3  
+          
+     0 7 0  0 0 0  0 0 0 
+     1 2 0  7 3 0  5 0 0  
+     3 0 0  0 8 2  0 7 0])
+
+  ;; 400ms
+  (dotimes [_ 5]
+    (time
+      (dotimes [_ 10]
+        (doall (sudokufd jacop)))))
+  )
 
 ;; From "Finite Domain Constraint Programming in Oz. A Tutorial" pg 22
 

From 6d1780d48085725e5b19f991bea2baae4409ad0e Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 5 May 2013 20:15:55 -0400
Subject: [PATCH 123/288] fix `unify-with-pmap*` implementation

---
 src/main/clojure/clojure/core/logic.clj | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 2d301274..a6f2208a 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2577,14 +2577,10 @@
   (loop [ks (keys u) s s]
     (if (seq ks)
       (let [kf (first ks)
-            vf (get v kf ::not-found)
-            uf (get u kf)]
+            vf (get v kf ::not-found)]
         (if (= vf ::not-found)
-          (if (= uf ::not-found)
-            (recur (next ks) s)
-            nil)
-          (if (= uf ::not-found)
-            nil
+          nil
+          (let [uf (get u kf)]
             (if-let [s (unify s uf vf)]
               (recur (next ks) s)
               nil))))

From 30fcd69dd4c9ca86b3a73c3f6b5866d6b943ddff Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 5 May 2013 20:32:30 -0400
Subject: [PATCH 124/288] LOGIC-132: "PMap is non-storable" exception when
 using featurec with nested feature map.

The recursive `featurec` support was a bit naive. `unify-with-pmap*`
nows handles the various cases properly.
---
 src/main/clojure/clojure/core/logic.clj       | 23 +++++++--------
 src/test/clojure/clojure/core/logic/tests.clj | 29 +++++++++++++++++++
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index a6f2208a..75962674 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2573,6 +2573,8 @@
 ;; =============================================================================
 ;; Partial Maps
 
+(declare featurec partial-map)
+
 (defn unify-with-pmap* [u v s]
   (loop [ks (keys u) s s]
     (if (seq ks)
@@ -2581,9 +2583,14 @@
         (if (= vf ::not-found)
           nil
           (let [uf (get u kf)]
-            (if-let [s (unify s uf vf)]
-              (recur (next ks) s)
-              nil))))
+            (if (lvar? vf)
+              (recur (next ks) ((featurec vf uf) s))
+              (if (map? uf)
+                (if-let [s (unify s (partial-map uf) vf)]
+                  (recur (next ks) s))
+                (if-let [s (unify s uf vf)]
+                  (recur (next ks) s)
+                  nil))))))
       s)))
 
 (declare partial-map?)
@@ -2644,21 +2651,13 @@
     IConstraintWatchedStores
     (-watched-stores [this] #{::subst})))
 
-(defn ->feature [x]
-  (-feature
-    (walk-term x
-      (fn [y]
-        (if (tree-term? y)
-          (->feature y)
-          y)))))
-
 (defn featurec
   "Ensure that a map contains at least the key-value pairs
   in the map fs. fs must be partially instantiated - that is, 
   it may contain values which are logic variables to support 
   feature extraction."
   [x fs]
-  (cgoal (-featurec x (->feature fs))))
+  (cgoal (-featurec x (partial-map fs))))
 
 ;; =============================================================================
 ;; defnc
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 54b55ad5..68024182 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1741,10 +1741,22 @@
            (featurec x {:foo {:bar y}})
            (== x {:foo {:bar 1}}))
         '([{:foo {:bar 1}} 1])))
+  (is (= (run* [x y]
+           (== x {:foo {:bar 1}})
+           (featurec x {:foo {:bar y}}))
+        '([{:foo {:bar 1}} 1])))
   (is (= (run* [x y]
            (featurec x {:foo {:bar y}})
            (== x {:foo {:bar 1 :woz 2}}))
         '([{:foo {:bar 1 :woz 2}} 1])))
+  (is (= (run* [x y]
+           (== x {:foo {:bar 1 :woz 2}})
+           (featurec x {:foo {:bar y}}))
+        '([{:foo {:bar 1 :woz 2}} 1])))
+  (is (= (run* [x y]
+           (== x {:foo {:baz 1}})
+           (featurec x {:foo {:bar y}}))
+        '()))
   (is (= (run* [x y]
            (featurec x {:foo {:bar y}})
            (== x {:foo {:baz 1}}))
@@ -1810,6 +1822,23 @@
              (fd/in x y z (fd/interval 0 9))))
          '([6 3]))))
 
+(deftest test-logic-132-recursive-featurec
+  (is (= (run* [x y]
+           (featurec x {:a {:b 1}})
+           (== y {:b 1})
+           (== x {:a y}))
+        '([{:a {:b 1}} {:b 1}])))
+  (is (= (run* [x y]
+           (featurec x {:a {:b 1}})
+           (== x {:a y})
+           (== y {:b 1}))
+        '([{:a {:b 1}} {:b 1}])))
+  (is (= (run* [x y]
+           (== x {:a y})
+           (== y {:b 1})
+           (featurec x {:a {:b 1}}))
+        '([{:a {:b 1}} {:b 1}]))))
+
 ;; =============================================================================
 ;; cKanren
 

From 773989ab4732987253b3fed0233e222fa675d3bc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 5 May 2013 22:42:57 -0400
Subject: [PATCH 125/288] bump nrepl

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 26ec4f95..8f2b0f67 100644
--- a/project.clj
+++ b/project.clj
@@ -18,7 +18,7 @@
   :dependencies [[org.clojure/clojure "1.5.1"]
                  [org.clojure/clojurescript "0.0-1586"]
                  [org.clojure/tools.macro "0.1.1"]
-                 [org.clojure/tools.nrepl "0.2.1"]
+                 [org.clojure/tools.nrepl "0.2.2"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
 
   :plugins [[lein-cljsbuild "0.3.0"]]

From 5d03e6500c29e8ad8e254ae59255834894aa82e3 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 6 May 2013 09:08:51 -0400
Subject: [PATCH 126/288] update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f60be42..c91d981b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>0.0.25</version>
+    <version>0.1.2</version>
   </parent>
 
   <developers>

From a35c8eebfff90515796ea734ba81e3f5db041b5c Mon Sep 17 00:00:00 2001
From: Austin Haas <austin@pettomato.com>
Date: Tue, 7 May 2013 15:07:47 -0700
Subject: [PATCH 127/288] Update membero to use disequality constraints. This
 can break code that depends upon what is considered a flaw in the previous
 version.

Before: (run* [q] (membero q [1 1 1])) ;; => '(1 1 1)
 After: (run* [q] (membero q [1 1 1])) ;; => '(1)
---
 src/main/clojure/clojure/core/logic.clj       |  5 +++-
 src/test/clojure/clojure/core/logic/tests.clj | 23 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 75962674..80c2d5e5 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1665,11 +1665,14 @@
 ;; =============================================================================
 ;; More convenient goals
 
-(defne membero 
+(declare !=)
+
+(defne membero
   "A relation where l is a collection, such that l contains x"
   [x l]
   ([_ [x . tail]])
   ([_ [head . tail]]
+     (!= x head)
      (membero x tail)))
 
 (defne appendo 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 68024182..349fc8d0 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -614,13 +614,16 @@
 (deftest membero-2
   (is (= (into #{}
            (run* [q]
-             (all
-              (== q [(lvar) (lvar)])
-              (membero ['foo (lvar)] q)
-              (membero [(lvar) 'bar] q))))
-         (into #{}
-           '([[foo bar] _0] [[foo _0] [_1 bar]]
-               [[_0 bar] [foo _1]] [_0 [foo bar]])))))
+             (membero q [1 2 3])))
+         #{1 2 3})))
+
+(deftest membero-3
+  ;; Note that membero only returns a single value in this case. The
+  ;; old membero, defined without disequality constraints, would have
+  ;; returned (1 1 1 1 1).
+  (is (= (run* [q]
+           (membero q [1 1 1 1 1]))
+         '(1))))
 
 ;; -----------------------------------------------------------------------------
 ;; rembero
@@ -1712,7 +1715,11 @@
     (== [:amaya (lvar) (lvar) (lvar)] s)
     (membero s answers)))
 
-(deftest test-116-constraint-store-migrate
+;; The following test has been disabled because it fails with the new
+;; version of membero, but that isn't due to any defect in
+;; membero. The test needs to be rewritten.
+
+#_(deftest test-116-constraint-store-migrate
   (is (= (first
            (run 1 [answers]
              (rule-0 answers)

From cc30fcb4f5690e928fa7103e5091b9de8aba0013 Mon Sep 17 00:00:00 2001
From: Austin Haas <austin@pettomato.com>
Date: Tue, 7 May 2013 12:07:21 -0700
Subject: [PATCH 128/288] Improved docstrings for lvaro and nonlvaro. Fixes
 LOGIC-131.

---
 src/main/clojure/clojure/core/logic.clj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 80c2d5e5..7bed3cd0 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1390,14 +1390,16 @@
 ;; lvar nonlvar
 
 (defmacro lvaro
-  "Goal to test whether a logic var is ground. Non-relational."
+  "A goal that succeeds if the argument is fresh. v must be a logic
+  variable. Non-relational."
   [v]
   `(fn [a#]
      (if (lvar? (walk a# ~v))
        a# nil)))
 
 (defmacro nonlvaro
-  "Goal to test whether a logic var is ground. Non-relational."
+  "A goal that succeeds if the argument is not fresh. v must be a
+  logic variable. Non-relational."
   [v]
   `(fn [a#]
      (if (not (lvar? (walk a# ~v)))

From 0a8b619880c7cbea4cf8e9a280cbd5bdb413a12c Mon Sep 17 00:00:00 2001
From: Austin Haas <austin@pettomato.com>
Date: Tue, 7 May 2013 13:19:55 -0700
Subject: [PATCH 129/288] Never wrap first item to Choice in a list. Fixes
 LOGIC-134.

---
 src/main/clojure/clojure/core/logic.clj | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 7bed3cd0..9a0a25bc 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1057,8 +1057,6 @@
   ITake
   (take* [this] this))
 
-;; TODO: Choice always holds a as a list, can we just remove that?
-
 (deftype Choice [a f]
   clojure.lang.ILookup
   (valAt [this k]
@@ -1075,7 +1073,7 @@
     (Choice. a (fn [] (mplus (fp) f))))
   ITake
   (take* [this]
-    (lazy-seq (cons (first a) (lazy-seq (take* f))))))
+    (lazy-seq (cons a (lazy-seq (take* f))))))
 
 (defn choice [a f]
   (Choice. a f))
@@ -1349,7 +1347,6 @@
   (ifu [b gs c]
     (-inc (ifu (b) gs c)))
 
-  ;; TODO: Choice always holds a as a list, can we just remove that?
   Choice
   (ifu [b gs c]
     (reduce bind (:a b) gs)))
@@ -2288,8 +2285,8 @@
                  (filter #(not (nil? %)))
                  (into #{}))]
     (if (empty? rcs)
-      (choice (list v) empty-f)
-      (choice (list `(~v :- ~@rcs)) empty-f))))
+      (choice v empty-f)
+      (choice `(~v :- ~@rcs) empty-f))))
 
 (defn reifyg [x]
   (all
@@ -2298,7 +2295,7 @@
      (let [v (walk* a x)
            r (-reify* (with-meta empty-s (meta a)) v)]
        (if (zero? (count r))
-         (choice (list v) empty-f)
+         (choice v empty-f)
          (let [v (walk* r v)]
            (reify-constraints v r a)))))))
 

From 9763469be8db38709e8d02d9d904e1144d47d0b0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 9 May 2013 09:57:19 -0400
Subject: [PATCH 130/288] `membero` disequality change significantly slowed
 down its performance. Instead revert `membero` and provide a new goal
 `member1o` that uses disequality.

---
 src/main/clojure/clojure/core/logic.clj       | 15 ++++++++++++---
 src/test/clojure/clojure/core/logic/tests.clj |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 9a0a25bc..e3d2234e 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1667,12 +1667,21 @@
 (declare !=)
 
 (defne membero
-  "A relation where l is a collection, such that l contains x"
+  "A relation where l is a collection, such that l contains x."
   [x l]
   ([_ [x . tail]])
   ([_ [head . tail]]
-     (!= x head)
-     (membero x tail)))
+    (membero x tail)))
+
+(defne member1o
+  "Like membero but uses to disequality further constraining
+   the results. For example, if x and l are ground and x occurs 
+   multiple times in l, member1o will succeed only once."
+  [x l]
+  ([_ [x . tail]])
+  ([_ [head . tail]]
+    (!= x head)
+    (member1o x tail)))
 
 (defne appendo 
   "A relation where x, y, and z are proper collections, 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 349fc8d0..9de7322e 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -622,7 +622,7 @@
   ;; old membero, defined without disequality constraints, would have
   ;; returned (1 1 1 1 1).
   (is (= (run* [q]
-           (membero q [1 1 1 1 1]))
+           (member1o q [1 1 1 1 1]))
          '(1))))
 
 ;; -----------------------------------------------------------------------------

From ae9a40ecdae268975b7d210d47cb574653ad69d2 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 10 May 2013 12:11:38 -0400
Subject: [PATCH 131/288] ammend `conso` docstring

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index e3d2234e..f4de377d 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1588,7 +1588,7 @@
 
 (defn conso
   "A relation where l is a collection, such that a is the first of l 
-  and d is the rest of l"
+  and d is the rest of l. If ground d must be bound to a proper tail."
   [a d l]
   (== (lcons a d) l))
 

From 994a7a34664d4a5790ba75f0816d27f1cc3bf6cc Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 11 May 2013 13:28:10 -0400
Subject: [PATCH 132/288] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71d5d514..f8e200d1 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,6 @@ Developer information
 Copyright and license
 ----
 
-Copyright © 2010-2012 David Nolen, Rich Hickey & contributors.
+Copyright © 2010-2013 David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).

From f176ca1100f46032025d885faefe08940182c456 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 11 May 2013 18:04:39 -0400
Subject: [PATCH 133/288] bump cljs

---
 project.clj | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/project.clj b/project.clj
index 8f2b0f67..b469d3ae 100644
--- a/project.clj
+++ b/project.clj
@@ -2,23 +2,15 @@
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 
-  ;; lein 1
-  :source-path "src/main/clojure"
-  :test-path "src/test/clojure"
-  :dev-dependencies [[lein-cljsbuild "0.2.9"]]
-  ; :extra-classpath-dirs ["checkouts/clojurescript/src/clj"
-  ;                        "checkouts/clojurescript/src/cljs"]
-
-  ;; lein 2
   :source-paths ["src/main/clojure"
                  ;"clojurescript/src/clj"
                  ;"clojurescript/src/cljs"
                  ]
   :test-paths ["src/test/clojure"]
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-1586"]
+                 [org.clojure/clojurescript "0.0-1806"]
                  [org.clojure/tools.macro "0.1.1"]
-                 [org.clojure/tools.nrepl "0.2.2"]
+                 [org.clojure/tools.nrepl "0.2.3"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
 
   :plugins [[lein-cljsbuild "0.3.0"]]

From 94eab54faa33122f952f19bf2f30364b8723c354 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 16 May 2013 12:25:18 -0400
Subject: [PATCH 134/288] Added new experimental constraint - negation as
 failure

---
 src/main/clojure/clojure/core/logic.clj       | 30 ++++++++++
 src/test/clojure/clojure/core/logic/tests.clj | 59 +++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index f4de377d..eb6ca609 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2775,6 +2775,36 @@
   ([x p pform]
      (cgoal (-predc x p pform))))
 
+;; =============================================================================
+;; Negation as failure
+
+(defn -nafc
+  ([c args]
+    (reify
+      IConstraintStep
+      (-step [this s]
+        (reify
+           clojure.lang.IFn
+           (invoke [_ s]
+             (when-not ((apply c args) s)
+               ((remcg this) s)))
+           IRunnable
+           (-runnable? [_]
+             (every? #(ground-term? % s) args))))
+      IConstraintOp
+      (-rator [_]
+        `nafc)
+      (-rands [_]
+        (vec (concat [c] args)))
+      IReifiableConstraint
+      (-reifyc [_ v r s]
+        `(nafc ~c ~@(-reify s args r)))
+      IConstraintWatchedStores
+      (-watched-stores [this] #{::subst}))))
+
+(defn nafc [c & args]
+  (cgoal (-nafc c args)))
+
 ;; =============================================================================
 ;; Deep Constraint
 
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 9de7322e..0623d516 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3161,6 +3161,65 @@
              (== x {:foo 1})))
          '(1))))
 
+;; =============================================================================
+;; Negation as failure
+
+(deftest test-naf-1
+  (is (= (into #{}
+           (run* [q]
+             (membero q '(a b c))
+             (nafc == q 'b)))
+          (into #{} '(a c))))
+  (is (= (into #{}
+           (run* [q]
+             (nafc == q 'b)
+             (membero q '(a b c))))
+         (into #{} '(a c)))))
+
+(deftest test-naf-2
+  (is (= (into #{}
+           (run* [x y]
+             (fd/in x y (fd/interval 1 5))
+             (fd/< x y)
+             (nafc fd/+ x y 5)))
+         (into #{}
+           (for [x (range 1 6)
+                 y (range 1 6)
+                 :when (and (< x y)
+                            (not (= (+ x y) 5)))]
+             [x y]))))
+  (is (= (into #{}
+           (run* [x y]
+             (nafc fd/+ x y 5)
+             (fd/< x y)
+             (fd/in x y (fd/interval 1 5))))
+         (into #{}
+           (for [x (range 1 6)
+                 y (range 1 6)
+                 :when (and (< x y)
+                            (not (= (+ x y) 5)))]
+             [x y])))))
+
+(deftest test-naf-3
+  (is (= (into #{}
+           (run* [q]
+             (fresh [x]
+               (membero q [:a x :c])
+               (nafc == q :b))))
+        (into #{} [:a ['_0 :- ['clojure.core.logic/nafc == '_0 :b]] :c]))))
+
+(deftest test-naf-4
+  (is (= (run* [q]
+           (fresh [x]
+             (== x {:bar 1})
+             (nafc featurec x {:foo 1})))
+        '(_0)))
+  (is (= (run* [q]
+           (fresh [x]
+             (== x {:foo 1})
+             (nafc featurec x {:foo 1})))
+        '())))
+
 ;; =============================================================================
 ;; Deep Constraints
 

From 39419867f7204f49956502828778bd3f7fd671c9 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 16 May 2013 12:33:02 -0400
Subject: [PATCH 135/288] cleanup tests

---
 src/test/clojure/clojure/core/logic/tests.clj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 0623d516..98e43cd5 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3169,12 +3169,12 @@
            (run* [q]
              (membero q '(a b c))
              (nafc == q 'b)))
-          (into #{} '(a c))))
+        '#{a c}))
   (is (= (into #{}
            (run* [q]
              (nafc == q 'b)
              (membero q '(a b c))))
-         (into #{} '(a c)))))
+        '#{a c})))
 
 (deftest test-naf-2
   (is (= (into #{}
@@ -3206,7 +3206,7 @@
              (fresh [x]
                (membero q [:a x :c])
                (nafc == q :b))))
-        (into #{} [:a ['_0 :- ['clojure.core.logic/nafc == '_0 :b]] :c]))))
+        #{:a :c ['_0 :- ['clojure.core.logic/nafc == '_0 :b]]})))
 
 (deftest test-naf-4
   (is (= (run* [q]

From b19ae2421f6ec8dc9d321f636d23e4873f5aa3a9 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 17 May 2013 09:46:05 -0400
Subject: [PATCH 136/288] fix bug in `nafc` implementation. We must force
 scheduling thunks to determine if we have a real answer - unit, choice, or
 mzero. add test cases illustrating membero and a negated membero.

---
 src/main/clojure/clojure/core/logic.clj       |  8 +++++++-
 src/test/clojure/clojure/core/logic/tests.clj | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index eb6ca609..499706c2 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2778,6 +2778,12 @@
 ;; =============================================================================
 ;; Negation as failure
 
+(defn tramp [f]
+  (loop [f f]
+    (if (fn? f)
+      (recur (f))
+      f)))
+
 (defn -nafc
   ([c args]
     (reify
@@ -2786,7 +2792,7 @@
         (reify
            clojure.lang.IFn
            (invoke [_ s]
-             (when-not ((apply c args) s)
+             (when-not (tramp ((apply c args) s))
                ((remcg this) s)))
            IRunnable
            (-runnable? [_]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 98e43cd5..e44f4931 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3220,6 +3220,16 @@
              (nafc featurec x {:foo 1})))
         '())))
 
+(deftest test-naf-5
+  (is (= (run* [q]
+           (membero q '(:a :b :c :d))
+           (nafc membero q '(:a :b :c)))
+         '(:d)))
+  (is (= (run* [q]
+           (nafc membero q '(:a :b :c))
+           (membero q '(:a :b :c :d)))
+         '(:d))))
+
 ;; =============================================================================
 ;; Deep Constraints
 

From 5afeace2761eeb6731cf558bed354607e5401631 Mon Sep 17 00:00:00 2001
From: Gary Fredericks <fredericksgary@gmail.com>
Date: Sat, 8 Jun 2013 15:27:07 -0500
Subject: [PATCH 137/288] Optimize map-sum so we don't OOM when there are lots
 of options

Using conde for domains on lots of logic vars can result in
exponential memory usage due to conde's interleaving (which is itself
caused by conde wrapping its result in -inc). This commit changes
map-sum such that it should be equivalent to the old version without
the -inc. This should be a valid change since the unification goals
should not diverge.
---
 src/main/clojure/clojure/core/logic/fd.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 9aba4940..637a9790 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -656,9 +656,11 @@
   (fn loop [ls]
     (if (empty? ls)
       (fn [a] nil)
-      (conde
-        [(f (first ls))]
-        [(loop (rest ls))]))))
+      (fn [a]
+        (mplus
+         ((f (first ls)) a)
+         (fn []
+           ((loop (rest ls)) a)))))))
 
 (defn to-vals [dom]
   (letfn [(to-vals* [is]

From 0d1d545f0a81c585c7449aecb5d661120f3da568 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Jun 2013 20:57:08 -0400
Subject: [PATCH 138/288] huge improvement on Norvig's hardest Sudoku, update
 bench.clj. add OOM tests.

---
 src/main/clojure/clojure/core/logic/bench.clj |  2 +-
 src/test/clojure/clojure/core/logic/tests.clj | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index bb192e5e..0b6e8a1f 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -737,7 +737,7 @@
 
   (dotimes [_ 5]
     (time
-     (dotimes [_ 1]
+     (dotimes [_ 100]
        (doall (sudokufd hard0)))))
 
   ;; from GeCode test suite
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index e44f4931..76d68f63 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1846,6 +1846,27 @@
            (featurec x {:a {:b 1}}))
         '([{:a {:b 1}} {:b 1}]))))
 
+(deftest test-137-oom
+  (is (= (let [vs (repeatedly 20 l/lvar)]
+           (first
+             (run 1 [q]
+               (== q vs)
+               (everyg (fn [v] (fd/in v (fd/interval 1 2))) vs))))
+          (take 20 (repeat 1))))
+  (is (= (first
+           (run 1 [q]
+             (fresh [x1 x2 x3 x4 x5 x6 x7 x8 x9
+                     x10 x11 x12 x13 x14 x15
+                     x16 x17 x18 x19 x20]
+               (== q [x1 x2 x3 x4 x5 x6 x7 x8 x9
+                      x10 x11 x12 x13 x14 x15
+                      x16 x17 x18 x19 x20])
+               (fd/in x1 x2 x3 x4 x5 x6 x7 x8 x9
+                      x10 x11 x12 x13 x14 x15
+                      x16 x17 x18 x19 x20
+                 (fd/interval 1 2)))))
+          (take 20 (repeat 1)))))
+
 ;; =============================================================================
 ;; cKanren
 

From a64ed2f3447bca78bb6f53244db5d5379ecd55f1 Mon Sep 17 00:00:00 2001
From: Stanislas Nanchen <stan@hood.ch>
Date: Mon, 6 May 2013 10:34:23 +0200
Subject: [PATCH 139/288] LOGIC-80: add macros fnm, fne, fna, fnu for anynomous
 goals functions.

---
 src/main/clojure/cljs/core/logic/macros.clj   | 41 +++++++++++++++----
 src/main/clojure/clojure/core/logic.clj       | 41 +++++++++++++++----
 src/test/clojure/clojure/core/logic/tests.clj | 22 ++++++++--
 3 files changed, 87 insertions(+), 17 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index be2f5e05..9c0d1885 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -362,16 +362,33 @@
 (defn env-locals [& syms]
   (disj (set (apply concat syms)) '_))
 
+(defmacro -fnm [fn-gen t as & cs]
+  (binding [*locals* (env-locals as (keys &env))]
+     `(~fn-gen [~@as] ~(handle-clauses t as cs))))
+
+(defmacro fnm
+   {:arglists '([t as tabled? & cs])}
+   [t as & cs]
+  (if-let [cs (and (= (first cs) :tabled) (rest cs))]
+    `(-fnm tabled ~t ~as ~@cs)
+    `(-fnm fn ~t ~as ~@cs)))
+
 (defmacro defnm [t n & rest]
-  (let [[n [as & cs]] (name-with-attributes n rest)]
-    (binding [*locals* (env-locals as (-> &env :locals keys))]
-     (if-let [tabled? (-> n meta :tabled)]
-       `(def ~n (tabled [~@as] ~(handle-clauses t as cs)))
-       `(defn ~n [~@as] ~(handle-clauses t as cs))))))
+  (let [[n [as & cs]] (name-with-attributes n rest)
+        e (if (-> n meta :tabled)
+            `(fnm ~t ~as :tabled ~@cs)
+            `(fnm ~t ~as ~@cs))]
+    `(def ~n ~e)))
 
 ;; =============================================================================
 ;; Goal sugar syntax
 
+(defmacro fne
+  "Define an anonymous goal fn. Supports pattern matching. All
+   patterns will be tried. See conde."
+  [& rest]
+  `(fnm conde ~@rest))
+
 (defmacro defne
   "Define a goal fn. Supports pattern matching. All
    patterns will be tried. See conde."
@@ -386,11 +403,21 @@
     (handle-clauses `conde xs cs)))
 
 ;; -----------------------------------------------------------------------------
-;; defnu, defna, matcha, matchu
+;; fnu, fna, defnu, defna, matcha, matchu
 
-;; TODO: we need to rethink defna and defnu, the unification comes first
+;; TODO: we need to rethink (de)fna and (de)fnu, the unification comes first
 ;; the *question* should come first
 
+(defmacro fna
+  "Define an anonymous soft cut goal. See conda."
+  [& rest]
+  `(fnm conda ~@rest))
+
+(defmacro fnu
+  "Define an anonymous committed choice goal. See condu."
+  [& rest]
+  `(fnm condu ~@rest))
+
 (defmacro defna
   "Define a soft cut goal. See conda."
   [& rest]
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 499706c2..d8da926b 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1566,12 +1566,23 @@
 (defn env-locals [& syms]
   (disj (set (apply concat syms)) '_))
 
+(defmacro -fnm [fn-gen t as & cs]
+  (binding [*locals* (env-locals as (keys &env))]
+     `(~fn-gen [~@as] ~(handle-clauses t as cs))))
+
+(defmacro fnm
+   {:arglists '([t as tabled? & cs])}
+   [t as & cs]
+  (if-let [cs (and (= (first cs) :tabled) (rest cs))]
+    `(-fnm tabled ~t ~as ~@cs)
+    `(-fnm fn ~t ~as ~@cs)))
+
 (defmacro defnm [t n & rest]
-  (let [[n [as & cs]] (name-with-attributes n rest)]
-    (binding [*locals* (env-locals as (keys &env))]
-     (if-let [tabled? (-> n meta :tabled)]
-       `(def ~n (tabled [~@as] ~(handle-clauses t as cs)))
-       `(defn ~n [~@as] ~(handle-clauses t as cs))))))
+  (let [[n [as & cs]] (name-with-attributes n rest)
+        e (if (-> n meta :tabled)
+            `(fnm ~t ~as :tabled ~@cs)
+            `(fnm ~t ~as ~@cs))]
+    `(def ~n ~e)))
 
 ;; =============================================================================
 ;; Useful goals
@@ -1620,6 +1631,12 @@
 ;; =============================================================================
 ;; Goal sugar syntax
 
+(defmacro fne
+  "Define an anonymous goal fn. Supports pattern matching. All
+   patterns will be tried. See conde."
+  [& rest]
+  `(fnm conde ~@rest))
+
 (defmacro defne
   "Define a goal fn. Supports pattern matching. All
    patterns will be tried. See conde."
@@ -1634,11 +1651,21 @@
     (handle-clauses `conde xs cs)))
 
 ;; -----------------------------------------------------------------------------
-;; defnu, defna, matcha, matchu
+;; fnu, fna, defnu, defna, matcha, matchu
 
-;; TODO: we need to rethink defna and defnu, the unification comes first
+;; TODO: we need to rethink (de)fna and (de)fnu, the unification comes first
 ;; the *question* should come first
 
+(defmacro fna
+  "Define an anonymous soft cut goal. See conda."
+  [& rest]
+  `(fnm conda ~@rest))
+
+(defmacro fnu
+  "Define an anonymous committed choice goal. See condu."
+  [& rest]
+  `(fnm condu ~@rest))
+
 (defmacro defna
   "Define a soft cut goal. See conda."
   [& rest]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 76d68f63..5c2e6b2d 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1395,10 +1395,26 @@
 (defne pm4 [x y]
   ([[h . t] t]))
 
+(defn -test-pm [test-msg rel1 rel2 rel3]
+  (testing test-msg
+    (is (= (run* [q] (fresh [x y] (== q [x y]) (rel1 x y))) '([:foo :bar])))
+    (is (= (run* [q] (fresh [x y] (rel2 x y) (== x y))) '(_0)))
+    (is (= (run* [q] (rel3 '(1 2) q)) '((2))))))
+
 (deftest test-pm []
-  (is (= (run* [q] (fresh [x y] (== q [x y]) (pm1 x y))) '([:foo :bar])))
-  (is (= (run* [q] (fresh [x y] (pm2 x y) (== x y))) '(_0)))
-  (is (= (run* [q] (pm4 '(1 2) q)) '((2)))))
+  (-test-pm "pattern matching with defne relations" pm1 pm2 pm4))
+
+(deftest test-pm-anonymous []
+  (-test-pm "pattern matching with anonymous fne relations"
+    (fne [x y] ([:foo :bar]))
+    (fne [x y] ([_ x]))
+    (fne [x y] ([[h . t] t]))))
+
+(deftest test-pm-anonymous-tabled []
+  (-test-pm "pattern matching with tabled anonymous fne relations"
+    (fne [x y] :tabled ([:foo :bar]))
+    (fne [x y] :tabled ([_ x]))
+    (fne [x y] :tabled ([[h . t] t]))))
 
 (defne form->ast1 [form ast]
   (['(fn ~args . ~body) {:op :fn :args args :body body}]))

From 721c68b05332914b9af56921f0a42a7729b98bd3 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 19 Jun 2013 10:46:40 -0400
Subject: [PATCH 140/288] explicit JVM opts

---
 project.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project.clj b/project.clj
index b469d3ae..2e079d7b 100644
--- a/project.clj
+++ b/project.clj
@@ -2,6 +2,8 @@
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 
+  :jvm-opts ^:replace ["-Xmx512m" "-server"]
+
   :source-paths ["src/main/clojure"
                  ;"clojurescript/src/clj"
                  ;"clojurescript/src/cljs"

From 9aa25cd8f0cc7c53242b8040014693dd09863ef9 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 21 Jun 2013 18:00:23 -0400
Subject: [PATCH 141/288] bump cljsbuild

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2e079d7b..b09a403e 100644
--- a/project.clj
+++ b/project.clj
@@ -15,7 +15,7 @@
                  [org.clojure/tools.nrepl "0.2.3"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
 
-  :plugins [[lein-cljsbuild "0.3.0"]]
+  :plugins [[lein-cljsbuild "0.3.2"]]
 
   :cljsbuild
   {:builds

From 19e592ea8273b02a694e2e55b5e5321870dafad8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 27 Jun 2013 23:22:42 -0400
Subject: [PATCH 142/288] bump CLJS

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b09a403e..aa117256 100644
--- a/project.clj
+++ b/project.clj
@@ -10,7 +10,7 @@
                  ]
   :test-paths ["src/test/clojure"]
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-1806"]
+                 [org.clojure/clojurescript "0.0-1835"]
                  [org.clojure/tools.macro "0.1.1"]
                  [org.clojure/tools.nrepl "0.2.3"]
                  [com.datomic/datomic-free "0.8.3551" :scope "provided"]]

From d00d58685764a68d4e7c6d8294ac200786c83a7e Mon Sep 17 00:00:00 2001
From: Norman Richards <orb@nostacktrace.com>
Date: Tue, 25 Jun 2013 19:38:31 -0500
Subject: [PATCH 143/288] fix unification on relations

---
 src/main/clojure/clojure/core/logic.clj       | 2 +-
 src/test/clojure/clojure/core/logic/tests.clj | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index d8da926b..b934f737 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1879,7 +1879,7 @@
                      (to-stream
                       (->> set#
                            (map (fn [cand#]
-                                  (when-let [~'a (clojure.core.logic/unify ~'a [~@as] cand#)]
+                                  (when-let [~'a ((== [~@as] cand#) ~'a)]
                                     ~'a)))))))))))))
 
 ;; TODO: Should probably happen in a transaction
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 5c2e6b2d..14214dab 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1160,6 +1160,13 @@
              (== [e a v] out)))
         '())))
 
+(deftest test-to-stream
+  ;; LOGIC-139
+  (let [answers
+        (run* [q] (fresh [x] (!= x 'Bob) (man x)))]
+    (is (= 2 (count answers)))
+    (is (every? symbol? answers))))
+
 ;; -----------------------------------------------------------------------------
 ;; nil in collection
 

From 5637bbfb03a5c1bc8a3a408844540471581c0851 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 28 Aug 2013 10:03:49 -0400
Subject: [PATCH 144/288] 0.8.4

---
 CHANGES.md  | 21 +++++++++++++++++++++
 README.md   |  6 +++---
 project.clj |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e7eae2ab..66ab7d63 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,24 @@
+From 0.8.3 to 0.8.4
+====
+
+Fixes
+----
+* Allow fd/in to appear in any position
+* LOGIC-127: nom-swapping now preserves vectors and maps
+* LOGIC-132: proper recursive featurec
+* LOGIC-139: fix unification on relations
+
+Changes
+----
+* membero now uses disequality constraint
+* docstring enhancements
+
+Enhancments
+----
+* Add experimental negation as failure constraint, nafc
+* Fix potential OOM when search over finite domains
+* Add anonymous goal constructors, fne, fna, fnu
+
 From 0.8.2 to 0.8.3
 ====
 
diff --git a/README.md b/README.md
index f8e200d1..09c73c8c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.3
+Latest stable release: 0.8.4
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.3
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.3"]
+[org.clojure/core.logic "0.8.4"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.3
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index aa117256..a2e711d3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.4-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.5-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From 42c8446dadf2b930d5fff4b88cf36ccde371931f Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Wed, 28 Aug 2013 09:05:08 -0500
Subject: [PATCH 145/288] [maven-release-plugin] prepare release
 core.logic-0.8.4

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c91d981b..6a67b69f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.4-SNAPSHOT</version>
+  <version>0.8.4</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -32,5 +32,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
+    <tag>core.logic-0.8.4</tag>
   </scm>
 </project>

From b37e9b2ef2bff92f9641e0a6cd397dd168420f36 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Wed, 28 Aug 2013 09:05:08 -0500
Subject: [PATCH 146/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a67b69f..ac397763 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.4</version>
+  <version>0.8.5-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -32,6 +32,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.4</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From cef96134f0e2309a331cce0743447176bf49821f Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 10 Sep 2013 02:05:52 -0400
Subject: [PATCH 147/288] docstring for nafc

---
 src/main/clojure/clojure/core/logic.clj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index b934f737..6d4a14f6 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2835,7 +2835,11 @@
       IConstraintWatchedStores
       (-watched-stores [this] #{::subst}))))
 
-(defn nafc [c & args]
+(defn nafc
+  "EXPERIMENTAL: negation as failure constraint. All arguments to the goal c
+   must be ground. If some argument is not ground the execution of this constraint
+   will be delayed."
+  [c & args]
   (cgoal (-nafc c args)))
 
 ;; =============================================================================

From 6bb507d33f87675bb942eb3854744f75a8d7671a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 11 Oct 2013 09:44:43 -0400
Subject: [PATCH 148/288] perf tweaks

---
 src/main/clojure/clojure/core/logic.clj | 58 ++++++++++++++-----------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 6d4a14f6..f8da9d47 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -221,8 +221,8 @@
 (defn unify [s u v]
   (if (identical? u v)
     s
-    (let [u  (walk s u)
-          v  (walk s v)]
+    (let [u (walk s u)
+          v (walk s v)]
       ;; TODO: we can't use an identical? check here at the moment
       ;; because we add metadata on vars in walk - David
       (if (and (lvar? u) (= u v))
@@ -349,7 +349,7 @@
           (not (bindable? vp))
           (if (subst-val? vp)
             (let [sv (:v vp)]
-              (if (= sv ::unbound)
+              (if (identical? sv ::unbound)
                 (with-meta v (assoc (meta vp) ::unbound true))
                 sv))
             vp)
@@ -546,7 +546,7 @@
       (if doms
         (let [[dom domv] (first doms)]
           (let [xdomv (get xdoms dom ::not-found)
-                ndomv (if (= xdomv ::not-found)
+                ndomv (if (identical? xdomv ::not-found)
                         domv
                         (-merge-doms domv xdomv))]
             (when ndomv
@@ -603,7 +603,7 @@
 ;; =============================================================================
 ;; Logic Variables
 
-(deftype LVar [name oname hash meta]
+(deftype LVar [id unique name oname hash meta]
   IVar
   clojure.lang.ILookup
   (valAt [this k]
@@ -612,20 +612,24 @@
     (case k
       :name name
       :oname oname
+      :id id
       not-found))
 
   clojure.lang.IObj
   (meta [this]
     meta)
   (withMeta [this new-meta]
-    (LVar. name oname hash new-meta))
+    (LVar. id unique name oname hash new-meta))
 
   Object
   (toString [_] (str "<lvar:" name ">"))
 
   (equals [this o]
-    (and (instance? IVar o)
-      (identical? name (:name o))))
+    (if (instance? IVar o)
+      (if unique
+        (identical? id (:id o))
+        (identical? name (:name o)))
+      false))
 
   (hashCode [_] hash)
 
@@ -685,16 +689,20 @@
 
 (defn lvar
   ([]
-     (let [name (str (. clojure.lang.RT (nextID)))]
-       (LVar. name nil (.hashCode name) nil)))
+     (let [id (. clojure.lang.RT (nextID))
+           name (str id)]
+       (LVar. id true name nil (.hashCode name) nil)))
   ([name]
      (lvar name true))
-  ([name gensym]
+  ([name unique]
      (let [oname name
-           name (if gensym
-                  (str name "__" (. clojure.lang.RT (nextID)))
+           id   (if unique
+                  (. clojure.lang.RT (nextID))
+                  name)
+           name (if unique
+                  (str name "__" id)
                   (str name))]
-       (LVar. name oname (.hashCode name) nil))))
+       (LVar. id unique name oname (.hashCode name) nil))))
 
 (defmethod print-method LVar [x ^Writer writer]
   (.write writer (str "<lvar:" (:name x) ">")))
@@ -707,7 +715,7 @@
 
 (defn bindable? [x]
   (or (lvar? x)
-    (instance? IBindable x)))
+      (instance? IBindable x)))
 
 ;; =============================================================================
 ;; LCons
@@ -771,7 +779,7 @@
                 :else (= me you))))))
 
   (hashCode [this]
-    (if (= cache -1)
+    (if (clojure.core/== cache -1)
       (do
         (set! cache (uai (umi (int 31) (clojure.lang.Util/hash d))
                          (clojure.lang.Util/hash a)))
@@ -782,8 +790,8 @@
   (unify-terms [u v s]
     (cond
       (sequential? v)
-      (loop [u u v v s s]
-        (if (seq v)
+      (loop [u u v (seq v) s s]
+        (if-not (nil? v)
           (if (lcons? u)
             (if-let [s (unify s (lfirst u) (first v))]
               (recur (lnext u) (next v) s)
@@ -870,27 +878,27 @@
   (cond
     (sequential? v)
     (if (and (counted? u) (counted? v)
-          (not= (count u) (count v)))
+             (not (clojure.core/== (count u) (count v))))
       nil
-      (loop [u u v v s s]
-        (if (seq u)
-          (if (seq v)
+      (loop [u (seq u) v (seq v) s s]
+        (if-not (nil? u)
+          (if-not (nil? v)
             (if-let [s (unify s (first u) (first v))]
               (recur (next u) (next v) s)
               nil)
             nil)
-          (if (seq v) nil s))))
+          (if-not (nil? v) nil s))))
     
     (lcons? v) (unify-terms v u s)
     :else nil))
 
 (defn unify-with-map* [u v s]
-  (when (= (count u) (count v))
+  (when (clojure.core/== (count u) (count v))
     (loop [ks (keys u) s s]
       (if (seq ks)
         (let [kf (first ks)
               vf (get v kf ::not-found)]
-          (when-not (= vf ::not-found)
+          (when-not (identical? vf ::not-found)
             (if-let [s (unify s (get u kf) vf)]
               (recur (next ks) s)
               nil)))

From 74ee03b3f58540f73fb0423ce994525671640879 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 11 Oct 2013 09:53:46 -0400
Subject: [PATCH 149/288] another perf tweak, 500-600ms shaved off zebrao
 benchmark on MBA 1.7ghz.

bump deps in project.clj
---
 project.clj                             | 16 +++++++--------
 src/main/clojure/clojure/core/logic.clj | 26 ++++++++++++-------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/project.clj b/project.clj
index a2e711d3..524c5491 100644
--- a/project.clj
+++ b/project.clj
@@ -4,18 +4,16 @@
 
   :jvm-opts ^:replace ["-Xmx512m" "-server"]
 
-  :source-paths ["src/main/clojure"
-                 ;"clojurescript/src/clj"
-                 ;"clojurescript/src/cljs"
-                 ]
+  :source-paths ["src/main/clojure"]
+  
   :test-paths ["src/test/clojure"]
+
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-1835"]
-                 [org.clojure/tools.macro "0.1.1"]
-                 [org.clojure/tools.nrepl "0.2.3"]
-                 [com.datomic/datomic-free "0.8.3551" :scope "provided"]]
+                 [org.clojure/clojurescript "0.0-1934"]
+                 [org.clojure/tools.macro "0.1.2"]
+                 [com.datomic/datomic-free "0.8.4218" :scope "provided"]]
 
-  :plugins [[lein-cljsbuild "0.3.2"]]
+  :plugins [[lein-cljsbuild "0.3.3"]]
 
   :cljsbuild
   {:builds
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index f8da9d47..d0290b4c 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -342,19 +342,19 @@
 
   (walk [this v]
     (if (bindable? v)
-      (loop [lv v [v vp :as me] (find s v)]
-        (cond
-          (nil? me) lv
-          
-          (not (bindable? vp))
-          (if (subst-val? vp)
-            (let [sv (:v vp)]
-              (if (identical? sv ::unbound)
-                (with-meta v (assoc (meta vp) ::unbound true))
-                sv))
-            vp)
-          
-          :else (recur vp (find s vp))))
+      (loop [lv v me (find s v)]
+        (if (nil? me)
+          lv
+          (let [v  (key me)
+                vp (val me)]
+            (if (not (bindable? vp))
+              (if (subst-val? vp)
+                (let [sv (:v vp)]
+                  (if (identical? sv ::unbound)
+                    (with-meta v (assoc (meta vp) ::unbound true))
+                    sv))
+                vp)
+              (recur vp (find s vp))))))
       v))
 
   ISubstitutionsCLP

From 1375f34ef42ee6b288ccb110b5c8c4aeb87a39a9 Mon Sep 17 00:00:00 2001
From: Norman Richards <orb@nostacktrace.com>
Date: Sun, 6 Oct 2013 10:24:14 -0500
Subject: [PATCH 150/288] integrate pldb

---
 src/main/clojure/clojure/core/logic.clj       |  20 +-
 src/main/clojure/clojure/core/logic/pldb.clj  | 127 ++++++++++
 .../clojure/clojure/core/logic/pldb/tests.clj | 232 ++++++++++++++++++
 3 files changed, 375 insertions(+), 4 deletions(-)
 create mode 100644 src/main/clojure/clojure/core/logic/pldb.clj
 create mode 100644 src/test/clojure/clojure/core/logic/pldb/tests.clj

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index d0290b4c..8cd5b407 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1201,21 +1201,33 @@
          (take n# xs#)
          xs#))))
 
+(def ^:dynamic *logic-dbs* [])
+
 (defmacro run
   "Executes goals until a maximum of n results are found."
   [n bindings & goals]
-  `(-run {:occurs-check true :n ~n} ~bindings ~@goals))
+  `(-run {:occurs-check true :n ~n :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run*
   "Executes goals until results are exhausted."
   [bindings & goals]
-  `(-run {:occurs-check true :n false} ~bindings ~@goals))
+  `(-run {:occurs-check true :n false :db *logic-dbs*} ~bindings ~@goals))
+
+(defmacro run-db
+  "Executes goals until a maximum of n results are found. Uses a specified logic database."
+  [n db bindings & goals]
+  `(-run {:occurs-check true :n ~n :db (flatten [~db])} ~bindings ~@goals))
+
+(defmacro run-db*
+  "Executes goals until results are exhausted. Uses a specified logic database."
+  [db bindings & goals]
+  `(-run {:occurs-check true :n false :db (flatten [~db])} ~bindings ~@goals))
 
 (defmacro run-nc
-  "Executes goals until a maximum of n results are found. Does not 
+  "Executes goals until a maximum of n results are found. Does not
    occurs-check."
   [n bindings & goals]
-  `(-run {:occurs-check false :n ~n} ~bindings ~@goals))
+  `(-run {:occurs-check false :n ~n :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."
diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
new file mode 100644
index 00000000..967ae743
--- /dev/null
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -0,0 +1,127 @@
+(ns clojure.core.logic.pldb
+  (:require [clojure.core.logic :as l]))
+
+;; ----------------------------------------
+
+(def empty-db {})
+
+(defmacro with-dbs [dbs & body]
+  `(binding [l/*logic-dbs* (concat l/*logic-dbs* ~dbs)]
+          ~@body))
+
+(defmacro with-db [db & body]
+  `(binding [l/*logic-dbs* (conj l/*logic-dbs* ~db)]
+          ~@body))
+
+(defn facts-for [dbs kname]
+  (mapcat #(get-in % [kname ::unindexed]) dbs))
+
+(defn facts-using-index [dbs kname index val]
+  (mapcat #(get-in % [kname index val]) dbs))
+
+;; ----------------------------------------
+(defn rel-key [rel]
+  (if (keyword? rel)
+    rel
+    (:rel-name (meta rel))))
+
+(defn rel-indexes [rel]
+  (:indexes (meta rel)))
+
+(defn indexed? [v]
+  (true? (:index (meta v))))
+
+(defn ground? [s term]
+  (not (l/contains-lvar? (l/walk* s term))))
+
+(defn index-for-query [s q indexes]
+  (let [indexable (map #(ground? s %)  q)
+        triples (map vector (range) indexable indexes)]
+    (first (for [[i indexable indexed] triples
+                 :when (and indexable indexed)]
+             i))))
+
+(defmacro db-rel [name & args]
+  (let [arity
+        (count args)
+
+        kname
+        (str name "_" arity)
+
+        indexes
+        (vec (map indexed? args))]
+    `(def ~name
+       (with-meta
+         (fn [& query#]
+           (fn [subs#]
+             (let [dbs#
+                   (-> subs# clojure.core/meta :db)
+
+                   facts#
+                   (if-let [index# (index-for-query subs# query# ~indexes)]
+                     (facts-using-index dbs#
+                                        ~kname
+                                        index#
+                                        (l/walk* subs# (nth query# index#)))
+                     (facts-for dbs# ~kname))]
+               (l/to-stream (map (fn [potential#]
+                                   ((l/== query# potential#) subs#))
+                                 facts#)))))
+         {:rel-name ~kname
+          :indexes ~indexes}))))
+
+;; ----------------------------------------
+
+(defn db-fact [db rel & args]
+  (let [key
+        (rel-key rel)
+
+        add-to-set
+        (fn [current new]
+          (conj (or current #{}) new))
+
+        db-with-fact
+        (update-in db [key ::unindexed] #(add-to-set %1 args))
+
+        indexes-to-update ;; ugly - get the vector indexes of indexed attributes
+        (map vector (rel-indexes rel) (range) args)
+
+        update-index-fn
+        (fn [db [is-indexed index-num val]]
+          (if is-indexed
+            (update-in db [key index-num val] #(add-to-set %1 args))
+            db))]
+    (reduce update-index-fn db-with-fact indexes-to-update)))
+
+(defn db-retraction [db rel & args]
+  (let [key
+        (rel-key rel)
+
+        retract-args
+        #(disj %1 args)
+
+        db-without-fact
+        (update-in db [key ::unindexed] retract-args)
+
+        indexes-to-update ;; also a bit ugly
+        (map vector (rel-indexes rel) (range) args)
+
+        remove-from-index-fn
+        (fn [db [is-indexed index-num val]]
+          (if is-indexed
+            (update-in db [key index-num val] retract-args)
+            db))]
+
+    (reduce remove-from-index-fn db-without-fact indexes-to-update)))
+
+;; ----------------------------------------
+(defn db-facts [base-db & facts]
+  (reduce #(apply db-fact %1 %2) base-db facts))
+
+(defn db [& facts]
+  (apply db-facts empty-db facts))
+
+(defn db-retractions [base-db & retractions]
+  (reduce #(apply db-retraction %1 %2) base-db retractions))
+
+
diff --git a/src/test/clojure/clojure/core/logic/pldb/tests.clj b/src/test/clojure/clojure/core/logic/pldb/tests.clj
new file mode 100644
index 00000000..7f1dd0fe
--- /dev/null
+++ b/src/test/clojure/clojure/core/logic/pldb/tests.clj
@@ -0,0 +1,232 @@
+(ns clojure.core.logic.pldb.tests
+  (:use [clojure.test])
+  (:require [clojure.core.logic :as l]
+            [clojure.core.logic.pldb :as pldb]))
+
+;; from core.logic tests
+(pldb/db-rel man p)
+(pldb/db-rel woman p)
+(pldb/db-rel likes p1 p2)
+(pldb/db-rel fun p)
+
+(def facts0
+  (pldb/db
+   [man 'Bob]
+   [man 'John]
+   [man 'Ricky]
+
+   [woman 'Mary]
+   [woman 'Martha]
+   [woman 'Lucy]
+
+   [likes 'Bob 'Mary]
+   [likes 'John 'Martha]
+   [likes 'Ricky 'Lucy]))
+
+(def facts1 (-> facts0
+                (pldb/db-fact fun 'Lucy)))
+
+(deftest test-facts0
+  ( pldb/with-db facts0
+    (is (=
+         (l/run* [q]
+                 (l/fresh [x y]
+                          (likes x y)
+                          (fun y)
+                          (l/== q [x y])))
+         '()))))
+
+(deftest test-facts1
+  (pldb/with-db facts1
+    (is (=
+         (l/run* [q]
+                 (l/fresh [x y]
+                          (likes x y)
+                          (fun y)
+                          (l/== q [x y])))
+         '([Ricky Lucy])))))
+
+(def facts1-retracted
+  (-> facts1
+      (pldb/db-retraction likes 'Bob 'Mary)))
+
+(deftest test-rel-retract
+  (pldb/with-db facts1-retracted
+    (is (= (into #{}
+                 (l/run* [q]
+                         (l/fresh [x y]
+                                  (likes x y)
+                                  (l/== q [x y]))))
+           (into #{} '([John Martha] [Ricky Lucy]))))))
+
+(pldb/db-rel rel1 ^:index a)
+(def indexed-db
+  (pldb/db [rel1 [1 2]]))
+
+(deftest test-rel-logic-29
+  (pldb/with-db indexed-db
+    (is (=
+         (l/run* [q]
+                 (l/fresh [a]
+                          (rel1 [q a])
+                          (l/== a 2)))
+         '(1)))))
+
+(pldb/db-rel rel2 ^:index e ^:index a ^:index v)
+(def facts2
+  (pldb/db
+   [rel2 :e1 :a1 :v1]
+   [rel2 :e1 :a2 :v2]))
+
+(def facts2-retracted1
+  (pldb/db-retractions facts2
+                       [rel2 :e1 :a1 :v1]))
+
+(def facts2-retracted2
+  (pldb/db-retractions facts2
+                       [rel2 :e1 :a2 :v2]))
+
+(def facts2-retracted-all
+  (pldb/db-retractions facts2
+                       [rel2 :e1 :a1 :v1]
+                       [rel2 :e1 :a2 :v2]))
+
+(deftest rel2-dup-retractions
+  (is (= #{[:e1 :a1 :v1] [:e1 :a2 :v2]}
+         (pldb/with-db facts2
+           (into #{}
+                 (l/run* [out]
+                         (l/fresh [e a v]
+                                  (rel2 e :a1 :v1)
+                                  (rel2 e a v)
+                                  (l/== [e a v] out)))))))
+  (is (= #{}
+         (pldb/with-db facts2-retracted1
+           (into #{}
+                 (l/run* [out]
+                         (l/fresh [e a v]
+                                  (rel2 e :a1 :v1)
+                                  (rel2 e a v)
+                                  (l/== [e a v] out)))))))
+  (is (= #{[:e1 :a1 :v1]}
+         (pldb/with-db facts2-retracted2
+           (into #{}
+                 (l/run* [out]
+                         (l/fresh [e a v]
+                                  (rel2 e :a1 :v1)
+                                  (rel2 e a v)
+                                  (l/== [e a v] out)))))))
+  (is (= #{}
+         (pldb/with-db facts2-retracted-all
+           (into #{}
+                 (l/run* [out]
+                         (l/fresh [e a v]
+                                  (rel2 e :a1 :v1)
+                                  (rel2 e a v)
+                                  (l/== [e a v] out))))))))
+
+
+;; ----------------------------------------
+
+(pldb/db-rel protocol name port-number)
+(pldb/db-rel open-port ip port-number)
+
+(def known-ports
+  (pldb/db
+   [protocol :ftp 21]
+   [protocol :ssh 22]
+   [protocol :telnet 23]
+   [protocol :smtp 25]
+   [protocol :http 80]
+   [protocol :pop3 110]
+   [protocol :imap 143]
+   [protocol :ldap 389]
+   [protocol :https 443]))
+
+(def network1
+  (pldb/db
+   [open-port :10.0.1.3 22]
+   [open-port :10.0.1.5 22]
+   [open-port :10.0.1.8 22]
+   [open-port :10.0.1.8 80]
+   [open-port :10.0.1.12 22]
+   [open-port :10.0.1.19 22]
+   [open-port :10.0.1.19 25]
+   [open-port :10.0.1.19 143]
+   [open-port :10.0.1.136 22]
+   [open-port :10.0.1.136 80]
+   [open-port :10.0.1.136 443]))
+
+(def network2
+  (pldb/db
+   [open-port :192.168.128.213 22]
+   [open-port :192.168.128.213 443]
+   [open-port :192.168.128.217 22]
+   [open-port :192.168.128.217 80]
+   [open-port :192.168.128.217 443]
+   [open-port :192.168.128.199 22]
+   [open-port :192.168.128.140 22]
+   [open-port :192.168.128.140 25]
+   [open-port :192.168.128.140 110]
+   [open-port :192.168.128.140 143]
+   [open-port :192.168.128.140 389]))
+
+
+(deftest merge-same-relationship
+  (is (= #{:10.0.1.19}
+         (pldb/with-db network1
+           (set (l/run* [ip]
+                        (open-port ip 143))))))
+
+  (is (= #{:192.168.128.140}
+         (pldb/with-db network2
+           (set (l/run* [ip]
+                        (open-port ip 143))))))
+
+  (is (= #{:192.168.128.140 :10.0.1.19}
+         (pldb/with-db network1
+           (pldb/with-db network2
+             (set (l/run* [ip]
+                          (open-port ip 143)))))))
+
+  (is (= #{:192.168.128.140 :10.0.1.19}
+         (pldb/with-db network2
+           (pldb/with-db network1
+             (set (l/run* [ip]
+                          (open-port ip 143)))))))
+
+  (is (= #{:192.168.128.140 :10.0.1.19}
+         (pldb/with-dbs [network1 network2]
+           (set (l/run* [ip]
+                        (open-port ip 143)))))))
+
+(deftest merge-across-relationship
+  (is (= #{:10.0.1.136 :192.168.128.217}
+         (pldb/with-dbs [known-ports network1 network2]
+           (set (l/run* [ip]
+                        (l/fresh [http-port https-port]
+                                 (protocol :http http-port)
+                                 (protocol :https https-port)
+                                 (open-port ip http-port)
+                                 (open-port ip https-port))))))))
+
+
+
+;; ----------------------------------------
+
+(pldb/db-rel rps move)
+(def moves-db (pldb/db
+  [rps :rock]
+  [rps :paper]
+  [rps :scissors]))
+
+(deftest test-lazy
+  (is (= (into #{}
+               (pldb/with-db moves-db
+                 (l/run* [q] (rps q))))
+
+         (pldb/with-db moves-db
+           (into #{}
+                 (l/run* [q] (rps q))))
+
+         #{:rock :paper :scissors})))

From b96ee396754c90a3721715ac3662e36479572e16 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 11 Oct 2013 19:23:07 -0400
Subject: [PATCH 151/288] remove references to ObjMap, we don't nil MZero cases
 anymore we have Fail

---
 src/main/clojure/cljs/core/logic.cljs | 42 +--------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 9169d00f..8a28df87 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -374,10 +374,6 @@
     (if (sequential? u)
       (-unify-with-seq v u s)
       (-unify-with-object v u s)))
-
-  ObjMap
-  (-unify-terms [u v s]
-    (-unify-with-map v u s))
   
   PersistentArrayMap
   (-unify-terms [u v s]
@@ -490,10 +486,6 @@
   default
   (-unify-with-map [v u s] (fail s))
 
-  ObjMap
-  (-unify-with-map [v u s]
-    (unify-with-map* v u s))
-
   PersistentArrayMap
   (-unify-with-map [v u s]
     (unify-with-map* v u s))
@@ -545,9 +537,6 @@
         (recur (next v) (conj r (-walk* s (first v))))
         r)))
 
-  ObjMap
-  (-walk-term [v s] (walk-term-map* v s))
-
   PersistentHashMap
   (-walk-term [v s] (walk-term-map* v s)))
 
@@ -593,21 +582,6 @@
 (defn choice [a f]
   (Choice. a f))
 
-;; -----------------------------------------------------------------------------
-;; MZero
-
-(extend-protocol IBind
-  nil
-  (-bind [_ g] nil))
-
-(extend-protocol IMPlus
-  nil
-  (-mplus [_ b] b))
-
-(extend-protocol ITake
-  nil
-  (-take* [_] '()))
-
 ;; -----------------------------------------------------------------------------
 ;; Unit
 
@@ -670,22 +644,12 @@
   (-ifu [b gs c]))
 
 (extend-protocol IIfA
-  nil
-  (-ifa [b gs c]
-       (when c
-         (force c)))
-
   Fail
   (-ifa [b gs c]
        (when c
          (force c))))
 
 (extend-protocol IIfU
-  nil
-  (-ifu [b gs c]
-       (when c
-         (force c)))
-
   Fail
   (-ifu [b gs c]
     (when c
@@ -823,17 +787,13 @@
   nil
   (unify-with-pmap [v u s] (fail s))
 
-  js/Object
+  default
   (unify-with-pmap [v u s] (fail s))
 
   cljs.core.logic.LVar
   (unify-with-pmap [v u s]
     (-ext s v u))
 
-  ObjMap
-  (unify-with-pmap [v u s]
-    (-unify-with-map u v s))
-
   PersistentArrayMap
   (unify-with-pmap [v u s]
     (-unify-with-map u v s))

From 335226f6c1761bcfdaa03dbcbbba79e2e8f3e5f4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 11 Oct 2013 22:07:05 -0400
Subject: [PATCH 152/288] perf tweaks, ~10.7-8ms now for zebra on MBA 1.7ghz

---
 project.clj                                 |   9 +-
 src/main/clojure/cljs/core/logic.cljs       | 123 ++++++++++----------
 src/main/clojure/cljs/core/logic/macros.clj |  10 +-
 3 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/project.clj b/project.clj
index 524c5491..8c76c89f 100644
--- a/project.clj
+++ b/project.clj
@@ -17,12 +17,13 @@
 
   :cljsbuild
   {:builds
-   [{:id "simple"
+   [{:id "ws"
      :source-paths ["src/test/cljs"]
-     :compiler {:optimizations :simple
-                :pretty-print true
+     :compiler {:optimizations :whitespace
                 :static-fns true
-                :output-to "tests.js"}}
+                :output-to "tests.js"
+                :output-dir "out"
+                :source-map "tests.js.map"}}
     {:id "adv"
      :source-paths ["src/test/cljs"]
      :compiler {:optimizations :advanced
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 8a28df87..48c66174 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -65,11 +65,11 @@
   ICounted
   (-count [_] 2)
   IIndexed
-  (-nth [_ i] (condp = i
+  (-nth [_ i] (condp cljs.core/== i
                    0 lhs
                    1 rhs
                    (throw (js/Error. "Index out of bounds"))))
-  (-nth [_ i not-found] (condp = i
+  (-nth [_ i not-found] (condp cljs.core/== i
                              0 lhs
                              1 rhs
                              not-found))
@@ -86,6 +86,11 @@
 ;; =============================================================================
 ;; Substitutions
 
+(declare LVar)
+
+(defn ^boolean lvar? [x]
+  (instance? LVar x))
+
 (defprotocol ISubstitutions
   (-occurs-check [this u v])
   (-ext [this u v])
@@ -130,7 +135,8 @@
       (-occurs-check-term v u this)))
   
   (-ext [this u v]
-    (if (and *occurs-check* (-occurs-check this u v))
+    (if (and ^boolean *occurs-check*
+             ^boolean (-occurs-check this u v))
       (fail this)
       (-ext-no-check this u v)))
 
@@ -166,7 +172,7 @@
 
   (-reify [this v]
     (let [v (-walk* this v)]
-      (-walk* (-reify* empty-s v) v)))
+      (-walk* ^not-native (-reify* ^not-native empty-s v) v)))
 
   IBind
   (-bind [this g]
@@ -183,7 +189,7 @@
 (defn make-s [s]
   (Substitutions. s))
 
-(def empty-s (make-s '()))
+(def ^not-native empty-s (make-s '()))
 
 (defn ^boolean subst? [x]
   (instance? Substitutions x))
@@ -222,30 +228,30 @@
   (-unify-terms [u v s]
     (-unify-with-lvar v u s))
   IUnifyWithNil
-  (-unify-with-nil [v u s]
+  (-unify-with-nil [v u ^not-native s]
     (-ext-no-check s v u))
   IUnifyWithObject
-  (-unify-with-object [v u s]
+  (-unify-with-object [v u ^not-native s]
     (-ext s v u))
   IUnifyWithLVar
-  (-unify-with-lvar [v u s]
+  (-unify-with-lvar [v u ^not-native s]
     (-ext-no-check s u v))
   IUnifyWithLSeq
-  (-unify-with-lseq [v u s]
+  (-unify-with-lseq [v u ^not-native s]
     (-ext s v u))
   IUnifyWithSequential
-  (-unify-with-seq [v u s]
+  (-unify-with-seq [v u ^not-native s]
     (-ext s v u))
   IUnifyWithMap
-  (-unify-with-map [v u s]
+  (-unify-with-map [v u ^not-native s]
     (-ext s v u))
   IReifyTerm
-  (-reify-term [v s]
+  (-reify-term [v ^not-native s]
     (-ext s v (-reify-lvar-name s)))
   IWalkTerm
   (-walk-term [v s] v)
   IOccursCheckTerm
-  (-occurs-check-term [v x s]
+  (-occurs-check-term [v x ^not-native s]
     (= (-walk s v) x)))
 
 (def lvar-sym-counter (atom 0))
@@ -256,9 +262,6 @@
      (let [name (str name "_" (swap! lvar-sym-counter inc))]
        (LVar. name nil))))
 
-(defn ^boolean lvar? [x]
-  (instance? LVar x))
-
 ;; =============================================================================
 ;; LCons
 
@@ -266,7 +269,10 @@
   (-lfirst [this])
   (-lnext [this]))
 
-(declare lcons? failed?)
+(declare LCons failed?)
+
+(defn ^boolean lcons? [x]
+  (instance? LCons x))
 
 (defn lcons-pr-seq [x]
   (cond
@@ -340,11 +346,11 @@
         (recur (-lnext v) (-reify* s (-lfirst v)))
         (-reify* s v))))
   IWalkTerm
-  (-walk-term [v s]
+  (-walk-term [v ^not-native s]
     (lcons (-walk* s (-lfirst v))
            (-walk* s (-lnext v))))
   IOccursCheckTerm
-  (-occurs-check-term [v x s]
+  (-occurs-check-term [v x ^not-native s]
     (loop [v v x x s s]
       (if (lcons? v)
         (or (-occurs-check s x (-lfirst v))
@@ -358,9 +364,6 @@
     (cons a (seq d))
     (LCons. a d nil)))
 
-(defn ^boolean lcons? [x]
-  (instance? LCons x))
-
 ;; =============================================================================
 ;; Unification
 
@@ -409,10 +412,10 @@
 
 (extend-protocol IUnifyWithLVar
   nil
-  (-unify-with-lvar [v u s] (-ext-no-check s u v))
+  (-unify-with-lvar [v u ^not-native s] (-ext-no-check s u v))
 
   default
-  (-unify-with-lvar [v u s]
+  (-unify-with-lvar [v u ^not-native s]
     (-ext s u v)))
 
 ;; -----------------------------------------------------------------------------
@@ -502,7 +505,7 @@
   (-reify-term [v s] s)
 
   default
-  (-reify-term [v s]
+  (-reify-term [v ^not-native s]
     (if (sequential? v)
       (loop [v v s s]
         (if (seq v)
@@ -513,29 +516,29 @@
 ;; =============================================================================
 ;; Walk Term
 
-(defn walk-term-map* [v s]
-  (loop [v v r {}]
-    (if (seq v)
-      (let [[vfk vfv] (first v)]
-        (recur (next v) (assoc r vfk (-walk* s vfv))))
-      r)))
+(defn walk-term-map* [^not-native v ^not-native s]
+  (loop [^not-native v (-seq v) ^not-native r (transient {})]
+    (if-not (nil? v)
+      (let [[vfk vfv] (-first v)]
+        (recur (-next v) (-assoc! r vfk (-walk* s vfv))))
+      (persistent! r))))
 
 (extend-protocol IWalkTerm
   nil
   (-walk-term [v s] nil)
 
   default
-  (-walk-term [v s]
+  (-walk-term [v ^not-native s]
     (if (sequential? v)
       (map #(-walk* s %) v)
       v))
 
   PersistentVector
-  (-walk-term [v s]
-    (loop [v v r []]
-      (if (seq v)
-        (recur (next v) (conj r (-walk* s (first v))))
-        r)))
+  (-walk-term [^not-native v ^not-native s]
+    (loop [^not-native v (-seq v) ^not-native r (transient [])]
+      (if-not (nil? v)
+        (recur (-next v) (-conj! r (-walk* s (first v))))
+        (persistent! r))))
 
   PersistentHashMap
   (-walk-term [v s] (walk-term-map* v s)))
@@ -548,48 +551,46 @@
   (-occurs-check-term [v x s] false)
 
   default
-  (-occurs-check-term [v x s]
+  (-occurs-check-term [v x ^not-native s]
     (if (sequential? v)
-      (loop [v v x x s s]
-        (if (seq v)
-          (or (-occurs-check s x (first v))
-              (recur (next v) x s))
+      (loop [^not-native v (seq v) x x s s]
+        (if-not (nil? v)
+          (or (-occurs-check s x (-first v))
+              (recur (-next v) x s))
           false))
       false)))
 
 ;; =============================================================================
 ;; Goals and Goal Constructors
 
-(extend-type default
-  ITake
-  (-take* [this] this))
+(declare Choice)
 
-;; TODO: Choice always holds a as a list, can we just remove that?
+(defn mplus [a f]
+  (if (satisfies? IMPlus a false)
+    (-mplus ^not-native a f)
+    (Choice. a f)))
+
+(defn take* [x]
+  (if (satisfies? ITake x false)
+    (-take* ^not-native x)
+    (list x)))
 
 (declare Inc)
 
 (deftype Choice [a f]
   IBind
   (-bind [this g]
-    (-mplus (g a) (-inc (-bind f g))))
+    (mplus (g a) (-inc (-bind ^not-native f g))))
   IMPlus
   (-mplus [this fp]
-    (Choice. a (-inc (-mplus (fp) f))))
+    (Choice. a (-inc (mplus (fp) f))))
   ITake
   (-take* [this]
-    (lazy-seq (cons (first a) (lazy-seq (-take* f))))))
+    (lazy-seq (cons a (lazy-seq (take* f))))))
 
 (defn choice [a f]
   (Choice. a f))
 
-;; -----------------------------------------------------------------------------
-;; Unit
-
-(extend-type default
-  IMPlus
-  (-mplus [this f]
-    (Choice. this f)))
-
 ;; -----------------------------------------------------------------------------
 ;; Inc
 
@@ -598,12 +599,14 @@
   (-invoke [_] (f))
   IBind
   (-bind [this g]
-    (-inc (-bind (f) g)))
+    (-inc
+      (let [^not-native a (f)]
+        (-bind a g))))
   IMPlus
   (-mplus [this fp]
-    (-inc (-mplus (fp) this)))
+    (-inc (mplus (fp) this)))
   ITake
-  (-take* [this] (lazy-seq (-take* (f)))))
+  (-take* [this] (lazy-seq (take* (f)))))
 
 ;; -----------------------------------------------------------------------------
 ;; Fail
diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index 9c0d1885..686157a5 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -25,14 +25,14 @@
   (mapcat lvar-bind syms))
 
 (defmacro bind*
-  ([a g] `(cljs.core.logic/-bind ~a ~g))
+  ([a g] `(cljs.core.logic/-bind ~(vary-meta a {:tag 'not-native}) ~g))
   ([a g & g-rest]
-     `(bind* (cljs.core.logic/-bind ~a ~g) ~@g-rest)))
+     `(bind* (cljs.core.logic/-bind ~(vary-meta a {:tag 'not-native}) ~g) ~@g-rest)))
 
 (defmacro mplus*
   ([e] e)
   ([e & e-rest]
-     `(cljs.core.logic/-mplus ~e (-inc (mplus* ~@e-rest)))))
+     `(cljs.core.logic/mplus ~e (-inc (mplus* ~@e-rest)))))
 
 (defmacro -inc [& rest]
   `(cljs.core.logic/Inc. (fn [] ~@rest)))
@@ -67,7 +67,7 @@
   `(let [xs# (cljs.core.logic/-take* (-inc
                       ((fresh [~x] ~@goals
                          (fn [a#]
-                           (cons (cljs.core.logic/-reify a# ~x) '()))) ;; TODO: do we need this?
+                           (cljs.core.logic/-reify a# ~x))) ;; TODO: do we need this?
                        cljs.core.logic/empty-s)))]
      (if ~n
        (take ~n xs#)
@@ -438,4 +438,4 @@
   "Define a committed choice goal. See condu."
   [xs & cs]
   (binding [*locals* (env-locals xs (-> &env :locals keys))]
-    (handle-clauses `condu xs cs)))
\ No newline at end of file
+    (handle-clauses `condu xs cs)))

From 1cdb5393aa9b5cac53de76e66d09b2555a1cd002 Mon Sep 17 00:00:00 2001
From: Norman Richards <orb@nostacktrace.com>
Date: Mon, 7 Oct 2013 09:14:47 -0500
Subject: [PATCH 153/288] remove old defrel

---
 src/main/clojure/clojure/core/logic.clj       | 253 ++----------------
 src/main/clojure/clojure/core/logic/bench.clj |  83 +++---
 src/main/clojure/clojure/core/logic/pldb.clj  |   6 +-
 src/test/clojure/clojure/core/logic/tests.clj |  94 +------
 4 files changed, 79 insertions(+), 357 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 8cd5b407..93ab0270 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -382,7 +382,7 @@
 
             :else (recur vp (find s vp)))))
       v))
-  
+
   (ext-run-cs [this x v]
     (let [x  (root-var this x)
           xs (if (lvar? v)
@@ -492,7 +492,7 @@
          (fn [s y] (rem-dom s y dom (conj (or seenset #{}) x)))))))
 
 ;; NOTE: I don't think we need to bother returning ::not-dom or some other
-;; not found value. Assume the case where the var is bound to nil in 
+;; not found value. Assume the case where the var is bound to nil in
 ;; the substitution where the var has a domain. That the var is member
 ;; will be verified by domc or something similar. The case where the var
 ;; is nil and has no domain is trivial.
@@ -660,7 +660,7 @@
         (if (-> u clojure.core/meta ::unbound)
           (ext-no-check s u (assoc (root-val s u) :v v))
           (ext-no-check s u v)))
-      
+
       :else nil))
 
   IReifyTerm
@@ -802,7 +802,7 @@
               s
               (unify s u nil))
             nil)))
-      
+
       (lcons? v)
       (loop [u u v v s s]
         (if (lvar? u)
@@ -814,7 +814,7 @@
               (recur (lnext u) (lnext v) s)
               nil)
             :else (unify s u v))))
-      
+
       :else nil))
 
   IReifyTerm
@@ -888,7 +888,7 @@
               nil)
             nil)
           (if-not (nil? v) nil s))))
-    
+
     (lcons? v) (unify-terms v u s)
     :else nil))
 
@@ -927,7 +927,7 @@
 
       (map? v)
       (unify-with-map* u v s)
-      
+
       :else nil)))
 
 ;; =============================================================================
@@ -1174,7 +1174,7 @@
   (mapcat lvar-bind syms))
 
 (defmacro fresh
-  "Creates fresh variables. Goals occuring within form a logical 
+  "Creates fresh variables. Goals occuring within form a logical
   conjunction."
   [[& lvars] & goals]
   `(fn [a#]
@@ -1384,7 +1384,7 @@
        (ifa* ~@(map (cond-clauses a) clauses)))))
 
 (defmacro condu
-  "Committed choice. Once the head (first goal) of a clause 
+  "Committed choice. Once the head (first goal) of a clause
   has succeeded, remaining goals of the clause will only
   be run once. Non-relational."
   [& clauses]
@@ -1475,7 +1475,7 @@
              (= f 'quote)
              (if (and (seq? s) (not quoted))
                (p->term s vars true)
-               p) 
+               p)
              (= f 'clojure.core/unquote)
              (if quoted
                (update-pvars! s vars)
@@ -1618,7 +1618,7 @@
   (== '() a))
 
 (defn conso
-  "A relation where l is a collection, such that a is the first of l 
+  "A relation where l is a collection, such that a is the first of l
   and d is the rest of l. If ground d must be bound to a proper tail."
   [a d l]
   (== (lcons a d) l))
@@ -1722,7 +1722,7 @@
 
 (defne member1o
   "Like membero but uses to disequality further constraining
-   the results. For example, if x and l are ground and x occurs 
+   the results. For example, if x and l are ground and x occurs
    multiple times in l, member1o will succeed only once."
   [x l]
   ([_ [x . tail]])
@@ -1730,8 +1730,8 @@
     (!= x head)
     (member1o x tail)))
 
-(defne appendo 
-  "A relation where x, y, and z are proper collections, 
+(defne appendo
+  "A relation where x, y, and z are proper collections,
   such that z is x appended to y"
   [x y z]
   ([() _ y])
@@ -1758,219 +1758,6 @@
       (choice (first aseq)
               (fn [] (to-stream (next aseq)))))))
 
-(defmacro def-arity-exc-helper []
-  (try
-    (Class/forName "clojure.lang.ArityException")
-    `(defn arity-exc-helper [~'name ~'n]
-       (fn [~'& ~'args]
-         (throw (clojure.lang.ArityException. ~'n (str ~'name)))))
-    (catch java.lang.ClassNotFoundException e
-     `(defn ~'arity-exc-helper [~'name ~'n]
-        (fn [~'& ~'args]
-          (throw
-           (java.lang.IllegalArgumentException.
-            (str "Wrong number of args (" ~'n ") passed to:" ~'name))))))))
-
-(def-arity-exc-helper)
-
-(defn- sym-helper [prefix n]
-  (symbol (str prefix n)))
-
-(def f-sym (partial sym-helper "f"))
-(def a-sym (partial sym-helper "a"))
-
-(defn- ->sym [& args]
-  (symbol (apply str args)))
-
-(defn- defrel-helper [name arity args]
-  (let [r (range 1 (+ arity 2))
-        arity-excs (fn [n] `(arity-exc-helper '~name ~n))]
-    (if (seq args)
-      `(do
-         (def ~name
-           (.withMeta
-            (~'clojure.core.logic.Rel.
-             '~name (atom {}) nil ~@(map arity-excs r))
-            {:ns ~'*ns*}))
-         (extend-rel ~name ~@args))
-      `(def ~name
-         (.withMeta
-          (~'clojure.core.logic.Rel. '~name (atom {}) nil ~@(map arity-excs r))
-          {:ns ~'*ns*})))))
-
-(defmacro def-apply-to-helper [n]
-  (let [r (range 1 (clojure.core/inc n))
-        args (map a-sym r)
-        arg-binds (fn [n]
-                    (mapcat (fn [a]
-                              `(~a (first ~'arglist)
-                                   ~'arglist (next ~'arglist)))
-                            (take n args)))
-        case-clause (fn [n]
-                      `(~n (let [~@(arg-binds (dec n))]
-                            (.invoke ~'ifn ~@(take (dec n) args)
-                                     (clojure.lang.Util/ret1
-                                      (first ~'arglist) nil)))))]
-   `(defn ~'apply-to-helper
-      [~(with-meta 'ifn {:tag clojure.lang.IFn}) ~'arglist]
-      (case (clojure.lang.RT/boundedLength ~'arglist 20)
-            ~@(mapcat case-clause r)))))
-
-(def-apply-to-helper 20)
-
-;; TODO: consider moving the set/indexes inside Rel, perf implications?
-
-(defmacro RelHelper [arity]
-  (let [r (range 1 (+ arity 2))
-        fs (map f-sym r)
-        mfs (map #(with-meta % {:volatile-mutable true :tag clojure.lang.IFn})
-                 fs)
-        create-sig (fn [n]
-                     (let [args (map a-sym (range 1 (clojure.core/inc n)))]
-                       `(invoke [~'_ ~@args]
-                                  (~(f-sym n) ~@args))))
-        set-case (fn [[f arity]]
-                   `(~arity (set! ~f ~'f)))]
-    `(do
-       (deftype ~'Rel [~'name ~'indexes ~'meta
-                       ~@mfs]
-         clojure.lang.IObj
-         (~'withMeta [~'_ ~'meta]
-           (~'Rel. ~'name ~'indexes ~'meta ~@fs))
-         (~'meta [~'_]
-           ~'meta)
-         clojure.lang.IFn
-         ~@(map create-sig r)
-         (~'applyTo [~'this ~'arglist]
-            (~'apply-to-helper ~'this ~'arglist))
-         ~'IRel
-         (~'setfn [~'_ ~'arity ~'f]
-           (case ~'arity
-                 ~@(mapcat set-case (map vector fs r))))
-         (~'indexes-for [~'_ ~'arity]
-           ((deref ~'indexes) ~'arity))
-         (~'add-indexes [~'_ ~'arity ~'index]
-           (swap! ~'indexes assoc ~'arity ~'index)))
-       (defmacro ~'defrel 
-         "Define a relation for adding facts. Takes a name and some fields.
-         Use fact/facts to add facts and invoke the relation to query it."
-         [~'name ~'& ~'rest]
-         (defrel-helper ~'name ~arity ~'rest)))))
-
-(RelHelper 20)
-
-(defn- index-sym [name arity o]
-  (->sym name "_" arity "-" o "-index"))
-
-(defn- set-sym [name arity]
-  (->sym name "_" arity "-set"))
-
-;; TODO: for arity greater than 20, we need to use rest args
-
-(defn contains-lvar? [x]
-  (some lvar? (tree-seq coll? seq x)))
-
-(defmacro extend-rel [name & args]
-  (let [arity (count args)
-        r (range 1 (clojure.core/inc arity))
-        as (map a-sym r)
-        indexed (vec (filter (fn [[a i]]
-                               (-> a meta :index))
-                             (map vector
-                                  args
-                                  (range 1 (clojure.core/inc arity)))))
-        check-lvar (fn [[o i]]
-                     (let [a (a-sym i)]
-                       `((not (clojure.core.logic/contains-lvar? (clojure.core.logic/walk* ~'a ~a)))
-                         ((deref ~(index-sym name arity o)) (clojure.core.logic/walk* ~'a ~a)))))
-        indexed-set (fn [[o i]]
-                      `(def ~(index-sym name arity o) (atom {})))]
-    (if (<= arity 20)
-     `(do
-        (def ~(set-sym name arity) (atom #{}))
-        ~@(map indexed-set indexed)
-        (add-indexes ~name ~arity '~indexed)
-        (setfn ~name ~arity
-               (fn [~@as]
-                 (fn [~'a]
-                   (let [set# (cond
-                               ~@(mapcat check-lvar indexed)
-                               :else (deref ~(set-sym name arity)))]
-                     (to-stream
-                      (->> set#
-                           (map (fn [cand#]
-                                  (when-let [~'a ((== [~@as] cand#) ~'a)]
-                                    ~'a)))))))))))))
-
-;; TODO: Should probably happen in a transaction
-
-(defn facts
-  "Define a series of facts. Takes a vector of vectors where each vector
-   represents a fact tuple, all with the same number of elements."
-  ([rel [f :as tuples]] (facts rel (count f) tuples))
-  ([^Rel rel arity tuples]
-     (let [rel-ns (:ns (meta rel))
-           rel-set (var-get (ns-resolve rel-ns (set-sym (.name rel) arity)))
-           tuples (map vec tuples)]
-       (swap! rel-set (fn [s] (into s tuples)))
-       (let [indexes (indexes-for rel arity)]
-         (doseq [[o i] indexes]
-           (let [index (var-get (ns-resolve rel-ns (index-sym (.name rel) arity o)))]
-             (let [indexed-tuples (map (fn [t]
-                                         {(nth t (dec i)) #{t}})
-                                       tuples)]
-               (swap! index
-                      (fn [i]
-                        (apply merge-with set/union i indexed-tuples))))))))))
-
-(defn fact
-  "Add a fact to a relation defined with defrel."
-  [rel & tuple]
-  (facts rel [(vec tuple)]))
-
-(defn difference-with
-  "Returns a map that consists of the first map with the rest of the maps
-   removed from it. When a key is found in the first map and a later map,
-   the value from the later map will be combined with the value in the first
-   map by calling (f val-in-first val-in-later). If this function returns nil
-   then the key will be removed completely."
-  [f & maps]
-  (when (some identity maps)
-    (let [empty-is-nil (fn [s] (if (empty? s) nil s))
-          merge-entry (fn [m [k v]]
-                         (if (contains? m k)
-                           (if-let [nv (empty-is-nil (f (get m k) v))]
-                             (assoc m k nv)
-                             (dissoc m k))
-                           m))
-          merge-map (fn [m1 m2] (reduce merge-entry (or m1 {}) (seq m2)))]
-      (reduce merge-map maps))))
-
-(defn retractions
-  "Retract a series of facts. Takes a vector of vectors where each vector
-   represents a fact tuple, all with the same number of elements. It is not
-   an error to retract a fact that isn't true."
-  ([rel [f :as tuples]]
-     (when f (retractions rel (count f) tuples)))
-  ([^Rel rel arity tuples]
-     (let [rel-ns (:ns (meta rel))
-           rel-set (var-get (ns-resolve rel-ns (set-sym (.name rel) arity)))
-           tuples (map vec tuples)]
-       (swap! rel-set (fn [s] (reduce disj s tuples)))
-       (let [indexes (indexes-for rel arity)]
-         (doseq [[o i] indexes]
-           (let [index (var-get (ns-resolve rel-ns (index-sym (.name rel) arity o)))]
-             (let [indexed-tuples (map (fn [t]
-                                         {(nth t (dec i)) #{t}})
-                                       tuples)]
-               (swap! index
-                      (fn [i]
-                        (apply difference-with set/difference i indexed-tuples))))))))))
-
-(defn retraction
-  "Remove a fact from a relation defined with defrel."
-  [rel & tuple]
-  (retractions rel [(vec tuple)]))
 
 ;; =============================================================================
 ;; Tabling
@@ -2036,7 +1823,7 @@
 
 (defn waiting-stream-check
   "Take a waiting stream, a success continuation, and a failure continuation.
-   If we don't find any ready suspended streams, invoke the failure continuation. 
+   If we don't find any ready suspended streams, invoke the failure continuation.
    If we find a ready suspended stream calculate the remainder of the waiting
    stream. If we've reached the fixpoint just call the thunk of the suspended
    stream, otherwise call mplus on the result of the thunk and the remainder
@@ -2169,7 +1956,7 @@
 ;; TODO: consider the concurrency implications much more closely
 
 (defmacro tabled
-  "Macro for defining a tabled goal. Prefer ^:tabled with the 
+  "Macro for defining a tabled goal. Prefer ^:tabled with the
   defne/a/u forms over using this directly."
   [args & grest]
   (let [uuid (symbol (str "tabled-" (UUID/randomUUID)))]
@@ -2513,7 +2300,7 @@
             (when-not (= vf ::not-found)
               (if-let [cs (disunify s (get u kf) vf cs)]
                 (recur (next ks) cs)
-                nil))) 
+                nil)))
           cs))
       nil)))
 
@@ -2711,8 +2498,8 @@
 
 (defn featurec
   "Ensure that a map contains at least the key-value pairs
-  in the map fs. fs must be partially instantiated - that is, 
-  it may contain values which are logic variables to support 
+  in the map fs. fs must be partially instantiated - that is,
+  it may contain values which are logic variables to support
   feature extraction."
   [x fs]
   (cgoal (-featurec x (partial-map fs))))
@@ -2875,7 +2662,7 @@
         (fc t s)
         (when-let [s (fc (lfirst t) s)]
           (recur (lnext t) s)))))
-  
+
   clojure.lang.Sequential
   (-constrain-tree [t fc s]
     (loop [t (seq t) s s]
diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 0b6e8a1f..0b95cdf8 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -3,6 +3,7 @@
   (:use [clojure.core.logic :as l])
   (:require [clojure.core.logic.arithmetic :as a]
             [clojure.core.logic.fd :as fd]
+            [clojure.core.logic.pldb :as pldb]
             [clojure.repl :as r]
             [clojure.pprint :as pp]
             [clojure.set :as set]))
@@ -93,7 +94,7 @@
 
 (comment
   (run 1 [q] (zebrao q))
-  
+
   ;; SWI-Prolog 6-8.5s
   ;; now 2.5-2.6s, old days <2.4s
   (dotimes [_ 5]
@@ -111,13 +112,16 @@
 ;; =============================================================================
 ;; cliques
 
-(defrel connected ^:index x ^:index y)
-(facts connected [[1 2] [1 5]])
-(facts connected [[2 1] [2 3] [2 5]])
-(facts connected [[3 2] [3 4]])
-(facts connected [[4 3] [4 5] [4 6]])
-(facts connected [[5 1] [5 2] [5 4]])
-(facts connected [[6 4]])
+(pldb/db-rel connected ^:index x ^:index y)
+
+(def connected-db
+  (pldb/db
+   [connected [[1 2] [1 5]]]
+   [connected [[2 1] [2 3] [2 5]]]
+   [connected [[3 2] [3 4]]]
+   [connected [[4 3] [4 5] [4 6]]]
+   [connected [[5 1] [5 2] [5 4]]]
+   [connected [[6 4]]]))
 
 (defne connected-to-allo
   "Ensure that vertex v is connected to all vertices
@@ -141,19 +145,20 @@
   (run-nc* [q]
     (fresh [a b d]
       (== q (llist a b d))
-      (bounded-listo q 6)
+      (fd/bounded-listo q 6)
       (all-connected-to-allo q)))
-  
+
   ;; 350-400ms
   (dotimes [_ 5]
     (time
      (dotimes [_ 100]
       (doall
-       (run-nc 20 [q]
-         (fresh [a b d]
-           (== q (llist a b d))
-           (bounded-listo q 6)
-           (all-connected-to-allo q)))))))
+       (pldb/with-db connected-db
+         (run-nc 20 [q]
+                (fresh [a b d]
+                       (== q (llist a b d))
+                       (fd/bounded-listo q 6)
+                       (all-connected-to-allo q))))))))
 )
 
 ;; =============================================================================
@@ -224,7 +229,7 @@
   ;; direct translation does not work
   ;; because of the subtraction constraints
   ;; also, some domain inference would be nice
-  
+
   (defne noattackfd [y ys d]
     ([_ () _])
     ([y1 [y2 . yr] d]
@@ -346,13 +351,13 @@
   ;; ~1050ms, a little bit slower w/ distribute step
   (dotimes [_ 5]
     (time
-     (dotimes [_ 100] 
+     (dotimes [_ 100]
        (doall (cryptarithfd-1)))))
 
   ;; 3X slower still
   (dotimes [_ 5]
     (time
-     (dotimes [_ 10] 
+     (dotimes [_ 10]
        (doall (cryptarithfd-1)))))
 
   ;; WORKS: takes a long time ([5 2 6 4 8 1 9 7 3 0])
@@ -415,7 +420,7 @@
     (everyg #(fd/in % (fd/interval 1 5)) vs)
     (fd/!= baker 5) (fd/!= cooper 1)
     (fd/!= fletcher 5) (fd/!= fletcher 1)
-    (fd/< cooper miller) 
+    (fd/< cooper miller)
     (not-adjacento smith fletcher)
     (not-adjacento fletcher cooper)))
 
@@ -470,9 +475,9 @@
   ;; 620ms
   (dotimes [_ 10]
     (time
-     (dotimes [_ 1e3] 
+     (dotimes [_ 1e3]
        (doall (simple-fd-eq)))))
-  
+
   (run* [q]
     (fresh [a b]
       (fd/* a 3 34)
@@ -529,7 +534,7 @@
 
 (defn matches [n]
   (run 1 [a b c d]
-    (fd/in a b c d (fd/interval 1 n)) 
+    (fd/in a b c d (fd/interval 1 n))
     (fd/distinct [a b c d])
     (== a 1)
     (fd/<= a b) (fd/<= b c) (fd/<= c d)
@@ -588,7 +593,7 @@
   ;; 1.9s
   (dotimes [_ 10]
     (time
-     (dotimes [_ 1e3] 
+     (dotimes [_ 1e3]
        (doall (small-sudokufd)))))
 
   (small-sudokufd)
@@ -624,7 +629,7 @@
     (get-square rows x y)))
 
 (defn sudokufd [hints]
-  (let [vars (repeatedly 81 lvar) 
+  (let [vars (repeatedly 81 lvar)
         rows (->rows vars)
         cols (->cols rows)
         sqs  (->squares rows)]
@@ -693,10 +698,10 @@
      3 0 1  0 0 7  0 4 0
      7 2 0  0 4 0  0 6 0
      0 0 4  0 1 0  0 0 3])
-  
+
   (sudokufd easy0)
   (time (doall (sudokufd easy0)))
-  
+
   (sudokufd easy1)
   (time (sudokufd easy1))
 
@@ -749,7 +754,7 @@
      0 0 0  0 9 0  2 0 0
      0 0 8  0 7 0  4 0 0
      0 0 3  0 6 0  0 0 0
-     
+
      0 1 0  0 0 2  8 9 0
      0 4 0  0 0 0  0 0 0
      0 5 0  1 0 0  0 0 0])
@@ -797,7 +802,7 @@
      9 0 0  0 0 4  0 7 0
      0 0 0  6 0 8  0 0 0
      0 1 0  2 0 0  0 0 3
-     
+
      8 2 0  5 0 0  0 0 0
      0 0 0  0 0 0  0 0 5
      0 3 4  0 9 0  7 1 0])
@@ -810,16 +815,16 @@
         (doall (sudokufd ciao)))))
 
   (def jacop
-    [0 1 0  4 2 0  0 0 5 
-     0 0 2  0 7 1  0 3 9  
-     0 0 0  0 0 0  0 4 0 
-          
-     2 0 7  1 0 0  0 0 6  
-     0 0 0  0 4 0  0 0 0 
-     6 0 0  0 0 7  4 0 3  
-          
-     0 7 0  0 0 0  0 0 0 
-     1 2 0  7 3 0  5 0 0  
+    [0 1 0  4 2 0  0 0 5
+     0 0 2  0 7 1  0 3 9
+     0 0 0  0 0 0  0 4 0
+
+     2 0 7  1 0 0  0 0 6
+     0 0 0  0 4 0  0 0 0
+     6 0 0  0 0 7  4 0 3
+
+     0 7 0  0 0 0  0 0 0
+     1 2 0  7 3 0  5 0 0
      3 0 0  0 8 2  0 7 0])
 
   ;; 400ms
@@ -863,7 +868,7 @@
   ;; ~2300ms
   (dotimes [_ 5]
     (time
-      (dotimes [_ 100] 
+      (dotimes [_ 100]
         (doall (safefd)))))
   )
 
diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
index 967ae743..7ef62927 100644
--- a/src/main/clojure/clojure/core/logic/pldb.clj
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -31,8 +31,12 @@
 (defn indexed? [v]
   (true? (:index (meta v))))
 
+
+(defn contains-lvar? [x]
+  (some l/lvar? (tree-seq coll? seq x)))
+
 (defn ground? [s term]
-  (not (l/contains-lvar? (l/walk* s term))))
+  (not (contains-lvar? (l/walk* s term))))
 
 (defn index-for-query [s q indexes]
   (let [indexable (map #(ground? s %)  q)
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 14214dab..644a3df4 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -709,7 +709,7 @@
   (fresh []
     (conde
       [f2 (conde
-            [f2] 
+            [f2]
             [(== false false)])]
       [(== false false)])))
 
@@ -1093,80 +1093,6 @@
     (is (and (= (count r) 4)
              (= r #{2 3 4 5})))))
 
-;; -----------------------------------------------------------------------------
-;; rel
-
-(defrel man p)
-
-(fact man 'Bob)
-(fact man 'John)
-(fact man 'Ricky)
-
-(defrel woman p)
-(fact woman 'Mary)
-(fact woman 'Martha)
-(fact woman 'Lucy)
-
-(defrel likes p1 p2)
-(fact likes 'Bob 'Mary)
-(fact likes 'John 'Martha)
-(fact likes 'Ricky 'Lucy)
-
-(defrel fun p)
-(fact fun 'Lucy)
-
-(deftest test-rel-1
-  (is (= (run* [q]
-           (fresh [x y]
-             (likes x y)
-             (fun y)
-             (== q [x y])))
-         '([Ricky Lucy]))))
-
-(retraction likes 'Bob 'Mary)
-
-(deftest test-rel-retract
-  (is (= (into #{}
-           (run* [q]
-             (fresh [x y]
-               (likes x y)
-               (== q [x y]))))
-         (into #{} '([John Martha] [Ricky Lucy])))))
-
-(defrel rel1 ^:index a)
-(fact rel1 [1 2])
-
-(deftest test-rel-logic-29
-  (is (= (run* [q]
-           (fresh [a]
-             (rel1 [q a])
-             (== a 2)))
-         '(1))))
-
-(defrel rel2 ^:index e ^:index a ^:index v)
-
-(facts rel2 [[:e1 :a1 :v1]
-             [:e1 :a2 :v2]])
-
-(retractions rel2 [[:e1 :a1 :v1]
-                   [:e1 :a1 :v1]
-                   [:e1 :a2 :v2]])
-
-(deftest rel2-dup-retractions
-  (is (= (run* [out]
-           (fresh [e a v]
-             (rel2 e :a1 :v1)
-             (rel2 e a v)
-             (== [e a v] out)))
-        '())))
-
-(deftest test-to-stream
-  ;; LOGIC-139
-  (let [answers
-        (run* [q] (fresh [x] (!= x 'Bob) (man x)))]
-    (is (= 2 (count answers)))
-    (is (every? symbol? answers))))
-
 ;; -----------------------------------------------------------------------------
 ;; nil in collection
 
@@ -1310,7 +1236,7 @@
 (deftest test-unifier-as-1
   (is (= (u/unify {:as '{?x (?y ?z)}} ['?x '(1 2)])))
   (is (= (u/unify {:as '{?x (?y ?z)}} ['(?x) '((1 2))])))
-  (is (= (u/unify {:as '{?x (?y ?y)}} '[[?y ?x] [1 (1 1)]]) 
+  (is (= (u/unify {:as '{?x (?y ?y)}} '[[?y ?x] [1 (1 1)]])
          '[1 (1 1)])))
 
 ;;Anonymous constraints
@@ -1440,7 +1366,7 @@
 ;; -----------------------------------------------------------------------------
 ;; Pattern matching functions preserve metadata
 
-(defne ^:tabled dummy 
+(defne ^:tabled dummy
   "Docstring"
   [x l]
   ([_ [x . tail]])
@@ -1613,7 +1539,7 @@
 
 (deftest test-111-conda-regression
   (is (= (run* [x]
-           (conda 
+           (conda
              [succeed
               (project [x] succeed)
               (project [x] succeed)]))
@@ -1640,7 +1566,7 @@
     (project [goals]
       ;;when there are no more goals we are done
       (conde [(== true
-                (empty? goals)) 
+                (empty? goals))
                (== curr end)]
         ;;there are still goals left
         ;;solve the first and recursive call
@@ -2104,7 +2030,7 @@
     (is (= (fd/-intersection mi0 7) 7))
     (is (= (fd/-intersection 7 mi0) 7))))
 
-;; |-----| 
+;; |-----|
 ;;   |-----|
 (deftest test-intersection-mimi-3
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
@@ -2162,7 +2088,7 @@
            (fd/multi-interval (fd/interval 1 4) (fd/interval 6 8))))))
 
 ;; |---|  |---|
-;;         N      
+;;         N
 (deftest test-difference-mis-1
   (let [mi0 (fd/multi-interval (fd/interval 1 4) (fd/interval 7 10))]
     (is (= (fd/-difference mi0 8)
@@ -3058,7 +2984,7 @@
     (everyg #(fd/in % (fd/interval 1 5)) vs)
     (fd/!= baker 5) (fd/!= cooper 1)
     (fd/!= fletcher 5) (fd/!= fletcher 1)
-    (fd/< cooper miller) 
+    (fd/< cooper miller)
     (not-adjacento smith fletcher)
     (not-adjacento fletcher cooper)))
 
@@ -3090,7 +3016,7 @@
 
 (defn matches [n]
   (run 1 [a b c d]
-    (fd/in a b c d (fd/interval 1 n)) 
+    (fd/in a b c d (fd/interval 1 n))
     (fd/distinct [a b c d])
     (== a 1)
     (fd/<= a b) (fd/<= b c) (fd/<= c d)
@@ -3127,7 +3053,7 @@
     (get-square rows x y)))
 
 (defn sudokufd [hints]
-  (let [vars (repeatedly 81 lvar) 
+  (let [vars (repeatedly 81 lvar)
         rows (->rows vars)
         cols (->cols rows)
         sqs  (->squares rows)]

From 1fabc200ce56db0e496592eccbcf0c3f732853bd Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 25 Nov 2013 13:46:49 -0500
Subject: [PATCH 154/288] bump CLJS dep

---
 project.clj                           | 10 +++++-----
 src/main/clojure/cljs/core/logic.cljs |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project.clj b/project.clj
index 8c76c89f..06692445 100644
--- a/project.clj
+++ b/project.clj
@@ -5,15 +5,15 @@
   :jvm-opts ^:replace ["-Xmx512m" "-server"]
 
   :source-paths ["src/main/clojure"]
-  
+
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-1934"]
+                 [org.clojure/clojurescript "0.0-2080"]
                  [org.clojure/tools.macro "0.1.2"]
-                 [com.datomic/datomic-free "0.8.4218" :scope "provided"]]
+                 [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 
-  :plugins [[lein-cljsbuild "0.3.3"]]
+  :plugins [[lein-cljsbuild "1.0.0"]]
 
   :cljsbuild
   {:builds
@@ -27,5 +27,5 @@
     {:id "adv"
      :source-paths ["src/test/cljs"]
      :compiler {:optimizations :advanced
-                :pretty-print true
+                :pretty-print false
                 :output-to "tests.js"}}]})
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 48c66174..92b52d5a 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -566,12 +566,12 @@
 (declare Choice)
 
 (defn mplus [a f]
-  (if (satisfies? IMPlus a false)
+  (if (implements? IMPlus a)
     (-mplus ^not-native a f)
     (Choice. a f)))
 
 (defn take* [x]
-  (if (satisfies? ITake x false)
+  (if (implements? ITake x)
     (-take* ^not-native x)
     (list x)))
 

From a998be74e31d29c62721015b5b366bfb9a13b45c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 25 Nov 2013 13:56:36 -0500
Subject: [PATCH 155/288] specify clojurescript as provided dep in the pom

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index ac397763..58723459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,15 @@
     </developer>
   </developers>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojurescript</artifactId>
+      <version>0.0-2080</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <scm>
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>

From eae950ef2e00f5fa11e05c61946a0b196b9b4134 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Mon, 25 Nov 2013 22:41:32 -0600
Subject: [PATCH 156/288] [maven-release-plugin] prepare release
 core.logic-0.8.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58723459..ffe2d8d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.5-SNAPSHOT</version>
+  <version>0.8.5</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -41,6 +41,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.5</tag>
   </scm>
 </project>

From 38e3808c80d3479ec73916a0ac8ae835db58851d Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Mon, 25 Nov 2013 22:41:32 -0600
Subject: [PATCH 157/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffe2d8d7..32db7599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.5</version>
+  <version>0.8.6-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -41,6 +41,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.5</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 483c4bd4d9b5ca0985a83bd642fd7ba8c71beea5 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 25 Nov 2013 23:46:00 -0500
Subject: [PATCH 158/288] 0.8.4 -> 0.8.5

---
 CHANGES.md | 8 ++++++++
 README.md  | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 66ab7d63..00398a0f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+From 0.8.4 to 0.8.5
+====
+
+Changes
+----
+* old defrel functionality now replaced by pldb
+* small perf enhancements to CLJ & CLJS implementations
+
 From 0.8.3 to 0.8.4
 ====
 
diff --git a/README.md b/README.md
index 09c73c8c..61996006 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.4
+Latest stable release: 0.8.5
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.4
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.4"]
+[org.clojure/core.logic "0.8.5"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.4
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.4</version>
+  <version>0.8.5</version>
 </dependency>
 ```
 

From e3794ee25c38228c5281d553e93ff3a9033ee678 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Nov 2013 02:02:49 -0500
Subject: [PATCH 159/288] wip progress, only a half solution, doesn't seem
 correct yet - x should be bound to y

---
 src/main/clojure/clojure/core/logic.clj       | 21 ++++++++++++-------
 src/test/clojure/clojure/core/logic/tests.clj |  7 +++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 93ab0270..0dcf1b32 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2479,20 +2479,25 @@
       (reify
         clojure.lang.IFn
         (invoke [_ s]
-          ((composeg
-             (== fs x)
-             (remcg this)) s))
+          (let [fs (walk s fs)]
+            ((composeg
+               (== (partial-map fs) x)
+               (remcg this)) s)))
         IRunnable
         (-runnable? [_]
-          (not (lvar? (walk s x))))))
+          (and (not (lvar? (walk s x)))
+               (not (lvar? (walk s fs)))))))
     IConstraintOp
     (-rator [_] `featurec)
     (-rands [_] [x])
     IReifiableConstraint
     (-reifyc [_ v r a]
-      (let [fs (into {} fs)
-            r  (-reify* r (walk* a fs))]
-        `(featurec ~(walk* r x) ~(walk* r fs))))
+      (if-not (lvar? fs)
+        (let [fs (into {} fs)
+              r (-reify* r (walk* a fs))]
+          `(featurec ~(walk* r x) ~(walk* r fs)))
+        (let [[x fs] (-reify a [x fs] r)]
+          `(featurec ~x ~fs))))
     IConstraintWatchedStores
     (-watched-stores [this] #{::subst})))
 
@@ -2502,7 +2507,7 @@
   it may contain values which are logic variables to support
   feature extraction."
   [x fs]
-  (cgoal (-featurec x (partial-map fs))))
+  (cgoal (-featurec x fs)))
 
 ;; =============================================================================
 ;; defnc
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 644a3df4..5e63c2b1 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1816,6 +1816,12 @@
                  (fd/interval 1 2)))))
           (take 20 (repeat 1)))))
 
+(deftest test-145-partial-map
+  (is (= (run* [x y]
+           (== y {:baz "woz"})
+           (== (partial-map {:foo x}) {:foo y}))
+        '(([_0 {:baz "woz"}] :- (clojure.core.logic/featurec {:baz "woz"} _0))))))
+
 ;; =============================================================================
 ;; cKanren
 
@@ -3461,3 +3467,4 @@
   (let [x (lvar 'x)
         s (update-dom empty-s x ::nom (fnil (fn [d] (conj d '(swap x y))) []))]
     (is (= (get-dom s x ::nom) '[(swap x y)]))))
+

From 737452044d8feeebd908b6fb0cfb12f3370b58f3 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Nov 2013 02:14:02 -0500
Subject: [PATCH 160/288] CLJS-145: partial map bug

make featurec more relation, feature map no longer need be
ground. Cleanup featurec reification a bit. Needed to walk the value in
the other map in unify-with-pmap*. Add test
---
 src/main/clojure/clojure/core/logic.clj       | 3 ++-
 src/test/clojure/clojure/core/logic/tests.clj | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 0dcf1b32..b7c0caf1 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2427,7 +2427,8 @@
             vf (get v kf ::not-found)]
         (if (= vf ::not-found)
           nil
-          (let [uf (get u kf)]
+          (let [uf (get u kf) 
+                vf (walk s vf)]
             (if (lvar? vf)
               (recur (next ks) ((featurec vf uf) s))
               (if (map? uf)
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 5e63c2b1..c7696792 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1820,7 +1820,7 @@
   (is (= (run* [x y]
            (== y {:baz "woz"})
            (== (partial-map {:foo x}) {:foo y}))
-        '(([_0 {:baz "woz"}] :- (clojure.core.logic/featurec {:baz "woz"} _0))))))
+        '([{:baz "woz"} {:baz "woz"}]))))
 
 ;; =============================================================================
 ;; cKanren

From d8b13f7fe8b5b2f344dfd9b0e5bcb5f708e3eadb Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 26 Nov 2013 02:18:45 -0500
Subject: [PATCH 161/288] bump project.clj version to match dev

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 06692445..8874ab1b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.5-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.6-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From c0f69ab5f43567c5a9f8932b187c51a42ed2a5da Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 4 Dec 2013 00:44:22 -0500
Subject: [PATCH 162/288] not fully baked conjo

---
 src/main/clojure/clojure/core/logic.clj | 36 +++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index b7c0caf1..5c4efd08 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2655,6 +2655,42 @@
   [c & args]
   (cgoal (-nafc c args)))
 
+;; =============================================================================
+;; conjo
+
+(defn -conjo
+  ([coll args]
+    (reify
+      IConstraintStep
+      (-step [this s]
+        (reify
+           clojure.lang.IFn
+           (invoke [_ s]
+             (let [coll (walk s coll)
+                   args (walk s args)]
+               ((composeg
+                  (== (apply conj coll (butlast args)) (last args))
+                  (remcg this)) s)))
+           IRunnable
+           (-runnable? [_]
+             (and (ground-term? coll s)
+                  (every? #(ground-term? % s) (butlast args))))))
+      IConstraintOp
+      (-rator [_]
+        `conjo)
+      (-rands [_]
+        (vec (concat [coll] args)))
+      IReifiableConstraint
+      (-reifyc [_ v r s]
+        `(conjo ~coll ~@(-reify s args r)))
+      IConstraintWatchedStores
+      (-watched-stores [this] #{::subst}))))
+
+(defn conjo
+  "A constraint version of conj"
+  [coll & args]
+  (cgoal (-conjo coll args)))
+
 ;; =============================================================================
 ;; Deep Constraint
 

From 9f86dbab5c8edc41c22a7ecafcce3b5dfa58571f Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 4 Dec 2013 01:16:34 -0500
Subject: [PATCH 163/288] less half-baked reversible conjo

---
 src/main/clojure/clojure/core/logic.clj       | 70 +++++++++++++++----
 .../clojure/clojure/core/logic/protocols.clj  |  6 ++
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 5c4efd08..dc73da79 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2658,38 +2658,78 @@
 ;; =============================================================================
 ;; conjo
 
+(extend-protocol IJonc
+  clojure.lang.IPersistentMap
+  (-joncf [f]
+    (fn [coll & args]
+      (reduce
+        (fn [m [k v]]
+          (if (= (get m k) v)
+            (dissoc m k v)
+            (reduced ::failed)))
+        coll args)))
+
+  clojure.lang.IPersistentVector
+  (-joncf [f]
+    (fn [coll & args]
+      (let [args (reverse args)]
+        (reduce
+          (fn [v x]
+            (if (= (peek v) x)
+              (pop v)
+              (reduced ::failed)))
+          coll args))))
+
+  clojure.lang.IPersistentList
+  (-joncf [f]
+    (fn [coll & args]
+      (let [args (reverse args)]
+        (reduce
+          (fn [v x]
+            (if (= (peek v) x)
+              (pop v)
+              (reduced ::failed)))
+          coll args)))))
+
 (defn -conjo
-  ([coll args]
+  ([coll args out]
     (reify
       IConstraintStep
       (-step [this s]
         (reify
-           clojure.lang.IFn
-           (invoke [_ s]
-             (let [coll (walk s coll)
-                   args (walk s args)]
-               ((composeg
-                  (== (apply conj coll (butlast args)) (last args))
-                  (remcg this)) s)))
-           IRunnable
-           (-runnable? [_]
-             (and (ground-term? coll s)
-                  (every? #(ground-term? % s) (butlast args))))))
+          clojure.lang.IFn
+          (invoke [_ s]
+            (let [coll (walk s coll)
+                  args (walk s args)]
+              (if-not (lvar? coll)
+                ((composeg
+                   (== (apply conj coll args) out)
+                   (remcg this)) s)
+                (let [outv (apply (-joncf out) out args)]
+                  (if-not (= outv ::failed)
+                    ((composeg
+                       (== outv coll)
+                       (remcg this)) s))))))
+          IRunnable
+          (-runnable? [_]
+            (and (every? #(ground-term? % s) args)
+                 (or (ground-term? coll s)
+                     (ground-term? out s))))))
       IConstraintOp
       (-rator [_]
         `conjo)
       (-rands [_]
-        (vec (concat [coll] args)))
+        (vec (concat [coll] args [out])))
       IReifiableConstraint
       (-reifyc [_ v r s]
-        `(conjo ~coll ~@(-reify s args r)))
+        `(conjo ~coll ~@(-reify s (concat args [out]) r)))
       IConstraintWatchedStores
       (-watched-stores [this] #{::subst}))))
 
 (defn conjo
   "A constraint version of conj"
   [coll & args]
-  (cgoal (-conjo coll args)))
+  (cgoal (-conjo coll (butlast args) (last args))))
 
 ;; =============================================================================
 ;; Deep Constraint
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index d80ef334..78c341c4 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -232,3 +232,9 @@
 
 (defprotocol IFeature
   (-feature [x]))
+
+;; -----------------------------------------------------------------------------
+;; Jonc
+
+(defprotocol IJonc
+  (-joncf [this]))

From 9b9b3a8bb87ab5ccac2491fb5fdd80af18c47847 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 14 Dec 2013 15:44:21 -0500
Subject: [PATCH 164/288] make doc string and parameter list less cryptic

---
 src/main/clojure/clojure/core/logic/fd.clj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 637a9790..7cbe19c4 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -896,9 +896,9 @@
 
 (defn +
   "A finite domain constraint for addition and subtraction.
-   u, v & w must eventually be given domains if vars."
-  [u v w]
-  (cgoal (+c u v w)))
+   x, y & sum must eventually be given domains if vars."
+  [x y sum]
+  (cgoal (+c x y sum)))
 
 (defn -
   [u v w]
@@ -972,10 +972,10 @@
 
 (defn *
   "A finite domain constraint for multiplication and
-   thus division. u, v & w must be eventually be given 
+   thus division. x, y & product must be eventually be given 
    domains if vars."
-  [u v w]
-  (cgoal (*c u v w)))
+  [x y product]
+  (cgoal (*c x y product)))
 
 (defn quot [u v w]
   (* v w u))

From dba36dd1219ee45812aaa3ffb558f176072e7d3a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 20 Dec 2013 13:17:41 -0500
Subject: [PATCH 165/288] typos caught by the anaylzer

---
 src/main/clojure/clojure/core/logic/bench.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 0b95cdf8..7f269f9e 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -401,8 +401,8 @@
      (conda
        ((project [x b]
           (== (<= x b) true))
-        (partition l b l1 d))
-       (partition l b c d))))
+        (partitiono l b l1 d))
+       (partitiono l b c d))))
 
 ;; =============================================================================
 ;; Dinesman Dwelling Problem with CLP(FD)

From 5bf5147afdb0fe04da658c3573ca63a922975d05 Mon Sep 17 00:00:00 2001
From: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
Date: Mon, 16 Dec 2013 01:49:40 -0800
Subject: [PATCH 166/288] Fix several issues found by linting core.logic

+ Several misplaced doc strings.

+ Several deftest names that were identical in the same namespace,
  causing the earlier one's tests never to be run.

+ Some missing (is ...) wrappers around unit tests (caught by linter
  because the first one's return value was discarded).
---
 src/main/clojure/cljs/core/logic/macros.clj       |  6 ++++--
 src/main/clojure/clojure/core/logic.clj           |  6 ++++--
 .../clojure/clojure/core/logic/arithmetic.clj     | 15 ++++++++++-----
 src/test/clojure/clojure/core/logic/tests.clj     | 12 ++++++------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index 686157a5..7250bb26 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -112,14 +112,16 @@
 ;; =============================================================================
 ;; Debugging
 
-(defmacro log [& s]
+(defmacro log
   "Goal for println"
+  [& s]
   `(fn [a#]
      (println ~@s)
      a#))
 
-(defmacro trace-s []
+(defmacro trace-s
   "Goal that prints the current substitution"
+  []
   `(fn [a#]
      (println (str a#))
      a#))
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index dc73da79..1704d277 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1248,14 +1248,16 @@
 ;; =============================================================================
 ;; Debugging
 
-(defmacro log [& s]
+(defmacro log
   "Goal for println"
+  [& s]
   `(fn [a#]
      (println ~@s)
      a#))
 
-(defmacro trace-s []
+(defmacro trace-s
   "Goal that prints the current substitution"
+  []
   `(fn [a#]
      (println (str a#))
      a#))
diff --git a/src/main/clojure/clojure/core/logic/arithmetic.clj b/src/main/clojure/clojure/core/logic/arithmetic.clj
index b6e6e9c7..ca201142 100644
--- a/src/main/clojure/clojure/core/logic/arithmetic.clj
+++ b/src/main/clojure/clojure/core/logic/arithmetic.clj
@@ -3,42 +3,47 @@
   (:use [clojure.core.logic.protocols]
         [clojure.core.logic]))
 
-(defmacro = [x y]
+(defmacro =
   "Goal for testing whether x and y are equal. Non-relational."
+  [x y]
   `(fn [a#]
      (let [wx# (walk a# ~x)
            wy# (walk a# ~y)]
        (if (clojure.core/= wx# wy# )
          a# nil))))
 
-(defmacro > [x y]
+(defmacro >
   "Goal for testing whether x is greater than y. Non-relational."
+  [x y]
   `(fn [a#]
      (let [wx# (walk a# ~x)
            wy# (walk a# ~y)]
        (if (clojure.core/> wx# wy# )
          a# nil))))
 
-(defmacro >= [x y]
+(defmacro >=
   "Goal for testing whether x is greater than or equal to y.
   Non-relational."
+  [x y]
   `(fn [a#]
      (let [wx# (walk a# ~x)
            wy# (walk a# ~y)]
        (if (clojure.core/>= wx# wy# )
          a# nil))))
 
-(defmacro < [x y]
+(defmacro <
   "Goal for testing whether x is less than y. Non-relational."
+  [x y]
   `(fn [a#]
      (let [wx# (walk a# ~x)
            wy# (walk a# ~y)]
        (if (clojure.core/< wx# wy# )
          a# nil))))
 
-(defmacro <= [x y]
+(defmacro <=
   "Goal for testing whether x is less than or equal to y.
   Non-relational."
+  [x y]
   `(fn [a#]
      (let [wx# (walk a# ~x)
            wy# (walk a# ~y)]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index c7696792..fe7f65ff 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -2200,7 +2200,7 @@
         s ((fd/process-dom x (fd/interval 1 10) (fd/interval 1 10)) empty-s)]
     (is (= (fd/get-dom s x) (fd/interval 1 10)))))
 
-(deftest test-dom-1
+(deftest test-process-dom-3
   (let [x (lvar 'x)
         s ((fd/dom x (fd/interval 1 10)) empty-s)]
     (is (= (fd/get-dom s x) (fd/interval 1 10)))))
@@ -2446,7 +2446,7 @@
   (is (fd/-difference (fd/interval 1 10) 1)
       (fd/interval 2 10)))
 
-(deftest test-boundary-interval-1
+(deftest test-boundary-interval-2
   (is (fd/-difference (fd/interval 1 10) 10)
       (fd/interval 1 9)))
 
@@ -2584,7 +2584,7 @@
                (== q [x y z]))))
          (into #{} '([1 2 3] [1 3 2] [2 1 3] [2 3 1] [3 1 2] [3 2 1])))))
 
-(deftest test-=fd-1
+(deftest test-=fd-2
   (is (= (into #{}
            (run* [q]
              (fresh [a b]
@@ -3422,7 +3422,7 @@
     (is (= (get-attr s x :foo) 'bar))
     (is (= (get-attr s x :baz) 'woz))))
 
-(deftest test-attrs-2 []
+(deftest test-attrs-3 []
   (let [x (lvar 'x)
         s (ext-no-check empty-s x 1)
         s (add-attr s x :foo 'bar)
@@ -3433,8 +3433,8 @@
 (deftest test-root-1 []
   (let [x (lvar 'x)
         s (ext-no-check empty-s x 1)]
-    (= (root-var s x) x)
-    (= (root-val s x) 1)))
+    (is (= (root-var s x) x))
+    (is (= (root-val s x) 1))))
 
 (deftest test-root-2 []
   (let [x (lvar 'x)

From 7c28c2dc75e143fac4429844a28210c0e9ed5575 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 30 Dec 2013 20:15:28 -0500
Subject: [PATCH 167/288] fix docstring

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 1704d277..0ad113c5 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2409,7 +2409,7 @@
      (distincto (lcons h1 t))))
 
 (defne rembero
-  "A relation between l and o where is removed from
+  "A relation between l and o where x is removed from
    l exactly one time."
   [x l o]
   ([_ [x . xs] xs])

From aa08c5f7775a3e2f3cc9c8eaa701d1f24753611a Mon Sep 17 00:00:00 2001
From: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
Date: Sun, 22 Dec 2013 23:02:07 -0800
Subject: [PATCH 168/288] Fix several problems with unit tests

A few were of the form (is (= expr1) expr2), which always passes.
Changed these to (is (= expr1 expr2)).

Many had extraneous [] after the deftest name.  deftest does not have
arguments like defn or defmacro.  These were harmless.  The only
strange behavior they caused was to evaluate an empty vector for those
tests, and then go on to the tests in the deftest.  However, it does
seem best to remove them.
---
 .../clojure/core/logic/nominal/tests.clj      |   6 +-
 src/test/clojure/clojure/core/logic/tests.clj | 116 +++++++++---------
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/nominal/tests.clj b/src/test/clojure/clojure/core/logic/nominal/tests.clj
index 25f5373c..45d33b3b 100644
--- a/src/test/clojure/clojure/core/logic/nominal/tests.clj
+++ b/src/test/clojure/clojure/core/logic/nominal/tests.clj
@@ -54,7 +54,7 @@
   (is (= (run* [q] (nom/fresh [a b] (== q b) (nom/hash a q))) '(a_0)))
   (is (= (run* [q] (nom/fresh [a b] (nom/hash a q) (== q b))) '(a_0)))
   (is (= (run* [q] (nom/fresh [a b] (conde [(== q a) (nom/hash b q)] [(== q b)]))) '(a_0 a_0)))
-  (is (= (run* [q] (nom/fresh [a] (nom/hash a a)))) '())
+  (is (= (run* [q] (nom/fresh [a] (nom/hash a a))) '()))
   (is (= (run* [q] (nom/fresh [a] (== q a) (nom/hash a q))) '()))
   (is (= (run* [q] (nom/fresh [a] (nom/hash a q) (== q a))) '()))
   (is (= (run* [q] (nom/fresh [a] (nom/hash a `(~a)))) '()))
@@ -292,8 +292,8 @@
          '((-> _0 (-> _1 _0)))))
   (is (= (run* [q]
            (nom/fresh [c]
-             (typo [] ['lam (nom/tie c ['app ['var c] ['var c]])] q))))
-      '())
+             (typo [] ['lam (nom/tie c ['app ['var c] ['var c]])] q)))
+         '()))
   (is (= (run 2 [q] (typo [] q '(-> int int)))
          [['lam (nom/tie 'a_0 '(var a_0))]
           ['lam (nom/tie 'a_0 ['app ['lam (nom/tie 'a_1 '(var a_1))] '(var a_0)])]])))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index fe7f65ff..30a474e7 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1180,10 +1180,10 @@
 ;; custom var reification
 
 (deftest test-reify-vars-false
-  (is (-run {:reify-vars false} [q]
-        (fresh [x]
-          (== q x)))
-      '(x)))
+  (is (= (-run {:reify-vars false} [q]
+               (fresh [x]
+                      (== q x)))
+         '(x))))
 
 (deftest test-custom-var-reifier-1
   (let [x (lvar 'x)]
@@ -1334,16 +1334,16 @@
     (is (= (run* [q] (fresh [x y] (rel2 x y) (== x y))) '(_0)))
     (is (= (run* [q] (rel3 '(1 2) q)) '((2))))))
 
-(deftest test-pm []
+(deftest test-pm
   (-test-pm "pattern matching with defne relations" pm1 pm2 pm4))
 
-(deftest test-pm-anonymous []
+(deftest test-pm-anonymous
   (-test-pm "pattern matching with anonymous fne relations"
     (fne [x y] ([:foo :bar]))
     (fne [x y] ([_ x]))
     (fne [x y] ([[h . t] t]))))
 
-(deftest test-pm-anonymous-tabled []
+(deftest test-pm-anonymous-tabled
   (-test-pm "pattern matching with tabled anonymous fne relations"
     (fne [x y] :tabled ([:foo :bar]))
     (fne [x y] :tabled ([_ x]))
@@ -1825,28 +1825,28 @@
 ;; =============================================================================
 ;; cKanren
 
-(deftest test-pair []
+(deftest test-pair
   (is (= (pair 1 2)
          (pair 1 2))))
 
-(deftest test-dom-1 []
+(deftest test-dom-1
   (let [x (lvar 'x)
         s ((fd/dom x 1) empty-s)]
     (is (= (:s s) {x 1}))))
 
-#_(deftest test-dom-2 []
+#_(deftest test-dom-2
   (let [x (lvar 'x)
         s ((fd/dom x (fd/interval 1 10)) empty-s)]
     (is (= (:ws s) {x (fd/interval 1 10)}))))
 
-#_(deftest test-dom-3 []
+#_(deftest test-dom-3
   (let [x (lvar 'x)
         s ((composeg
             (fd/dom x (fd/interval 1 10))
             (fd/dom x (fd/interval 3 6))) empty-s)]
     (is (= (:ws s) {x (fd/interval 3 6)}))))
 
-#_(deftest test-dom-4 []
+#_(deftest test-dom-4
   (let [x (lvar 'x)
         s ((composeg
             (fd/dom x (fd/interval 1 5))
@@ -1854,7 +1854,7 @@
     (is (= (:s s) {x 5}))
     (is (= (:ws s) {}))))
 
-(deftest test-keep-before-1 []
+(deftest test-keep-before-1
   (is (= (fd/-keep-before (fd/interval 1 10) 5)
          (fd/interval 1 4)))
   (is (= (fd/-keep-before (fd/interval 5 10) 5)
@@ -1864,7 +1864,7 @@
   (is (= (fd/-keep-before (fd/interval 5 10) 10)
          (fd/interval 5 9))))
 
-(deftest test-drop-before-1 []
+(deftest test-drop-before-1
   (is (= (fd/-drop-before (fd/interval 5 10) 4)
          (fd/interval 5 10)))
   (is (= (fd/-drop-before (fd/interval 1 10) 5)
@@ -1878,7 +1878,7 @@
   (is (= (fd/-drop-before (fd/interval 5 10) 11)
          nil)))
 
-(deftest test-keep-before-2 []
+(deftest test-keep-before-2
   (is (= (fd/-keep-before 1 3)
          1))
   (is (= (fd/-keep-before 1 2)
@@ -1886,7 +1886,7 @@
   (is (= (fd/-keep-before 1 1)
          nil)))
 
-(deftest test-drop-before-2 []
+(deftest test-drop-before-2
   (is (= (fd/-drop-before 1 3)
          nil))
   (is (= (fd/-drop-before 1 2)
@@ -1896,11 +1896,11 @@
   (is (= (fd/-drop-before 1 0)
          1)))
 
-(deftest test-drop-before-mi-1 []
+(deftest test-drop-before-mi-1
   (is (= (fd/-drop-before (fd/multi-interval 2 4) (fd/-lb 3))
          4)))
 
-(deftest test-keep-before-mi-2 []
+(deftest test-keep-before-mi-2
   (is (= (fd/-keep-before (fd/multi-interval 2 4) (fd/-lb 3))
          2)))
 
@@ -2443,12 +2443,12 @@
            (fd/interval 2 10)))))
 
 (deftest test-boundary-interval-1
-  (is (fd/-difference (fd/interval 1 10) 1)
-      (fd/interval 2 10)))
+  (is (= (fd/-difference (fd/interval 1 10) 1)
+         (fd/interval 2 10))))
 
 (deftest test-boundary-interval-2
-  (is (fd/-difference (fd/interval 1 10) 10)
-      (fd/interval 1 9)))
+  (is (= (fd/-difference (fd/interval 1 10) 10)
+         (fd/interval 1 9))))
 
 (deftest test-process-imi-1
   (let [x (lvar 'x)
@@ -2672,7 +2672,7 @@
 ;; -----------------------------------------------------------------------------
 ;; CLP(Tree)
 
-#_(deftest test-recover-vars []
+#_(deftest test-recover-vars
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
@@ -2681,7 +2681,7 @@
     (is (= (recover-vars (:l s))
            #{x y}))))
 
-#_(deftest test-prefix-s []
+#_(deftest test-prefix-s
   (let [x (lvar 'x)
         y (lvar 'y)
         s empty-s
@@ -2693,7 +2693,7 @@
            (list (pair y 2) (pair x 1))))
     (is (= (-> p meta :s) sp))))
 
-#_(deftest test-prefix-subsumes? []
+#_(deftest test-prefix-subsumes?
   (let [x (lvar 'x)
         y (lvar 'y)
         z (lvar 'z)
@@ -2706,7 +2706,7 @@
     (is (true? (prefix-subsumes? p (list (pair y 2)))))
     (is (false? (prefix-subsumes? p (list (pair z 3)))))))
 
-(deftest test-remc []
+(deftest test-remc
   (let [x (lvar 'x)
         y (lvar 'y)
         z (lvar 'z)
@@ -2717,13 +2717,13 @@
     (is (= (:km cs) {}))
     (is (= (:cm cs) {}))))
 
-(deftest test-treec-id-1 []
+(deftest test-treec-id-1
   (let [x (lvar 'x)
         y (lvar 'y)
         c (with-id (!= x y) 0)]
     (is (zero? (id c)))))
 
-(deftest test-tree-constraint? []
+(deftest test-tree-constraint?
   (let [x (lvar 'x)
         y (lvar 'y)
         c (!=c (list (pair x 1) (pair y 2)))
@@ -2732,7 +2732,7 @@
     (is (= (into #{} (keys (:km cs)))
            #{x y}))))
 
-(deftest test-prefix-protocols []
+(deftest test-prefix-protocols
   (let [x (lvar 'x)
         y (lvar 'y)
         c (!=c (list (pair x 1) (pair y 2)))
@@ -2740,13 +2740,13 @@
     (is (= (-prefix c)
            (list (pair x 1))))))
 
-(deftest test-!=-1 []
+(deftest test-!=-1
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x y) empty-s)]
     (is (= (-prefix ((:cm (:cs s)) 0)) {x y}))))
 
-(deftest test-!=-2 []
+(deftest test-!=-2
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x y) empty-s)
@@ -2757,7 +2757,7 @@
 ;; vars from the constraint store. This may return but as a finer grained
 ;; protocol IRelevantLVar or some such
 
-#_(deftest test-!=-3 []
+#_(deftest test-!=-3
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x y) empty-s)
@@ -2766,7 +2766,7 @@
     (is (empty? (:cm (:cs s))))
     (is (empty? (:km (:cs s))))))
 
-(deftest test-!=-4 []
+(deftest test-!=-4
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((== x 1) empty-s)
@@ -2775,7 +2775,7 @@
     (is (empty? (:cm (:cs s))))
     (is (empty? (:km (:cs s))))))
 
-(deftest test-!=-5 []
+(deftest test-!=-5
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((== x 1) empty-s)
@@ -2784,13 +2784,13 @@
     (is (empty? (:cm (:cs s))))
     (is (empty? (:km (:cs s))))))
 
-(deftest test-!=-6 []
+(deftest test-!=-6
   (let [x (lvar 'x)
         y (lvar 'y)
         s ((!= x 1) empty-s)]
     (is (= (-prefix ((:cm (:cs s)) 0)) {x 1}))))
 
-#_(deftest test-normalize-store []
+#_(deftest test-normalize-store
   (let [x (lvar 'x)
         y (lvar 'y)
         c (!=c (list (pair x 1)))
@@ -2798,7 +2798,7 @@
         cs (addc (make-cs) empty-s c)]
     ))
 
-(deftest test-multi-constraints-1 []
+(deftest test-multi-constraints-1
   (is (= (run* [q]
            (fresh [x y z]
              (fd/in x y z (fd/interval 1 3))
@@ -2807,7 +2807,7 @@
              (== q [x y z])))
          '([1 1 2]))))
 
-(deftest test--fd-1 []
+(deftest test--fd-1
   (is (= (run* [q]
            (fd/in q (fd/interval 1 10))
            (fd/- 4 q 1))
@@ -2817,7 +2817,7 @@
            (fd/- 4 2 q))
          '(2))))
 
-(deftest test-quot-1 []
+(deftest test-quot-1
   (is (= (run* [q]
            (fd/in q (fd/interval 1 10))
            (fd/quot 4 2 q))
@@ -2826,7 +2826,7 @@
 ;; =============================================================================
 ;; fd/eq
 
-(deftest test-fd-eq-1 []
+(deftest test-fd-eq-1
   (is (= (run* [q]
            (fresh [x y]
              (fd/in x y (fd/interval 0 9))
@@ -2836,7 +2836,7 @@
              (== q [x y])))
          '([6 3]))))
 
-(deftest test-fd-eq-2 []
+(deftest test-fd-eq-2
   (is (= (run* [q]
            (fresh [s e n d m o r y]
              (== q [s e n d m o r y])
@@ -2849,7 +2849,7 @@
                  (+ (* 10000 m) (* 1000 o) (* 100 n) (* 10 e) y)))))
          '([9 5 6 7 1 0 8 2]))))
 
-(deftest test-fd-eq-3 []
+(deftest test-fd-eq-3
   (is (= (run* [q]
            (fresh [x y]
              (fd/in x y (fd/interval 1 20))
@@ -2859,7 +2859,7 @@
              (== q [x y])))
          '([4 7]))))
 
-(deftest test-fd-distinct-1 []
+(deftest test-fd-distinct-1
   (is (= (run 1 [q]
            (fresh [x y]
              (fd/distinct q)
@@ -2868,7 +2868,7 @@
              (== y 1)))
          ())))
 
-(deftest test-logic-62-fd []
+(deftest test-logic-62-fd
   (is (= (run 1 [q]
            (fresh [x y a b]
              (fd/distinct [x y])
@@ -2886,7 +2886,7 @@
              (fd/distinct [x y])))
          ())))
 
-(deftest test-distincto-1 []
+(deftest test-distincto-1
   (is (= (run 1 [q]
            (fresh [x y a b]
              (distincto q)
@@ -2896,13 +2896,13 @@
              (== y 2)))
          '([1 2]))))
 
-(deftest test-eq-vars-1 []
+(deftest test-eq-vars-1
   (let [x0 (lvar 'x)
         x1 (with-meta x0 {:foo 'bar})
         s  (unify empty-s x0 x1)]
     (is (= s empty-s))))
 
-(deftest test-logic-81-fd []
+(deftest test-logic-81-fd
   (is (= (run* [q]
            (fresh [x y]
              (== q x)
@@ -2923,7 +2923,7 @@
 ;; =============================================================================
 ;; predc
 
-(deftest test-predc-1 []
+(deftest test-predc-1
   (is (= (run* [q]
            (predc q number? `number?))
          '((_0 :- clojure.core/number?))))
@@ -2994,7 +2994,7 @@
     (not-adjacento smith fletcher)
     (not-adjacento fletcher cooper)))
 
-(deftest test-dinesmandfd []
+(deftest test-dinesmandfd
   (is (= (dinesmanfd) '([3 2 4 5 1]))))
 
 (defne subchecko [w sl r o n]
@@ -3409,12 +3409,12 @@
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change
 
-(deftest test-attrs-1 []
+(deftest test-attrs-1
   (let [x (lvar 'x)
         s (add-attr empty-s x :foo 'bar)]
     (is (= (get-attr s x :foo) 'bar))))
 
-(deftest test-attrs-2 []
+(deftest test-attrs-2
   (let [x (lvar 'x)
         s (ext-no-check empty-s x 1)
         s (add-attr s x :foo 'bar)
@@ -3422,7 +3422,7 @@
     (is (= (get-attr s x :foo) 'bar))
     (is (= (get-attr s x :baz) 'woz))))
 
-(deftest test-attrs-3 []
+(deftest test-attrs-3
   (let [x (lvar 'x)
         s (ext-no-check empty-s x 1)
         s (add-attr s x :foo 'bar)
@@ -3430,18 +3430,18 @@
         s (rem-attr s x :foo)]
     (is (= (get-attr s x :foo) nil))))
 
-(deftest test-root-1 []
+(deftest test-root-1
   (let [x (lvar 'x)
         s (ext-no-check empty-s x 1)]
     (is (= (root-var s x) x))
     (is (= (root-val s x) 1))))
 
-(deftest test-root-2 []
+(deftest test-root-2
   (let [x (lvar 'x)
         s (add-attr empty-s x :foo 'bar)]
     (is (subst-val? (root-val s x)))))
 
-(deftest test-root-3 []
+(deftest test-root-3
   (let [x (lvar 'x)
         y (lvar 'y)
         s (-> empty-s
@@ -3449,7 +3449,7 @@
            (ext-no-check y x))]
     (is (= (root-var s y) x))))
 
-(deftest test-ext-run-cs-1 []
+(deftest test-ext-run-cs-1
   (let [x (lvar 'x)
         s (ext-no-check empty-s x (subst-val ::l/unbound))
         s (add-attr s x ::l/fd (fd/domain 1 2 3))
@@ -3457,13 +3457,13 @@
     (is (= (root-val s x) 1))
     (is (= (walk s x) 1))))
 
-(deftest test-update-dom-1 []
+(deftest test-update-dom-1
   (let [x (lvar 'x)
         s (add-dom empty-s x ::nom '[(swap a b)])
         s (update-dom s x ::nom (fn [d] (conj d '(swap x y))))]
     (is (= (get-dom s x ::nom) '[(swap a b) (swap x y)]))))
 
-(deftest test-update-dom-2 []
+(deftest test-update-dom-2
   (let [x (lvar 'x)
         s (update-dom empty-s x ::nom (fnil (fn [d] (conj d '(swap x y))) []))]
     (is (= (get-dom s x ::nom) '[(swap x y)]))))

From 4b96296a9633015774bb44fa1a4b0dae40b4c3b3 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 7 Feb 2014 21:54:36 -0500
Subject: [PATCH 169/288] add IVerifyConstraint protocol, call in
 ConstraintStore addc, addcg now fails if addc return a false-y value.

---
 src/main/clojure/clojure/core/logic.clj       | 20 +++++++++++--------
 .../clojure/clojure/core/logic/protocols.clj  |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 0ad113c5..6632f603 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -113,10 +113,12 @@
 
   IConstraintStore
   (addc [this a c]
-    (let [vars (var-rands a c)
-          c (with-id c cid)
-          cs (reduce (fn [cs v] (add-var cs v c)) this vars)]
-      (ConstraintStore. (:km cs) (:cm cs) (inc cid) running)))
+    (when (or (not (instance? clojure.core.logic.protocols.IVerifyConstraint c))
+              (-verify c a this))
+      (let [vars (var-rands a c)
+            c    (with-id c cid)
+            cs   (reduce (fn [cs v] (add-var cs v c)) this vars)]
+        (ConstraintStore. (:km cs) (:cm cs) (inc cid) running))))
 
   (updatec [this a c]
     (let [oc (cm (id c))
@@ -1998,10 +2000,12 @@
 
 (defn addcg [c]
   (fn [a]
-    (let [a (reduce (fn [a x]
-                      (ext-no-check a x (subst-val ::unbound)))
-              a (unbound-rands a c))]
-      (assoc a :cs (addc (:cs a) a c)))))
+    (let [a  (reduce
+               (fn [a x]
+                 (ext-no-check a x (subst-val ::unbound)))
+               a (unbound-rands a c))
+          cs (addc (:cs a) a c)]
+      (when cs (assoc a :cs cs)))))
 
 (defn updatecg [c]
   (fn [a]
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index 78c341c4..192b56aa 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -174,6 +174,9 @@
 (defprotocol IReifiableConstraint
   (-reifyc [c v r a]))
 
+(defprotocol IVerifyConstraint
+  (-verify [c a cs]))
+
 (defn reifiable? [x]
   (instance? clojure.core.logic.protocols.IReifiableConstraint x))
 

From d6473a097dc220d8b2620599cd71bdad7a26424d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 7 Feb 2014 21:56:56 -0500
Subject: [PATCH 170/288] 0.8.6

---
 README.md   | 6 +++---
 project.clj | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 61996006..56888cb6 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.5
+Latest stable release: 0.8.6
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.5
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.5"]
+[org.clojure/core.logic "0.8.6"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.5
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.5</version>
+  <version>0.8.6</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index 8874ab1b..3740e396 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.6-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.7-SNAPSHOT" 
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 
@@ -9,11 +9,11 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2080"]
+                 [org.clojure/clojurescript "0.0-2138" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 
-  :plugins [[lein-cljsbuild "1.0.0"]]
+  :plugins [[lein-cljsbuild "1.0.2"]]
 
   :cljsbuild
   {:builds

From 2f98bcb59cf45eaec5a2c11e6cb348376c260c86 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 7 Feb 2014 22:03:08 -0500
Subject: [PATCH 171/288] hard dependency on Clojure 1.5.1, pldb uses reducers

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 32db7599..51e0682b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,10 +29,15 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.5.1</version>
+    </dependency>
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojurescript</artifactId>
-      <version>0.0-2080</version>
+      <version>0.0-2138</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

From 61a63566a66f4861da623ebfb2c17d0cf8d3c6e4 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Fri, 7 Feb 2014 21:05:51 -0600
Subject: [PATCH 172/288] [maven-release-plugin] prepare release
 core.logic-0.8.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 51e0682b..da02240f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.6-SNAPSHOT</version>
+  <version>0.8.6</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.6</tag>
   </scm>
 </project>

From 8c166015b4a5f66eec9168accc0e5c3a6a27c509 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Fri, 7 Feb 2014 21:05:51 -0600
Subject: [PATCH 173/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index da02240f..8244748c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.6</version>
+  <version>0.8.7-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.6</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From b256c9ffe3b7fa46850cb3960414571c62293cb7 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Feb 2014 12:42:39 -0500
Subject: [PATCH 174/288] fix connected bench

---
 src/main/clojure/clojure/core/logic/bench.clj | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 7f269f9e..6274e007 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -116,12 +116,20 @@
 
 (def connected-db
   (pldb/db
-   [connected [[1 2] [1 5]]]
-   [connected [[2 1] [2 3] [2 5]]]
-   [connected [[3 2] [3 4]]]
-   [connected [[4 3] [4 5] [4 6]]]
-   [connected [[5 1] [5 2] [5 4]]]
-   [connected [[6 4]]]))
+    [connected 1 2]
+    [connected 1 5]
+    [connected 2 1]
+    [connected 2 3]
+    [connected 2 5]
+    [connected 3 2]
+    [connected 3 4]
+    [connected 4 3]
+    [connected 4 5]
+    [connected 4 6]
+    [connected 5 1]
+    [connected 5 2]
+    [connected 5 4]
+    [connected 6 4]))
 
 (defne connected-to-allo
   "Ensure that vertex v is connected to all vertices
@@ -142,23 +150,24 @@
      (all-connected-to-allo t)))
 
 (comment
-  (run-nc* [q]
-    (fresh [a b d]
-      (== q (llist a b d))
-      (fd/bounded-listo q 6)
-      (all-connected-to-allo q)))
+  (pldb/with-db connected-db
+    (run-nc* [q]
+      (fresh [a b d]
+        (== q (llist a b d))
+        (fd/bounded-listo q 6)
+        (all-connected-to-allo q))))
 
   ;; 350-400ms
   (dotimes [_ 5]
     (time
-     (dotimes [_ 100]
-      (doall
-       (pldb/with-db connected-db
-         (run-nc 20 [q]
-                (fresh [a b d]
-                       (== q (llist a b d))
-                       (fd/bounded-listo q 6)
-                       (all-connected-to-allo q))))))))
+      (dotimes [_ 100]
+        (doall
+          (pldb/with-db connected-db
+            (run-nc 20 [q]
+              (fresh [a b d]
+                (== q (llist a b d))
+                (fd/bounded-listo q 6)
+                (all-connected-to-allo q))))))))
 )
 
 ;; =============================================================================

From f9402356262aba73eef5f1b9ecd012514255114e Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Feb 2014 14:35:05 -0500
Subject: [PATCH 175/288] make conjo handle more cases

---
 src/main/clojure/clojure/core/logic.clj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 6632f603..ee39210b 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2711,16 +2711,15 @@
                 ((composeg
                    (== (apply conj coll args) out)
                    (remcg this)) s)
-                (let [outv (apply (-joncf out) out args)]
+                (let [out  (walk s out)
+                      outv (apply (-joncf out) out args)]
                   (if-not (= outv ::failed)
                     ((composeg
                        (== outv coll)
                        (remcg this)) s))))))
           IRunnable
           (-runnable? [_]
-            (and (every? #(ground-term? % s) args)
-                 (or (ground-term? coll s)
-                     (ground-term? out s))))))
+            (= (count (filter #(ground-term? % s) [coll args out])) 2))))
       IConstraintOp
       (-rator [_]
         `conjo)

From dcc94f57a93c3c4d6085121844480dd9799f8cd5 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Feb 2014 14:41:49 -0500
Subject: [PATCH 176/288] conjo tests

---
 src/test/clojure/clojure/core/logic/tests.clj | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 30a474e7..76f2092c 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3406,6 +3406,51 @@
         s (((fd/in x (fd/domain 1 2 3)) s))]
     (is (= (get-dom s x ::l/fd) (fd/domain 1 2 3)))))
 
+;; =============================================================================
+;; conjo
+
+(deftest test-conjo-1
+  (is (= (run* [p q]
+           (conjo p 2 q)
+           (== p [1]))
+         '([[1] [1 2]])))
+  (is (= (run* [p q]
+           (== p [1])
+           (conjo p 2 q))
+         '([[1] [1 2]])))
+  (is (= (run* [p q]
+           (conjo p 2 q)
+           (== q [1 2]))
+         '([[1] [1 2]])))
+  (is (= (run* [p q]
+           (== q [1 2])
+           (conjo p 2 q))
+         '([[1] [1 2]])))
+  (is (= (run* [p q]
+           (== p {:foo :bar})
+           (conjo p [:baz :woz] q))
+         '([{:foo :bar} {:foo :bar :baz :woz}])))
+  (is (= (run* [p q]
+           (conjo p [:baz :woz] q)
+           (== p {:foo :bar}))
+         '([{:foo :bar} {:foo :bar :baz :woz}])))
+  (is (= (run* [p q]
+           (conjo p [:baz :woz] q)
+           (== q {:foo :bar :baz :woz}))
+         '([{:foo :bar} {:foo :bar :baz :woz}])))
+  (is (= (run* [p q]
+           (== q {:foo :bar :baz :woz})
+           (conjo p [:baz :woz] q))
+         '([{:foo :bar} {:foo :bar :baz :woz}])))
+  (is (= (run* [p q]
+           (conjo p [:baz :woz] q)
+           (== q {:foo :bar}))
+         '()))
+  (is (= (run* [p q]
+           (== q {:foo :bar})
+           (conjo p [:baz :woz] q))
+         '())))
+
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change
 

From d7565d61460e2538e3d425aa62f1c2df7e80d403 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Feb 2014 14:54:23 -0500
Subject: [PATCH 177/288] include failing test that should work

---
 src/test/clojure/clojure/core/logic/tests.clj | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 76f2092c..166e5e06 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3449,7 +3449,12 @@
   (is (= (run* [p q]
            (== q {:foo :bar})
            (conjo p [:baz :woz] q))
-         '())))
+         '()))
+  ;; (is (= (run* [q]
+  ;;          (conjo q [:baz :woz] {:foo :bar :baz :woz})
+  ;;          (== q {:foo :bar :baz :woz}))
+  ;;        '()))
+  )
 
 ;; =============================================================================
 ;; Implementation Specific Tests - Subject To Change

From 6959cf71092c5a778663c584a380189a1a66f9be Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 8 Feb 2014 15:47:52 -0500
Subject: [PATCH 178/288] remove stale comment

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index ee39210b..d2431504 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1889,7 +1889,7 @@
                   [(make-suspended-stream cache start
                      (fn [] (reuse this argv cache (:ansl @cache) (count start))))]
                   ;; we have answer terms to reuse in the cache
-                  (let [ans (first ansv*)] ;; FIXME: sets are unordered! - David
+                  (let [ans (first ansv*)]
                     (Choice. (subunify this argv (reify-tabled this ans))
                       (fn [] (reuse-loop (rest ansv*)))))))]
         (reuse-loop start))))

From b03b277884fe45f36a0b1ebc8e9389f3445e06f6 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 9 Feb 2014 17:14:32 -0500
Subject: [PATCH 179/288] Need to verify when constraints are migrated. Change
 IConstraintStore so that it takes the substitution. In migrate we now verify
 any constraints that need verification. Change lvar unification so that we
 fail if we could not migrate the constraints.

---
 src/main/clojure/clojure/core/logic.clj       | 25 ++++++++++++-------
 .../clojure/clojure/core/logic/protocols.clj  |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index d2431504..da3d19da 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -152,11 +152,17 @@
     (when-let [ids (get km (root-var a x))]
       (filter #((-watched-stores %) ws) (map cm (remove running ids)))))
 
-  (migrate [this x root]
+  (migrate [this x root a]
     (let [xcs    (km x)
           rootcs (km root #{})
           nkm    (assoc (dissoc km x) root (into rootcs xcs))]
-      (ConstraintStore. nkm cm cid running)))
+      (when (every?
+              (fn [c]
+                (if (instance? clojure.core.logic.protocols.IVerifyConstraint c)
+                  (-verify c a this)
+                  true))
+              (map cm xcs))
+        (ConstraintStore. nkm cm cid running))))
 
   clojure.lang.Counted
   (count [this]
@@ -644,13 +650,14 @@
                       (-> v clojure.core/meta ::unbound) [v u]
                       :else nil)]
         (if repoint
-          (let [[root other] repoint
-                s (assoc s :cs (migrate (:cs s) other root))
-                s (if (-> other clojure.core/meta ::unbound)
-                    (merge-with-root s other root)
-                    s)]
-            (when s
-              (ext-no-check s other root)))
+          (let [[root other] repoint]
+            (when-let [s (if (-> other clojure.core/meta ::unbound)
+                           (merge-with-root s other root)
+                           s)]
+              (let [s  (ext-no-check s other root)
+                    cs (migrate (:cs s) other root s)]
+                (when cs
+                  (assoc s :cs cs)))))
           (ext-no-check s u v)))
 
       (non-storable? v)
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index 192b56aa..9f52c445 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -125,7 +125,7 @@
   (remc [this a c])
   (runc [this c state])
   (constraints-for [this a x ws])
-  (migrate [this x root]))
+  (migrate [this x root a]))
 
 ;; -----------------------------------------------------------------------------
 ;; Generic constraint protocols

From ff6b35db77072e9d5603aa028eb3760426bc3613 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 9 Feb 2014 17:17:09 -0500
Subject: [PATCH 180/288] 0.8.6 -> 0.8.7

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 56888cb6..8b4cb289 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.6
+Latest stable release: 0.8.7
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.6
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.6"]
+[org.clojure/core.logic "0.8.7"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.6
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.6</version>
+  <version>0.8.7</version>
 </dependency>
 ```
 

From 5ad1c16ea84837caa4777e5c830aee77d93fcbd1 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 9 Feb 2014 16:18:11 -0600
Subject: [PATCH 181/288] [maven-release-plugin] prepare release
 core.logic-0.8.7

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8244748c..f0477098 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.7-SNAPSHOT</version>
+  <version>0.8.7</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.7</tag>
   </scm>
 </project>

From 1f0e7d14add8d09d6dc26ede3560c5b08ad849b3 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 9 Feb 2014 16:18:11 -0600
Subject: [PATCH 182/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0477098..4de528d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.7</version>
+  <version>0.8.8-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.7</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 191fe473bfdd95683e8188eba516de844915a7d0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 20 Feb 2014 18:17:25 -0500
Subject: [PATCH 183/288] document changes between 0.8.5 and 0.8.6

---
 CHANGES.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 00398a0f..380047b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+From 0.8.5 to 0.8.6
+====
+
+Changes
+----
+* Support detecting incompatible constraints, IVerifyConstraint
+  protocol
+* Hard dependency on Clojure 1.5.1, pldb uses reducers
+
+Fixes
+----
+* LOGIC-145: partial map bug
+
 From 0.8.4 to 0.8.5
 ====
 

From 09c5d02bd1f1c6b45487c1d13f337dc3bb631365 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 21 Feb 2014 00:28:07 -0500
Subject: [PATCH 184/288] doc 0.8.6 -> 0.8.7 changes

---
 CHANGES.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 380047b2..825b03e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+From 0.8.6 to 0.8.7
+====
+
+Fixes
+----
+* Constraint verification did not properly handle aliases logic vars
+
 From 0.8.5 to 0.8.6
 ====
 

From 0057ded54ffc41b324c9e8ee6418245597d6c8e8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 26 Mar 2014 11:41:32 -0700
Subject: [PATCH 185/288] prep for !=

---
 src/main/clojure/cljs/core/logic.cljs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 92b52d5a..e64cd326 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -118,7 +118,7 @@
           (.-rhs x)
           (recur (-next xs)))))))
 
-(deftype Substitutions [s]
+(deftype Substitutions [s c]
   IEquiv
   (-equiv [this o]
     (or (identical? this o)
@@ -141,7 +141,7 @@
       (-ext-no-check this u v)))
 
   (-ext-no-check [this u v]
-    (Substitutions. (conj s (Pair. u v))))
+    (Substitutions. (conj s (Pair. u v)) c))
   
   (-walk [this v]
     (cond
@@ -186,10 +186,13 @@
   (-take* [this]
     this))
 
-(defn make-s [s]
-  (Substitutions. s))
+(defn make-s
+  ([s]
+     (Substitutions. s nil))
+  ([s c]
+     (Substitutions. s c)))
 
-(def ^not-native empty-s (make-s '()))
+(def ^not-native empty-s (make-s '() nil))
 
 (defn ^boolean subst? [x]
   (instance? Substitutions x))
@@ -269,7 +272,10 @@
   (-lfirst [this])
   (-lnext [this]))
 
-(declare LCons failed?)
+(declare LCons Fail)
+
+(defn ^boolean failed? [x]
+  (instance? Fail x))
 
 (defn ^boolean lcons? [x]
   (instance? LCons x))
@@ -619,9 +625,6 @@
   ITake
   (-take* [this] ()))
 
-(defn failed? [x]
-  (instance? Fail x))
-
 ;; =============================================================================
 ;; Syntax
 

From ae8fdd3b15d213c98239122e4046a7f531b0de79 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 26 Mar 2014 11:42:37 -0700
Subject: [PATCH 186/288] bump cljs

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 3740e396..00f4ad5d 100644
--- a/project.clj
+++ b/project.clj
@@ -9,7 +9,7 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2138" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2173" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 

From c1484d283d3c810886914a06a09b6a815235a09c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 27 Mar 2014 12:48:18 -0700
Subject: [PATCH 187/288] fix source paths for cljs code

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 00f4ad5d..bb625960 100644
--- a/project.clj
+++ b/project.clj
@@ -25,7 +25,7 @@
                 :output-dir "out"
                 :source-map "tests.js.map"}}
     {:id "adv"
-     :source-paths ["src/test/cljs"]
+     :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
                 :pretty-print false
                 :output-to "tests.js"}}]})

From aaa792a996249e6fc90cce9d60ecec1a96fcc090 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Thu, 27 Mar 2014 17:18:20 -0700
Subject: [PATCH 188/288] c defaults to empty list

---
 src/main/clojure/cljs/core/logic.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index e64cd326..3bdb96ed 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -188,7 +188,7 @@
 
 (defn make-s
   ([s]
-     (Substitutions. s nil))
+     (Substitutions. s ()))
   ([s c]
      (Substitutions. s c)))
 

From 77f823f49fac98581bf541c6804c3fc3a85cc991 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 28 Mar 2014 19:26:55 -0400
Subject: [PATCH 189/288] tweak project.clj

---
 project.clj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index bb625960..795f17fa 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.7-SNAPSHOT" 
+(defproject org.clojure/core.logic "0.8.7-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 
@@ -8,8 +8,8 @@
 
   :test-paths ["src/test/clojure"]
 
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2173" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [org.clojure/clojurescript "0.0-2197" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 
@@ -17,9 +17,9 @@
 
   :cljsbuild
   {:builds
-   [{:id "ws"
+   [{:id "dev"
      :source-paths ["src/test/cljs"]
-     :compiler {:optimizations :whitespace
+     :compiler {:optimizations :none
                 :static-fns true
                 :output-to "tests.js"
                 :output-dir "out"

From faa785392c307cbf9307d09048e03c269da883b7 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 28 Mar 2014 19:27:10 -0400
Subject: [PATCH 190/288] don't define record? if already defined, part of core
 in 1.6.0

---
 src/main/clojure/clojure/core/logic.clj | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index da3d19da..a6dcf82f 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -8,6 +8,12 @@
            [clojure.core.logic.protocols
             IBindable ITreeTerm IVar ITreeConstraint INonStorable]))
 
+(defmacro ^:private compile-when
+  ([exp then]
+     (if (try (eval exp)
+              (catch Throwable _ false))
+       `(do ~then))))
+
 (def ^{:dynamic true} *locals*)
 
 (def fk (Exception.))
@@ -27,8 +33,9 @@
 (defn dissoc-dom [x k]
   (assoc x :doms (dissoc (:doms x) k)))
 
-(defn record? [x]
-  (instance? clojure.lang.IRecord x))
+(compile-when (not (resolve clojure.core/record?))
+  (defn record? [x]
+    (instance? clojure.lang.IRecord x)))
 
 ;; =============================================================================
 ;; Pair

From d5d4d4697f37248f67e51146a510eef6a796371d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Fri, 28 Mar 2014 20:01:31 -0400
Subject: [PATCH 191/288] remove tests that fail because of hashing changes, we
 need to rethink reification

---
 .../clojure/clojure/core/logic/nominal/tests.clj  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/clojure/clojure/core/logic/nominal/tests.clj b/src/test/clojure/clojure/core/logic/nominal/tests.clj
index 45d33b3b..4e90c0ba 100644
--- a/src/test/clojure/clojure/core/logic/nominal/tests.clj
+++ b/src/test/clojure/clojure/core/logic/nominal/tests.clj
@@ -38,13 +38,16 @@
   (is (= (run* [q] (fresh [x y] (nom/fresh [a] (nom/hash a y) (== y `(~x)) (== [y a] q))))
         '(([(_0) a_1] :- a_1#_0))))
   (is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a q) (== q `(~x ~y))))) '((_0 _1))))
-  (is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (== z `(~x ~y)) (== [z a] q))))
+  ;; SET ORDER BUG
+  #_(is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (== z `(~x ~y)) (== [z a] q))))
         '(([(_0 _1) a_2] :- a_2#_1 a_2#_0))))
   (is (= (run* [q] (fresh [x y] (nom/fresh [a] (nom/hash a q) (conso x y q)))) `(~(lcons '_0 '_1))))
-  (is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (conso x y z) (== [z a] q))))
+  ;; SET ORDER BUG
+  #_(is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (conso x y z) (== [z a] q))))
         [[[(lcons '_0 '_1) 'a_2] ':- 'a_2#_1 'a_2#_0]]))
   (is (= (run* [q] (fresh [x y] (nom/fresh [a]  (conso x y q) (nom/hash a q)))) `(~(lcons '_0 '_1))))
-  (is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (conso x y z) (== [z a] q))))
+  ;; SET ORDER BUG
+  #_(is (= (run* [q] (fresh [x y z] (nom/fresh [a] (nom/hash a z) (conso x y z) (== [z a] q))))
         [[[(lcons '_0 '_1) 'a_2] ':- 'a_2#_1 'a_2#_0]]))
   (is (= (run* [q] (nom/fresh [a b] (== q nil) (nom/hash a q))) '(nil)))
   (is (= (run* [q] (nom/fresh [a b] (== q 1) (nom/hash a q))) '(1)))
@@ -83,7 +86,8 @@
   (is (= (run* [q] (nom/fresh [a] (== q (nom/tie a a)))) [(nom/tie 'a_0 'a_0)]))
   (is (= (run* [q] (nom/fresh [a b] (== q (nom/tie a ['foo a 3 b])))) [(nom/tie 'a_0 ['foo 'a_0 3 'a_1])]))
   (is (= (run* [q] (nom/fresh [a b] (== (nom/tie a q) (nom/tie b b)))) '(a_0)))
-  (is (= (run* [q]
+  ;; SET ORDER BUG
+  #_(is (= (run* [q]
            (nom/fresh [a b]
              (fresh [x y]
                (== (nom/tie a (nom/tie a x)) (nom/tie a (nom/tie b y)))
@@ -488,7 +492,8 @@
         '(_0))))
 
 (deftest test-no-dup-reified-freshness-constraints
-  (is (= (run* [q]
+  ;; SET ORDER TEST
+  #_(is (= (run* [q]
            (fresh [x y]
              (nom/fresh [a b]
                (== (nom/tie a x) (nom/tie b y))

From e9cb65b28714da6df06da670bca3b7a4ebc35ce4 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Mon, 31 Mar 2014 12:22:53 -0400
Subject: [PATCH 192/288] typo

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index a6dcf82f..228f6dcb 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -33,7 +33,7 @@
 (defn dissoc-dom [x k]
   (assoc x :doms (dissoc (:doms x) k)))
 
-(compile-when (not (resolve clojure.core/record?))
+(compile-when (not (resolve 'clojure.core/record?))
   (defn record? [x]
     (instance? clojure.lang.IRecord x)))
 

From 59edd69055426124cbcb67b52237abeb03d09842 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex@puredanger.com>
Date: Tue, 8 Apr 2014 09:04:58 -0500
Subject: [PATCH 193/288] Update pom.xml to Clojure 1.6.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4de528d4..961e89dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojure</artifactId>
-      <version>1.5.1</version>
+      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>

From 94dd57986ba0eb1a87e8c42bf25306c3d87050f1 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 18 May 2014 12:32:03 -0500
Subject: [PATCH 194/288] add pldb to ClojureScript, not yet working

---
 src/main/clojure/cljs/core/logic.cljs      |  9 ++-
 src/main/clojure/cljs/core/logic/pldb.clj  | 41 ++++++++++
 src/main/clojure/cljs/core/logic/pldb.cljs | 91 ++++++++++++++++++++++
 src/test/cljs/cljs/core/logic/tests.cljs   | 51 +++++++++++-
 4 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100644 src/main/clojure/cljs/core/logic/pldb.clj
 create mode 100644 src/main/clojure/cljs/core/logic/pldb.cljs

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 3bdb96ed..f0d5013f 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -6,7 +6,8 @@
   (:require [clojure.set :as set])
   (:use [clojure.walk :only [postwalk]]))
 
-(def ^{:dynamic true} *occurs-check* true)
+(def ^:dynamic *occurs-check* true)
+(def ^:dynamic *logic-dbs* [])
 
 (defprotocol IUnifyTerms
   (-unify-terms [u v s]))
@@ -932,4 +933,8 @@
   ([u w & ts]
      (apply binding-map (binding-map u w) ts)))
 
-
+(defn to-stream [aseq]
+  (let [aseq (drop-while nil? aseq)]
+    (when (seq aseq)
+      (choice (first aseq)
+              (fn [] (to-stream (next aseq)))))))
diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
new file mode 100644
index 00000000..885b3ddf
--- /dev/null
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -0,0 +1,41 @@
+(ns cljs.core.logic.pldb)
+
+(defn indexed? [v]
+  (true? (:index (meta v))))
+
+(defmacro with-dbs [dbs & body]
+  `(binding [cljs.core.logic/*logic-dbs* (concat cljs.core.logic/*logic-dbs* ~dbs)]
+          ~@body))
+
+(defmacro with-db [db & body]
+  `(binding [cljs.core.logic/*logic-dbs* (conj cljs.core.logic/*logic-dbs* ~db)]
+          ~@body))
+
+(defmacro db-rel [name & args]
+  (let [arity
+        (count args)
+
+        kname
+        (str name "_" arity)
+
+        indexes
+        (vec (map indexed? args))]
+    `(def ~name
+       (with-meta
+         (fn [& query#]
+           (fn [subs#]
+             (let [dbs#
+                   (-> subs# cljs.core/meta :db)
+
+                   facts#
+                   (if-let [index# (index-for-query subs# query# ~indexes)]
+                     (facts-using-index dbs#
+                                        ~kname
+                                        index#
+                                        (cljs.core.logic/walk* subs# (nth query# index#)))
+                     (facts-for dbs# ~kname))]
+               (cljs.core.logic/to-stream (map (fn [potential#]
+                                   ((cljs.core.logic/== query# potential#) subs#))
+                                 facts#)))))
+         {:rel-name ~kname
+          :indexes ~indexes}))))
diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
new file mode 100644
index 00000000..17e1f818
--- /dev/null
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -0,0 +1,91 @@
+(ns cljs.core.logic.pldb
+  (:require [cljs.core.logic :as l]))
+
+;; ----------------------------------------
+
+(def empty-db {})
+
+(defn facts-for [dbs kname]
+  (mapcat #(get-in % [kname ::unindexed]) dbs))
+
+(defn facts-using-index [dbs kname index val]
+  (mapcat #(get-in % [kname index val]) dbs))
+
+;; ----------------------------------------
+(defn rel-key [rel]
+  (if (keyword? rel)
+    rel
+    (:rel-name (meta rel))))
+
+(defn rel-indexes [rel]
+  (:indexes (meta rel)))
+
+(defn contains-lvar? [x]
+  (some l/lvar? (tree-seq coll? seq x)))
+
+(defn ground? [s term]
+  (not (contains-lvar? (l/walk* s term))))
+
+(defn index-for-query [s q indexes]
+  (let [indexable (map #(ground? s %)  q)
+        triples (map vector (range) indexable indexes)]
+    (first (for [[i indexable indexed] triples
+                 :when (and indexable indexed)]
+             i))))
+
+;; ----------------------------------------
+
+(defn db-fact [db rel & args]
+  (let [key
+        (rel-key rel)
+
+        add-to-set
+        (fn [current new]
+          (conj (or current #{}) new))
+
+        db-with-fact
+        (update-in db [key ::unindexed] #(add-to-set %1 args))
+
+        indexes-to-update ;; ugly - get the vector indexes of indexed attributes
+        (map vector (rel-indexes rel) (range) args)
+
+        update-index-fn
+        (fn [db [is-indexed index-num val]]
+          (if is-indexed
+            (update-in db [key index-num val] #(add-to-set %1 args))
+            db))]
+    (reduce update-index-fn db-with-fact indexes-to-update)))
+
+(defn db-retraction [db rel & args]
+  (let [key
+        (rel-key rel)
+
+        retract-args
+        #(disj %1 args)
+
+        db-without-fact
+        (update-in db [key ::unindexed] retract-args)
+
+        indexes-to-update ;; also a bit ugly
+        (map vector (rel-indexes rel) (range) args)
+
+        remove-from-index-fn
+        (fn [db [is-indexed index-num val]]
+          (if is-indexed
+            (update-in db [key index-num val] retract-args)
+            db))]
+
+    (reduce remove-from-index-fn db-without-fact indexes-to-update)))
+
+;; ----------------------------------------
+(defn db-facts [base-db & facts]
+  (reduce #(apply db-fact %1 %2) base-db facts))
+
+(defn db [& facts]
+  (apply db-facts empty-db facts))
+
+(defn db-retractions [base-db & retractions]
+  (reduce #(apply db-retraction %1 %2) base-db retractions))
+
+
+
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index fdaa4f0c..89e913d0 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -4,7 +4,9 @@
    [cljs.core.logic.macros
     :only [run run* == conde conda condu fresh defne matche all]])
   (:require-macros [cljs.core.logic.macros :as m]
-                   [clojure.tools.macro :as mu])
+                   [clojure.tools.macro :as mu]
+                   [cljs.core.logic.pldb :as pldb])
+  (:require [cljs.core.logic.pldb :as pldb])
   (:use
    [cljs.core.logic
     :only [pair lvar lcons -unify -ext-no-check -walk -walk*
@@ -956,3 +958,50 @@
 (assert (= (run* [q] (map-geto (seq {:title "Blub"}) :title q)) '("Blub")))
 
 (println "ok")
+
+;; =============================================================================
+;; pldb
+
+(pldb/db-rel man p)
+(pldb/db-rel woman p)
+(pldb/db-rel likes p1 p2)
+(pldb/db-rel fun p)
+
+(def ^:dynamic facts0
+  (pldb/db
+    [man 'Bob]
+    [man 'John]
+    [man 'Ricky]
+
+    [woman 'Mary]
+    [woman 'Martha]
+    [woman 'Lucy]
+
+    [likes 'Bob 'Mary]
+    [likes 'John 'Martha]
+    [likes 'Ricky 'Lucy]))
+
+(def ^:dynamic facts1
+  (-> facts0
+    (pldb/db-fact fun 'Lucy)))
+
+(comment
+  (pldb/with-db facts0
+    (assert
+      (= (run* [q]
+           (fresh [x y]
+             (likes x y)
+             (fun y)
+             (== q [x y])))
+        '())))
+
+ (pldb/with-db facts1
+   (assert
+     (= (run* [q]
+          (fresh [x y]
+            (likes x y)
+            (fun y)
+            (== q [x y])))
+       '([Ricky Lucy]))))
+ )
+

From b75429c738def09f3b18c5dc370e1f40162047f8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 18 May 2014 13:12:03 -0500
Subject: [PATCH 195/288] fix some obvious bugs

---
 src/main/clojure/cljs/core/logic.cljs      | 5 +++--
 src/main/clojure/cljs/core/logic/pldb.clj  | 2 +-
 src/main/clojure/cljs/core/logic/pldb.cljs | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index f0d5013f..a52c408f 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -935,6 +935,7 @@
 
 (defn to-stream [aseq]
   (let [aseq (drop-while nil? aseq)]
-    (when (seq aseq)
+    (if (seq aseq)
       (choice (first aseq)
-              (fn [] (to-stream (next aseq)))))))
+        (fn [] (to-stream (next aseq))))
+      (fail empty-s))))
diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index 885b3ddf..bd097517 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -32,7 +32,7 @@
                      (facts-using-index dbs#
                                         ~kname
                                         index#
-                                        (cljs.core.logic/walk* subs# (nth query# index#)))
+                                        (cljs.core.logic/-walk* subs# (nth query# index#)))
                      (facts-for dbs# ~kname))]
                (cljs.core.logic/to-stream (map (fn [potential#]
                                    ((cljs.core.logic/== query# potential#) subs#))
diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index 17e1f818..d45e8d16 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -24,7 +24,7 @@
   (some l/lvar? (tree-seq coll? seq x)))
 
 (defn ground? [s term]
-  (not (contains-lvar? (l/walk* s term))))
+  (not (contains-lvar? (l/-walk* s term))))
 
 (defn index-for-query [s q indexes]
   (let [indexable (map #(ground? s %)  q)

From faae00e6a9350dcba8c237b4e192d67c4a167f57 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 18 May 2014 21:36:51 -0500
Subject: [PATCH 196/288] cljs.core.logic Substitutions now support metadata

---
 src/main/clojure/cljs/core/logic.cljs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index a52c408f..ce2dca27 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -119,7 +119,14 @@
           (.-rhs x)
           (recur (-next xs)))))))
 
-(deftype Substitutions [s c]
+(deftype Substitutions [s c _meta]
+  IMeta
+  (-meta [_] _meta)
+
+  IWithMeta
+  (-with-meta [_ new-meta]
+    (Substitutions. s c new-meta))
+
   IEquiv
   (-equiv [this o]
     (or (identical? this o)
@@ -142,7 +149,7 @@
       (-ext-no-check this u v)))
 
   (-ext-no-check [this u v]
-    (Substitutions. (conj s (Pair. u v)) c))
+    (Substitutions. (conj s (Pair. u v)) c _meta))
   
   (-walk [this v]
     (cond
@@ -189,9 +196,9 @@
 
 (defn make-s
   ([s]
-     (Substitutions. s ()))
+     (Substitutions. s () nil))
   ([s c]
-     (Substitutions. s c)))
+     (Substitutions. s c nil)))
 
 (def ^not-native empty-s (make-s '() nil))
 

From ac1e12f68d3778408fde2724d08d4568a4f61e5c Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 18 May 2014 21:37:14 -0500
Subject: [PATCH 197/288] align run cljs.core.logic macros with
 clojure.core.logic

---
 src/main/clojure/cljs/core/logic/macros.clj | 64 ++++++++++++---------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index 7250bb26..0b10788f 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -63,47 +63,57 @@
       (let [~@(lvar-binds lvars)]
         (bind* a# ~@goals)))))
 
-(defmacro solve [& [n [x] & goals]]
-  `(let [xs# (cljs.core.logic/-take* (-inc
-                      ((fresh [~x] ~@goals
-                         (fn [a#]
-                           (cljs.core.logic/-reify a# ~x))) ;; TODO: do we need this?
-                       cljs.core.logic/empty-s)))]
-     (if ~n
-       (take ~n xs#)
-       xs#)))
+(defmacro -run [opts [x :as bindings] & goals]
+  (if (> (count bindings) 1)
+    (let [[rbindings as-key [as]] (partition-by #{:as} bindings)]
+      (if (seq as-key)
+        `(-run ~opts [~as] (fresh [~@rbindings] (== ~as [~@rbindings]) ~@goals))
+        `(-run ~opts [q#] (fresh ~bindings (== q# ~bindings) ~@goals))))
+    `(let [opts# ~opts
+           xs# (cljs.core.logic/-take*
+                 (-inc
+                   ((fresh [~x] ~@goals
+                      (fn [a#]
+                        (cljs.core.logic/-reify a# ~x))) ;; TODO: do we need this?
+                    (with-meta cljs.core.logic/empty-s
+                      (merge {:reify-vars true} opts#)))))]
+       (if-let [n# (:n opts#)]
+         (take n# xs#)
+         xs#))))
 
 (defmacro run
   "Executes goals until a maximum of n results are found."
-  [n & goals]
-  `(doall (solve ~n ~@goals)))
+  [n bindings & goals]
+  `(-run {:occurs-check true :n ~n :db cljs.core.logic/*logic-dbs*}
+     ~bindings ~@goals))
 
 (defmacro run*
   "Executes goals until results are exhausted."
-  [& goals]
-  `(run false ~@goals))
+  [bindings & goals]
+  `(-run {:occurs-check true :n false :db cljs.core.logic/*logic-dbs*}
+     ~bindings ~@goals))
+
+(defmacro run-db
+  "Executes goals until a maximum of n results are found. Uses a specified logic database."
+  [n db bindings & goals]
+  `(-run {:occurs-check true :n ~n :db (flatten [~db])} ~bindings ~@goals))
+
+(defmacro run-db*
+  "Executes goals until results are exhausted. Uses a specified logic database."
+  [db bindings & goals]
+  `(-run {:occurs-check true :n false :db (flatten [~db])} ~bindings ~@goals))
 
 (defmacro run-nc
-  "Executes goals until a maximum of n results are found. Does not occurs-check."
-  [& [n & goals]]
-  `(binding [*occurs-check* false]
-     (run ~n ~@goals)))
+  "Executes goals until a maximum of n results are found. Does not
+   occurs-check."
+  [n bindings & goals]
+  `(-run {:occurs-check false :n ~n :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."
   [& goals]
   `(run-nc false ~@goals))
 
-(defmacro lazy-run
-  "Lazily executes goals until a maximum of n results are found."
-  [& [n & goals]]
-  `(solve ~n ~@goals))
-
-(defmacro lazy-run*
-  "Lazily executes goals until results are exhausted."
-  [& goals]
-  `(solve false ~@goals))
-
 (defmacro all
   "Like fresh but does does not create logic variables."
   ([] `cljs.core.logic/s#)

From 0eab7c1d80ad1757f9aba84995400698501fd3e8 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sun, 18 May 2014 22:56:19 -0400
Subject: [PATCH 198/288] cljs.core.logic pldb wip

---
 src/main/clojure/cljs/core/logic/pldb.clj  | 36 +++++++-----------
 src/main/clojure/cljs/core/logic/pldb.cljs | 43 +++++++---------------
 src/main/clojure/clojure/core/logic.clj    |  6 +--
 3 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index bd097517..ec3edf1a 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -5,37 +5,29 @@
 
 (defmacro with-dbs [dbs & body]
   `(binding [cljs.core.logic/*logic-dbs* (concat cljs.core.logic/*logic-dbs* ~dbs)]
-          ~@body))
+     ~@body))
 
 (defmacro with-db [db & body]
   `(binding [cljs.core.logic/*logic-dbs* (conj cljs.core.logic/*logic-dbs* ~db)]
-          ~@body))
+     ~@body))
 
 (defmacro db-rel [name & args]
-  (let [arity
-        (count args)
-
-        kname
-        (str name "_" arity)
-
-        indexes
-        (vec (map indexed? args))]
+  (let [arity   (count args)
+        kname   (str name "_" arity)
+        indexes (vec (map indexed? args))]
     `(def ~name
        (with-meta
          (fn [& query#]
            (fn [subs#]
-             (let [dbs#
-                   (-> subs# cljs.core/meta :db)
-
+             (let [dbs# (-> subs# cljs.core/meta :db)
                    facts#
-                   (if-let [index# (index-for-query subs# query# ~indexes)]
-                     (facts-using-index dbs#
-                                        ~kname
-                                        index#
-                                        (cljs.core.logic/-walk* subs# (nth query# index#)))
-                     (facts-for dbs# ~kname))]
-               (cljs.core.logic/to-stream (map (fn [potential#]
-                                   ((cljs.core.logic/== query# potential#) subs#))
-                                 facts#)))))
+                   (if-let [index# (cljs.core.logic/index-for-query subs# query# ~indexes)]
+                     (cljs.core.logic/facts-using-index dbs# ~kname index#
+                       (cljs.core.logic/-walk* subs# (nth query# index#)))
+                     (cljs.core.logic/facts-for dbs# ~kname))]
+               (cljs.core.logic/to-stream
+                 (map (fn [potential#]
+                        ((cljs.core.logic/== query# potential#) subs#))
+                   facts#)))))
          {:rel-name ~kname
           :indexes ~indexes}))))
diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index d45e8d16..11e854b9 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -29,26 +29,19 @@
 (defn index-for-query [s q indexes]
   (let [indexable (map #(ground? s %)  q)
         triples (map vector (range) indexable indexes)]
-    (first (for [[i indexable indexed] triples
-                 :when (and indexable indexed)]
-             i))))
+    (first
+      (for [[i indexable indexed] triples
+            :when (and indexable indexed)]
+        i))))
 
 ;; ----------------------------------------
 
 (defn db-fact [db rel & args]
-  (let [key
-        (rel-key rel)
-
-        add-to-set
-        (fn [current new]
-          (conj (or current #{}) new))
-
-        db-with-fact
-        (update-in db [key ::unindexed] #(add-to-set %1 args))
-
-        indexes-to-update ;; ugly - get the vector indexes of indexed attributes
-        (map vector (rel-indexes rel) (range) args)
-
+  (let [key               (rel-key rel)
+        add-to-set        (fn [current new] (conj (or current #{}) new))
+        db-with-fact      (update-in db [key ::unindexed] #(add-to-set %1 args))
+        ;; ugly - get the vector indexes of indexed attributes
+        indexes-to-update (map vector (rel-indexes rel) (range) args)
         update-index-fn
         (fn [db [is-indexed index-num val]]
           (if is-indexed
@@ -57,24 +50,16 @@
     (reduce update-index-fn db-with-fact indexes-to-update)))
 
 (defn db-retraction [db rel & args]
-  (let [key
-        (rel-key rel)
-
-        retract-args
-        #(disj %1 args)
-
-        db-without-fact
-        (update-in db [key ::unindexed] retract-args)
-
-        indexes-to-update ;; also a bit ugly
-        (map vector (rel-indexes rel) (range) args)
-
+  (let [key               (rel-key rel)
+        retract-args      #(disj %1 args)
+        db-without-fact   (update-in db [key ::unindexed] retract-args)
+        ;; also a bit ugly
+        indexes-to-update (map vector (rel-indexes rel) (range) args)
         remove-from-index-fn
         (fn [db [is-indexed index-num val]]
           (if is-indexed
             (update-in db [key index-num val] retract-args)
             db))]
-
     (reduce remove-from-index-fn db-without-fact indexes-to-update)))
 
 ;; ----------------------------------------
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 228f6dcb..aa8c0658 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1222,12 +1222,12 @@
 (defmacro run
   "Executes goals until a maximum of n results are found."
   [n bindings & goals]
-  `(-run {:occurs-check true :n ~n :db *logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check true :n ~n :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
 
 (defmacro run*
   "Executes goals until results are exhausted."
   [bindings & goals]
-  `(-run {:occurs-check true :n false :db *logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check true :n false :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-db
   "Executes goals until a maximum of n results are found. Uses a specified logic database."
@@ -1243,7 +1243,7 @@
   "Executes goals until a maximum of n results are found. Does not
    occurs-check."
   [n bindings & goals]
-  `(-run {:occurs-check false :n ~n :db *logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check false :n ~n :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."

From 688aa2962d75a88da35fb73aff0ba244096b885c Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Tue, 20 May 2014 19:24:35 -0700
Subject: [PATCH 199/288] Add CONTRIBUTING.md

---
 CONTRIBUTING.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..326ea6eb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,14 @@
+This is a [Clojure contrib] project.
+
+Under the Clojure contrib [guidelines], this project cannot accept
+pull requests. All patches must be submitted via [JIRA].
+
+See [Contributing] and the [FAQ] on the Clojure development [wiki] for
+more information on how to contribute.
+
+[Clojure contrib]: http://dev.clojure.org/display/doc/Clojure+Contrib
+[Contributing]: http://dev.clojure.org/display/community/Contributing
+[FAQ]: http://dev.clojure.org/display/community/Contributing+FAQ
+[JIRA]: http://dev.clojure.org/jira/browse/LOGIC
+[guidelines]: http://dev.clojure.org/display/community/Guidelines+for+Clojure+Contrib+committers
+[wiki]: http://dev.clojure.org/

From 10f80c27bc935484edd0b8519998d0c7e525103a Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 21 May 2014 00:49:57 -0500
Subject: [PATCH 200/288] fix some typos

---
 src/main/clojure/cljs/core/logic/macros.clj | 2 +-
 src/main/clojure/clojure/core/logic.clj     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic/macros.clj
index 0b10788f..7ff00864 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic/macros.clj
@@ -107,7 +107,7 @@
   "Executes goals until a maximum of n results are found. Does not
    occurs-check."
   [n bindings & goals]
-  `(-run {:occurs-check false :n ~n :db *logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check false :n ~n :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index aa8c0658..228f6dcb 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1222,12 +1222,12 @@
 (defmacro run
   "Executes goals until a maximum of n results are found."
   [n bindings & goals]
-  `(-run {:occurs-check true :n ~n :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check true :n ~n :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run*
   "Executes goals until results are exhausted."
   [bindings & goals]
-  `(-run {:occurs-check true :n false :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check true :n false :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-db
   "Executes goals until a maximum of n results are found. Uses a specified logic database."
@@ -1243,7 +1243,7 @@
   "Executes goals until a maximum of n results are found. Does not
    occurs-check."
   [n bindings & goals]
-  `(-run {:occurs-check false :n ~n :db cljs.core.logic/*logic-dbs*} ~bindings ~@goals))
+  `(-run {:occurs-check false :n ~n :db *logic-dbs*} ~bindings ~@goals))
 
 (defmacro run-nc*
   "Executes goals until results are exhausted. Does not occurs-check."

From ee07b1ab94fe1602fb1438efbf4882658e1e2ba6 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 31 May 2014 13:24:42 -0400
Subject: [PATCH 201/288] fix some obvious pldb bugs

---
 src/main/clojure/cljs/core/logic/pldb.clj | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index ec3edf1a..b7aa91ba 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -9,6 +9,7 @@
 
 (defmacro with-db [db & body]
   `(binding [cljs.core.logic/*logic-dbs* (conj cljs.core.logic/*logic-dbs* ~db)]
+
      ~@body))
 
 (defmacro db-rel [name & args]
@@ -19,15 +20,15 @@
        (with-meta
          (fn [& query#]
            (fn [subs#]
-             (let [dbs# (-> subs# cljs.core/meta :db)
+             (let [dbs# (-> subs# meta :db)
                    facts#
-                   (if-let [index# (cljs.core.logic/index-for-query subs# query# ~indexes)]
-                     (cljs.core.logic/facts-using-index dbs# ~kname index#
+                   (if-let [index# (cljs.core.logic.pldb/index-for-query
+                                     subs# query# ~indexes)]
+                     (cljs.core.logic.pldb/facts-using-index dbs# ~kname index#
                        (cljs.core.logic/-walk* subs# (nth query# index#)))
-                     (cljs.core.logic/facts-for dbs# ~kname))]
+                     (cljs.core.logic.pldb/facts-for dbs# ~kname))]
                (cljs.core.logic/to-stream
                  (map (fn [potential#]
-                        ((cljs.core.logic/== query# potential#) subs#))
+                        ((cljs.core.logic.macros/== query# potential#) subs#))
                    facts#)))))
-         {:rel-name ~kname
-          :indexes ~indexes}))))
+         {:rel-name ~kname :indexes ~indexes}))))

From 3ad8208f4a9279bd2817cda01e6ac317471b20b6 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 31 May 2014 14:16:15 -0400
Subject: [PATCH 202/288] formatting

---
 src/main/clojure/cljs/core/logic/pldb.cljs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index 11e854b9..fb91e346 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -28,7 +28,7 @@
 
 (defn index-for-query [s q indexes]
   (let [indexable (map #(ground? s %)  q)
-        triples (map vector (range) indexable indexes)]
+        triples   (map vector (range) indexable indexes)]
     (first
       (for [[i indexable indexed] triples
             :when (and indexable indexed)]
@@ -71,6 +71,3 @@
 
 (defn db-retractions [base-db & retractions]
   (reduce #(apply db-retraction %1 %2) base-db retractions))
-
-
-

From c8329fc0f31649b7a2502f53ecaf3ff3a1940c75 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 31 May 2014 14:16:29 -0400
Subject: [PATCH 203/288] need to remove failed unifications

---
 src/main/clojure/cljs/core/logic/pldb.clj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index b7aa91ba..fd276365 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -9,7 +9,6 @@
 
 (defmacro with-db [db & body]
   `(binding [cljs.core.logic/*logic-dbs* (conj cljs.core.logic/*logic-dbs* ~db)]
-
      ~@body))
 
 (defmacro db-rel [name & args]
@@ -28,7 +27,8 @@
                        (cljs.core.logic/-walk* subs# (nth query# index#)))
                      (cljs.core.logic.pldb/facts-for dbs# ~kname))]
                (cljs.core.logic/to-stream
-                 (map (fn [potential#]
-                        ((cljs.core.logic.macros/== query# potential#) subs#))
-                   facts#)))))
+                 (remove cljs.core.logic/failed?
+                   (map (fn [potential#]
+                          ((cljs.core.logic.macros/== query# potential#) subs#))
+                     facts#))))))
          {:rel-name ~kname :indexes ~indexes}))))

From 211abca68926ff756429c7efcd84ec6c79328de2 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 31 May 2014 14:16:46 -0400
Subject: [PATCH 204/288] tail of Choice needs to be -inc

---
 src/main/clojure/cljs/core/logic.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index ce2dca27..dcc90093 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -944,5 +944,5 @@
   (let [aseq (drop-while nil? aseq)]
     (if (seq aseq)
       (choice (first aseq)
-        (fn [] (to-stream (next aseq))))
+        (-inc (to-stream (next aseq))))
       (fail empty-s))))

From 11952a1d02aa82234b249648a4207e325df5931e Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Sat, 31 May 2014 15:31:06 -0400
Subject: [PATCH 205/288] update project.clj, tweak tests

---
 project.clj                              | 19 ++++++-----
 src/test/cljs/cljs/core/logic/tests.cljs | 43 +++++++++++-------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/project.clj b/project.clj
index 795f17fa..1247ff3f 100644
--- a/project.clj
+++ b/project.clj
@@ -8,24 +8,27 @@
 
   :test-paths ["src/test/clojure"]
 
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2197" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.5.1"]
+                 [org.clojure/clojurescript "0.0-2227" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 
-  :plugins [[lein-cljsbuild "1.0.2"]]
+  :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]]
 
   :cljsbuild
   {:builds
    [{:id "dev"
-     :source-paths ["src/test/cljs"]
+     :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :none
-                :static-fns true
+                :pretty-print true
                 :output-to "tests.js"
                 :output-dir "out"
-                :source-map "tests.js.map"}}
+                :source-map true}}
     {:id "adv"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
-                :pretty-print false
-                :output-to "tests.js"}}]})
+                :pretty-print true
+                :output-to "tests.js"
+                :pseudo-names true
+                :output-dir "out-adv"
+                :source-map "tests.js.map"}}]})
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index 89e913d0..c12eb689 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -940,8 +940,8 @@
 
 (binding [*occurs-check* false]
   (time
-    (dotimes [_ 1000]
-      (run 1 [q] (zebrao q)))))
+    (dotimes [_ 100]
+      (doall (run 1 [q] (zebrao q))))))
 
 (println (pr-str
           (run 10 [q]
@@ -957,8 +957,6 @@
 
 (assert (= (run* [q] (map-geto (seq {:title "Blub"}) :title q)) '("Blub")))
 
-(println "ok")
-
 ;; =============================================================================
 ;; pldb
 
@@ -985,23 +983,22 @@
   (-> facts0
     (pldb/db-fact fun 'Lucy)))
 
-(comment
-  (pldb/with-db facts0
-    (assert
-      (= (run* [q]
-           (fresh [x y]
-             (likes x y)
-             (fun y)
-             (== q [x y])))
-        '())))
-
- (pldb/with-db facts1
-   (assert
-     (= (run* [q]
-          (fresh [x y]
-            (likes x y)
-            (fun y)
-            (== q [x y])))
-       '([Ricky Lucy]))))
- )
+(pldb/with-db facts0
+  (assert
+    (= (run* [q]
+         (fresh [x y]
+           (likes x y)
+           (fun y)
+           (== q [x y])))
+      '())))
+
+(pldb/with-db facts1
+  (assert
+    (= (run* [q]
+         (fresh [x y]
+           (likes x y)
+           (fun y)
+           (== q [x y])))
+      '([Ricky Lucy]))))
 
+(println "ok")

From 0bde5c9cd8eba650cbcfd4d5401c6274a286f28d Mon Sep 17 00:00:00 2001
From: David Nolen <davidnolen@Davids-iMac.local>
Date: Sat, 31 May 2014 16:38:20 -0400
Subject: [PATCH 206/288] remove *occurs-check* dynamic var, use metadata
 approach instead

---
 project.clj                              | 12 ++++++------
 resources/index.html                     | 11 +++++++++++
 src/main/clojure/cljs/core/logic.cljs    |  3 +--
 src/test/cljs/cljs/core/logic/tests.cljs | 14 ++++++--------
 4 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 resources/index.html

diff --git a/project.clj b/project.clj
index 1247ff3f..0b502e9e 100644
--- a/project.clj
+++ b/project.clj
@@ -9,7 +9,7 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2227" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2229" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
 
@@ -21,14 +21,14 @@
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :none
                 :pretty-print true
-                :output-to "tests.js"
-                :output-dir "out"
+                :output-to "resources/tests.js"
+                :output-dir "resources/out-dev"
                 :source-map true}}
     {:id "adv"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
                 :pretty-print true
-                :output-to "tests.js"
                 :pseudo-names true
-                :output-dir "out-adv"
-                :source-map "tests.js.map"}}]})
+                :output-to "resources/tests.js"
+                :output-dir "resources/out-adv"
+                :source-map "resources/tests.js.map"}}]})
diff --git a/resources/index.html b/resources/index.html
new file mode 100644
index 00000000..153ef8ca
--- /dev/null
+++ b/resources/index.html
@@ -0,0 +1,11 @@
+<html>
+    <body>
+        <!--
+        <script src="out-dev/goog/base.js"></script>
+        -->
+        <script src="tests.js"></script>
+        <!--
+        <script>goog.require("cljs.core.logic.tests");</script>
+        -->
+    </body>
+</html>
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index dcc90093..28520abe 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -6,7 +6,6 @@
   (:require [clojure.set :as set])
   (:use [clojure.walk :only [postwalk]]))
 
-(def ^:dynamic *occurs-check* true)
 (def ^:dynamic *logic-dbs* [])
 
 (defprotocol IUnifyTerms
@@ -143,7 +142,7 @@
       (-occurs-check-term v u this)))
   
   (-ext [this u v]
-    (if (and ^boolean *occurs-check*
+    (if (and ^boolean (:occurs-check _meta)
              ^boolean (-occurs-check this u v))
       (fail this)
       (-ext-no-check this u v)))
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index c12eb689..a139c635 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -2,7 +2,7 @@
   (:refer-clojure :exclude [==])
   (:use-macros
    [cljs.core.logic.macros
-    :only [run run* == conde conda condu fresh defne matche all]])
+    :only [run run* run-nc == conde conda condu fresh defne matche all]])
   (:require-macros [cljs.core.logic.macros :as m]
                    [clojure.tools.macro :as mu]
                    [cljs.core.logic.pldb :as pldb])
@@ -11,7 +11,7 @@
    [cljs.core.logic
     :only [pair lvar lcons -unify -ext-no-check -walk -walk*
            -reify-lvar-name empty-s to-s succeed fail s# u# conso
-           nilo firsto resto emptyo appendo membero *occurs-check*
+           nilo firsto resto emptyo appendo membero
            unifier binding-map partial-map failed?]]))
 
 (defn js-print [& args]
@@ -933,15 +933,13 @@
     (nexto (list _ _ _ 'fox _) (list _ 'chesterfields _ _ _) hs))))
 
 (defn ^:export run_zebra []
-  (binding [*occurs-check* false]
-    (doall (run 1 [q] (zebrao q)))))
+  (doall (run-nc 1 [q] (zebrao q))))
 
 (println (pr-str (run 1 [q] (zebrao q))))
 
-(binding [*occurs-check* false]
-  (time
-    (dotimes [_ 100]
-      (doall (run 1 [q] (zebrao q))))))
+(time
+  (dotimes [_ 100]
+    (doall (run-nc 1 [q] (zebrao q)))))
 
 (println (pr-str
           (run 10 [q]

From 50b8fc3fdf73dcb65c58390b4a3c9225f05a1e49 Mon Sep 17 00:00:00 2001
From: David Nolen <davidnolen@Davids-iMac.local>
Date: Sat, 31 May 2014 16:48:14 -0400
Subject: [PATCH 207/288] remove unused protocol, condp == -> case, formatting

---
 src/main/clojure/cljs/core/logic.cljs | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 28520abe..2d244014 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -53,10 +53,6 @@
 ;; =============================================================================
 ;; Pair
 
-(defprotocol IPair
-  (-lhs [this])
-  (-rhs [this]))
-
 (deftype Pair [lhs rhs]
   IEquiv
   (-equiv [this other]
@@ -65,17 +61,16 @@
   ICounted
   (-count [_] 2)
   IIndexed
-  (-nth [_ i] (condp cljs.core/== i
-                   0 lhs
-                   1 rhs
-                   (throw (js/Error. "Index out of bounds"))))
-  (-nth [_ i not-found] (condp cljs.core/== i
-                             0 lhs
-                             1 rhs
-                             not-found))
-  IPair
-  (-lhs [_] lhs)
-  (-rhs [_] rhs)
+  (-nth [_ i]
+    (case i
+      0 lhs
+      1 rhs
+      (throw (js/Error. "Index out of bounds"))))
+  (-nth [_ i not-found]
+    (case i
+      0 lhs
+      1 rhs
+      not-found))
   IPrintWithWriter
   (-pr-writer [coll writer opts]
     (-write writer (str "(" lhs " . " rhs ")"))))
@@ -112,7 +107,7 @@
   (loop [^not-native xs (-seq xs)]
     (if (nil? xs)
       not-found
-      (let [x (-first xs)
+      (let [x   (-first xs)
             lhs (.-lhs x)]
         (if (identical? k lhs)
           (.-rhs x)

From 536848d0f560b097f18500491a70f32d5e844e66 Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 13:56:28 -0400
Subject: [PATCH 208/288] update deps, update zebrao iters

---
 project.clj                              | 7 ++++---
 resources/index.html                     | 6 ------
 resources/index_dev.html                 | 7 +++++++
 src/test/cljs/cljs/core/logic/tests.cljs | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 resources/index_dev.html

diff --git a/project.clj b/project.clj
index 0b502e9e..361ee45e 100644
--- a/project.clj
+++ b/project.clj
@@ -8,10 +8,11 @@
 
   :test-paths ["src/test/clojure"]
 
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2229" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [org.clojure/clojurescript "0.0-2261" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
-                 [com.datomic/datomic-free "0.8.4270" :scope "provided"]]
+                 ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
+                 ]
 
   :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]]
 
diff --git a/resources/index.html b/resources/index.html
index 153ef8ca..3ea1f4bc 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -1,11 +1,5 @@
 <html>
     <body>
-        <!--
-        <script src="out-dev/goog/base.js"></script>
-        -->
         <script src="tests.js"></script>
-        <!--
-        <script>goog.require("cljs.core.logic.tests");</script>
-        -->
     </body>
 </html>
diff --git a/resources/index_dev.html b/resources/index_dev.html
new file mode 100644
index 00000000..d3dd3666
--- /dev/null
+++ b/resources/index_dev.html
@@ -0,0 +1,7 @@
+<html>
+    <body>
+        <script src="out-dev/goog/base.js"></script>
+        <script src="tests.js"></script>
+        <script>goog.require("cljs.core.logic.tests");</script>
+    </body>
+</html>
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index a139c635..97f85bf1 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -938,7 +938,7 @@
 (println (pr-str (run 1 [q] (zebrao q))))
 
 (time
-  (dotimes [_ 100]
+  (dotimes [_ 1000]
     (doall (run-nc 1 [q] (zebrao q)))))
 
 (println (pr-str

From 9ec9ae7b0641aa49445f5771ed3d5aff9cd33fdc Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 14:38:56 -0400
Subject: [PATCH 209/288] add cider-nrepl dev dep

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 361ee45e..c7102556 100644
--- a/project.clj
+++ b/project.clj
@@ -14,7 +14,8 @@
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
 
-  :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]]
+  :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]
+            [cider/cider-nrepl "0.7.0-SNAPSHOT"]]
 
   :cljsbuild
   {:builds

From 5de847d4f2e16f3714fe511702e032818066ee21 Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 14:39:47 -0400
Subject: [PATCH 210/288] bump deps

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 961e89dc..40d467dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojurescript</artifactId>
-      <version>0.0-2138</version>
+      <version>0.0-2261</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

From 5221af81fcc6d391c7db5841807ac2daa14926d6 Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 15:22:51 -0400
Subject: [PATCH 211/288] LOGIC-160: Disequality on pairs not respected

IDisunifyTerms was not defined for LCons
---
 src/main/clojure/clojure/core/logic.clj       | 62 ++++++++++++++-----
 src/test/clojure/clojure/core/logic/tests.clj | 14 +++++
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 228f6dcb..100e4d9e 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -2292,23 +2292,56 @@
   (-disunify-terms [u v s {pc :prefixc :as cs}]
     (assoc cs :prefixc (assoc pc u v)))
 
-  clojure.lang.Sequential
+  LCons
   (-disunify-terms [u v s cs]
-    (if (sequential? v)
-      (loop [u (seq u) v (seq v) cs cs]
-        (if u
-          (if v
-            (let [uv (first u)
-                  vv (first v)
-                  cs (disunify s uv vv cs)]
-              (if cs
-                (recur (next u) (next v) cs)
-                nil))
+    (cond
+      (sequential? v)
+      (loop [u u v (seq v) cs cs]
+        (if-not (nil? v)
+          (if (lcons? u)
+            (if-let [cs (disunify s (lfirst u) (first v) cs)]
+              (recur (lnext u) (next v) cs)
+              nil)
             nil)
-          (if (nil? v)
-            cs
+          (if (lvar? u)
+            (disunify s u () cs)
             nil)))
-      nil))
+      
+      (lcons? v)
+      (loop [u u v (seq v) cs cs]
+        (if (lvar? u)
+          (if (lvar? v)
+            (disunify s u v cs)
+            nil)
+          (cond
+            (lvar? v) nil
+            (and (lcons? u) (lcons? v))
+            (if-let [cs (disunify s (lfirst u) (lfirst v) cs)]
+              (recur (lnext u) (lnext v) cs)
+              nil)
+            :else nil)))
+      
+      :else nil))
+
+  clojure.lang.Sequential
+  (-disunify-terms [u v s cs]
+    (if (lcons? v)
+      (-disunify-terms v u s cs)
+      (if (sequential? v)
+        (loop [u (seq u) v (seq v) cs cs]
+          (if u
+            (if v
+              (let [uv (first u)
+                    vv (first v)
+                    cs (disunify s uv vv cs)]
+                (if cs
+                  (recur (next u) (next v) cs)
+                  nil))
+              nil)
+            (if (nil? v)
+              cs
+              nil)))
+        nil)))
 
   clojure.lang.IPersistentMap
   (-disunify-terms [u v s cs]
@@ -2839,4 +2872,3 @@
         :else fail))
     (fn [_ v _ r a]
       `(seqc ~(-reify a v r)))))
-
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 166e5e06..53ea954d 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -1050,6 +1050,20 @@
   (is (= (run* [q]
            (!= {1 2 3 4} 'foo))
         '(_0))))
+
+(deftest test-logic-160-disequality
+  (is (= (run* [q]
+           (fresh [a d]
+             (!= (lcons a d) '(2))
+             (== (lcons a d) '(2))))
+         ()))
+  (is (= (run* [q]
+           (fresh [a d]
+             (!= (lcons a d) '(2))
+             (== a 2)
+             (== d ())))
+         ())))
+
 ;; -----------------------------------------------------------------------------
 ;; tabled
 

From 0a68d7a6325fcd812163a0a068d4b78f73b23a6f Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 15:26:45 -0400
Subject: [PATCH 212/288] do not make pair private

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 100e4d9e..5c3338c6 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -77,7 +77,7 @@
            (= rhs (:rhs o)))
       false)))
 
-(defn- pair [lhs rhs]
+(defn pair [lhs rhs]
   (Pair. lhs rhs))
 
 (defmethod print-method Pair [x ^Writer writer]

From fe7386549d24af417743964bc35c81bfd1df0792 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 6 Jul 2014 14:31:19 -0500
Subject: [PATCH 213/288] [maven-release-plugin] prepare release
 core.logic-0.8.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 40d467dd..4a50a2c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.8-SNAPSHOT</version>
+  <version>0.8.8</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.8</tag>
   </scm>
 </project>

From 42ef2c4269f30222881aa2e5255056207e10bf1e Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Sun, 6 Jul 2014 14:31:19 -0500
Subject: [PATCH 214/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a50a2c2..77fee196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.8</version>
+  <version>0.8.9-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.8</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 37564f6bd6efcd49deec8e04a40f77465b83e6bb Mon Sep 17 00:00:00 2001
From: David Nolen <dnolen@cognitect.com>
Date: Sun, 6 Jul 2014 15:35:31 -0400
Subject: [PATCH 215/288] update for 0.8.8

---
 CHANGES.md | 13 +++++++++++++
 README.md  |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 825b03e4..8ac4db3f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+From 0.8.7 to 0.8.8
+====
+
+Changes
+----
+* pldb support in ClojureScript
+* run interface matches clojure.core.logic
+* Minimum dependency on Clojure 1.6.0 and ClojureScript 0.0-2261
+
+Fixes
+----
+* LOGIC-160: disequality on LCons not respected
+
 From 0.8.6 to 0.8.7
 ====
 
diff --git a/README.md b/README.md
index 8b4cb289..e7cf5dc0 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.7
+Latest stable release: 0.8.8
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -38,7 +38,7 @@ Latest stable release: 0.8.7
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.7"]
+[org.clojure/core.logic "0.8.8"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -47,7 +47,7 @@ Latest stable release: 0.8.7
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.7</version>
+  <version>0.8.8</version>
 </dependency>
 ```
 

From 3685a61bb40e4c2dca2696e06aac03b7d072be42 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Tue, 26 Aug 2014 20:03:07 -0400
Subject: [PATCH 216/288] bump

---
 .gitignore  | 1 +
 project.clj | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73e07091..d3ff20ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .lein*
 *.jar
 *.org
diff --git a/project.clj b/project.clj
index c7102556..5cdf9fb7 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.7-SNAPSHOT"
+(defproject org.clojure/core.logic "0.8.9-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 
@@ -9,7 +9,7 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2261" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2311" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]

From d581272bdec21d8dab5ce0d17e68cec138cb7140 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Wed, 15 Oct 2014 18:38:19 -0400
Subject: [PATCH 217/288] bump CLJS

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 5cdf9fb7..5d2bcbd2 100644
--- a/project.clj
+++ b/project.clj
@@ -9,7 +9,7 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2311" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2371" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]

From fa9451ed57ba9647399e1e6e1d5a723e422d7c6b Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobias.kortkamp@gmail.com>
Date: Fri, 15 Aug 2014 19:34:14 +0200
Subject: [PATCH 218/288] Change defnm to add :arglists metadata to defined var

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 5c3338c6..1d4f1e32 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1620,7 +1620,7 @@
         e (if (-> n meta :tabled)
             `(fnm ~t ~as :tabled ~@cs)
             `(fnm ~t ~as ~@cs))]
-    `(def ~n ~e)))
+    `(def ~(vary-meta n #(merge {:arglists (list 'quote (list as))} %1)) ~e)))
 
 ;; =============================================================================
 ;; Useful goals

From 36d4e03055c57094e09aa81e2bc37883de1dfbde Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Wed, 15 Oct 2014 19:05:02 -0400
Subject: [PATCH 219/288] cleanup project.clj

---
 project.clj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 5d2bcbd2..cd292fe9 100644
--- a/project.clj
+++ b/project.clj
@@ -22,15 +22,11 @@
    [{:id "dev"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :none
-                :pretty-print true
                 :output-to "resources/tests.js"
                 :output-dir "resources/out-dev"
                 :source-map true}}
     {:id "adv"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
-                :pretty-print true
-                :pseudo-names true
                 :output-to "resources/tests.js"
-                :output-dir "resources/out-adv"
-                :source-map "resources/tests.js.map"}}]})
+                :output-dir "resources/out-adv"}}]})

From 719c23f80280762ff20216a579d88efa32da2de7 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Thu, 16 Oct 2014 17:48:40 -0400
Subject: [PATCH 220/288] LOGIC-161: negative values should never appear in
 intervals

---
 src/main/clojure/clojure/core/logic/fd.clj    | 19 +++++++++++--------
 src/test/clojure/clojure/core/logic/tests.clj | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 7cbe19c4..aa97406f 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -157,8 +157,9 @@
    be integers given in sorted order. domains may be more efficient 
    than intervals when only a few values are possible."
   [& args]
-  (when (seq args)
-    (sorted-set->domain (into (sorted-set) args))))
+  (let [args (remove neg? args)]
+    (when (seq args)
+      (sorted-set->domain (into (sorted-set) args)))))
 
 (defmethod print-method FiniteDomain [x ^Writer writer]
   (.write writer (str "<domain:" (string/join " " (seq (:s x))) ">")))
@@ -357,11 +358,13 @@
   "Construct an interval for an assignment to a var. intervals may
    be more efficient that the domain type when the range of possiblities
    is large."
-  ([ub] (IntervalFD. 0 ub))
+  ([ub] (interval 0 ub))
   ([lb ub]
-     (if (zero? (core/- ub lb))
-       ub
-       (IntervalFD. lb ub))))
+   (let [lb (if (neg? lb) 0 lb)
+         ub (if (neg? ub) 0 ub)]
+     (cond
+      (zero? (core/- ub lb)) ub
+      :else (IntervalFD. lb ub)))))
 
 (defn intersection* [is js]
   (loop [is (seq (-intervals is)) js (seq (-intervals js)) r []]
@@ -572,10 +575,10 @@
   ([i0] i0)
   ([i0 i1]
      (let [is [i0 i1]]
-       (MultiIntervalFD. (reduce min (map -lb is)) (reduce max (map -ub is)) is)))
+       (MultiIntervalFD. (max 0 (reduce min (map -lb is))) (max 0 (reduce max (map -ub is))) is)))
   ([i0 i1 & ir]
      (let [is (into [] (concat (list i0 i1) ir))]
-       (MultiIntervalFD. (reduce min (map -lb is)) (reduce max (map -ub is)) is))))
+       (MultiIntervalFD. (max 0 (reduce min (map -lb is))) (max 0 (reduce max (map -ub is))) is))))
 
 (defmethod print-method MultiIntervalFD [x ^Writer writer]
   (.write writer (str "<intervals:" (apply pr-str (:is x)) ">")))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 53ea954d..86e58d6f 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3532,3 +3532,20 @@
         s (update-dom empty-s x ::nom (fnil (fn [d] (conj d '(swap x y))) []))]
     (is (= (get-dom s x ::nom) '[(swap x y)]))))
 
+;; LOGIC-161
+
+(deftest test-logic-161
+  (is
+    (= (into {}
+         (run* [q]
+           (fresh [a b]
+             (fd/in a b (fd/interval 0 10))
+             (fd/eq (= 4 (* (- a b) 2)))
+             (== q [a b]))))
+
+       (into {}
+         (run* [q]
+           (fresh [a b]
+             (fd/in a b (fd/interval 0 10))
+             (fd/eq (= 2 (- a b)))
+             (== q [a b])))))))
\ No newline at end of file

From 38e5917e8a626a8d83bcb8620039612e6bc5a3c0 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 16 Oct 2014 16:51:19 -0500
Subject: [PATCH 221/288] [maven-release-plugin] prepare release
 core.logic-0.8.9

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 77fee196..0fcc02fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.9-SNAPSHOT</version>
+  <version>0.8.9</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.9</tag>
   </scm>
 </project>

From 2d08994676e685ba69c84f5ed1609489c7c320ab Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 16 Oct 2014 16:51:19 -0500
Subject: [PATCH 222/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0fcc02fa..3e57caa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.9</version>
+  <version>0.8.10-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.9</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 4f23f6b9631c4fe52f0bea39e6dcbc19314244a4 Mon Sep 17 00:00:00 2001
From: arrdem <me@arrdem.com>
Date: Sun, 9 Nov 2014 16:31:31 -0600
Subject: [PATCH 223/288] Namespace qualify pldb relations

---
 src/main/clojure/clojure/core/logic/pldb.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
index 7ef62927..5180f108 100644
--- a/src/main/clojure/clojure/core/logic/pldb.clj
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -50,7 +50,7 @@
         (count args)
 
         kname
-        (str name "_" arity)
+        (str (ns-name *ns*) name "_" arity)
 
         indexes
         (vec (map indexed? args))]

From 8e579c12322f195f5ec87f510e7a0468864e7a61 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Sun, 9 Nov 2014 18:00:50 -0500
Subject: [PATCH 224/288] add ns separator

---
 src/main/clojure/clojure/core/logic/pldb.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
index 5180f108..d991e423 100644
--- a/src/main/clojure/clojure/core/logic/pldb.clj
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -50,7 +50,7 @@
         (count args)
 
         kname
-        (str (ns-name *ns*) name "_" arity)
+        (str (ns-name *ns*) "/" name "_" arity)
 
         indexes
         (vec (map indexed? args))]

From 375874803bbf4be95d33596dcfe5d1809bc6e042 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 12 Nov 2014 09:48:24 -0500
Subject: [PATCH 225/288] port LOGIC-163 to ClojureScript pldb

---
 src/main/clojure/cljs/core/logic/pldb.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index fd276365..ae342511 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -13,7 +13,7 @@
 
 (defmacro db-rel [name & args]
   (let [arity   (count args)
-        kname   (str name "_" arity)
+        kname   (str (ns-name *ns*) "/" name "_" arity)
         indexes (vec (map indexed? args))]
     `(def ~name
        (with-meta

From dba7c697ca45a7fee7595cd18d057c420261d498 Mon Sep 17 00:00:00 2001
From: Jennifer Smith <jennifer@home>
Date: Wed, 14 May 2014 14:36:25 +0800
Subject: [PATCH 226/288] Fixes LOGIC-118 by making prep* handle collections.

---
 src/main/clojure/clojure/core/logic/unifier.clj |  3 +--
 src/test/clojure/clojure/core/logic/tests.clj   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index 222d0345..b51387da 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -40,7 +40,7 @@
          (lvarq-sym? expr)
          (proc-lvar expr store)
         
-         (seq? expr)
+         (coll? expr)
          (if (or lcons? (lcons-expr? expr))
            (let [[f & n] expr
                  skip (= f '.)
@@ -49,7 +49,6 @@
                tail
                (lcons (prep* f store) tail)))
            (walk-term expr (replace-lvar store)))
-         
         :else expr))))
 
 (defn prep
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 86e58d6f..36144369 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -3548,4 +3548,15 @@
            (fresh [a b]
              (fd/in a b (fd/interval 0 10))
              (fd/eq (= 2 (- a b)))
-             (== q [a b])))))))
\ No newline at end of file
+             (== q [a b])))))))
+
+;; LOGIC-118
+
+(deftest test-logic-118-prep-lvar-no-tail
+  (let [[[xprepped]] (u/prep '([?x]))]
+    (is (lvar? xprepped))))
+
+(deftest test-logic-118-prep-lvar-with-tail
+  (let [result (u/prep '([?x] . ?foo))
+        [head] (lfirst result)]
+    (is (lvar? head))) )

From 4a37f4a34f9cefda8bb813870e00c3ca6bcbad5d Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 16 Dec 2014 08:30:29 -0500
Subject: [PATCH 227/288] breaking changing, `cljs/core/logic/macros.clj` ->
 `cljs/core/logic.clj` to be compatible with `:include-macros`,
 `:refer-macros` usage

---
 .gitignore                                    |   3 +
 project.clj                                   |  10 +-
 .../cljs/core/{logic/macros.clj => logic.clj} |   2 +-
 src/main/clojure/cljs/core/logic.cljs         |   9 +-
 src/main/clojure/cljs/core/logic/pldb.clj     |   2 +-
 src/main/clojure/cljs/core/logic/pldb.cljs    |   2 +-
 src/test/cljs/cljs/core/logic/tests.cljs      | 174 +++++++++---------
 7 files changed, 103 insertions(+), 99 deletions(-)
 rename src/main/clojure/cljs/core/{logic/macros.clj => logic.clj} (99%)

diff --git a/.gitignore b/.gitignore
index d3ff20ca..e5634eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.iml
+.nrepl*
 .idea
 .lein*
 *.jar
@@ -8,3 +10,4 @@
 target/
 out/
 tests.js
+resources/
\ No newline at end of file
diff --git a/project.clj b/project.clj
index cd292fe9..bb24758f 100644
--- a/project.clj
+++ b/project.clj
@@ -9,13 +9,13 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2371" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2411" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
 
   :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]
-            [cider/cider-nrepl "0.7.0-SNAPSHOT"]]
+            [cider/cider-nrepl "0.8.1"]]
 
   :cljsbuild
   {:builds
@@ -25,6 +25,12 @@
                 :output-to "resources/tests.js"
                 :output-dir "resources/out-dev"
                 :source-map true}}
+    {:id "simp"
+     :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
+     :compiler {:optimizations :simple
+                :static-fns true
+                :output-to "resources/tests.js"
+                :output-dir "resources/out-simp"}}
     {:id "adv"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
diff --git a/src/main/clojure/cljs/core/logic/macros.clj b/src/main/clojure/cljs/core/logic.clj
similarity index 99%
rename from src/main/clojure/cljs/core/logic/macros.clj
rename to src/main/clojure/cljs/core/logic.clj
index 7ff00864..f9bb35cc 100644
--- a/src/main/clojure/cljs/core/logic/macros.clj
+++ b/src/main/clojure/cljs/core/logic.clj
@@ -1,4 +1,4 @@
-(ns cljs.core.logic.macros
+(ns cljs.core.logic
   (:refer-clojure :exclude [==])
   (:require [clojure.set :as set]))
 
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 2d244014..fe27e60a 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -1,10 +1,9 @@
 (ns cljs.core.logic
   (:refer-clojure :exclude [==])
-  (:use-macros [cljs.core.logic.macros :only
-                [defne defna defnu fresh == -inc]])
-  (:require-macros [cljs.core.logic.macros :as m])
-  (:require [clojure.set :as set])
-  (:use [clojure.walk :only [postwalk]]))
+  (:require-macros [cljs.core.logic :as m
+                    :refer [defne defna defnu fresh == -inc]])
+  (:require [clojure.set :as set]
+            [clojure.walk :refer [postwalk]]))
 
 (def ^:dynamic *logic-dbs* [])
 
diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index ae342511..3b2bacc8 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -29,6 +29,6 @@
                (cljs.core.logic/to-stream
                  (remove cljs.core.logic/failed?
                    (map (fn [potential#]
-                          ((cljs.core.logic.macros/== query# potential#) subs#))
+                          ((cljs.core.logic/== query# potential#) subs#))
                      facts#))))))
          {:rel-name ~kname :indexes ~indexes}))))
diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index fb91e346..c844dcaa 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -1,5 +1,5 @@
 (ns cljs.core.logic.pldb
-  (:require [cljs.core.logic :as l]))
+  (:require [cljs.core.logic :as l :include-macros true]))
 
 ;; ----------------------------------------
 
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index 97f85bf1..d817898b 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -1,21 +1,17 @@
 (ns cljs.core.logic.tests
   (:refer-clojure :exclude [==])
-  (:use-macros
-   [cljs.core.logic.macros
-    :only [run run* run-nc == conde conda condu fresh defne matche all]])
-  (:require-macros [cljs.core.logic.macros :as m]
-                   [clojure.tools.macro :as mu]
-                   [cljs.core.logic.pldb :as pldb])
-  (:require [cljs.core.logic.pldb :as pldb])
-  (:use
-   [cljs.core.logic
-    :only [pair lvar lcons -unify -ext-no-check -walk -walk*
-           -reify-lvar-name empty-s to-s succeed fail s# u# conso
-           nilo firsto resto emptyo appendo membero
-           unifier binding-map partial-map failed?]]))
+  (:require-macros [clojure.tools.macro :as mu])
+  (:require
+   [cljs.core.logic :as l
+    :refer [pair lvar lcons -unify -ext-no-check -walk -walk*
+            -reify-lvar-name empty-s to-s succeed fail s# u# conso
+            nilo firsto resto emptyo appendo membero
+            unifier binding-map partial-map failed?]
+    :refer-macros [run run* run-nc == conde conda condu fresh defne matche all]]
+   [cljs.core.logic.pldb :as pldb :include-macros true]))
 
 (defn js-print [& args]
-  (if (js* "typeof console != 'undefined'")
+  (if (exists? js/console)
     (.log js/console (apply str args))
     (js/print (apply str args))))
 
@@ -360,18 +356,18 @@
 (println "run and unify")
 
 (assert (= (run* [q]
-             (m/== true q))
+             (== true q))
            '(true)))
 
 (assert (= (run* [q]
              (fresh [x y]
-               (m/== [x y] [1 5])
-               (m/== [x y] q)))
+               (== [x y] [1 5])
+               (== [x y] q)))
            [[1 5]]))
 
 (assert (= (run* [q]
              (fresh [x y]
-               (m/== [x y] q)))
+               (== [x y] q)))
            '[[_.0 _.1]]))
 
 ;; =============================================================================
@@ -381,7 +377,7 @@
 
 (assert (= (run* [q]
              fail
-             (m/== true q))
+             (== true q))
            []))
 
 ;; =============================================================================
@@ -391,8 +387,8 @@
 
 (assert (= (run* [q]
              (all
-              (m/== 1 1)
-              (m/== q true)))
+              (== 1 1)
+              (== q true)))
            '(true)))
 
 ;; =============================================================================
@@ -402,7 +398,7 @@
 
 (defn pairo [p]
   (fresh [a d]
-    (m/== (lcons a d) p)))
+    (== (lcons a d) p)))
 
 (defn twino [p]
   (fresh [x]
@@ -418,7 +414,7 @@
 
 (defn flatteno [s out]
   (conde
-    [(emptyo s) (m/== '() out)]
+    [(emptyo s) (== '() out)]
     [(pairo s)
      (fresh [a d res-a res-d]
        (conso a d s)
@@ -429,11 +425,11 @@
 
 (defn rembero [x l out]
   (conde
-    [(m/== '() l) (m/== '() out)]
+    [(== '() l) (== '() out)]
     [(fresh [a d]
        (conso a d l)
-       (m/== x a)
-       (m/== d out))]
+       (== x a)
+       (== d out))]
     [(fresh [a d res]
        (conso a d l)
        (conso a res out)
@@ -446,30 +442,30 @@
 
 (assert (= (run* [x]
              (conde
-               [(m/== x 'olive) succeed]
+               [(== x 'olive) succeed]
                [succeed succeed]
-               [(m/== x 'oil) succeed]))
+               [(== x 'oil) succeed]))
            '[olive _.0 oil]))
 
 (assert (= (run* [r]
              (fresh [x y]
                (conde
-                 [(m/== 'split x) (m/== 'pea y)]
-                 [(m/== 'navy x) (m/== 'bean y)])
-               (m/== (cons x (cons y ())) r)))
+                 [(== 'split x) (== 'pea y)]
+                 [(== 'navy x) (== 'bean y)])
+               (== (cons x (cons y ())) r)))
            '[(split pea) (navy bean)]))
 
 (defn teacupo [x]
   (conde
-    [(m/== 'tea x) s#]
-    [(m/== 'cup x) s#]))
+    [(== 'tea x) s#]
+    [(== 'cup x) s#]))
 
 (assert (= (run* [r]
              (fresh [x y]
                (conde
-                 [(teacupo x) (m/== true y) s#]
-                 [(m/== false x) (m/== true y)])
-               (m/== (cons x (cons y ())) r)))
+                 [(teacupo x) (== true y) s#]
+                 [(== false x) (== true y)])
+               (== (cons x (cons y ())) r)))
            '((false true) (tea true) (cup true))))
 
 ;; =============================================================================
@@ -480,7 +476,7 @@
 (assert (= (run* [q]
              (fresh [a d]
                (conso a d ())
-               (m/== (cons a d) q)))
+               (== (cons a d) q)))
            []))
 
 (let [a (lvar 'a)
@@ -490,7 +486,7 @@
              [(lcons a d)])))
 
 (assert (= (run* [q]
-             (m/== [q] nil))
+             (== [q] nil))
            []))
 
 (assert (=
@@ -559,14 +555,14 @@
 
 (assert (= (run* [q]
              (all
-              (m/== q [(lvar)])
+              (== q [(lvar)])
               (membero ['foo (lvar)] q)
               (membero [(lvar) 'bar] q)))
            '([[foo bar]])))
 
 (assert (= (run* [q]
              (all
-              (m/== q [(lvar) (lvar)])
+              (== q [(lvar) (lvar)])
               (membero ['foo (lvar)] q)
               (membero [(lvar) 'bar] q)))
            '([[foo bar] _.0] [[foo _.0] [_.1 bar]]
@@ -588,27 +584,27 @@
 
 (defn digit-1 [x]
   (conde
-    [(m/== 0 x)]))
+    [(== 0 x)]))
 
 (defn digit-4 [x]
   (conde
-    [(m/== 0 x)]
-    [(m/== 1 x)]
-    [(m/== 2 x)]
-    [(m/== 3 x)]))
+    [(== 0 x)]
+    [(== 1 x)]
+    [(== 2 x)]
+    [(== 3 x)]))
 
 (assert (= (run* [q]
              (fresh [x y]
                (digit-1 x)
                (digit-1 y)
-               (m/== q [x y])))
+               (== q [x y])))
            '([0 0])))
 
 (assert (= (run* [q]
              (fresh [x y]
                (digit-4 x)
                (digit-4 y)
-               (m/== q [x y])))
+               (== q [x y])))
            '([0 0] [0 1] [0 2] [1 0] [0 3] [1 1] [1 2] [2 0]
                [1 3] [2 1] [3 0] [2 2] [3 1] [2 3] [3 2] [3 3])))
 
@@ -624,12 +620,12 @@
 
 (assert (= (run 1 [q]
              (anyo s#)
-             (m/== true q))
+             (== true q))
            (list true)))
 
 (assert (= (run 5 [q]
              (anyo s#)
-             (m/== true q))
+             (== true q))
            (list true true true true true)))
 
 ;; -----------------------------------------------------------------------------
@@ -642,13 +638,13 @@
 (assert (= (run 1 [q]
              (conde
                [f1]
-               [(m/== false false)]))
+               [(== false false)]))
            '(_.0)))
 
 (assert (= (run 1 [q]
              (conde
-               [f1 (m/== false false)]
-               [(m/== false false)]))
+               [f1 (== false false)]
+               [(== false false)]))
            '(_.0)))
 
 (def f2
@@ -656,8 +652,8 @@
     (conde
       [f2 (conde
             [f2]
-            [(m/== false false)])]
-      [(m/== false false)])))
+            [(== false false)])]
+      [(== false false)])))
 
 (assert (= (run 5 [q] f2)
            '(_.0 _.0 _.0 _.0 _.0)))
@@ -669,48 +665,48 @@
 
 (assert (= (run* [x]
              (conda
-               [(m/== 'olive x) s#]
-               [(m/== 'oil x) s#]
+               [(== 'olive x) s#]
+               [(== 'oil x) s#]
                [u#]))
            '(olive)))
 
 (assert (= (run* [x]
              (conda
-               [(m/== 'virgin x) u#]
-               [(m/== 'olive x) s#]
-               [(m/== 'oil x) s#]
+               [(== 'virgin x) u#]
+               [(== 'olive x) s#]
+               [(== 'oil x) s#]
                [u#]))
            '()))
 
 (assert (= (run* [x]
              (fresh (x y)
-               (m/== 'split x)
-               (m/== 'pea y)
+               (== 'split x)
+               (== 'pea y)
                (conda
-                 [(m/== 'split x) (m/== x y)]
+                 [(== 'split x) (== x y)]
                  [s#]))
-             (m/== true x))
+             (== true x))
            '()))
 
 (assert (= (run* [x]
              (fresh (x y)
-               (m/== 'split x)
-               (m/== 'pea y)
+               (== 'split x)
+               (== 'pea y)
                (conda
-                 [(m/== x y) (m/== 'split x)]
+                 [(== x y) (== 'split x)]
                  [s#]))
-             (m/== true x))
+             (== true x))
            '(true)))
 
 (defn not-pastao [x]
   (conda
-    [(m/== 'pasta x) u#]
+    [(== 'pasta x) u#]
     [s#]))
 
 (assert (= (run* [x]
              (conda
                [(not-pastao x)]
-               [(m/== 'spaghetti x)]))
+               [(== 'spaghetti x)]))
            '(spaghetti)))
 
 ;; -----------------------------------------------------------------------------
@@ -729,13 +725,13 @@
 (assert (= (run* [r]
              (conde
                [(teacupo r) s#]
-               [(m/== false r) s#]))
+               [(== false r) s#]))
            '(false tea cup)))
 
 (assert (= (run* [r]
              (conda
                [(teacupo r) s#]
-               [(m/== false r) s#]))
+               [(== false r) s#]))
            '(tea cup)))
 
 
@@ -745,27 +741,27 @@
 (println "nil in collection")
 
 (assert (= (run* [q]
-             (m/== q [nil]))
+             (== q [nil]))
            '([nil])))
 
 (assert (= (run* [q]
-             (m/== q [1 nil]))
+             (== q [1 nil]))
            '([1 nil])))
 
 (assert (= (run* [q]
-             (m/== q [nil 1]))
+             (== q [nil 1]))
            '([nil 1])))
 
 (assert (= (run* [q]
-             (m/== q '(nil)))
+             (== q '(nil)))
            '((nil))))
 
 (assert (= (run* [q]
-             (m/== q {:foo nil}))
+             (== q {:foo nil}))
            '({:foo nil})))
 
 (assert (= (run* [q]
-             (m/== q {nil :foo}))
+             (== q {nil :foo}))
            '({nil :foo})))
 
 ;; -----------------------------------------------------------------------------
@@ -827,7 +823,7 @@
 (println "occurs check")
 
 (assert (= (run* [q]
-             (m/== q [q]))
+             (== q [q]))
            ()))
 
 ;; -----------------------------------------------------------------------------
@@ -837,24 +833,24 @@
 
 (assert (= (run* [p]
              (fresh [a b]
-               (m/== b ())
-               (m/== '(0 1) (lcons a b))
-               (m/== p [a b])))
+               (== b ())
+               (== '(0 1) (lcons a b))
+               (== p [a b])))
            ()))
 
 (assert (= (run* [p]
              (fresh [a b]
-               (m/== b '(1))
-               (m/== '(0) (lcons a b))
-               (m/== p [a b])))
+               (== b '(1))
+               (== '(0) (lcons a b))
+               (== p [a b])))
            ()))
 
 (assert (= (run* [p]
              (fresh [a b c d]
-               (m/== () b)
-               (m/== '(1) d)
-               (m/== (lcons a b) (lcons c d))
-               (m/== p [a b c d])))
+               (== () b)
+               (== '(1) d)
+               (== (lcons a b) (lcons c d))
+               (== p [a b c d])))
            ()))
 
 ;; -----------------------------------------------------------------------------
@@ -917,7 +913,7 @@
 (defn zebrao [hs]
   (mu/symbol-macrolet [_ (lvar)]
    (all
-    (m/== (list _ _ (list _ _ 'milk _ _) _ _) hs)
+    (== (list _ _ (list _ _ 'milk _ _) _ _) hs)
     (firsto hs (list 'norwegian _ _ _ _))
     (nexto (list 'norwegian _ _ _ _) (list _ _ _ _ 'blue) hs)
     (righto (list _ _ _ _ 'ivory) (list _ _ _ _ 'green) hs)

From 0e2043ce99f2c4bc742a0fffa0f152df732abf20 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 17 Dec 2014 23:41:21 -0500
Subject: [PATCH 228/288] convert tests to cljs.test

---
 project.clj                              |    2 +-
 src/test/cljs/cljs/core/logic/tests.cljs | 1242 +++++++++++-----------
 2 files changed, 594 insertions(+), 650 deletions(-)

diff --git a/project.clj b/project.clj
index bb24758f..8339ec36 100644
--- a/project.clj
+++ b/project.clj
@@ -9,7 +9,7 @@
   :test-paths ["src/test/clojure"]
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2411" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-2496" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
diff --git a/src/test/cljs/cljs/core/logic/tests.cljs b/src/test/cljs/cljs/core/logic/tests.cljs
index d817898b..63b33c3f 100644
--- a/src/test/cljs/cljs/core/logic/tests.cljs
+++ b/src/test/cljs/cljs/core/logic/tests.cljs
@@ -2,6 +2,7 @@
   (:refer-clojure :exclude [==])
   (:require-macros [clojure.tools.macro :as mu])
   (:require
+   [cljs.test :as test :refer-macros [deftest is testing run-tests]]
    [cljs.core.logic :as l
     :refer [pair lvar lcons -unify -ext-no-check -walk -walk*
             -reify-lvar-name empty-s to-s succeed fail s# u# conso
@@ -23,379 +24,331 @@
 ;; -----------------------------------------------------------------------------
 ;; unify with nil
 
-(println "unify with nil")
-
-(let [x (lvar 'x)]
-  (assert (= (pair x nil) (pair x nil))))
-
-(let [x (lvar 'x)]
-  (assert (false? (= (pair x nil) (pair nil x)))))
-
-(assert (failed? (-unify empty-s nil 1)))
-
-(let [x (lvar 'x)
-      a (-ext-no-check empty-s x nil)
-      b (-unify empty-s nil x)]
-  (assert (= a b)))
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s nil (lcons 1 x)))))
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s nil {}))))
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s nil #{}))))
+(deftest test-unify-with-nil
+  (testing "Unify with nil"
+    (let [x (lvar 'x)]
+      (is (= (pair x nil) (pair x nil))))
+    (let [x (lvar 'x)]
+      (is (false? (= (pair x nil) (pair nil x)))))
+    (is (failed? (-unify empty-s nil 1)))
+    (let [x (lvar 'x)
+          a (-ext-no-check empty-s x nil)
+          b (-unify empty-s nil x)]
+      (is (= a b)))
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s nil (lcons 1 x)))))
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s nil {}))))
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s nil #{}))))))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with object
 
-(println "unify with object")
-
-(assert (failed? (-unify empty-s 1 nil)))
-(assert (= (-unify empty-s 1 1) empty-s))
-(assert (= (-unify empty-s :foo :foo) empty-s))
-(assert (= (-unify empty-s 'foo 'foo) empty-s))
-(assert (= (-unify empty-s "foo" "foo") empty-s))
-(assert (failed? (-unify empty-s 1 2)))
-(assert (failed? (-unify empty-s 2 1)))
-(assert (failed? (-unify empty-s :foo :bar)))
-(assert (failed? (-unify empty-s 'foo 'bar)))
-(assert (failed? (-unify empty-s "foo" "bar")))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x 1)]
-  (assert (= (-unify empty-s 1 x) os)))
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s 1 (lcons 1 'x)))))
-
-(assert (failed? (-unify empty-s 1 '())))
-(assert (failed? (-unify empty-s 1 '[])))
-(assert (failed? (-unify empty-s 1 {})))
-(assert (failed? (-unify empty-s 1 #{})))
+(deftest test-unify-with-object
+  (testing "Unify wiht object"
+    (is (failed? (-unify empty-s 1 nil)))
+    (is (= (-unify empty-s 1 1) empty-s))
+    (is (= (-unify empty-s :foo :foo) empty-s))
+    (is (= (-unify empty-s 'foo 'foo) empty-s))
+    (is (= (-unify empty-s "foo" "foo") empty-s))
+    (is (failed? (-unify empty-s 1 2)))
+    (is (failed? (-unify empty-s 2 1)))
+    (is (failed? (-unify empty-s :foo :bar)))
+    (is (failed? (-unify empty-s 'foo 'bar)))
+    (is (failed? (-unify empty-s "foo" "bar")))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x 1)]
+      (is (= (-unify empty-s 1 x) os)))
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s 1 (lcons 1 'x)))))
+    (is (failed? (-unify empty-s 1 '())))
+    (is (failed? (-unify empty-s 1 '[])))
+    (is (failed? (-unify empty-s 1 {})))
+    (is (failed? (-unify empty-s 1 #{})))))
 
 ;; -----------------------------------------------------------------------------
 ;; unify with lvar
 
-(println "unify with lvar")
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x 1)]
-  (assert (= (-unify empty-s x 1) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      os (-ext-no-check empty-s x y)]
-  (assert (= (-unify empty-s x y) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      l (lcons 1 y)
-      os (-ext-no-check empty-s x l)]
-  (assert (= (-unify empty-s x l) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x [])]
-  (assert (= (-unify empty-s x []) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x [1 2 3])]
-  (assert (= (-unify empty-s x [1 2 3]) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x '())]
-  (assert (= (-unify empty-s x '()) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x '(1 2 3))]
-  (assert (= (-unify empty-s x '(1 2 3)) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x {})]
-  (assert (= (-unify empty-s x {}) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x {1 2 3 4})]
-  (assert (= (-unify empty-s x {1 2 3 4}) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x #{})]
-  (assert (= (-unify empty-s x #{}) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x #{1 2 3})]
-  (assert (= (-unify empty-s x #{1 2 3}) os)))
+(deftest test-unify-with-lvar
+  (testing "Unify with lvar"
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x 1)]
+      (is (= (-unify empty-s x 1) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          os (-ext-no-check empty-s x y)]
+      (is (= (-unify empty-s x y) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          l (lcons 1 y)
+          os (-ext-no-check empty-s x l)]
+      (is (= (-unify empty-s x l) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x [])]
+      (is (= (-unify empty-s x []) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x [1 2 3])]
+      (is (= (-unify empty-s x [1 2 3]) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x '())]
+      (is (= (-unify empty-s x '()) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x '(1 2 3))]
+      (is (= (-unify empty-s x '(1 2 3)) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x {})]
+      (is (= (-unify empty-s x {}) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x {1 2 3 4})]
+      (is (= (-unify empty-s x {1 2 3 4}) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x #{})]
+      (is (= (-unify empty-s x #{}) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x #{1 2 3})]
+      (is (= (-unify empty-s x #{1 2 3}) os))))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; unify with lcons
 
-(println "unify with lcons")
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s (lcons 1 x) 1))))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      l (lcons 1 y)
-      os (-ext-no-check empty-s x l)]
-  (assert (= (-unify empty-s l x) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc1 (lcons 1 x)
-      lc2 (lcons 1 y)
-      os (-ext-no-check empty-s x y)]
-  (assert (= (-unify empty-s lc1 lc2) os)))
-
-;; NOTE: sketchy tests that makes ordering assumptions about representation
-;; - David
-
-;; START HERE
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      z (lvar 'z)
-      lc1 (lcons 1 (lcons 2 x))
-      lc2 (lcons 1 (lcons z y))
-      os (-> empty-s
-             (-ext-no-check z 2)
-             (-ext-no-check x y))]
-  (assert (= (-unify empty-s lc1 lc2) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc1 (lcons 1 (lcons 2 x))
-      lc2 (lcons 1 (lcons 2 (lcons 3 y)))
-      os (-ext-no-check empty-s x (lcons 3 y))]
-  (assert (= (-unify empty-s lc1 lc2) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc1 (lcons 1 (lcons 2 x))
-      lc2 (lcons 1 (lcons 3 (lcons 4 y)))]
-  (assert (failed? (-unify empty-s lc1 lc2))))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc2 (lcons 1 (lcons 2 x))
-      lc1 (lcons 1 (lcons 3 (lcons 4 y)))]
-  (assert (failed? (-unify empty-s lc1 lc2))))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc1 (lcons 1 (lcons 2 x))
-      lc2 (lcons 1 (lcons 2 y))
-      os (-ext-no-check empty-s x y)]
-  (assert (= (-unify empty-s lc1 lc2) os)))
-
-(let [x (lvar 'x)
-      lc1 (lcons 1 (lcons 2 x))
-      l1 '(1 2 3 4)
-      os (-ext-no-check empty-s x '(3 4))]
-  (assert (= (-unify empty-s lc1 l1) os)))
-
-(let [x (lvar 'x)
-      y (lvar 'y)
-      lc1 (lcons 1 (lcons y (lcons 3 x)))
-      l1 '(1 2 3 4)
-      os (-> empty-s
-             (-ext-no-check y 2)
-             (-ext-no-check x '(4)))]
-  (assert (= (-unify empty-s lc1 l1) os)))
-
-(let [x (lvar 'x)
-      lc1 (lcons 1 (lcons 2 (lcons 3 x)))
-      l1 '(1 2 3)
-      os (-ext-no-check empty-s x '())]
-  (assert (= (-unify empty-s lc1 l1) os)))
-
-(let [x (lvar 'x)
-      lc1 (lcons 1 (lcons 3 x))
-      l1 '(1 2 3 4)]
-  (assert (failed? (-unify empty-s lc1 l1))))
-
-(let [x (lvar 'x)
-      lc1 (lcons 1 (lcons 2 x))
-      l1 '(1 3 4 5)]
-  (assert (failed? (-unify empty-s lc1 l1))))
-
-(assert (failed? (-unify empty-s (lcons 1 (lvar 'x)) {})))
-(assert (failed? (-unify empty-s (lcons 1 (lvar 'x)) #{})))
+(deftest test-unify-with-lcons
+  (testing "Unify with lcons"
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s (lcons 1 x) 1))))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          l (lcons 1 y)
+          os (-ext-no-check empty-s x l)]
+      (is (= (-unify empty-s l x) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc1 (lcons 1 x)
+          lc2 (lcons 1 y)
+          os (-ext-no-check empty-s x y)]
+      (is (= (-unify empty-s lc1 lc2) os)))
+
+    ;; NOTE: sketchy tests that makes ordering assumptions about representation
+    ;; - David
+
+    ;; START HERE
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          z (lvar 'z)
+          lc1 (lcons 1 (lcons 2 x))
+          lc2 (lcons 1 (lcons z y))
+          os (-> empty-s
+               (-ext-no-check z 2)
+               (-ext-no-check x y))]
+      (is (= (-unify empty-s lc1 lc2) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc1 (lcons 1 (lcons 2 x))
+          lc2 (lcons 1 (lcons 2 (lcons 3 y)))
+          os (-ext-no-check empty-s x (lcons 3 y))]
+      (is (= (-unify empty-s lc1 lc2) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc1 (lcons 1 (lcons 2 x))
+          lc2 (lcons 1 (lcons 3 (lcons 4 y)))]
+      (is (failed? (-unify empty-s lc1 lc2))))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc2 (lcons 1 (lcons 2 x))
+          lc1 (lcons 1 (lcons 3 (lcons 4 y)))]
+      (is (failed? (-unify empty-s lc1 lc2))))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc1 (lcons 1 (lcons 2 x))
+          lc2 (lcons 1 (lcons 2 y))
+          os (-ext-no-check empty-s x y)]
+      (is (= (-unify empty-s lc1 lc2) os)))
+    (let [x (lvar 'x)
+          lc1 (lcons 1 (lcons 2 x))
+          l1 '(1 2 3 4)
+          os (-ext-no-check empty-s x '(3 4))]
+      (is (= (-unify empty-s lc1 l1) os)))
+    (let [x (lvar 'x)
+          y (lvar 'y)
+          lc1 (lcons 1 (lcons y (lcons 3 x)))
+          l1 '(1 2 3 4)
+          os (-> empty-s
+               (-ext-no-check y 2)
+               (-ext-no-check x '(4)))]
+      (is (= (-unify empty-s lc1 l1) os)))
+    (let [x (lvar 'x)
+          lc1 (lcons 1 (lcons 2 (lcons 3 x)))
+          l1 '(1 2 3)
+          os (-ext-no-check empty-s x '())]
+      (is (= (-unify empty-s lc1 l1) os)))
+    (let [x (lvar 'x)
+          lc1 (lcons 1 (lcons 3 x))
+          l1 '(1 2 3 4)]
+      (is (failed? (-unify empty-s lc1 l1))))
+    (let [x (lvar 'x)
+          lc1 (lcons 1 (lcons 2 x))
+          l1 '(1 3 4 5)]
+      (is (failed? (-unify empty-s lc1 l1))))
+    (is (failed? (-unify empty-s (lcons 1 (lvar 'x)) {})))
+    (is (failed? (-unify empty-s (lcons 1 (lvar 'x)) #{}))))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; unify with sequential
 
-(println "unify with sequential")
-
-(assert (failed? (-unify empty-s '() 1)))
-(assert (failed? (-unify empty-s [] 1)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x [])]
-  (assert (= (-unify empty-s [] x) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x [])]
-  (assert (= (-unify empty-s [] x) os)))
-
-(let [x (lvar 'x)
-      lc1 (lcons 1 (lcons 2 x))
-      l1 '(1 2 3 4)
-      os (-ext-no-check empty-s x '(3 4))]
-  (assert (= (-unify empty-s l1 lc1) os)))
-
-(assert (= (-unify empty-s [1 2 3] [1 2 3]) empty-s))
-(assert (= (-unify empty-s '(1 2 3) [1 2 3]) empty-s))
-(assert (= (-unify empty-s '(1 2 3) '(1 2 3)) empty-s))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x 2)]
-  (assert (= (-unify empty-s `(1 ~x 3) `(1 2 3)) os)))
-
-(assert (failed? (-unify empty-s [1 2] [1 2 3])))
-(assert (failed? (-unify empty-s '(1 2) [1 2 3])))
-(assert (failed? (-unify empty-s [1 2 3] [3 2 1])))
-(assert (= (-unify empty-s '() '()) empty-s))
-(assert (failed? (-unify empty-s '() '(1))))
-(assert (failed? (-unify empty-s '(1) '())))
-(assert (= (-unify empty-s [[1 2]] [[1 2]]) empty-s))
-(assert (failed? (-unify empty-s [[1 2]] [[2 1]])))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x 1)]
-  (assert (= (-unify empty-s [[x 2]] [[1 2]]) os)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x [1 2])]
-  (assert (= (-unify empty-s [x] [[1 2]]) os)))
-
-(let [x (lvar 'x) y (lvar 'y)
-      u (lvar 'u) v (lvar 'v)
-      os (-> empty-s
-             (-ext-no-check y 'a)
-             (-ext-no-check x 'b))]
-  (assert (= (-unify empty-s ['a x] [y 'b]) os)))
-
-(assert (failed? (-unify empty-s [] {})))
-(assert (failed? (-unify empty-s '() {})))
-(assert (failed? (-unify empty-s [] #{})))
-(assert (failed? (-unify empty-s '() #{})))
+(deftest test-unify-with-sequential
+  (testing "Unify wiht sequential"
+    (is (failed? (-unify empty-s '() 1)))
+    (is (failed? (-unify empty-s [] 1)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x [])]
+      (is (= (-unify empty-s [] x) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x [])]
+      (is (= (-unify empty-s [] x) os)))
+    (let [x (lvar 'x)
+          lc1 (lcons 1 (lcons 2 x))
+          l1 '(1 2 3 4)
+          os (-ext-no-check empty-s x '(3 4))]
+      (is (= (-unify empty-s l1 lc1) os)))
+    (is (= (-unify empty-s [1 2 3] [1 2 3]) empty-s))
+    (is (= (-unify empty-s '(1 2 3) [1 2 3]) empty-s))
+    (is (= (-unify empty-s '(1 2 3) '(1 2 3)) empty-s))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x 2)]
+      (is (= (-unify empty-s `(1 ~x 3) `(1 2 3)) os)))
+    (is (failed? (-unify empty-s [1 2] [1 2 3])))
+    (is (failed? (-unify empty-s '(1 2) [1 2 3])))
+    (is (failed? (-unify empty-s [1 2 3] [3 2 1])))
+    (is (= (-unify empty-s '() '()) empty-s))
+    (is (failed? (-unify empty-s '() '(1))))
+    (is (failed? (-unify empty-s '(1) '())))
+    (is (= (-unify empty-s [[1 2]] [[1 2]]) empty-s))
+    (is (failed? (-unify empty-s [[1 2]] [[2 1]])))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x 1)]
+      (is (= (-unify empty-s [[x 2]] [[1 2]]) os)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x [1 2])]
+      (is (= (-unify empty-s [x] [[1 2]]) os)))
+    (let [x (lvar 'x) y (lvar 'y)
+          u (lvar 'u) v (lvar 'v)
+          os (-> empty-s
+               (-ext-no-check y 'a)
+               (-ext-no-check x 'b))]
+      (is (= (-unify empty-s ['a x] [y 'b]) os)))
+    (is (failed? (-unify empty-s [] {})))
+    (is (failed? (-unify empty-s '() {})))
+    (is (failed? (-unify empty-s [] #{})))
+    (is (failed? (-unify empty-s '() #{}))))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; unify with map
 
-(println "unify with map")
-
-(assert (failed? (-unify empty-s {} 1)))
-
-(let [x (lvar 'x)
-      os (-ext-no-check empty-s x {})]
-  (assert (= (-unify empty-s {} x) os)))
-
-(let [x (lvar 'x)]
-  (assert (failed? (-unify empty-s {} (lcons 1 x)))))
-
-(assert (failed? (-unify empty-s {} '())))
-(assert (= (-unify empty-s {} {}) empty-s))
-(assert (= (-unify empty-s {1 2 3 4} {1 2 3 4}) empty-s))
-(assert (failed? (-unify empty-s {1 2} {1 2 3 4})))
-
-(let [x (lvar 'x)
-      m1 {1 2 3 4}
-      m2 {1 2 3 x}
-      os (-ext-no-check empty-s x 4)]
-  (assert (= (-unify empty-s m1 m2) os)))
-
-(let [x (lvar 'x)
-      m1 {1 2 3 4}
-      m2 {1 4 3 x}]
-  (assert (failed? (-unify empty-s m1 m2))))
-
-(assert (failed? (-unify empty-s {} #{})))
+(deftest test-unify-with-map
+  (testing "Unify wiht map"
+    (is (failed? (-unify empty-s {} 1)))
+    (let [x (lvar 'x)
+          os (-ext-no-check empty-s x {})]
+      (is (= (-unify empty-s {} x) os)))
+    (let [x (lvar 'x)]
+      (is (failed? (-unify empty-s {} (lcons 1 x)))))
+    (is (failed? (-unify empty-s {} '())))
+    (is (= (-unify empty-s {} {}) empty-s))
+    (is (= (-unify empty-s {1 2 3 4} {1 2 3 4}) empty-s))
+    (is (failed? (-unify empty-s {1 2} {1 2 3 4})))
+    (let [x (lvar 'x)
+          m1 {1 2 3 4}
+          m2 {1 2 3 x}
+          os (-ext-no-check empty-s x 4)]
+      (is (= (-unify empty-s m1 m2) os)))
+    (let [x (lvar 'x)
+          m1 {1 2 3 4}
+          m2 {1 4 3 x}]
+      (is (failed? (-unify empty-s m1 m2))))
+    (is (failed? (-unify empty-s {} #{}))))
+  )
 
 ;; =============================================================================
 ;; walk
 
-(println "walk")
-
-(assert (= (let [x (lvar 'x)
-                 y (lvar 'y)
-                 s (to-s [[x 5] [y x]])]
-             (-walk s y))
-           5))
-
-(assert (= (let [[x y z c b a :as s] (map lvar '[x y z c b a])
-                 s (to-s [[x 5] [y x] [z y] [c z] [b c] [a b]])]
-             (-walk s a))
-           5))
+(deftest test-walk
+  (testing "Walk"
+    (is (= (let [x (lvar 'x)
+                     y (lvar 'y)
+                     s (to-s [[x 5] [y x]])]
+                 (-walk s y))
+              5))
+
+    (is (= (let [[x y z c b a :as s] (map lvar '[x y z c b a])
+                     s (to-s [[x 5] [y x] [z y] [c z] [b c] [a b]])]
+                 (-walk s a))
+              5)))
+  )
 
 ;; =============================================================================
 ;; reify
 
-(println "reify")
-
-(assert (= (let [x (lvar 'x)
-                 y (lvar 'y)]
-             (-reify-lvar-name (to-s [[x 5] [y x]])))
-           '_.2))
+(deftest test-reify
+  (is (= (let [x (lvar 'x)
+                   y (lvar 'y)]
+               (-reify-lvar-name (to-s [[x 5] [y x]])))
+            '_.2))
+  )
 
 ;; =============================================================================
 ;; walk*
 
-(println "walk*")
-
-(assert (= (let [x (lvar 'x)
-                 y (lvar 'y)]
-             (-walk* (to-s [[x 5] [y x]]) `(~x ~y)))
-           '(5 5)))
+(deftest test-walk*
+  (is (= (let [x (lvar 'x)
+                   y (lvar 'y)]
+               (-walk* (to-s [[x 5] [y x]]) `(~x ~y)))
+            '(5 5))))
 
 ;; =============================================================================
 ;; run and unify
 
-(println "run and unify")
-
-(assert (= (run* [q]
-             (== true q))
-           '(true)))
-
-(assert (= (run* [q]
-             (fresh [x y]
-               (== [x y] [1 5])
-               (== [x y] q)))
-           [[1 5]]))
-
-(assert (= (run* [q]
-             (fresh [x y]
-               (== [x y] q)))
-           '[[_.0 _.1]]))
+(deftest test-run-and-unfiy
+  (is (= (run* [q]
+               (== true q))
+            '(true)))
+
+  (is (= (run* [q]
+               (fresh [x y]
+                 (== [x y] [1 5])
+                 (== [x y] q)))
+            [[1 5]]))
+
+  (is (= (run* [q]
+               (fresh [x y]
+                 (== [x y] q)))
+            '[[_.0 _.1]]))
+  )
 
 ;; =============================================================================
 ;; fail
 
-(println "fail")
-
-(assert (= (run* [q]
-             fail
-             (== true q))
-           []))
+(deftest test-fail
+  (is (= (run* [q]
+               fail
+               (== true q))
+            [])))
 
 ;; =============================================================================
 ;; Basic
 
-(println "basic")
-
-(assert (= (run* [q]
-             (all
-              (== 1 1)
-              (== q true)))
-           '(true)))
+(deftest test-basic
+  (is (= (run* [q]
+               (all
+                 (== 1 1)
+                 (== q true)))
+            '(true))))
 
 ;; =============================================================================
 ;; TRS
 
-(println "trs")
-
 (defn pairo [p]
   (fresh [a d]
     (== (lcons a d) p)))
@@ -438,150 +391,147 @@
 ;; =============================================================================
 ;; conde
 
-(println "conde")
+(deftest test-conde1
+  (is (= (run* [x]
+           (conde
+             [(== x 'olive) succeed]
+             [succeed succeed]
+             [(== x 'oil) succeed]))
+        '[olive _.0 oil]))
 
-(assert (= (run* [x]
+  (is (= (run* [r]
+           (fresh [x y]
              (conde
-               [(== x 'olive) succeed]
-               [succeed succeed]
-               [(== x 'oil) succeed]))
-           '[olive _.0 oil]))
-
-(assert (= (run* [r]
-             (fresh [x y]
-               (conde
-                 [(== 'split x) (== 'pea y)]
-                 [(== 'navy x) (== 'bean y)])
-               (== (cons x (cons y ())) r)))
-           '[(split pea) (navy bean)]))
+               [(== 'split x) (== 'pea y)]
+               [(== 'navy x) (== 'bean y)])
+             (== (cons x (cons y ())) r)))
+        '[(split pea) (navy bean)]))
+  )
 
 (defn teacupo [x]
   (conde
     [(== 'tea x) s#]
     [(== 'cup x) s#]))
 
-(assert (= (run* [r]
-             (fresh [x y]
-               (conde
-                 [(teacupo x) (== true y) s#]
-                 [(== false x) (== true y)])
-               (== (cons x (cons y ())) r)))
-           '((false true) (tea true) (cup true))))
+(deftest test-conde2
+  (is (= (run* [r]
+               (fresh [x y]
+                 (conde
+                   [(teacupo x) (== true y) s#]
+                   [(== false x) (== true y)])
+                 (== (cons x (cons y ())) r)))
+            '((false true) (tea true) (cup true)))))
 
 ;; =============================================================================
 ;; conso
 
-(println "conso")
-
-(assert (= (run* [q]
+(deftest test-conso
+  (testing "conso"
+    (is (= (run* [q]
              (fresh [a d]
                (conso a d ())
                (== (cons a d) q)))
-           []))
+          []))
 
-(let [a (lvar 'a)
-      d (lvar 'd)]
-  (assert (= (run* [q]
+    (let [a (lvar 'a)
+          d (lvar 'd)]
+      (is (= (run* [q]
                (conso a d q))
-             [(lcons a d)])))
+            [(lcons a d)])))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== [q] nil))
-           []))
+          []))
 
-(assert (=
-         (run* [q]
-           (conso 'a nil q))
-         '[(a)]))
+    (is (=
+          (run* [q]
+            (conso 'a nil q))
+          '[(a)]))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (conso 'a '(d) q))
-           '[(a d)]))
+          '[(a d)]))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (conso 'a q '(a)))
-           '[()]))
+          '[()]))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (conso q '(b c) '(a b c)))
-           '[a]))
+          '[a])))
+  )
 
 ;; =============================================================================
 ;; firsto
 
-(println "firsto")
-
-(assert (= (run* [q]
-             (firsto q '(1 2)))
-           (list (lcons '(1 2) (lvar 'x)))))
+(deftest test-firsto
+  (is (= (run* [q]
+               (firsto q '(1 2)))
+            (list (lcons '(1 2) (lvar 'x))))))
 
 ;; =============================================================================
 ;; resto
 
-(println "resto")
-
-(assert (= (run* [q]
-             (resto q '(1 2)))
-           '[(_.0 1 2)]))
+(deftest test-resto
+  (is (= (run* [q]
+           (resto q '(1 2)))
+        '[(_.0 1 2)]))
 
-(assert (= (run* [q]
-             (resto q [1 2]))
-           '[(_.0 1 2)]))
+  (is (= (run* [q]
+           (resto q [1 2]))
+        '[(_.0 1 2)]))
 
-(assert (= (run* [q]
-             (resto [1 2] q))
-           '[(2)]))
+  (is (= (run* [q]
+           (resto [1 2] q))
+        '[(2)]))
 
-(assert (= (run* [q]
-             (resto [1 2 3 4 5 6 7 8] q))
-           '[(2 3 4 5 6 7 8)]))
+  (is (= (run* [q]
+           (resto [1 2 3 4 5 6 7 8] q))
+        '[(2 3 4 5 6 7 8)]))
+  )
 
 ;; =============================================================================
 ;; flatteno
 
-(println "flatteno")
-
-(assert (= (run* [x]
-             (flatteno '[[a b] c] x))
-           '(([[a b] c]) ([a b] (c)) ([a b] c) ([a b] c ())
-             (a (b) (c)) (a (b) c) (a (b) c ()) (a b (c))
-             (a b () (c)) (a b c) (a b c ()) (a b () c)
-             (a b () c ()))))
+(deftest test-flatteno
+  (is (= (run* [x]
+               (flatteno '[[a b] c] x))
+            '(([[a b] c]) ([a b] (c)) ([a b] c) ([a b] c ())
+              (a (b) (c)) (a (b) c) (a (b) c ()) (a b (c))
+              (a b () (c)) (a b c) (a b c ()) (a b () c)
+              (a b () c ())))))
 
 ;; =============================================================================
 ;; membero
 
-(println "membero")
-
-(assert (= (run* [q]
-             (all
-              (== q [(lvar)])
-              (membero ['foo (lvar)] q)
-              (membero [(lvar) 'bar] q)))
-           '([[foo bar]])))
-
-(assert (= (run* [q]
-             (all
-              (== q [(lvar) (lvar)])
-              (membero ['foo (lvar)] q)
-              (membero [(lvar) 'bar] q)))
-           '([[foo bar] _.0] [[foo _.0] [_.1 bar]]
-               [[_.0 bar] [foo _.1]] [_.0 [foo bar]])))
+(deftest test-membero
+  (is (= (run* [q]
+           (all
+             (== q [(lvar)])
+             (membero ['foo (lvar)] q)
+             (membero [(lvar) 'bar] q)))
+        '([[foo bar]])))
+
+  (is (= (run* [q]
+           (all
+             (== q [(lvar) (lvar)])
+             (membero ['foo (lvar)] q)
+             (membero [(lvar) 'bar] q)))
+        '([[foo bar] _.0] [[foo _.0] [_.1 bar]]
+          [[_.0 bar] [foo _.1]] [_.0 [foo bar]])))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; rembero
 
-(println "rembero")
-
-(assert (= (run 1 [q]
-             (rembero 'b '(a b c b d) q))
-           '((a c b d))))
+(deftest rember-o
+  (is (= (run 1 [q]
+               (rembero 'b '(a b c b d) q))
+            '((a c b d)))))
 
 ;; -----------------------------------------------------------------------------
 ;; conde clause count
 
-(println "conde clause count")
-
 (defn digit-1 [x]
   (conde
     [(== 0 x)]))
@@ -593,59 +543,61 @@
     [(== 2 x)]
     [(== 3 x)]))
 
-(assert (= (run* [q]
-             (fresh [x y]
-               (digit-1 x)
-               (digit-1 y)
-               (== q [x y])))
-           '([0 0])))
-
-(assert (= (run* [q]
-             (fresh [x y]
-               (digit-4 x)
-               (digit-4 y)
-               (== q [x y])))
-           '([0 0] [0 1] [0 2] [1 0] [0 3] [1 1] [1 2] [2 0]
-               [1 3] [2 1] [3 0] [2 2] [3 1] [2 3] [3 2] [3 3])))
+(deftest test-conde-clause-count
+  (is (= (run* [q]
+           (fresh [x y]
+             (digit-1 x)
+             (digit-1 y)
+             (== q [x y])))
+        '([0 0])))
+
+  (is (= (run* [q]
+           (fresh [x y]
+             (digit-4 x)
+             (digit-4 y)
+             (== q [x y])))
+        '([0 0] [0 1] [0 2] [1 0] [0 3] [1 1] [1 2] [2 0]
+          [1 3] [2 1] [3 0] [2 2] [3 1] [2 3] [3 2] [3 3])))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; anyo
 
-(println "anyo")
-
 (defn anyo [q]
   (conde
     [q s#]
     [(anyo q)]))
 
-(assert (= (run 1 [q]
-             (anyo s#)
-             (== true q))
-           (list true)))
+(deftest test-anyo
+  (is (= (run 1 [q]
+           (anyo s#)
+           (== true q))
+        (list true)))
 
-(assert (= (run 5 [q]
-             (anyo s#)
-             (== true q))
-           (list true true true true true)))
+  (is (= (run 5 [q]
+           (anyo s#)
+           (== true q))
+        (list true true true true true)))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; divergence
 
-(println "divergence")
-
 (def f1 (fresh [] f1))
 
-(assert (= (run 1 [q]
-             (conde
-               [f1]
-               [(== false false)]))
-           '(_.0)))
-
-(assert (= (run 1 [q]
-             (conde
-               [f1 (== false false)]
-               [(== false false)]))
-           '(_.0)))
+(deftest test-divergence1
+  (is (= (run 1 [q]
+           (conde
+             [f1]
+             [(== false false)]))
+        '(_.0)))
+
+  (is (= (run 1 [q]
+           (conde
+             [f1 (== false false)]
+             [(== false false)]))
+        '(_.0)))
+  )
 
 (def f2
   (fresh []
@@ -655,242 +607,232 @@
             [(== false false)])]
       [(== false false)])))
 
-(assert (= (run 5 [q] f2)
-           '(_.0 _.0 _.0 _.0 _.0)))
+(deftest test-divergence2
+  (is (= (run 5 [q] f2)
+        '(_.0 _.0 _.0 _.0 _.0))))
 
 ;; -----------------------------------------------------------------------------
 ;; conda (soft-cut)
 
-(println "conda")
-
-(assert (= (run* [x]
+(deftest test-conda1
+  (is (= (run* [x]
+           (conda
+             [(== 'olive x) s#]
+             [(== 'oil x) s#]
+             [u#]))
+        '(olive)))
+
+  (is (= (run* [x]
+           (conda
+             [(== 'virgin x) u#]
+             [(== 'olive x) s#]
+             [(== 'oil x) s#]
+             [u#]))
+        '()))
+
+  (is (= (run* [x]
+           (fresh (x y)
+             (== 'split x)
+             (== 'pea y)
              (conda
-               [(== 'olive x) s#]
-               [(== 'oil x) s#]
-               [u#]))
-           '(olive)))
-
-(assert (= (run* [x]
+               [(== 'split x) (== x y)]
+               [s#]))
+           (== true x))
+        '()))
+
+  (is (= (run* [x]
+           (fresh (x y)
+             (== 'split x)
+             (== 'pea y)
              (conda
-               [(== 'virgin x) u#]
-               [(== 'olive x) s#]
-               [(== 'oil x) s#]
-               [u#]))
-           '()))
-
-(assert (= (run* [x]
-             (fresh (x y)
-               (== 'split x)
-               (== 'pea y)
-               (conda
-                 [(== 'split x) (== x y)]
-                 [s#]))
-             (== true x))
-           '()))
-
-(assert (= (run* [x]
-             (fresh (x y)
-               (== 'split x)
-               (== 'pea y)
-               (conda
-                 [(== x y) (== 'split x)]
-                 [s#]))
-             (== true x))
-           '(true)))
+               [(== x y) (== 'split x)]
+               [s#]))
+           (== true x))
+        '(true)))
+  )
 
 (defn not-pastao [x]
   (conda
     [(== 'pasta x) u#]
     [s#]))
 
-(assert (= (run* [x]
-             (conda
-               [(not-pastao x)]
-               [(== 'spaghetti x)]))
-           '(spaghetti)))
+(deftest test-conda2
+  (is (= (run* [x]
+           (conda
+             [(not-pastao x)]
+             [(== 'spaghetti x)]))
+        '(spaghetti))))
 
 ;; -----------------------------------------------------------------------------
 ;; condu (committed-choice)
 
-(println "condu")
-
 (defn onceo [g]
   (condu
     (g s#)))
 
-(assert (= (run* [x]
-             (onceo (teacupo x)))
-           '(tea)))
-
-(assert (= (run* [r]
-             (conde
-               [(teacupo r) s#]
-               [(== false r) s#]))
-           '(false tea cup)))
-
-(assert (= (run* [r]
-             (conda
-               [(teacupo r) s#]
-               [(== false r) s#]))
-           '(tea cup)))
-
+(deftest test-condu
+  (is (= (run* [x]
+           (onceo (teacupo x)))
+        '(tea)))
+
+  (is (= (run* [r]
+           (conde
+             [(teacupo r) s#]
+             [(== false r) s#]))
+        '(false tea cup)))
+
+  (is (= (run* [r]
+           (conda
+             [(teacupo r) s#]
+             [(== false r) s#]))
+        '(tea cup)))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; nil in collection
 
-(println "nil in collection")
-
-(assert (= (run* [q]
+(deftest test-nil-in-coll
+  (testing "nil in collection"
+    (is (= (run* [q]
              (== q [nil]))
-           '([nil])))
+          '([nil])))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== q [1 nil]))
-           '([1 nil])))
+          '([1 nil])))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== q [nil 1]))
-           '([nil 1])))
+          '([nil 1])))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== q '(nil)))
-           '((nil))))
+          '((nil))))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== q {:foo nil}))
-           '({:foo nil})))
+          '({:foo nil})))
 
-(assert (= (run* [q]
+    (is (= (run* [q]
              (== q {nil :foo}))
-           '({nil :foo})))
+          '({nil :foo}))))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; Unifier
 
-(println "simple unifier")
-
-; test-unifier-1
-(assert (= (unifier '(?x ?y) '(1 2))
-         '(1 2)))
-
-; test-unifier-2
-(assert (= (unifier '(?x ?y 3) '(1 2 ?z))
-         '(1 2 3)))
-
-; test-unifier-3
-(assert (= (unifier '[(?x . ?y) 3] [[1 2] 3])
-         '[(1 2) 3]))
-
-; test-unifier-4
-(assert (= (unifier '(?x . ?y) '(1 . ?z))
-           (lcons 1 '_.0)))
-
-; test-unifier-5
-(assert (= (unifier '(?x 2 . ?y) '(1 2 3 4 5))
-           '(1 2 3 4 5)))
-
-; test-unifier-6
-(assert (= (unifier '(?x 2 . ?y) '(1 9 3 4 5))
-           nil))
-
-; test-binding-map-1
-(assert (= (binding-map '(?x ?y) '(1 2))
-         '{?x 1 ?y 2}))
-
-; test-binding-map-2
-(assert (= (binding-map '(?x ?y 3) '(1 2 ?z))
-         '{?x 1 ?y 2 ?z 3}))
-
-; test-binding-map-3
-(assert (= (binding-map '[(?x . ?y) 3] [[1 2] 3])
-         '{?x 1 ?y (2)}))
-
-; test-binding-map-4
-(assert (= (binding-map '(?x . ?y) '(1 . ?z))
-           '{?z _.0, ?x 1, ?y _.0}))
-
-; test-binding-map-5
-(assert (= (binding-map '(?x 2 . ?y) '(1 2 3 4 5))
-           '{?x 1 ?y (3 4 5)}))
-
-; test-binding-map-6
-(assert (= (binding-map '(?x 2 . ?y) '(1 9 3 4 5))
-           nil))
+(deftest test-unifier
+  (testing "Unifier"
+    ;; test-unifier-1
+    (is (= (unifier '(?x ?y) '(1 2))
+          '(1 2)))
+    ;; test-unifier-2
+    (is (= (unifier '(?x ?y 3) '(1 2 ?z))
+          '(1 2 3)))
+    ;; test-unifier-3
+    (is (= (unifier '[(?x . ?y) 3] [[1 2] 3])
+          '[(1 2) 3]))
+    ;; test-unifier-4
+    (is (= (unifier '(?x . ?y) '(1 . ?z))
+          (lcons 1 '_.0)))
+    ;; test-unifier-5
+    (is (= (unifier '(?x 2 . ?y) '(1 2 3 4 5))
+          '(1 2 3 4 5)))
+    ;; test-unifier-6
+    (is (= (unifier '(?x 2 . ?y) '(1 9 3 4 5))
+          nil))
+    ;; test-binding-map-1
+    (is (= (binding-map '(?x ?y) '(1 2))
+          '{?x 1 ?y 2}))
+    ;; test-binding-map-2
+    (is (= (binding-map '(?x ?y 3) '(1 2 ?z))
+          '{?x 1 ?y 2 ?z 3}))
+    ;; test-binding-map-3
+    (is (= (binding-map '[(?x . ?y) 3] [[1 2] 3])
+          '{?x 1 ?y (2)}))
+    ;; test-binding-map-4
+    (is (= (binding-map '(?x . ?y) '(1 . ?z))
+          '{?z _.0, ?x 1, ?y _.0}))
+    ;; test-binding-map-5
+    (is (= (binding-map '(?x 2 . ?y) '(1 2 3 4 5))
+          '{?x 1 ?y (3 4 5)}))
+    ;; test-binding-map-6
+    (is (= (binding-map '(?x 2 . ?y) '(1 9 3 4 5))
+          nil)))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; Occurs Check
 
-(println "occurs check")
-
-(assert (= (run* [q]
-             (== q [q]))
-           ()))
+(deftest test-occurs-check
+  (is (= (run* [q]
+           (== q [q]))
+        ())))
 
 ;; -----------------------------------------------------------------------------
 ;; Unifications that should fail
 
-(println "unifications that sould fail")
-
-(assert (= (run* [p]
-             (fresh [a b]
-               (== b ())
-               (== '(0 1) (lcons a b))
-               (== p [a b])))
-           ()))
-
-(assert (= (run* [p]
-             (fresh [a b]
-               (== b '(1))
-               (== '(0) (lcons a b))
-               (== p [a b])))
-           ()))
-
-(assert (= (run* [p]
-             (fresh [a b c d]
-               (== () b)
-               (== '(1) d)
-               (== (lcons a b) (lcons c d))
-               (== p [a b c d])))
-           ()))
+(deftest test-failing-unifications
+  (is (= (run* [p]
+           (fresh [a b]
+             (== b ())
+             (== '(0 1) (lcons a b))
+             (== p [a b])))
+        ()))
+
+  (is (= (run* [p]
+           (fresh [a b]
+             (== b '(1))
+             (== '(0) (lcons a b))
+             (== p [a b])))
+        ()))
+
+  (is (= (run* [p]
+           (fresh [a b c d]
+             (== () b)
+             (== '(1) d)
+             (== (lcons a b) (lcons c d))
+             (== p [a b c d])))
+        ()))
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; Pattern matching other data structures
 
-(println "pattern matching")
-
 (defne match-map [m o]
   ([{:foo {:bar o}} _]))
 
-(assert (= (run* [q]
-             (match-map {:foo {:bar 1}} q))
-           '(1)))
+(deftest test-defne1
+  (is (= (run* [q]
+           (match-map {:foo {:bar 1}} q))
+        '(1))))
 
 (defne match-set [s o]
   ([#{:cat :bird :dog} _]))
 
-(assert (= (run* [q]
-             (match-set #{:cat :bird :dog} q))
-           '(_.0)))
+(deftest tset-defne2
+  (is (= (run* [q]
+           (match-set #{:cat :bird :dog} q))
+        '(_.0))))
 
 ;; -----------------------------------------------------------------------------
 ;; Partial maps
 
-(println "partial maps")
-
-(assert (= '({:a 1})
-           (run* [q]
-             (fresh [pm x]
-               (== pm (partial-map {:a x}))
-               (== pm {:a 1 :b 2})
-               (== pm q)))))
-
-(assert (= '(1)
-           (run* [q]
-             (fresh [pm x]
-               (== pm (partial-map {:a x}))
-               (== pm {:a 1 :b 2})
-               (== x q)))))
-
+(deftest test-partial-map
+  (is (= '({:a 1})
+        (run* [q]
+          (fresh [pm x]
+            (== pm (partial-map {:a x}))
+            (== pm {:a 1 :b 2})
+            (== pm q)))))
+
+  (is (= '(1)
+        (run* [q]
+          (fresh [pm x]
+            (== pm (partial-map {:a x}))
+            (== pm {:a 1 :b 2})
+            (== x q)))))
+  )
 
 (comment
   ;; FIXME: for some reason set #{:cat :bird} works on match-set call - David
@@ -899,8 +841,6 @@
 ;; =============================================================================
 ;; zebrao
 
-(println "zebrao")
-
 (defne righto [x y l]
   ([_ _ [x y . r]])
   ([_ _ [_ . r]] (righto x y r)))
@@ -949,7 +889,8 @@
     ([[[k v] . _]])
     ([[_ . tail]] (map-geto tail k v))))
 
-(assert (= (run* [q] (map-geto (seq {:title "Blub"}) :title q)) '("Blub")))
+(deftest test-matche
+  (is (= (run* [q] (map-geto (seq {:title "Blub"}) :title q)) '("Blub"))))
 
 ;; =============================================================================
 ;; pldb
@@ -977,22 +918,25 @@
   (-> facts0
     (pldb/db-fact fun 'Lucy)))
 
-(pldb/with-db facts0
-  (assert
-    (= (run* [q]
-         (fresh [x y]
-           (likes x y)
-           (fun y)
-           (== q [x y])))
-      '())))
-
-(pldb/with-db facts1
-  (assert
-    (= (run* [q]
-         (fresh [x y]
-           (likes x y)
-           (fun y)
-           (== q [x y])))
-      '([Ricky Lucy]))))
-
-(println "ok")
+(deftest test-pldb
+  (testing "pldb"
+    (pldb/with-db facts0
+      (is
+        (= (run* [q]
+             (fresh [x y]
+               (likes x y)
+               (fun y)
+               (== q [x y])))
+          '())))
+
+    (pldb/with-db facts1
+      (is
+        (= (run* [q]
+             (fresh [x y]
+               (likes x y)
+               (fun y)
+               (== q [x y])))
+          '([Ricky Lucy])))))
+  )
+
+(run-tests)

From cdde428bfbc55967c0d1dfcea9d46ffb3362b685 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 30 Dec 2014 09:54:00 -0500
Subject: [PATCH 229/288] ignores, update YourKit

---
 .gitignore |  3 ++-
 README.md  | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5634eb8..b373f2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 target/
 out/
 tests.js
-resources/
\ No newline at end of file
+resources/
+*init.clj
\ No newline at end of file
diff --git a/README.md b/README.md
index e7cf5dc0..a0795c92 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,14 @@ Differences from core.unify
 YourKit
 ----
 
-YourKit has given an open source license for their profiler, greatly simplifying the profiling of core.logic performance.
+<img src="http://www.yourkit.com/images/yklogo.png"></img>
 
-YourKit is kindly supporting open source projects with its full-featured Java Profiler. YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications. Take a look at YourKit's leading software products:
+YourKit has given an open source license for their profiler, greatly simplifying the profiling of core.logic performance.
 
-* <a href="http://www.yourkit.com/java/profiler/index.jsp">YourKit Java Profiler</a> and
-* <a href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET Profiler</a>.
+YourKit supports open source projects with its full-featured Java Profiler.
+YourKit, LLC is the creator of <a href="http://www.yourkit.com/java/profiler/index.jsp">YourKit Java Profiler</a>
+and <a href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET Profiler</a>,
+innovative and intelligent tools for profiling Java and .NET applications.
 
 Releases and dependency information
 ----

From 0989152f5e69b8451ab35658331a5c6510881f59 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Wed, 11 Feb 2015 22:11:04 -0500
Subject: [PATCH 230/288] macro inference

---
 src/main/clojure/cljs/core/logic/pldb.cljs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index c844dcaa..418d2d24 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -1,4 +1,5 @@
 (ns cljs.core.logic.pldb
+  (:require-macros cljs.core.logic.pldb)
   (:require [cljs.core.logic :as l :include-macros true]))
 
 ;; ----------------------------------------

From f3f2b4c6c4a906c1fa512720aa09cb1abe312cd1 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 19 Feb 2015 13:47:23 -0800
Subject: [PATCH 231/288] Add functional disjunction/conjunction operators.

conde and all don't need to be macros, so here they are as functions.
---
 src/main/clojure/clojure/core/logic.clj       | 21 +++++++++++++
 src/test/clojure/clojure/core/logic/tests.clj | 30 ++++++++++++-------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 1d4f1e32..3e98397a 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1182,6 +1182,21 @@
        (-inc
         (mplus* ~@(bind-conde-clauses a clauses))))))
 
+(defn or*
+  "A function version of conde, which takes a list of goals and tries them as if via conde.
+   Note that or* only does disjunction, ie (or* [a b c]) is the same as (conde [a] [b] [c]).
+   If you need something like (conde [a b] [c]), you can use and*, or all:
+   (or* [(and* a b) c])."
+  [goals]
+  (letfn [(mplus'
+            ([e] e)
+            ([e & es]
+               (mplus e (fn [] (apply mplus' es)))))]
+   (fn [a]
+     (fn []
+       (apply mplus' (for [goal goals]
+                       (bind a goal)))))))
+
 (defn- lvar-bind [sym]
   ((juxt identity
          (fn [s] `(lvar '~s))) sym))
@@ -1255,6 +1270,12 @@
   ([] `clojure.core.logic/s#)
   ([& goals] `(fn [a#] (bind* a# ~@goals))))
 
+(defn and*
+  "A function version of all, which takes a list of goals and succeeds only fi they all succeed."
+  [goals]
+  (fn [a]
+    (reduce bind a goals)))
+
 (defn solutions
   ([s g]
      (solutions s (lvar) g))
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 36144369..8bd0cb0d 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -692,18 +692,22 @@
 (def f1 (fresh [] f1))
 
 (deftest test-divergence-1
-  (is (= (run 1 [q]
-           (conde
-             [f1]
-             [(== false false)]))
-         '(_0))))
+  (is (= '(_0)
+         (run 1 [q]
+              (conde
+                [f1]
+                [(== false false)]))
+         (run 1 [q]
+              (or* [f1 (== false false)])))))
 
 (deftest test-divergence-2
-  (is (= (run 1 [q]
-           (conde
-             [f1 (== false false)]
-             [(== false false)]))
-         '(_0))))
+  (is (= '(_0)
+         (run 1 [q]
+              (conde
+                [f1 (== false false)]
+                [(== false false)]))
+         (run 1 [q]
+              (or* [(and* [f1 (== false false)]) (== false false)])))))
 
 (def f2
   (fresh []
@@ -713,8 +717,14 @@
             [(== false false)])]
       [(== false false)])))
 
+(def f2-function
+  (fresh []
+         (or* [(and* [f2 (or* [f2 (== false false)])])
+               (== false false)])))
+
 (deftest test-divergence-3
   (is (= (run 5 [q] f2)
+         (run 5 [q] f2-function)
          '(_0 _0 _0 _0 _0))))
 
 ;; -----------------------------------------------------------------------------

From 96764eb9f4b1632ae51a79608eca4e0ed130aea0 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Tue, 10 Mar 2015 14:39:27 -0500
Subject: [PATCH 232/288] [maven-release-plugin] prepare release
 core.logic-0.8.10

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e57caa3..88806aed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.10-SNAPSHOT</version>
+  <version>0.8.10</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.10</tag>
   </scm>
 </project>

From c1b0c03c8a3b675e020a4ec2e6775cb029cc2054 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Tue, 10 Mar 2015 14:39:28 -0500
Subject: [PATCH 233/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 88806aed..7177986e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.10</version>
+  <version>0.8.11-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.10</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From ae45a2c64f65247b1e23e527945de5c0a9f4b918 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 10 Mar 2015 15:45:56 -0400
Subject: [PATCH 234/288] 0.8.10

---
 CHANGES.md  | 24 ++++++++++++++++++++++++
 README.md   | 54 +++++++++++++++++++++++++++++++++++++++--------------
 project.clj |  2 +-
 3 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8ac4db3f..3d841011 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,27 @@
+From 0.8.9 to 0.8.10
+====
+
+Changes
+----
+* CLJS macro inference support
+* `cljs/core/logic/macros.clj` -> `cljs/core/logic.clj` to be
+  compatible with `:include-macros`, `:refer-macros` usage
+  Breaking for CLJS
+
+Fixes
+----
+* Fixes LOGIC-118 by making prep* handle collections.
+* port LOGIC-163 to ClojureScript pldb
+* Namespace qualify pldb relations
+
+From 0.8.8 to 0.8.9
+====
+
+Fixes
+----
+
+* LOGIC-161: negative values should never appear in intervals
+
 From 0.8.7 to 0.8.8
 ====
 
diff --git a/README.md b/README.md
index a0795c92..52d36dc0 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,64 @@
 core.logic
 ====
 
-A logic programming library for Clojure & ClojureScript. core.logic offers Prolog-like relational programming, constraint logic programming, and nominal logic programming for Clojure. At its heart is an original implementation of miniKanren as described in William Byrd's dissertation [Relational Programming in miniKanren: Techniques, Applications, and Implementations](http://pqdtopen.proquest.com/#abstract?dispub=3380156) as well as the extensions described in [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and [αKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It is designed to be easily extended to forms of logic programming beyond the ones provided.
+A logic programming library for Clojure & ClojureScript. core.logic
+offers Prolog-like relational programming, constraint logic
+programming, and nominal logic programming for Clojure. At its heart
+is an original implementation of miniKanren as described in William
+Byrd's dissertation
+[Relational Programming in miniKanren: Techniques, Applications, and Implementations](http://pqdtopen.proquest.com/#abstract?dispub=3380156)
+as well as the extensions described in
+[cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
+[αKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It
+is designed to be easily extended to forms of logic programming beyond
+the ones provided.
 
 Reasoned Schemer
 ----
 
-If you wish to work through [The Reasoned Schemer](http://mitpress.mit.edu/0262562146) with core.logic make sure to look over [this](http://github.com/clojure/core.logic/wiki/Differences-from-The-Reasoned-Schemer) first.
+If you wish to work through
+[The Reasoned Schemer](http://mitpress.mit.edu/0262562146) with
+core.logic make sure to look over
+[this](http://github.com/clojure/core.logic/wiki/Differences-from-The-Reasoned-Schemer)
+first.
 
-If you're interested in using core.logic from [ClojureScript](http://github.com/clojure/clojurescript/) look [here](http://github.com/clojure/core.logic/wiki/Using-core.logic-with-ClojureScript).
+If you're interested in using core.logic from
+[ClojureScript](http://github.com/clojure/clojurescript/) look
+[here](http://github.com/clojure/core.logic/wiki/Using-core.logic-with-ClojureScript).
 
-For more information & documentation please consult the [wiki](http://github.com/clojure/core.logic/wiki).
+For more information & documentation please consult the
+[wiki](http://github.com/clojure/core.logic/wiki).
 
 Differences from core.unify
 ----
 
-[core.unify](http://github.com/clojure/core.unify) provides a la carte unification facilities that are not deeply tied into the operation of a logic engine. While core.logic does provide a similar simple unifier interface with support for specifying fine-grained constraints, if you have no need for a logic programming system, core.unify may be a better fit.
+[core.unify](http://github.com/clojure/core.unify) provides a la carte
+unification facilities that are not deeply tied into the operation of
+a logic engine. While core.logic does provide a similar simple unifier
+interface with support for specifying fine-grained constraints, if you
+have no need for a logic programming system, core.unify may be a
+better fit.
 
 YourKit
 ----
 
 <img src="http://www.yourkit.com/images/yklogo.png"></img>
 
-YourKit has given an open source license for their profiler, greatly simplifying the profiling of core.logic performance.
+YourKit has given an open source license for their profiler, greatly
+simplifying the profiling of core.logic performance.
 
-YourKit supports open source projects with its full-featured Java Profiler.
-YourKit, LLC is the creator of <a href="http://www.yourkit.com/java/profiler/index.jsp">YourKit Java Profiler</a>
-and <a href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET Profiler</a>,
-innovative and intelligent tools for profiling Java and .NET applications.
+YourKit supports open source projects with its full-featured Java
+Profiler.  YourKit, LLC is the creator of <a
+href="http://www.yourkit.com/java/profiler/index.jsp">YourKit Java
+Profiler</a> and <a
+href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET
+Profiler</a>, innovative and intelligent tools for profiling Java and
+.NET applications.
 
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.8
+Latest stable release: 0.8.10
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -40,7 +66,7 @@ Latest stable release: 0.8.8
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.8"]
+[org.clojure/core.logic "0.8.10"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -49,7 +75,7 @@ Latest stable release: 0.8.8
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.8</version>
+  <version>0.8.10</version>
 </dependency>
 ```
 
@@ -74,6 +100,6 @@ Developer information
 Copyright and license
 ----
 
-Copyright © 2010-2013 David Nolen, Rich Hickey & contributors.
+Copyright © 2010-2015 David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).
diff --git a/project.clj b/project.clj
index 8339ec36..b6387cab 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.9-SNAPSHOT"
+(defproject org.clojure/core.logic "0.8.11-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.0.25"]
 

From 93c3a0576aea79983c282d04995064ca2d5106ca Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Mon, 6 Apr 2015 19:07:31 -0400
Subject: [PATCH 235/288] bump cljsbuild

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b6387cab..970d818b 100644
--- a/project.clj
+++ b/project.clj
@@ -14,7 +14,7 @@
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
 
-  :plugins [[lein-cljsbuild "1.0.4-SNAPSHOT"]
+  :plugins [[lein-cljsbuild "1.0.5"]
             [cider/cider-nrepl "0.8.1"]]
 
   :cljsbuild

From 0e944fd5ef820a808e501afb458b1beee2720d2a Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Wed, 6 May 2015 17:57:21 -0400
Subject: [PATCH 236/288] reorg README

---
 README.md | 82 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 52d36dc0..b34185ac 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,53 @@ as well as the extensions described in
 is designed to be easily extended to forms of logic programming beyond
 the ones provided.
 
+Releases and dependency information
+----
+
+Latest stable release: 0.8.10
+
+* [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
+* [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
+
+[Leiningen](http://github.com/technomancy/leiningen/) dependency information:
+
+```
+[org.clojure/core.logic "0.8.10"]
+```
+
+[Maven](http://maven.apache.org) dependency information:
+
+```
+<dependency>
+  <groupId>org.clojure</groupId>
+  <artifactId>core.logic</artifactId>
+  <version>0.8.10</version>
+</dependency>
+```
+
+Example usage
+----
+
+```clojure
+(use 'clojure.core.logic)
+
+(run* [q]
+  (== q true))  
+;;=> (true)
+```
+
+Running the tests
+----
+
+Assuming you have V8 installed from source:
+
+```
+lein cljsbuild once test
+d8 resources/tests.js
+```
+
+If you have another JS engine installed use that instead.
+
 Reasoned Schemer
 ----
 
@@ -55,41 +102,6 @@ href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET
 Profiler</a>, innovative and intelligent tools for profiling Java and
 .NET applications.
 
-Releases and dependency information
-----
-
-Latest stable release: 0.8.10
-
-* [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
-* [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
-
-[Leiningen](http://github.com/technomancy/leiningen/) dependency information:
-
-```
-[org.clojure/core.logic "0.8.10"]
-```
-
-[Maven](http://maven.apache.org) dependency information:
-
-```
-<dependency>
-  <groupId>org.clojure</groupId>
-  <artifactId>core.logic</artifactId>
-  <version>0.8.10</version>
-</dependency>
-```
-
-Example usage
-----
-
-```clojure
-(use 'clojure.core.logic)
-
-(run* [q]
-  (== q true))  
-;;=> (true)
-```
-
 Developer information
 ----
 

From d3018b62bc8fe58603482a291cbdfb67e07d1b14 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Wed, 6 May 2015 17:58:48 -0400
Subject: [PATCH 237/288] tweak

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b34185ac..0d796859 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Running the tests
 Assuming you have V8 installed from source:
 
 ```
-lein cljsbuild once test
+lein cljsbuild once adv
 d8 resources/tests.js
 ```
 

From 29a46db8a294b29a37d8046fe7ed52be51f126f0 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Mon, 27 Jul 2015 17:08:31 -0400
Subject: [PATCH 238/288] just comment out bogus failing test under 1.7.0, bump
 Clojure & ClojureScript deps

---
 project.clj                                   | 4 ++--
 src/test/clojure/clojure/core/logic/tests.clj | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 970d818b..e95ecf8b 100644
--- a/project.clj
+++ b/project.clj
@@ -8,8 +8,8 @@
 
   :test-paths ["src/test/clojure"]
 
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2496" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.7.0" :scope "provided"]
+                 [org.clojure/clojurescript "0.0-3308" :scope "provided"]
                  [org.clojure/tools.macro "0.1.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
diff --git a/src/test/clojure/clojure/core/logic/tests.clj b/src/test/clojure/clojure/core/logic/tests.clj
index 8bd0cb0d..9e70b528 100644
--- a/src/test/clojure/clojure/core/logic/tests.clj
+++ b/src/test/clojure/clojure/core/logic/tests.clj
@@ -984,16 +984,18 @@
              (== x ['foo])))
          '())))
 
-(deftest test-disequality-17
+;; the following test is subject to ordering
+;; issues due to 1.7 changes, just commenting out for now
+#_(deftest test-disequality-17
   (is (= (run* [q]
            (fresh [x y]
              (!= [1 x] [y 2])
              (== q [x y])))
-         '(([_0 _1] :- (!= (_0 2) (_1 1))))))
+         '(([_0 _1] :- (!= (_1 1) (_0 2))))))
   (is (= (run* [q]
            (fresh [x y]
              (!= [x 1] [2 y])))
-         '((_0 :- (!= (_1 1) (_2 2)))))))
+         '((_0 :- (!= (_1 2) (_2 1)))))))
 
 (deftest test-logic-95-disequality-1
   (is (= (run* [q]

From 1c4020f63a5b792f08a90434ab6e8be6aa467a82 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Mon, 27 Jul 2015 17:13:23 -0400
Subject: [PATCH 239/288] bump cljsbuild add :clean-targets

---
 project.clj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index e95ecf8b..40883c4f 100644
--- a/project.clj
+++ b/project.clj
@@ -14,7 +14,9 @@
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
 
-  :plugins [[lein-cljsbuild "1.0.5"]
+  :clean-targets ^{:protect false} ["resources/tests.js" "resources/out"]
+
+  :plugins [[lein-cljsbuild "1.0.6"]
             [cider/cider-nrepl "0.8.1"]]
 
   :cljsbuild

From 4b576599cf46b6c8d37f819dd8832d8631aaad17 Mon Sep 17 00:00:00 2001
From: dnolen <dnolen@cognitect.com>
Date: Wed, 4 Nov 2015 22:18:26 -0500
Subject: [PATCH 240/288] tweak builds

---
 project.clj | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 40883c4f..34880f27 100644
--- a/project.clj
+++ b/project.clj
@@ -26,15 +26,21 @@
      :compiler {:optimizations :none
                 :output-to "resources/tests.js"
                 :output-dir "resources/out-dev"
-                :source-map true}}
+                :source-map true
+                :verbose true
+                :compiler-stats true}}
     {:id "simp"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :simple
                 :static-fns true
                 :output-to "resources/tests.js"
-                :output-dir "resources/out-simp"}}
+                :output-dir "resources/out-simp"
+                :verbose true
+                :compiler-stats true}}
     {:id "adv"
      :source-paths ["src/main/clojure/cljs" "src/test/cljs"]
      :compiler {:optimizations :advanced
                 :output-to "resources/tests.js"
-                :output-dir "resources/out-adv"}}]})
+                :output-dir "resources/out-adv"
+                :verbose true
+                :compiler-stats true}}]})

From 29917372ef066c42ca362e3a94f68d620ddd1b56 Mon Sep 17 00:00:00 2001
From: puredanger <alex.miller@cognitect.com>
Date: Thu, 20 Oct 2016 14:17:21 -0500
Subject: [PATCH 241/288] Fix macro that creates fn with qualified name.

This is flagged by specs in Clojure 1.9.
---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 3e98397a..2dcb8181 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1075,7 +1075,7 @@
      `(mplus ~e (fn [] (mplus* ~@e-rest)))))
 
 (defmacro -inc [& rest]
-  `(fn -inc [] ~@rest))
+  `(fn ~'-inc [] ~@rest))
 
 (extend-type Object
   ITake

From 2a1b8677b036bade2bf805822db78ecda6fcff34 Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 20 Oct 2016 14:19:17 -0500
Subject: [PATCH 242/288] [maven-release-plugin] prepare release
 core.logic-0.8.11

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7177986e..d74e7596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.11-SNAPSHOT</version>
+  <version>0.8.11</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.11</tag>
   </scm>
 </project>

From 5db1fb4a72929f5a8d4c2bc4ddc2a62f37736fbe Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Thu, 20 Oct 2016 14:19:17 -0500
Subject: [PATCH 243/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d74e7596..be6213e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.11</version>
+  <version>0.8.12-SNAPSHOT</version>
   <name>${artifactId}</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.11</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 21da178befc551f842d18db0500cca589ce3cc89 Mon Sep 17 00:00:00 2001
From: puredanger <alex.miller@cognitect.com>
Date: Thu, 20 Oct 2016 14:27:26 -0500
Subject: [PATCH 244/288] update for 0.8.11

---
 CHANGES.md | 8 ++++++++
 README.md  | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3d841011..bdf04727 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+From 0.8.10 to 0.8.11
+====
+
+Fixes
+----
+* Fixes bug where -inc created an anonymous function with a qualified name
+  (which is flagged by the Clojure 1.9 specs)
+
 From 0.8.9 to 0.8.10
 ====
 
diff --git a/README.md b/README.md
index 0d796859..a9abab2c 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ the ones provided.
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.10
+Latest stable release: 0.8.11
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -24,7 +24,7 @@ Latest stable release: 0.8.10
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.10"]
+[org.clojure/core.logic "0.8.11"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -33,7 +33,7 @@ Latest stable release: 0.8.10
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.10</version>
+  <version>0.8.11</version>
 </dependency>
 ```
 
@@ -112,6 +112,6 @@ Developer information
 Copyright and license
 ----
 
-Copyright © 2010-2015 David Nolen, Rich Hickey & contributors.
+Copyright © 2010-2016 David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).

From 4e6ae5cbf53db902f2c89de8d0d26e67d3adba56 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex@puredanger.com>
Date: Tue, 13 Dec 2016 08:43:10 -0600
Subject: [PATCH 245/288] Update parent pom version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be6213e7..109117ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>0.1.2</version>
+    <version>0.2.0</version>
   </parent>
 
   <developers>

From 4da34bf871c53c1167e24e824eb796dcd988da14 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex@puredanger.com>
Date: Tue, 13 Dec 2016 11:49:50 -0600
Subject: [PATCH 246/288] Fix project name

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 109117ae..f45ba6b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
   <version>0.8.12-SNAPSHOT</version>
-  <name>${artifactId}</name>
+  <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
   <licenses>

From a7fc934dc39878a75489711d86c46855fde14a57 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex@puredanger.com>
Date: Tue, 21 Mar 2017 21:54:40 -0500
Subject: [PATCH 247/288] Update parent pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f45ba6b4..7381037a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.2</version>
   </parent>
 
   <developers>

From 44cf5a700afb57d7193c7592bcd2921815d01798 Mon Sep 17 00:00:00 2001
From: puredanger <alex.miller@cognitect.com>
Date: Thu, 15 Jun 2017 09:38:23 -0500
Subject: [PATCH 248/288] fix typo

---
 src/main/clojure/clojure/core/logic.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 2dcb8181..040372ae 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1271,7 +1271,7 @@
   ([& goals] `(fn [a#] (bind* a# ~@goals))))
 
 (defn and*
-  "A function version of all, which takes a list of goals and succeeds only fi they all succeed."
+  "A function version of all, which takes a list of goals and succeeds only if they all succeed."
   [goals]
   (fn [a]
     (reduce bind a goals)))

From 10ee95eb2bed70af5bc29ea3bd78b380f054a8b4 Mon Sep 17 00:00:00 2001
From: Michael Fogleman <michaelwfogleman@gmail.com>
Date: Mon, 17 Jul 2017 08:40:50 -0400
Subject: [PATCH 249/288] LOGIC-184: Exclude indexed? in pldb.

---
 src/main/clojure/clojure/core/logic/pldb.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
index d991e423..5072806e 100644
--- a/src/main/clojure/clojure/core/logic/pldb.clj
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -1,4 +1,5 @@
 (ns clojure.core.logic.pldb
+  (:refer-clojure :exclude [indexed?])
   (:require [clojure.core.logic :as l]))
 
 ;; ----------------------------------------

From 0be8e9599f5a71a2892af58fb32aada70b8c2b35 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sun, 28 Apr 2019 15:31:56 -0700
Subject: [PATCH 250/288] Update links in CONTRIBUTING.md

---
 CONTRIBUTING.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 326ea6eb..f5fdce11 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,12 +3,10 @@ This is a [Clojure contrib] project.
 Under the Clojure contrib [guidelines], this project cannot accept
 pull requests. All patches must be submitted via [JIRA].
 
-See [Contributing] and the [FAQ] on the Clojure development [wiki] for
+See [Contributing] on the Clojure website for
 more information on how to contribute.
 
-[Clojure contrib]: http://dev.clojure.org/display/doc/Clojure+Contrib
-[Contributing]: http://dev.clojure.org/display/community/Contributing
-[FAQ]: http://dev.clojure.org/display/community/Contributing+FAQ
+[Clojure contrib]: https://clojure.org/community/contrib_libs
+[Contributing]: https://clojure.org/community/contributing
 [JIRA]: http://dev.clojure.org/jira/browse/LOGIC
-[guidelines]: http://dev.clojure.org/display/community/Guidelines+for+Clojure+Contrib+committers
-[wiki]: http://dev.clojure.org/
+[guidelines]: https://clojure.org/community/contrib_howto

From bd325069d9ded1612515d15ad578d588094a47f7 Mon Sep 17 00:00:00 2001
From: Nada Amin <namin@alum.mit.edu>
Date: Sat, 31 Aug 2019 10:24:36 -0400
Subject: [PATCH 251/288] update broken reference link

---
 src/main/clojure/clojure/core/logic/nominal.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 6f572977..0ac70fe5 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -13,7 +13,7 @@
 ;; Some references / inspiration:
 ;; alphaKanren - http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf
 ;; Nominal Unification - http://www.cl.cam.ac.uk/~amp12/papers/nomu/nomu-jv.pdf
-;; http://code.google.com/p/iucs-relational-research/source/browse/trunk/lib/minikanren/nominal.sls
+;; https://github.com/lkuper/relational-research/blob/master/lib/minikanren/nominal.sls
 
 ;; =============================================================================
 ;; Nominal unification protocols

From 3b63f43097667d4686043d78a90affb967af93de Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Tue, 5 Nov 2019 20:05:56 -0600
Subject: [PATCH 252/288] update project.clj

---
 project.clj | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 34880f27..561938d5 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,6 @@
-(defproject org.clojure/core.logic "0.8.11-SNAPSHOT"
+(defproject org.clojure/core.logic "0.8.12-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
-  :parent [org.clojure/pom.contrib "0.0.25"]
+  :parent [org.clojure/pom.contrib "0.2.2"]
 
   :jvm-opts ^:replace ["-Xmx512m" "-server"]
 
@@ -10,14 +10,13 @@
 
   :dependencies [[org.clojure/clojure "1.7.0" :scope "provided"]
                  [org.clojure/clojurescript "0.0-3308" :scope "provided"]
-                 [org.clojure/tools.macro "0.1.2"]
+                 [org.clojure/tools.analyzer.jvm "0.7.2"]
                  ;[com.datomic/datomic-free "0.8.4270" :scope "provided"]
                  ]
 
   :clean-targets ^{:protect false} ["resources/tests.js" "resources/out"]
 
-  :plugins [[lein-cljsbuild "1.0.6"]
-            [cider/cider-nrepl "0.8.1"]]
+  :plugins [[lein-cljsbuild "1.0.6"]]
 
   :cljsbuild
   {:builds

From 2bdfe51488f27ecf05a5749efbbfda497b5e2e6f Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Fri, 7 Feb 2020 12:44:38 -0600
Subject: [PATCH 253/288] [maven-release-plugin] prepare release
 core.logic-0.8.12

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7381037a..b9f02f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.12-SNAPSHOT</version>
+  <version>0.8.12</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-0.8.12</tag>
   </scm>
 </project>

From eced3f3c2ba180e733d1078864474b525c9b0d6e Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Fri, 7 Feb 2020 12:44:38 -0600
Subject: [PATCH 254/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9f02f1b..ce7a8eab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.12</version>
+  <version>0.8.13-SNAPSHOT</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-0.8.12</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From c53b67a4ec6435a6852aa393724e7f41311eb0f5 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 7 Feb 2020 12:48:57 -0600
Subject: [PATCH 255/288] update for release

---
 CHANGES.md | 9 +++++++++
 README.md  | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index bdf04727..fcaa9174 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+From 0.8.11 to 0.8.12
+====
+
+Fixes
+----
+* Fixes LOGIC-184 warning from not excluding indexed?
+* Fixes docstring typo in and*
+* Infrastructure pom updates
+
 From 0.8.10 to 0.8.11
 ====
 
diff --git a/README.md b/README.md
index a9abab2c..1e10bdfa 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ the ones provided.
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.11
+Latest stable release: 0.8.12
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -24,7 +24,7 @@ Latest stable release: 0.8.11
 [Leiningen](http://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.11"]
+[org.clojure/core.logic "0.8.12"]
 ```
 
 [Maven](http://maven.apache.org) dependency information:
@@ -33,7 +33,7 @@ Latest stable release: 0.8.11
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.11</version>
+  <version>0.8.12</version>
 </dependency>
 ```
 

From 75d815aadb07621398bba8715d10d2f914c053f1 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 7 Feb 2020 12:54:34 -0600
Subject: [PATCH 256/288] refresh readme links

---
 README.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 1e10bdfa..4804f148 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ offers Prolog-like relational programming, constraint logic
 programming, and nominal logic programming for Clojure. At its heart
 is an original implementation of miniKanren as described in William
 Byrd's dissertation
-[Relational Programming in miniKanren: Techniques, Applications, and Implementations](http://pqdtopen.proquest.com/#abstract?dispub=3380156)
+[Relational Programming in miniKanren: Techniques, Applications, and Implementations](https://pqdtopen.proquest.com/#abstract?dispub=3380156)
 as well as the extensions described in
 [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
 [αKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It
@@ -18,16 +18,16 @@ Releases and dependency information
 
 Latest stable release: 0.8.12
 
-* [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
-* [Development snapshot version](http://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
+* [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
+* [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
 
-[Leiningen](http://github.com/technomancy/leiningen/) dependency information:
+[Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```
 [org.clojure/core.logic "0.8.12"]
 ```
 
-[Maven](http://maven.apache.org) dependency information:
+[Maven](https://maven.apache.org) dependency information:
 
 ```
 <dependency>
@@ -64,22 +64,22 @@ Reasoned Schemer
 ----
 
 If you wish to work through
-[The Reasoned Schemer](http://mitpress.mit.edu/0262562146) with
+[The Reasoned Schemer](https://mitpress.mit.edu/books/reasoned-schemer-second-edition) with
 core.logic make sure to look over
-[this](http://github.com/clojure/core.logic/wiki/Differences-from-The-Reasoned-Schemer)
+[this](https://github.com/clojure/core.logic/wiki/Differences-from-The-Reasoned-Schemer)
 first.
 
 If you're interested in using core.logic from
-[ClojureScript](http://github.com/clojure/clojurescript/) look
-[here](http://github.com/clojure/core.logic/wiki/Using-core.logic-with-ClojureScript).
+[ClojureScript](https://github.com/clojure/clojurescript/) look
+[here](https://github.com/clojure/core.logic/wiki/Using-core.logic-with-ClojureScript).
 
 For more information & documentation please consult the
-[wiki](http://github.com/clojure/core.logic/wiki).
+[wiki](https://github.com/clojure/core.logic/wiki).
 
 Differences from core.unify
 ----
 
-[core.unify](http://github.com/clojure/core.unify) provides a la carte
+[core.unify](https://github.com/clojure/core.unify) provides a la carte
 unification facilities that are not deeply tied into the operation of
 a logic engine. While core.logic does provide a similar simple unifier
 interface with support for specifying fine-grained constraints, if you
@@ -89,29 +89,29 @@ better fit.
 YourKit
 ----
 
-<img src="http://www.yourkit.com/images/yklogo.png"></img>
+<img src="https://www.yourkit.com/images/yklogo.png"></img>
 
 YourKit has given an open source license for their profiler, greatly
 simplifying the profiling of core.logic performance.
 
 YourKit supports open source projects with its full-featured Java
 Profiler.  YourKit, LLC is the creator of <a
-href="http://www.yourkit.com/java/profiler/index.jsp">YourKit Java
+href="https://www.yourkit.com/java/profiler/index.jsp">YourKit Java
 Profiler</a> and <a
-href="http://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET
+href="https://www.yourkit.com/.net/profiler/index.jsp">YourKit .NET
 Profiler</a>, innovative and intelligent tools for profiling Java and
 .NET applications.
 
 Developer information
 ----
 
-* [Bug Tracker](http://dev.clojure.org/jira/browse/LOGIC)
-* [Continuous Integration](http://build.clojure.org/job/core.logic/)
-* [Compatibility Test Matrix](http://build.clojure.org/job/core.logic-test-matrix/)
+* [Bug Tracker](https://clojure.atlassian.net/browse/LOGIC)
+* [Continuous Integration](https://build.clojure.org/job/core.logic/)
+* [Compatibility Test Matrix](https://build.clojure.org/job/core.logic-test-matrix/)
 
 Copyright and license
 ----
 
-Copyright © 2010-2016 David Nolen, Rich Hickey & contributors.
+Copyright © 2010-2020 David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).

From d3538d0775c3a77eb643bedb3c87b238632ddc28 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 7 Feb 2020 12:58:00 -0600
Subject: [PATCH 257/288] update jira link

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f5fdce11..c26a9547 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,5 +8,5 @@ more information on how to contribute.
 
 [Clojure contrib]: https://clojure.org/community/contrib_libs
 [Contributing]: https://clojure.org/community/contributing
-[JIRA]: http://dev.clojure.org/jira/browse/LOGIC
+[JIRA]: https://clojure.atlassian.net/browse/LOGIC
 [guidelines]: https://clojure.org/community/contrib_howto

From f669b168f845318f77e8109496b50395db686d0e Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Tue, 18 Feb 2020 12:12:07 -0600
Subject: [PATCH 258/288] [maven-release-plugin] prepare release
 core.logic-1.0.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce7a8eab..40328176 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>0.8.13-SNAPSHOT</version>
+  <version>1.0.0</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>core.logic-1.0.0</tag>
   </scm>
 </project>

From bd10e5e2c23f3272b7d3e53cf7f1284e3961098a Mon Sep 17 00:00:00 2001
From: "Hudson @ build.clojure.org" <build@clojure.com>
Date: Tue, 18 Feb 2020 12:12:08 -0600
Subject: [PATCH 259/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 40328176..b5c664f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0-SNAPSHOT</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -46,6 +46,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>core.logic-1.0.0</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 4f6f7262f0b562b2d8501d0752e737e25beefc1c Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Tue, 18 Feb 2020 12:16:20 -0600
Subject: [PATCH 260/288] update for release

---
 CHANGES.md  | 5 +++++
 README.md   | 8 +++++---
 project.clj | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fcaa9174..cbc822a1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+From 0.8.12 to 1.0.0
+====
+
+No changes
+
 From 0.8.11 to 0.8.12
 ====
 
diff --git a/README.md b/README.md
index 4804f148..a6584d05 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,9 @@ the ones provided.
 Releases and dependency information
 ----
 
-Latest stable release: 0.8.12
+This project follows the version scheme MAJOR.MINOR.PATCH where each component provides some relative indication of the size of the change, but does not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names).
+
+Latest stable release: 1.0.0
 
 * [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
@@ -24,7 +26,7 @@ Latest stable release: 0.8.12
 [Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "0.8.12"]
+[org.clojure/core.logic "1.0.0"]
 ```
 
 [Maven](https://maven.apache.org) dependency information:
@@ -33,7 +35,7 @@ Latest stable release: 0.8.12
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>0.8.12</version>
+  <version>1.0.0</version>
 </dependency>
 ```
 
diff --git a/project.clj b/project.clj
index 561938d5..9ac069f3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/core.logic "0.8.12-SNAPSHOT"
+(defproject org.clojure/core.logic "1.1.0-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
   :parent [org.clojure/pom.contrib "0.2.2"]
 

From d42c396c1bfeb7ec96e6a1ca127f3c466a2309d8 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Sun, 23 Feb 2020 15:23:07 -0600
Subject: [PATCH 261/288] fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a6584d05..704b32ee 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Byrd's dissertation
 [Relational Programming in miniKanren: Techniques, Applications, and Implementations](https://pqdtopen.proquest.com/#abstract?dispub=3380156)
 as well as the extensions described in
 [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
-[αKanren](http://www.cs.indiana.edu/~webyrd/alphamk/alphamk.pdf). It
+[αKanren](http://webyrd.net/alphamk/alphamk.pdf). It
 is designed to be easily extended to forms of logic programming beyond
 the ones provided.
 

From db627045e569767c927bce79aaabdd20025b5c7e Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 18 Jun 2020 12:58:46 -0500
Subject: [PATCH 262/288] add LICENSE text file

---
 LICENSE | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..e246f6a2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,205 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+   distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+    i) changes to the Program, and
+   ii) additions to the Program;
+
+   where such changes and/or additions to the Program originate from and are
+   distributed by that particular Contributor. A Contribution 'originates'
+   from a Contributor if it was added to the Program by such Contributor
+   itself or anyone acting on such Contributor's behalf. Contributions do not
+   include additions to the Program which: (i) are separate modules of
+   software distributed in conjunction with the Program under their own
+   license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+  a) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free copyright license to
+     reproduce, prepare derivative works of, publicly display, publicly
+     perform, distribute and sublicense the Contribution of such Contributor,
+     if any, and such derivative works, in source code and object code form.
+  b) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free patent license under
+     Licensed Patents to make, use, sell, offer to sell, import and otherwise
+     transfer the Contribution of such Contributor, if any, in source code and
+     object code form. This patent license shall apply to the combination of
+     the Contribution and the Program if, at the time the Contribution is
+     added by the Contributor, such addition of the Contribution causes such
+     combination to be covered by the Licensed Patents. The patent license
+     shall not apply to any other combinations which include the Contribution.
+     No hardware per se is licensed hereunder.
+  c) Recipient understands that although each Contributor grants the licenses
+     to its Contributions set forth herein, no assurances are provided by any
+     Contributor that the Program does not infringe the patent or other
+     intellectual property rights of any other entity. Each Contributor
+     disclaims any liability to Recipient for claims brought by any other
+     entity based on infringement of intellectual property rights or
+     otherwise. As a condition to exercising the rights and licenses granted
+     hereunder, each Recipient hereby assumes sole responsibility to secure
+     any other intellectual property rights needed, if any. For example, if a
+     third party patent license is required to allow Recipient to distribute
+     the Program, it is Recipient's responsibility to acquire that license
+     before distributing the Program.
+  d) Each Contributor represents that to its knowledge it has sufficient
+     copyright rights in its Contribution, if any, to grant the copyright
+     license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+  a) it complies with the terms and conditions of this Agreement; and
+  b) its license agreement:
+      i) effectively disclaims on behalf of all Contributors all warranties
+         and conditions, express and implied, including warranties or
+         conditions of title and non-infringement, and implied warranties or
+         conditions of merchantability and fitness for a particular purpose;
+     ii) effectively excludes on behalf of all Contributors all liability for
+         damages, including direct, indirect, special, incidental and
+         consequential damages, such as lost profits;
+    iii) states that any provisions which differ from this Agreement are
+         offered by that Contributor alone and not by any other party; and
+     iv) states that source code for the Program is available from such
+         Contributor, and informs licensees how to obtain it in a reasonable
+         manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+  a) it must be made available under this Agreement; and
+  b) a copy of this Agreement must be included with each copy of the Program.
+     Contributors may not remove or alter any copyright notices contained
+     within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and
+b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such claim at
+its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
+

From e8012102b6f824d211719ae29820e15034aed6da Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Tue, 1 Sep 2020 14:49:06 -0700
Subject: [PATCH 263/288] Add CLI/deps.edn information

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 704b32ee..50df3220 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,11 @@ Latest stable release: 1.0.0
 * [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
 
+[CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information:
+```clojure
+org.clojure/core.logic {:mvn/version "1.0.0"}
+```
+
 [Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```

From e50172a22be3062e7acabc060760efad38f9049e Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Wed, 16 Sep 2020 12:34:58 -0500
Subject: [PATCH 264/288] add copyright statement to src files

---
 src/main/clojure/cljs/core/logic.clj               | 8 ++++++++
 src/main/clojure/cljs/core/logic.cljs              | 8 ++++++++
 src/main/clojure/cljs/core/logic/pldb.clj          | 8 ++++++++
 src/main/clojure/cljs/core/logic/pldb.cljs         | 8 ++++++++
 src/main/clojure/clojure/core/logic.clj            | 8 ++++++++
 src/main/clojure/clojure/core/logic/arithmetic.clj | 8 ++++++++
 src/main/clojure/clojure/core/logic/bench.clj      | 8 ++++++++
 src/main/clojure/clojure/core/logic/datomic.clj    | 8 ++++++++
 src/main/clojure/clojure/core/logic/dcg.clj        | 8 ++++++++
 src/main/clojure/clojure/core/logic/fd.clj         | 8 ++++++++
 src/main/clojure/clojure/core/logic/nominal.clj    | 8 ++++++++
 src/main/clojure/clojure/core/logic/pldb.clj       | 8 ++++++++
 src/main/clojure/clojure/core/logic/protocols.clj  | 8 ++++++++
 src/main/clojure/clojure/core/logic/unifier.clj    | 8 ++++++++
 14 files changed, 112 insertions(+)

diff --git a/src/main/clojure/cljs/core/logic.clj b/src/main/clojure/cljs/core/logic.clj
index f9bb35cc..69c5fd65 100644
--- a/src/main/clojure/cljs/core/logic.clj
+++ b/src/main/clojure/cljs/core/logic.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns cljs.core.logic
   (:refer-clojure :exclude [==])
   (:require [clojure.set :as set]))
diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index fe27e60a..ac7b5978 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns cljs.core.logic
   (:refer-clojure :exclude [==])
   (:require-macros [cljs.core.logic :as m
diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index 3b2bacc8..b1b623cb 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns cljs.core.logic.pldb)
 
 (defn indexed? [v]
diff --git a/src/main/clojure/cljs/core/logic/pldb.cljs b/src/main/clojure/cljs/core/logic/pldb.cljs
index 418d2d24..6922e811 100644
--- a/src/main/clojure/cljs/core/logic/pldb.cljs
+++ b/src/main/clojure/cljs/core/logic/pldb.cljs
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns cljs.core.logic.pldb
   (:require-macros cljs.core.logic.pldb)
   (:require [cljs.core.logic :as l :include-macros true]))
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
index 040372ae..ff350e0a 100644
--- a/src/main/clojure/clojure/core/logic.clj
+++ b/src/main/clojure/clojure/core/logic.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic
   (:refer-clojure :exclude [==])
   (:use [clojure.core.logic.protocols])
diff --git a/src/main/clojure/clojure/core/logic/arithmetic.clj b/src/main/clojure/clojure/core/logic/arithmetic.clj
index ca201142..ff0ea7ce 100644
--- a/src/main/clojure/clojure/core/logic/arithmetic.clj
+++ b/src/main/clojure/clojure/core/logic/arithmetic.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.arithmetic
   (:refer-clojure :exclude [== = > < >= <=])
   (:use [clojure.core.logic.protocols]
diff --git a/src/main/clojure/clojure/core/logic/bench.clj b/src/main/clojure/clojure/core/logic/bench.clj
index 6274e007..e477c32d 100644
--- a/src/main/clojure/clojure/core/logic/bench.clj
+++ b/src/main/clojure/clojure/core/logic/bench.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.bench
   (:refer-clojure :exclude [==])
   (:use [clojure.core.logic :as l])
diff --git a/src/main/clojure/clojure/core/logic/datomic.clj b/src/main/clojure/clojure/core/logic/datomic.clj
index f47c95ba..9290a7a6 100644
--- a/src/main/clojure/clojure/core/logic/datomic.clj
+++ b/src/main/clojure/clojure/core/logic/datomic.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (defmacro ^:private compile-if
   "Evaluate `exp` and if it returns logical true and doesn't error, expand to
   `then`.  Else expand to `else`.
diff --git a/src/main/clojure/clojure/core/logic/dcg.clj b/src/main/clojure/clojure/core/logic/dcg.clj
index 9dfc431f..1ae3f6e6 100644
--- a/src/main/clojure/clojure/core/logic/dcg.clj
+++ b/src/main/clojure/clojure/core/logic/dcg.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.dcg
   (:refer-clojure :exclude [==])
   (:use [clojure.core.logic]))
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index aa97406f..4bfa4858 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.fd
   (:refer-clojure :exclude [== < > <= >= + - * quot distinct])
   (:use [clojure.core.logic.protocols]
diff --git a/src/main/clojure/clojure/core/logic/nominal.clj b/src/main/clojure/clojure/core/logic/nominal.clj
index 0ac70fe5..f6c39162 100644
--- a/src/main/clojure/clojure/core/logic/nominal.clj
+++ b/src/main/clojure/clojure/core/logic/nominal.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.nominal
   (:refer-clojure :exclude [== hash])
   (:use [clojure.core.logic.protocols]
diff --git a/src/main/clojure/clojure/core/logic/pldb.clj b/src/main/clojure/clojure/core/logic/pldb.clj
index 5072806e..cee03b53 100644
--- a/src/main/clojure/clojure/core/logic/pldb.clj
+++ b/src/main/clojure/clojure/core/logic/pldb.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.pldb
   (:refer-clojure :exclude [indexed?])
   (:require [clojure.core.logic :as l]))
diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj
index 9f52c445..492fbee6 100644
--- a/src/main/clojure/clojure/core/logic/protocols.clj
+++ b/src/main/clojure/clojure/core/logic/protocols.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.protocols)
 
 ;; Marker Interfaces
diff --git a/src/main/clojure/clojure/core/logic/unifier.clj b/src/main/clojure/clojure/core/logic/unifier.clj
index b51387da..523c2722 100644
--- a/src/main/clojure/clojure/core/logic/unifier.clj
+++ b/src/main/clojure/clojure/core/logic/unifier.clj
@@ -1,3 +1,11 @@
+;   Copyright (c) David Nolen, Rich Hickey, contributors. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns clojure.core.logic.unifier
   (:refer-clojure :exclude [==])
   (:use [clojure.core.logic.protocols]

From 3f8eb4a8648476daa401a7074074c54f520aac40 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Wed, 20 Jan 2021 13:55:40 -0600
Subject: [PATCH 265/288] use clojure.version property for CI

---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5c664f3..f60ff001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,15 @@
     </developer>
   </developers>
 
+  <properties>
+    <clojure.version>1.6.0</clojure.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojure</artifactId>
-      <version>1.6.0</version>
+      <version>${clojure.version}</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>

From 01c0310b0dc4fd3e402bd4dabf5579322a935416 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 18 Feb 2021 08:28:03 -0600
Subject: [PATCH 266/288] fix old jira link

---
 pom.xml                                    | 2 +-
 src/main/clojure/clojure/core/logic/fd.clj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f60ff001..ca511086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>0.2.2</version>
+    <version>1.0.0</version>
   </parent>
 
   <developers>
diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
index 4bfa4858..0635b120 100644
--- a/src/main/clojure/clojure/core/logic/fd.clj
+++ b/src/main/clojure/clojure/core/logic/fd.clj
@@ -507,7 +507,7 @@
 
   IMemberCount
   (-member-count [this]
-    ;; NOTE: ugly hack around http://dev.clojure.org/jira/browse/CLJ-1202 - David
+    ;; NOTE: ugly hack around https://clojure.atlassian.net/browse/CLJ-1202 - David
     (reduce core/+ 0 (map #(-member-count %) is)))
 
   IInterval

From 4a8e286dd510e0d0ac3ed2db022fe84e46c261a6 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 15 Apr 2021 15:50:29 -0500
Subject: [PATCH 267/288] update parent pom version to latest

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca511086..c27e0c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <developers>

From 5d1978227f59e73177a0c4e58a0e0ec32f2c8f46 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Wed, 14 Jul 2021 08:54:30 -0500
Subject: [PATCH 268/288] fix link for miniKanren paper

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 50df3220..8910ac1b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ offers Prolog-like relational programming, constraint logic
 programming, and nominal logic programming for Clojure. At its heart
 is an original implementation of miniKanren as described in William
 Byrd's dissertation
-[Relational Programming in miniKanren: Techniques, Applications, and Implementations](https://pqdtopen.proquest.com/#abstract?dispub=3380156)
+[Relational Programming in miniKanren: Techniques, Applications, and Implementations](https://www.proquest.com/docview/304903505/E30282E6EF13453CPQ/1)
 as well as the extensions described in
 [cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
 [αKanren](http://webyrd.net/alphamk/alphamk.pdf). It

From 4e3f2a22625c918b4a083f04405e8bfce4e438a7 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 4 Nov 2021 21:07:13 -0500
Subject: [PATCH 269/288] add pr template

---
 .github/PULL_REQUEST_TEMPLATE | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE

diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 00000000..686625a4
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,14 @@
+Hi! Thanks for your interest in contributing to this project.
+
+Clojure contrib projects do not use GitHub issues or pull requests, and
+require a signed Contributor Agreement. If you would like to contribute,
+please read more about the CA and sign that first (this can be done online).
+
+Then go to this project's issue tracker in JIRA to create tickets, update
+tickets, or submit patches. For help in creating tickets and patches,
+please see:
+
+- Signing the CA: https://clojure.org/community/contributing
+- Creating Tickets: https://clojure.org/community/creating_tickets
+- Developing Patches: https://clojure.org/community/developing_patches
+- Contributing FAQ: https://clojure.org/community/contributing

From 115a9925cebe4a4b49ce607860ce647ec1d2e10b Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 4 Nov 2021 21:26:50 -0500
Subject: [PATCH 270/288] fix docstring for appendo

---
 src/main/clojure/cljs/core/logic.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index ac7b5978..11e36181 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -750,7 +750,7 @@
 
 (defne appendo 
   "A relation where x, y, and z are proper collections, 
-  such that z is x appended to y"
+  such that z is y appended to x"
   [x y z]
   ([() _ y])
   ([[a . d] _ [a . r]] (appendo d y r)))

From 61c21be776949c5e9f82ecf4a0bb000ca7b7ee3c Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Thu, 17 Feb 2022 08:46:40 -0600
Subject: [PATCH 271/288] remove duplicate not-found definition

---
 src/main/clojure/cljs/core/logic.cljs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/clojure/cljs/core/logic.cljs b/src/main/clojure/cljs/core/logic.cljs
index 11e36181..792bdd06 100644
--- a/src/main/clojure/cljs/core/logic.cljs
+++ b/src/main/clojure/cljs/core/logic.cljs
@@ -480,8 +480,6 @@
 ;; -----------------------------------------------------------------------------
 ;; Unify IPersistentMap with X
 
-(def not-found (js-obj))
-
 (defn unify-with-map* [v u s]
   (if-not (cljs.core/== (count v) (count u))
     (fail s)

From 01e0ed68ce646a80652e10517bf2c863c3c198cd Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 25 Feb 2022 08:54:25 -0600
Subject: [PATCH 272/288] remove indexed? warning in cljs impl

---
 src/main/clojure/cljs/core/logic/pldb.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/cljs/core/logic/pldb.clj b/src/main/clojure/cljs/core/logic/pldb.clj
index b1b623cb..cb22a39a 100644
--- a/src/main/clojure/cljs/core/logic/pldb.clj
+++ b/src/main/clojure/cljs/core/logic/pldb.clj
@@ -6,7 +6,8 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.core.logic.pldb)
+(ns cljs.core.logic.pldb
+  (:refer-clojure :exclude [indexed?]))
 
 (defn indexed? [v]
   (true? (:index (meta v))))

From eba8d039f1db4da9c44c5f98f4055d0fa57c5009 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 25 Feb 2022 08:55:15 -0600
Subject: [PATCH 273/288] update changelog

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cbc822a1..59f67323 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+From 1.0.0 to 1.0.1
+====
+
+* Fixes warning about `indexed?` in cljs impl
+
 From 0.8.12 to 1.0.0
 ====
 

From d854548a1eb0706150bd5f5d939c7bca162c07fb Mon Sep 17 00:00:00 2001
From: Clojure Build <clojure-build@clojure.com>
Date: Fri, 25 Feb 2022 08:57:11 -0600
Subject: [PATCH 274/288] [maven-release-plugin] prepare release v1.0.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c27e0c97..11a8c9e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>v1.0.1</tag>
   </scm>
 </project>

From a165123c179ed84545b43775ea411e9592ef2af4 Mon Sep 17 00:00:00 2001
From: Clojure Build <clojure-build@clojure.com>
Date: Fri, 25 Feb 2022 08:57:11 -0600
Subject: [PATCH 275/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11a8c9e3..c6ebba27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>http://github.com/clojure/core.logic</url>
-    <tag>v1.0.1</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 143bb6cdcbe1199e02acc04041660416df0b9f8b Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 25 Feb 2022 09:00:39 -0600
Subject: [PATCH 276/288] update for release

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8910ac1b..4d79e472 100644
--- a/README.md
+++ b/README.md
@@ -18,20 +18,20 @@ Releases and dependency information
 
 This project follows the version scheme MAJOR.MINOR.PATCH where each component provides some relative indication of the size of the change, but does not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names).
 
-Latest stable release: 1.0.0
+Latest stable release: 1.0.1
 
 * [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
 
 [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information:
 ```clojure
-org.clojure/core.logic {:mvn/version "1.0.0"}
+org.clojure/core.logic {:mvn/version "1.0.1"}
 ```
 
 [Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "1.0.0"]
+[org.clojure/core.logic "1.0.1"]
 ```
 
 [Maven](https://maven.apache.org) dependency information:
@@ -40,7 +40,7 @@ org.clojure/core.logic {:mvn/version "1.0.0"}
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
 </dependency>
 ```
 

From 56e928be2fe77d7bf471c5d15b0374e1fce35630 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 26 May 2023 14:51:29 -0500
Subject: [PATCH 277/288] add actions

---
 .github/workflows/release.yml  | 19 +++++++++++++++++++
 .github/workflows/snapshot.yml |  8 ++++++++
 .github/workflows/test.yml     |  7 +++++++
 README.md                      |  5 ++---
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/release.yml
 create mode 100644 .github/workflows/snapshot.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..e2718bd3
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,19 @@
+name: Release on demand
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "Version to release"
+        required: true
+      snapshotVersion:
+        description: "Snapshot version after release"
+        required: true
+
+jobs:
+  call-release:
+    uses: clojure/build.ci/.github/workflows/release.yml@master
+    with:
+      releaseVersion: ${{ github.event.inputs.releaseVersion }}
+      snapshotVersion: ${{ github.event.inputs.snapshotVersion }}
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 00000000..24729578
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,8 @@
+name: Snapshot on demand
+
+on: [workflow_dispatch]
+
+jobs:
+  call-snapshot:
+    uses: clojure/build.ci/.github/workflows/snapshot.yml@master
+    secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..1fa127c9
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,7 @@
+name: Test
+
+on: [push]
+
+jobs:
+  call-test:
+    uses: clojure/build.ci/.github/workflows/test.yml@master
diff --git a/README.md b/README.md
index 4d79e472..90e00ae6 100644
--- a/README.md
+++ b/README.md
@@ -113,12 +113,11 @@ Developer information
 ----
 
 * [Bug Tracker](https://clojure.atlassian.net/browse/LOGIC)
-* [Continuous Integration](https://build.clojure.org/job/core.logic/)
-* [Compatibility Test Matrix](https://build.clojure.org/job/core.logic-test-matrix/)
+* [Continuous Integration](https://github.com/clojure/core.logic/actions/workflows/test.yml)
 
 Copyright and license
 ----
 
-Copyright © 2010-2020 David Nolen, Rich Hickey & contributors.
+Copyright © 2010-2023 David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).

From 5b2cb71a7cec97282b51cc21ee888c369d7e76ec Mon Sep 17 00:00:00 2001
From: JarrodCTaylor <jarrod@fastmail.com>
Date: Wed, 16 Aug 2023 09:29:22 -0500
Subject: [PATCH 278/288] Added github action to build api docs

---
 .github/workflows/doc-build.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/workflows/doc-build.yml

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
new file mode 100644
index 00000000..ebe7753b
--- /dev/null
+++ b/.github/workflows/doc-build.yml
@@ -0,0 +1,10 @@
+name: Build API Docs
+
+on:
+  workflow_dispatch:
+
+jobs:
+  call-doc-build-workflow:
+    uses: clojure/build.ci/.github/workflows/doc-build.yml@master
+    with:
+      project: clojure/core.logic

From 325997afa71f0288cb7d472c12cf58709ac7c107 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Mon, 19 Feb 2024 09:33:36 -0600
Subject: [PATCH 279/288] update parent pom

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6ebba27..5fb186c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <licenses>
     <license>
       <name>Eclipse Public License 1.0</name>
-      <url>http://opensource.org/licenses/eclipse-1.0.php</url>
+      <url>https://opensource.org/license/epl-1-0/</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -17,19 +17,19 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
   </parent>
 
   <developers>
     <developer>
       <id>swannodette</id>
       <name>David Nolen</name>
-      <url>http://dosync.posterous.com</url>
+      <url>https://dosync.posterous.com</url>
     </developer>
   </developers>
 
   <properties>
-    <clojure.version>1.6.0</clojure.version>
+    <clojure.version>1.9.0</clojure.version>
   </properties>
 
   <dependencies>
@@ -49,7 +49,7 @@
   <scm>
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
-    <url>http://github.com/clojure/core.logic</url>
+    <url>https://github.com/clojure/core.logic</url>
     <tag>HEAD</tag>
   </scm>
 </project>

From a489bb3bca10f74edc0e6c3869a9108298ecc060 Mon Sep 17 00:00:00 2001
From: clojure-build <clojure-build@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:35:22 +0000
Subject: [PATCH 280/288] [maven-release-plugin] prepare release v1.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fb186c8..8f36570e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>https://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>v1.1.0</tag>
   </scm>
 </project>

From aecc18b3372b9b75b736822fa555d0a1dccd0c7f Mon Sep 17 00:00:00 2001
From: clojure-build <clojure-build@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:35:22 +0000
Subject: [PATCH 281/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f36570e..fa7d41cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>https://github.com/clojure/core.logic</url>
-    <tag>v1.1.0</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From f41b8847a6bab2d334ac3c01441f7a109dc2b43e Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Mon, 19 Feb 2024 09:37:09 -0600
Subject: [PATCH 282/288] update for release

---
 CHANGES.md |  5 +++++
 README.md  | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 59f67323..e55fad21 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+From 1.0.1 to 1.1.0
+====
+
+* Update parent pom version
+
 From 1.0.0 to 1.0.1
 ====
 
diff --git a/README.md b/README.md
index 90e00ae6..683f2c79 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ is an original implementation of miniKanren as described in William
 Byrd's dissertation
 [Relational Programming in miniKanren: Techniques, Applications, and Implementations](https://www.proquest.com/docview/304903505/E30282E6EF13453CPQ/1)
 as well as the extensions described in
-[cKanren](http://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
+[cKanren](https://www.schemeworkshop.org/2011/papers/Alvis2011.pdf) and
 [αKanren](http://webyrd.net/alphamk/alphamk.pdf). It
 is designed to be easily extended to forms of logic programming beyond
 the ones provided.
@@ -18,20 +18,20 @@ Releases and dependency information
 
 This project follows the version scheme MAJOR.MINOR.PATCH where each component provides some relative indication of the size of the change, but does not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names).
 
-Latest stable release: 1.0.1
+Latest stable release: 1.1.0
 
 * [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
 
 [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information:
 ```clojure
-org.clojure/core.logic {:mvn/version "1.0.1"}
+org.clojure/core.logic {:mvn/version "1.1.0"}
 ```
 
 [Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "1.0.1"]
+[org.clojure/core.logic "1.1.0"]
 ```
 
 [Maven](https://maven.apache.org) dependency information:
@@ -40,7 +40,7 @@ org.clojure/core.logic {:mvn/version "1.0.1"}
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 
@@ -118,6 +118,6 @@ Developer information
 Copyright and license
 ----
 
-Copyright © 2010-2023 David Nolen, Rich Hickey & contributors.
+Copyright © David Nolen, Rich Hickey & contributors.
 
 Licensed under the EPL (see the file epl.html).

From f843a2bdbfa1d7fe8068b94eae7f4cfc630735cb Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Fri, 30 May 2025 14:23:43 -0500
Subject: [PATCH 283/288] update to new parent pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fa7d41cb..f1bcbf8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
   </parent>
 
   <developers>

From 3ad493b09aee88ae389da081f3491071bed31007 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Tue, 30 Dec 2025 12:50:37 -0600
Subject: [PATCH 284/288] update permissions in workflows

---
 .github/workflows/doc-build.yml | 3 +++
 .github/workflows/release.yml   | 3 +++
 .github/workflows/snapshot.yml  | 3 +++
 .github/workflows/test.yml      | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
index ebe7753b..ec3dcda3 100644
--- a/.github/workflows/doc-build.yml
+++ b/.github/workflows/doc-build.yml
@@ -1,5 +1,8 @@
 name: Build API Docs
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e2718bd3..286cf956 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,8 @@
 name: Release on demand
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 24729578..9fdad8c6 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -1,5 +1,8 @@
 name: Snapshot on demand
 
+permissions:
+  contents: read
+
 on: [workflow_dispatch]
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1fa127c9..2cc441ac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,8 @@
 name: Test
 
+permissions:
+  contents: read
+
 on: [push]
 
 jobs:

From 1921195ad33c558d2f4ec13c4bb237d8c2f1dc10 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Tue, 30 Dec 2025 12:52:23 -0600
Subject: [PATCH 285/288] update to latest parent pom

---
 CHANGES.md  | 5 +++++
 pom.xml     | 4 ++--
 project.clj | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e55fad21..db64ae27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+From 1.1.0 to 1.1.1
+====
+
+* Update parent pom version
+
 From 1.0.1 to 1.1.0
 ====
 
diff --git a/pom.xml b/pom.xml
index f1bcbf8b..a3155338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
   </parent>
 
   <developers>
@@ -29,7 +29,7 @@
   </developers>
 
   <properties>
-    <clojure.version>1.9.0</clojure.version>
+    <clojure.version>1.11.4</clojure.version>
   </properties>
 
   <dependencies>
diff --git a/project.clj b/project.clj
index 9ac069f3..e1bc4e9d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,6 @@
 (defproject org.clojure/core.logic "1.1.0-SNAPSHOT"
   :description "A logic/relational programming library for Clojure"
-  :parent [org.clojure/pom.contrib "0.2.2"]
+  :parent [org.clojure/pom.contrib "1.4.0"]
 
   :jvm-opts ^:replace ["-Xmx512m" "-server"]
 

From c897d5f97330431abf239accaeb72edb42855963 Mon Sep 17 00:00:00 2001
From: clojure-build <clojure-build@users.noreply.github.com>
Date: Tue, 30 Dec 2025 18:54:47 +0000
Subject: [PATCH 286/288] [maven-release-plugin] prepare release v1.1.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3155338..4949aef1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>https://github.com/clojure/core.logic</url>
-    <tag>HEAD</tag>
+    <tag>v1.1.1</tag>
   </scm>
 </project>

From 5bc414b25e64e57394d6e0f418374a4c97a55455 Mon Sep 17 00:00:00 2001
From: clojure-build <clojure-build@users.noreply.github.com>
Date: Tue, 30 Dec 2025 18:54:47 +0000
Subject: [PATCH 287/288] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4949aef1..cea095ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core.logic</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>core.logic</name>
   <description>A logic/relational programming library for Clojure</description>
 
@@ -50,6 +50,6 @@
     <connection>scm:git:git://github.com/clojure/core.logic.git</connection>
     <developerConnection>scm:git:git://github.com/clojure/core.logic.git</developerConnection>
     <url>https://github.com/clojure/core.logic</url>
-    <tag>v1.1.1</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

From 326101fc5d491462ba4cf5ee04d8f1850926d232 Mon Sep 17 00:00:00 2001
From: Alex Miller <alex.miller@cognitect.com>
Date: Tue, 30 Dec 2025 12:57:42 -0600
Subject: [PATCH 288/288] update for release

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 683f2c79..4e8f7973 100644
--- a/README.md
+++ b/README.md
@@ -18,20 +18,20 @@ Releases and dependency information
 
 This project follows the version scheme MAJOR.MINOR.PATCH where each component provides some relative indication of the size of the change, but does not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names).
 
-Latest stable release: 1.1.0
+Latest stable release: 1.1.1
 
 * [All released versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22core.logic%22)
 * [Development snapshot version](https://oss.sonatype.org/index.html#nexus-search;gav~org.clojure~core.logic~~~)
 
 [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information:
 ```clojure
-org.clojure/core.logic {:mvn/version "1.1.0"}
+org.clojure/core.logic {:mvn/version "1.1.1"}
 ```
 
 [Leiningen](https://github.com/technomancy/leiningen/) dependency information:
 
 ```
-[org.clojure/core.logic "1.1.0"]
+[org.clojure/core.logic "1.1.1"]
 ```
 
 [Maven](https://maven.apache.org) dependency information:
@@ -40,7 +40,7 @@ org.clojure/core.logic {:mvn/version "1.1.0"}
 <dependency>
   <groupId>org.clojure</groupId>
   <artifactId>core.logic</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
 </dependency>
 ```