Permalink
Browse files

move IForceAnswerTerm back into core.clj

  • Loading branch information...
1 parent 14f110d commit 7d0a4d266df953765c830f2704cc121fbbdeef1e @swannodette swannodette committed Jan 17, 2013
@@ -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
@@ -1,7 +1,6 @@
(ns clojure.core.logic.fd
(:refer-clojure :exclude [== < > <= >= + - * quot distinct])
- (:use clojure.core.logic.protocols
- [clojure.core.logic :exclude [get-dom == != !=c] :as l])
+ (:use [clojure.core.logic :exclude [get-dom == != !=c] :as l])
(:require [clojure.set :as set]
[clojure.string :as string])
(:import [java.io Writer]
@@ -1,7 +1,6 @@
(ns clojure.core.logic.nominal
(:refer-clojure :exclude [== hash])
- (:use clojure.core.logic.protocols
- [clojure.core.logic :exclude [fresh] :as l])
+ (:use [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]))
@@ -1,9 +0,0 @@
-(ns clojure.core.logic.protocols)
-
-;; -----------------------------------------------------------------------------
-;; force-ans support
-
-;; TODO: this is really Mozart/OZ "distribute"
-
-(defprotocol IForceAnswerTerm
- (-force-ans [v x]))

0 comments on commit 7d0a4d2

Please sign in to comment.