diff --git a/src/jolt/core.janet b/src/jolt/core.janet index 65c2f92..d7d25cf 100644 --- a/src/jolt/core.janet +++ b/src/jolt/core.janet @@ -201,10 +201,26 @@ (= 0 (length coll)))))))))) (defn core-every? [pred coll] - (var result true) - (each x (realize-for-iteration coll) - (if (not (pred x)) (do (set result false) (break)))) - result) + # Short-circuit on the first false — and pull lazily so an infinite seq with an + # early false (e.g. (every? pos? (range))) returns rather than hanging. Walks + # cells via realize-ls directly (core-first/lazy-from are defined later). + (if (lazy-seq? coll) + (do + (var cur coll) (var result true) (var go true) + (while (and result go) + (let [cell (realize-ls cur)] + (if (or (nil? cell) (= :jolt/pending cell) (= 0 (length cell))) + (set go false) + (if (pred (in cell 0)) + (let [rt (in cell 1)] + (if (nil? rt) (set go false) (set cur (make-lazy-seq rt)))) + (set result false))))) + result) + (do + (var result true) + (each x (realize-for-iteration coll) + (if (not (pred x)) (do (set result false) (break)))) + result))) # ============================================================ # Math — Clojure semantics (variadic, / with one arg = reciprocal) diff --git a/test/integration/lazy-infinite-test.janet b/test/integration/lazy-infinite-test.janet index 4d94b30..a3fabfc 100644 --- a/test/integration/lazy-infinite-test.janet +++ b/test/integration/lazy-infinite-test.janet @@ -50,6 +50,8 @@ ["take 4 interleave range iterate" "(quote (0 10 1 11))" "(take 4 (interleave (range) (iterate inc 10)))"] ["take 4 reductions + range" "(quote (0 1 3 6))" "(take 4 (reductions + (range)))"] ["take 3 tree-seq infinite" "(quote (0 0 0))" "(take 3 (tree-seq (fn [_] true) (fn [n] [n]) 0))"] + ["every? short-circuits on inf" "false" "(every? pos? (range))"] + ["not-every? short-circuits on inf" "true" "(not-every? pos? (range))"] ["take 3 partition 2 range" "(quote ((0 1) (2 3) (4 5)))" "(take 3 (partition 2 (range)))"] ["take 3 partition-all 2 range" "(quote ((0 1) (2 3) (4 5)))" "(take 3 (partition-all 2 (range)))"] ["take 3 map-indexed vector range" "(quote ([0 0] [1 1] [2 2]))" "(take 3 (map-indexed vector (range)))"]