Use meta in favor of deprecated ^.

mstump · Dec 8, 2009 · 74d6b5c · 74d6b5c
1 parent 19a4911
commit 74d6b5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/swank/commands/basic.clj b/src/swank/commands/basic.clj
@@ -182,7 +182,7 @@
     (list :designator symbol-name
           (cond
             macro? :macro
-            (:arglists ^var) :function
+            (:arglists (meta var)) :function
             :else :variable)
           (apply str (concat arglists (if macro? d2 d1))))))
 
@@ -207,16 +207,16 @@ Sorted alphabetically by namespace name and then symbol name, except
 that symbols accessible in the current namespace go first."
   [x y]
   (let [accessible?
-        (fn [var] (= (ns-resolve (maybe-ns *current-package*) (:name ^var))
+        (fn [var] (= (ns-resolve (maybe-ns *current-package*) (:name (meta var)))
                      var))
         ax (accessible? x) ay (accessible? y)]
     (cond
-      (and ax ay) (compare (:name ^x) (:name ^y))
+      (and ax ay) (compare (:name (meta x)) (:name (meta y)))
       ax -1
       ay 1
-      :else (let [nx (str (:ns ^x)) ny (str (:ns ^y))]
+      :else (let [nx (str (:ns (meta x))) ny (str (:ns (meta y)))]
               (if (= nx ny)
-                (compare (:name ^x) (:name ^y))
+                (compare (:name (meta x)) (:name (meta y)))
                 (compare nx ny))))))
 
 (defslimefn apropos-list-for-emacs

diff --git a/src/swank/commands/contrib/swank_fuzzy.clj b/src/swank/commands/contrib/swank_fuzzy.clj
@@ -159,7 +159,7 @@
     (map (fn [[match-result score var sym]]
            (if (var? var)
              (struct fuzzy-matching
-                     var nil (or (:name ^var)
+                     var nil (or (:name (meta var))
                                  (symbol (pr-str var)))
                      nil
                      score nil match-result)
@@ -265,7 +265,7 @@
   (let [make-var-meta (fn [m]
                         (fn [key]
                           (when-let [var (:var m)]
-                            (when-let [var-meta ^var]
+                            (when-let [var-meta (meta var)]
                               (get var-meta key)))))
         vm (make-var-meta m)]
     (set

diff --git a/src/swank/commands/indent.clj b/src/swank/commands/indent.clj
@@ -58,7 +58,7 @@
    Otherwise return nil"
   ([find-in-cache var]
      (when-let [indent (var-indent-representation var)]
-       (let [name (:name ^var)]
+       (let [name (:name (meta var))]
          (when-not (= (find-in-cache name) indent)
            [name indent])))))