move IForceAnswerTerm back into core.clj

clojure · Jan 17, 2013 · 7d0a4d2 · 7d0a4d2
1 parent 14f110d
commit 7d0a4d2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
@@ -1,6 +1,5 @@
 (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]
@@ -216,6 +215,9 @@
 (defprotocol IMemberCount
   (member-count [this]))
 
+(defprotocol IForceAnswerTerm
+  (-force-ans [v x]))
+
 ;; -----------------------------------------------------------------------------
 ;; Tree Constraints
 

diff --git a/src/main/clojure/clojure/core/logic/fd.clj b/src/main/clojure/clojure/core/logic/fd.clj
@@ -1,7 +1,6 @@
 (ns clojure.core.logic.fd
   (:refer-clojure :exclude [== < > <= >= + - * quot distinct])
-  (:use clojure.core.logic.protocols
+  (:use [clojure.core.logic :exclude [get-dom == != !=c] :as l])
-        [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
@@ -1,7 +1,6 @@
 (ns clojure.core.logic.nominal
   (:refer-clojure :exclude [== hash])
-  (:use clojure.core.logic.protocols
+  (:use [clojure.core.logic :exclude [fresh] :as l])
-        [clojure.core.logic :exclude [fresh] :as l])
   (:require [clojure.core.logic.fd :as fd])
   (:import [java.io Writer]
            [clojure.core.logic LVar LCons IBindable ITreeTerm]))

diff --git a/src/main/clojure/clojure/core/logic/protocols.clj b/src/main/clojure/clojure/core/logic/protocols.clj