Merge branch 'issue-44' into fixes-2022
This commit is contained in:
commit
be68293056
2 changed files with 17 additions and 2 deletions
|
|
@ -28,8 +28,10 @@
|
||||||
(unreduced-> (-> x# ~expr) ~@exprs)))))
|
(unreduced-> (-> x# ~expr) ~@exprs)))))
|
||||||
|
|
||||||
(defn- pair? [x] (and (vector? x) (= 2 (core/count x))))
|
(defn- pair? [x] (and (vector? x) (= 2 (core/count x))))
|
||||||
(defn- destructuring-pair? [x]
|
(let [kw-or-& #(or (keyword? %) (= '& %))]
|
||||||
(and (pair? x) (not (or (keyword? x) (= '& x)))))
|
(defn- destructuring-pair? [x]
|
||||||
|
(and (pair? x)
|
||||||
|
(not (kw-or-& (first x))))))
|
||||||
|
|
||||||
(defmacro for
|
(defmacro for
|
||||||
"Like clojure.core/for with the first expression being replaced by % (or _). Returns a transducer.
|
"Like clojure.core/for with the first expression being replaced by % (or _). Returns a transducer.
|
||||||
|
|
|
||||||
|
|
@ -142,3 +142,16 @@
|
||||||
(is (= (reverse (range 100)) (x/into [] (x/sort >) (shuffle (range 100)))))
|
(is (= (reverse (range 100)) (x/into [] (x/sort >) (shuffle (range 100)))))
|
||||||
(is (= (sort-by str (range 100)) (x/into [] (x/sort-by str) (shuffle (range 100)))))
|
(is (= (sort-by str (range 100)) (x/into [] (x/sort-by str) (shuffle (range 100)))))
|
||||||
(is (= (sort-by str (comp - compare) (range 100)) (x/into [] (x/sort-by str (comp - compare)) (shuffle (range 100))))))
|
(is (= (sort-by str (comp - compare) (range 100)) (x/into [] (x/sort-by str (comp - compare)) (shuffle (range 100))))))
|
||||||
|
|
||||||
|
(deftest destructuring-pair?
|
||||||
|
(let [destructuring-pair? #'x/destructuring-pair?]
|
||||||
|
(are [candidate expected]
|
||||||
|
(= expected (destructuring-pair? candidate))
|
||||||
|
'[a b] true
|
||||||
|
'[a b c] false
|
||||||
|
'[& foo] false
|
||||||
|
'[:as foo] false
|
||||||
|
1 false
|
||||||
|
'(a b) false
|
||||||
|
'{foo bar} false
|
||||||
|
'{foo :bar} false)))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue