diff options
| author | Rich Hickey <richhickey@gmail.com> | 2008-01-07 01:41:09 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2008-01-07 01:41:09 +0000 |
| commit | e133b4037f91c359071852106073b7a8dcf6eccb (patch) | |
| tree | 0de13c3151296254158eda87b3d30e9ad3dd34fa | |
| parent | fa30aeed53960838cdcc5d0437fdccab0e9be828 (diff) | |
renamed contains to contains?
| -rw-r--r-- | src/boot.clj | 6 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/RT.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/boot.clj b/src/boot.clj index 79e0533d..6ac33e35 100644 --- a/src/boot.clj +++ b/src/boot.clj @@ -323,7 +323,7 @@ ;;map stuff -(defn contains [map key] +(defn contains? [map key] (. clojure.lang.RT (contains map key))) (defn get @@ -584,7 +584,7 @@ (defn merge-with [f & maps] (let [merge-entry (fn [m e] (let [k (key e) v (val e)] - (if (contains m k) + (if (contains? m k) (assoc m k (f (m k) v)) (assoc m k v)))) merge2 (fn [m1 m2] @@ -978,7 +978,7 @@ and or + * / - == < <= > >= inc dec pos? neg? zero? quot rem complement constantly identity seq count - peek pop nth contains get + peek pop nth contains? get assoc dissoc find keys vals merge merge-with scan touch key val diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java index 14b78de9..5a6ffbcc 100644 --- a/src/jvm/clojure/lang/RT.java +++ b/src/jvm/clojure/lang/RT.java @@ -341,7 +341,7 @@ static public Associative assoc(Object coll, Object key, Object val){ static public Object contains(Object coll, Object key){ if(coll == null) - return false; + return F; return ((Associative) coll).containsKey(key) ? T : F; } |