comp tweak, ireduce for vecs

Author: richhickey

src/clj/clojure/core.clj

@@ -2435,20 +2435,8 @@
        ([x y] (f (g x y)))
        ([x y z] (f (g x y z)))
        ([x y z & args] (f (apply g x y z args)))))
-  ([f g h] 
-     (fn 
-       ([] (f (g (h))))
-       ([x] (f (g (h x))))
-       ([x y] (f (g (h x y))))
-       ([x y z] (f (g (h x y z))))
-       ([x y z & args] (f (g (apply h x y z args))))))
-  ([f1 f2 f3 & fs]
-    (let [fs (reverse (list* f1 f2 f3 fs))]
-      (fn [& args]
-        (loop [ret (apply (first fs) args) fs (next fs)]
-          (if fs
-            (recur ((first fs) ret) (next fs))
-            ret))))))
+  ([f g & fs]
+     (reduce1 comp (list* f g fs))))
 
 (defn juxt 
   "Takes a set of functions and returns a fn that is the juxtaposition

src/jvm/clojure/lang/PersistentVector.java

@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class PersistentVector extends APersistentVector implements IObj, IEditableCollection{
+public class PersistentVector extends APersistentVector implements IObj, IEditableCollection, IReduce{
 
 public static class Node implements Serializable {
 	transient public final AtomicBoolean edit;
@@ -260,6 +260,24 @@ public void remove(){
 
 public Iterator iterator(){return rangedIterator(0,count());}
 
+public Object reduce(IFn f){
+	throw new UnsupportedOperationException();
+}
+
+public Object reduce(IFn f, Object init){
+    int step = 0;
+    for(int i=0;i<cnt;i+=step){
+        Object[] array = arrayFor(i);
+        for(int j =0;j<array.length;++j){
+            init = f.invoke(init,array[j]);
+            if(RT.isReduced(init))
+	            return ((IDeref)init).deref();
+            }
+        step = array.length;
+    }
+    return init;
+}
+
 public Object kvreduce(IFn f, Object init){
     int step = 0;
     for(int i=0;i<cnt;i+=step){