summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2009-12-17 13:31:37 -0500
committerRich Hickey <richhickey@gmail.com>2009-12-17 13:31:37 -0500
commit3d8c97a939e5779553c53f47696f7445cf378583 (patch)
tree166da6cf7ddb1656ba4071b4cdfb7c940466fdd3
parent383c0b95fbf908dc2fe17a8ceb749c06b5c33a19 (diff)
fix name conflict - bound-fn. fixes #225
-rw-r--r--src/clj/clojure/core.clj14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index 6bb7a266..7433adb3 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -3425,7 +3425,7 @@
`(binding [*math-context* (java.math.MathContext. ~precision ~@rm)]
~@body)))
-(defn bound-fn
+(defn mk-bound-fn
{:private true}
[#^clojure.lang.Sorted sc test key]
(fn [e]
@@ -3436,30 +3436,30 @@
>=. Returns a seq of those entries with keys ek for
which (test (.. sc comparator (compare ek key)) 0) is true"
([#^clojure.lang.Sorted sc test key]
- (let [include (bound-fn sc test key)]
+ (let [include (mk-bound-fn sc test key)]
(if (#{> >=} test)
(when-let [[e :as s] (. sc seqFrom key true)]
(if (include e) s (next s)))
(take-while include (. sc seq true)))))
([#^clojure.lang.Sorted sc start-test start-key end-test end-key]
(when-let [[e :as s] (. sc seqFrom start-key true)]
- (take-while (bound-fn sc end-test end-key)
- (if ((bound-fn sc start-test start-key) e) s (next s))))))
+ (take-while (mk-bound-fn sc end-test end-key)
+ (if ((mk-bound-fn sc start-test start-key) e) s (next s))))))
(defn rsubseq
"sc must be a sorted collection, test(s) one of <, <=, > or
>=. Returns a reverse seq of those entries with keys ek for
which (test (.. sc comparator (compare ek key)) 0) is true"
([#^clojure.lang.Sorted sc test key]
- (let [include (bound-fn sc test key)]
+ (let [include (mk-bound-fn sc test key)]
(if (#{< <=} test)
(when-let [[e :as s] (. sc seqFrom key false)]
(if (include e) s (next s)))
(take-while include (. sc seq false)))))
([#^clojure.lang.Sorted sc start-test start-key end-test end-key]
(when-let [[e :as s] (. sc seqFrom end-key false)]
- (take-while (bound-fn sc start-test start-key)
- (if ((bound-fn sc end-test end-key) e) s (next s))))))
+ (take-while (mk-bound-fn sc start-test start-key)
+ (if ((mk-bound-fn sc end-test end-key) e) s (next s))))))
(defn repeatedly
"Takes a function of no args, presumably with side effects, and returns an infinite