added parameter destructuring support to reify and deftype/record

bwanab · Apr 27, 2010 · bf8bb79 · bf8bb79
1 parent db3466e
commit bf8bb79
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
@@ -3043,6 +3043,24 @@
      (even? (count bindings)) "an even number of forms in binding vector")
   `(let* ~(destructure bindings) ~@body))
 
+(defn ^{:private true}
+  maybe-destructured
+  [params body]
+  (if (every? symbol? params)
+    (cons params body)
+    (loop [params params
+           new-params []
+           lets []]
+      (if params
+        (if (symbol? (first params))
+          (recur (next params) (conj new-params (first params)) lets)
+          (let [gparam (gensym "p__")]
+            (recur (next params) (conj new-params gparam)
+                   (-> lets (conj (first params)) (conj gparam)))))
+        `(~new-params
+          (let ~lets
+            ~@body))))))
+
 ;redefine fn with destructuring and pre/post conditions
 (defmacro fn
   "(fn name? [params* ] exprs*)
@@ -3077,20 +3095,7 @@
                               (concat (map (fn* [c] `(assert ~c)) pre) 
                                       body)
                               body)]
-                   (if (every? symbol? params)
-                     (cons params body)
-                     (loop [params params
-                            new-params []
-                            lets []]
-                       (if params
-                         (if (symbol? (first params))
-                           (recur (next params) (conj new-params (first params)) lets)
-                           (let [gparam (gensym "p__")]
-                             (recur (next params) (conj new-params gparam)
-                                    (-> lets (conj (first params)) (conj gparam)))))
-                         `(~new-params
-                           (let ~lets
-                             ~@body)))))))
+                   (maybe-destructured params body)))
           new-sigs (map psig sigs)]
       (with-meta
         (if name

diff --git a/src/clj/clojure/core_deftype.clj b/src/clj/clojure/core_deftype.clj
@@ -50,7 +50,9 @@
                        set
                        (disj 'Object 'java.lang.Object)
                        vec)
-        methods (apply concat (vals impls))]
+        methods (map (fn [[name params & body]]
+                       (cons name (maybe-destructured params body)))
+                     (apply concat (vals impls)))]
     (when-let [bad-opts (seq (remove #{:no-print} (keys opts)))]
       (throw (IllegalArgumentException. (apply print-str "Unsupported option(s) -" bad-opts))))
     [interfaces methods opts]))