From dc8b3b8f133b218f915985e1094ad92e9fd9d789 Mon Sep 17 00:00:00 2001 From: Brandon Bloom Date: Sun, 2 Sep 2012 00:07:13 -0700 Subject: [PATCH] CLJS-408: Include :form key on fn :methods --- src/clj/cljs/analyzer.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/clj/cljs/analyzer.clj b/src/clj/cljs/analyzer.clj index 139dc4a..9d7c6c2 100644 --- a/src/clj/cljs/analyzer.clj +++ b/src/clj/cljs/analyzer.clj @@ -360,11 +360,11 @@ (when export-as {:export export-as}) (when init-expr {:children [init-expr]}))))) -(defn- analyze-fn-method [env locals meth type] - (let [param-names (first meth) +(defn- analyze-fn-method [env locals form type] + (let [param-names (first form) variadic (boolean (some '#{&} param-names)) param-names (vec (remove '#{&} param-names)) - body (next meth) + body (next form) [locals params] (reduce (fn [[locals params] name] (let [param {:name name :tag (-> name meta :tag) @@ -376,7 +376,7 @@ block (binding [*recur-frames* (cons recur-frame *recur-frames*)] (analyze-block (assoc env :context :return :locals locals) body))] (merge {:env env :variadic variadic :params params :max-fixed-arity fixed-arity - :type type :recurs @(:flag recur-frame)} + :type type :form form :recurs @(:flag recur-frame)} block))) (defmethod parse 'fn* -- 1.7.12