fix some obvious pldb bugs

clojure · May 31, 2014 · ee07b1a · ee07b1a
1 parent 6e2eabb
commit ee07b1a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git 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}))))