diff options
| author | Rich Hickey <richhickey@gmail.com> | 2009-03-17 12:54:07 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2009-03-17 12:54:07 +0000 |
| commit | f015ab4f71a680f6c526a17e61f41da9529597bf (patch) | |
| tree | 3e28cb99977b6373cbd3cb694757a8f7d84951ef | |
| parent | 63a0c31264186f4072a98bb1b9bf98dea17c8e35 (diff) | |
made (empty aseq) -> (), (empty non-IPersistentCollection) -> nil
| -rw-r--r-- | src/clj/clojure/core.clj | 5 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/ASeq.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj index 56db96b3..397ca177 100644 --- a/src/clj/clojure/core.clj +++ b/src/clj/clojure/core.clj @@ -3154,8 +3154,9 @@ (defn empty "Returns an empty collection of the same category as coll, or nil" - [#^clojure.lang.IPersistentCollection coll] - (.empty coll)) + [coll] + (when (instance? clojure.lang.IPersistentCollection coll) + (.empty #^clojure.lang.IPersistentCollection coll))) (defmacro amap "Maps an expression across an array a, using an index named idx, and diff --git a/src/jvm/clojure/lang/ASeq.java b/src/jvm/clojure/lang/ASeq.java index cb38bb6d..73f88da7 100644 --- a/src/jvm/clojure/lang/ASeq.java +++ b/src/jvm/clojure/lang/ASeq.java @@ -20,7 +20,7 @@ public String toString(){ }
public IPersistentCollection empty(){
- return null;
+ return PersistentList.EMPTY;
}
protected ASeq(IPersistentMap meta){
|