greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Add TODO about external bindings.

Browse source
This commit is contained in:
Richard Newman 2016-07-20 12:25:33 -07:00
parent cddd72e283
commit 6b4f3cb396
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/datomish/clauses.cljc
View file

@ -71,13 +71,32 @@
(map (fn [v] [:= root v]) (rest vs))))) (map (fn [v] [:= root v]) (rest vs)))))
bindings)) bindings))
;; This is so we can link clauses to the outside world.
(defn impose-external-bindings [cc]
(if (empty? (:external-bindings cc))
cc
(let [ours (:bindings cc)
theirs (:external-bindings cc)
vars (clojure.set/intersection (set (keys theirs)) (set (keys ours)))]
(util/concat-in
cc [:wheres]
(map
(fn [v]
(let [external (first (v theirs))
internal (first (v ours))]
(assert external)
(assert internal)
[:= external internal]))
vars)))))
(defn expand-where-from-bindings (defn expand-where-from-bindings
"Take the bindings in the CC and contribute "Take the bindings in the CC and contribute
additional where clauses. Calling this more than additional where clauses. Calling this more than
once will result in duplicate clauses." once will result in duplicate clauses."
[cc] [cc]
(assoc cc :wheres (concat (bindings->where (:bindings cc)) (impose-external-bindings
(:wheres cc)))) (assoc cc :wheres (concat (bindings->where (:bindings cc))
(:wheres cc)))))
;; Pattern building is recursive, so we need forward declarations. ;; Pattern building is recursive, so we need forward declarations.
(declare Not->NotJoinClause not-join->where-fragment) (declare Not->NotJoinClause not-join->where-fragment)
@ -218,19 +237,7 @@
(when-not (instance? DefaultSrc (:source not)) (when-not (instance? DefaultSrc (:source not))
(raise-str "Non-default sources are not supported in patterns. Pattern: " (raise-str "Non-default sources are not supported in patterns. Pattern: "
not)) not))
(impose-external-bindings (make-not-join-clause source external-bindings (:vars not) (:clauses not)))
(make-not-join-clause source external-bindings (:vars not) (:clauses not))))
;; This is so we can link the clause to the outside world.
(defn impose-external-constraints [not-join-clause wheres]
(util/concat-in not-join-clause [:cc :wheres] wheres))
(defn impose-external-bindings [not-join-clause]
(let [ours (:bindings (:cc not-join-clause))
theirs (:external-bindings (:cc not-join-clause))
vars (clojure.set/intersection (set (keys theirs)) (set (keys ours)))
pairings (map (fn [v] [:= (first (v theirs)) (first (v ours))]) vars)]
(impose-external-constraints not-join-clause pairings)))
(defn not-join->where-fragment [not-join] (defn not-join->where-fragment [not-join]
[:not [:not