CLJS-608: Stop re-seq after reaching end of string

clojure · Oct 17, 2013 · e483c4a · e483c4a
1 parent 6906a56
commit e483c4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/cljs/cljs/core.cljs b/src/cljs/cljs/core.cljs
@@ -6564,7 +6564,7 @@ reduces them without incurring seq initialization"
         match-idx (.search s re)
         match-str (if (coll? match-data) (first match-data) match-data)
         post-match (subs s (+ match-idx (count match-str)))]
-    (when match-data (lazy-seq (cons match-data (re-seq re post-match))))))
+    (when match-data (lazy-seq (cons match-data (when (seq post-match) (re-seq re post-match)))))))
 
 (defn re-pattern
   "Returns an instance of RegExp which has compiled the provided string."

diff --git a/test/cljs/cljs/core_test.cljs b/test/cljs/cljs/core_test.cljs
@@ -1960,5 +1960,8 @@
   ;; CLJS-600
   (assert (= "foobar" (apply str (concat "foo" "bar"))))
 
+  ;; CLJS-608
+  (assert (= '("") (re-seq #"\s*" "")))
+
   :ok
   )