Skip to content

Commit 030e866

Browse files
committed
Unbreak :compare-fn.
1 parent 668e05c commit 030e866

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/active/clojure/match.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256

257257
(s/def ::regex regex?)
258258
(s/def ::compare-fn-token #{:compare-fn})
259-
(s/def ::fn? #(or (ifn? %) (ifn? (eval %))))
259+
(s/def ::fn? any?)
260260
(s/def ::compare-fn (s/cat :compare-fn ::compare-fn-token :fn ::fn?))
261261

262262
(s/def ::or-token #{:or})

test/active/clojure/match_test.clj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@
274274
((p/map-matcher [(:x (:compare-fn even?))] ::even)
275275
{:x 42})))))
276276

277-
;; FIXME this should work
278-
;; (t/deftest closes-over-outer-variables-test
279-
;; (let [evt {:x "x"}]
280-
;; (p/map-matcher [(:x (:compare-fn #(= % (:x evt))))] x)))
277+
(t/deftest closes-over-outer-variables-test
278+
(let [evt {:x "x"}]
279+
(t/is (= "x"
280+
((p/map-matcher [(:x (:compare-fn #(= % (:x evt))))] x)
281+
evt)))))

0 commit comments

Comments
 (0)