remove unnecessary destructuring-reify

Nathan Marz · Nathan Marz · commit b26070c39b8b · 2012-03-21T04:24:42.000-07:00
diff --git a/src/clj/backtype/storm/clojure.clj b/src/clj/backtype/storm/clojure.clj
@@ -44,7 +44,7 @@
 (defmacro bolt [& body]
   (let [[bolt-fns other-fns] (split-with #(not (symbol? %)) body)
         fns (normalize-fns bolt-fns)]
-    `(destructuring-reify IBolt
+    `(reify IBolt
        ~@fns
        ~@other-fns)))
 
@@ -55,7 +55,7 @@
 (defmacro spout [& body]
   (let [[spout-fns other-fns] (split-with #(not (symbol? %)) body)
         fns (normalize-fns spout-fns)]
-    `(destructuring-reify ISpout
+    `(reify ISpout
        ~@fns
        ~@other-fns)))
 
diff --git a/src/clj/backtype/storm/util.clj b/src/clj/backtype/storm/util.clj
@@ -591,20 +591,3 @@
   (let [entries (->> zipfile (ZipFile.) .entries enumeration-seq (map (memfn getName)))]
     (some? #(.startsWith % (str target "/")) entries)
     ))
-
-(defn destructure-method [[name args & body]]
-  (let [[newargs subs] (reduce (fn [[args submap] val]
-                         (if (symbol? val)
-                           [(conj args val) submap]
-                           (let [newsym (gensym)]
-                             [(conj args newsym) (assoc submap newsym val)]
-                             )))
-                         [[] {}]
-                         args)
-        let-bindings (forcat [[sym val] subs] [val sym])]
-  `(~name ~newargs (let [~@let-bindings] ~@body))
-  ))
-
-(defmacro destructuring-reify [& args]
-  (let [args (map #(if (list? %) (destructure-method %) %) args)]
-    `(reify ~@args )))
