Fix macroexpansion of methods in deftype* and reify*

It looks like deftype* and reify* no longer accept the
multiple-arglist-function syntax, so we can't use expand-fn
for expanding methods any more.

Author: khinsen

src/main/clojure/clojure/tools/macro.clj

@@ -148,24 +148,19 @@
       (cons f bodies)
       (cons f (cons name bodies)))))
 
-(defn- expand-method
-  "Handle a method in a deftype* or reify* form."
-  [m]
-  (rest (expand-fn (cons 'fn* m))))
-
 (defn- expand-deftype
   "Handle deftype* forms."
   [[symbol typename classname fields implements interfaces & methods]]
   (assert (= implements :implements))
-  (let [expanded-methods (map expand-method methods)]
+  (let [expanded-methods (map #(expand-args % 2) methods)]
     (concat
      (list symbol typename classname fields implements interfaces)
      expanded-methods)))
 
 (defn- expand-reify
   "Handle reify* forms."
   [[symbol interfaces & methods]]
-  (let [expanded-methods (map expand-method methods)]
+  (let [expanded-methods (map #(expand-args % 2) methods)]
     (cons symbol (cons interfaces expanded-methods))))
 
 ; Handlers for special forms that require special treatment. The default