CLJ-1387: reduce-kv on hash map should handle reduced

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

src/jvm/clojure/lang/PersistentHashMap.java

@@ -182,9 +182,13 @@ public Object kvreduce(IFn f, Object init){
 	if(RT.isReduced(init))
 		return ((IDeref)init).deref();
 	if(root != null){
-        return root.kvreduce(f,init);
-    }
-    return init;
+		init = root.kvreduce(f,init);
+		if(RT.isReduced(init))
+			return ((IDeref)init).deref();
+		else
+			return init;
+	}
+	return init;
 }
 
 public Object fold(long n, final IFn combinef, final IFn reducef,
@@ -405,7 +409,7 @@ public Object kvreduce(IFn f, Object init){
             if(node != null){
                 init = node.kvreduce(f,init);
 	            if(RT.isReduced(init))
-		            return ((IDeref)init).deref();
+		            return init;
 	            }
 	        }
         return init;
@@ -1132,7 +1136,7 @@ static public Object kvreduce(Object[] array, IFn f, Object init){
                      init = node.kvreduce(f,init);
                  }
              if(RT.isReduced(init))
-	             return ((IDeref)init).deref();
+	             return init;
              }
         return init;
     }

test/clojure/test_clojure/reducers.clj

@@ -9,7 +9,9 @@
 ;; Author: Tassilo Horn
 
 (ns clojure.test-clojure.reducers
-  (:require [clojure.core.reducers :as r])
+  (:require [clojure.core.reducers :as r]
+            [clojure.test.generative :refer (defspec)]
+            [clojure.data.generators :as gen])
   (:use clojure.test))
 
 (defmacro defequivtest
@@ -62,6 +64,22 @@
   (is (= {:k :v} (reduce-kv assoc {:k :v} nil)))
   (is (= 0 (r/fold + nil))))
 
+(defn gen-num []
+  (gen/uniform 0 2000))
+
+(defn reduced-at-probe
+  [m p]
+  (reduce-kv (fn [_ k v] (when (== p k) (reduced :foo))) nil m))
+
+(defspec reduced-always-returns
+  (fn [probe to-end]
+    (let [len (+ probe to-end 1)
+          nums (range len)
+          m (zipmap nums nums)]
+      (reduced-at-probe m probe)))
+  [^{:tag `gen-num} probe ^{:tag `gen-num} to-end]
+  (assert (= :foo %)))
+
 (deftest test-fold-runtime-exception
   (is (thrown? IndexOutOfBoundsException
                (let [test-map-count 1234