check when chunked seq goes unchunked, #328

Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>
thickey · Apr 30, 2010 · d2fce54 · d2fce54
1 parent 08a9204
commit d2fce54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/clj/clojure/core/protocols.clj b/src/clj/clojure/core/protocols.clj
@@ -24,11 +24,13 @@
   (internal-reduce
    [s f val]
    (if-let [s (seq s)]
-     (recur (chunk-next s)
-            f
-            (.reduce (chunk-first s) f val))
+     (if (chunked-seq? s)
+       (recur (chunk-next s)
+              f
+              (.reduce (chunk-first s) f val))
+       (internal-reduce s f val))
      val))
-
+ 
   clojure.lang.StringSeq
   (internal-reduce
    [str-seq f val]

diff --git a/test/clojure/test_clojure/sequences.clj b/test/clojure/test_clojure/sequences.clj
@@ -18,6 +18,9 @@
 ; apply, map, filter, remove
 ; and more...
 
+(deftest test-reduce-from-chunked-into-unchunked
+  (= [1 2 \a \b] (into [] (concat [1 2] "ab"))))
+
 (deftest test-reduce
   (let [int+ (fn [a b] (+ (int a) (int b)))
         arange (range 100) ;; enough to cross nodes