Permalink
Browse files

CLJ-975: bugfix.

:as destructuring option is not colliding anymore.

Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>
  • Loading branch information...
1 parent de6341b commit 92b0573ee935038feb319196b909a30ca9ab5680 @neotyk neotyk committed with stuarthalloway Apr 20, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 src/clj/clojure/core.clj
View
@@ -3929,10 +3929,14 @@
ret))))
pmap
(fn [bvec b v]
- (let [gmap (or (:as b) (gensym "map__"))
+ (let [gmap (gensym "map__")
defaults (:or b)]
(loop [ret (-> bvec (conj gmap) (conj v)
- (conj gmap) (conj `(if (seq? ~gmap) (apply hash-map ~gmap) ~gmap)))
+ (conj gmap) (conj `(if (seq? ~gmap) (apply hash-map ~gmap) ~gmap))
+ ((fn [ret]
+ (if (:as b)
+ (conj ret (:as b) gmap)
+ ret))))
bes (reduce1
(fn [bes entry]
(reduce1 #(assoc %1 %2 ((val entry) %2))

0 comments on commit 92b0573

Please sign in to comment.