diff options
| author | Chouser <chouser@n01se.net> | 2008-10-06 13:50:42 +0000 |
|---|---|---|
| committer | Chouser <chouser@n01se.net> | 2008-10-06 13:50:42 +0000 |
| commit | 0aa0933c67a516e9bd2ea9aba4ef56b833e3024f (patch) | |
| tree | 343e57612fa278523d7162b31f9e9ce9ae64fd09 /clojurescript | |
| parent | 7136e152bdfa55fbe95860373ddf01eef5225495 (diff) | |
ClojureScript: update patch for latest clojure svn
Diffstat (limited to 'clojurescript')
| -rw-r--r-- | clojurescript/avoid-java-in-boot.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clojurescript/avoid-java-in-boot.patch b/clojurescript/avoid-java-in-boot.patch index db694617..f9deb0f7 100644 --- a/clojurescript/avoid-java-in-boot.patch +++ b/clojurescript/avoid-java-in-boot.patch @@ -1,5 +1,5 @@ diff --git a/src/clj/clojure/boot.clj b/src/clj/clojure/boot.clj -index e0dd304..3c1f7e8 100644 +index 40c90a0..99caeba 100644 --- a/src/clj/clojure/boot.clj +++ b/src/clj/clojure/boot.clj @@ -315,7 +315,7 @@ @@ -52,9 +52,9 @@ index e0dd304..3c1f7e8 100644 (take (- end start) (iterate inc start)))) ([start end step] @@ -1410,7 +1410,7 @@ - ([#^java.util.Comparator comp #^java.util.Collection coll] - (when (and coll (not (. coll (isEmpty)))) - (let [a (. coll (toArray))] + ([#^java.util.Comparator comp coll] + (when (and coll (not (zero? (count coll)))) + (let [a (to-array coll)] - (. java.util.Arrays (sort a comp)) + (clojure.lang.RT/sortArray a comp) (seq a))))) @@ -251,7 +251,7 @@ index e0dd304..3c1f7e8 100644 boring? #(not= (.getMethodName %) "doInvoke") trace (into-array (drop 2 (drop-while boring? raw-trace)))] diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java -index 2a01ab3..18d4007 100644 +index 0a891bf..a1fafb7 100644 --- a/src/jvm/clojure/lang/RT.java +++ b/src/jvm/clojure/lang/RT.java @@ -30,6 +30,8 @@ public class RT{ @@ -274,7 +274,7 @@ index 2a01ab3..18d4007 100644 static public IPersistentMap map(Object... init){ if(init != null && init.length == 2) return new PersistentArrayMap(init); -@@ -1642,4 +1648,35 @@ static public int alength(Object xs){ +@@ -1644,4 +1650,35 @@ static public int alength(Object xs){ return Array.getLength(xs); } |