From e5b7819ef66410a87b8072417dc2f09ac4ddb03f Mon Sep 17 00:00:00 2001 From: Tom Faulhaber Date: Fri, 11 Dec 2009 00:07:33 -0800 Subject: Changed all instances of ^x across contrib to (meta x) since the ^x form is being deprecated in 1.1 refs #48 --- clojurescript/src/clojure/contrib/clojurescript.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clojurescript') diff --git a/clojurescript/src/clojure/contrib/clojurescript.clj b/clojurescript/src/clojure/contrib/clojurescript.clj index 1b8d696a..a9db6d7b 100644 --- a/clojurescript/src/clojure/contrib/clojurescript.clj +++ b/clojurescript/src/clojure/contrib/clojurescript.clj @@ -147,7 +147,7 @@ n))) (defn- var-parts [e] - (let [{:keys [name ns]} ^(.var e)] + (let [{:keys [name ns]} (meta (.var e))] [(Compiler/munge (str (.getName ns))) (var-munge name)])) (defmethod tojs clojure.lang.Compiler$UnresolvedVarExpr [e ctx] @@ -318,7 +318,7 @@ (eval f) nil) (when-not (or (and (instance? Compiler$DefExpr mainexpr) - (skip-def (:name ^(.var mainexpr)))) + (skip-def (:name (meta (.var mainexpr))))) (and (instance? Compiler$InstanceMethodExpr mainexpr) (or (= "setMacro" (.methodName mainexpr)) (and (= "addMethod" (.methodName mainexpr)) -- cgit v1.2.3-18-g5258