Skip to content

Commit fbfa114

Browse files
committed
CLJS-3362: some-fn has different short-circuiting when using 3 predicates
1 parent 51a5b05 commit fbfa114

File tree

4 files changed

+387
-4
lines changed

4 files changed

+387
-4
lines changed

src/main/cljs/cljs/core.cljs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4683,8 +4683,8 @@ reduces them without incurring seq initialization"
46834683
(fn ep3
46844684
([] true)
46854685
([x] (boolean (and (p1 x) (p2 x) (p3 x))))
4686-
([x y] (boolean (and (p1 x) (p2 x) (p3 x) (p1 y) (p2 y) (p3 y))))
4687-
([x y z] (boolean (and (p1 x) (p2 x) (p3 x) (p1 y) (p2 y) (p3 y) (p1 z) (p2 z) (p3 z))))
4686+
([x y] (boolean (and (p1 x) (p1 y) (p2 x) (p2 y) (p3 x) (p3 y))))
4687+
([x y z] (boolean (and (p1 x) (p1 y) (p1 z) (p2 x) (p2 y) (p2 z) (p3 x) (p3 y) (p3 z))))
46884688
([x y z & args] (boolean (and (ep3 x y z)
46894689
(every? #(and (p1 %) (p2 %) (p3 %)) args))))))
46904690
([p1 p2 p3 & ps]
@@ -4722,8 +4722,8 @@ reduces them without incurring seq initialization"
47224722
(fn sp3
47234723
([] nil)
47244724
([x] (or (p1 x) (p2 x) (p3 x)))
4725-
([x y] (or (p1 x) (p2 x) (p3 x) (p1 y) (p2 y) (p3 y)))
4726-
([x y z] (or (p1 x) (p2 x) (p3 x) (p1 y) (p2 y) (p3 y) (p1 z) (p2 z) (p3 z)))
4725+
([x y] (or (p1 x) (p1 y) (p2 x) (p2 y) (p3 x) (p3 y)))
4726+
([x y z] (or (p1 x) (p1 y) (p1 z) (p2 x) (p2 y) (p2 z) (p3 x) (p3 y) (p3 z)))
47274727
([x y z & args] (or (sp3 x y z)
47284728
(some #(or (p1 %) (p2 %) (p3 %)) args)))))
47294729
([p1 p2 p3 & ps]

0 commit comments

Comments
 (0)