Skip to content

Commit

Permalink
No need to use eval to calculate var
Browse files Browse the repository at this point in the history
  • Loading branch information
mfikes committed Feb 15, 2016
1 parent 7f1ded8 commit bed0734
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions planck-cljs/src-bundle/cljs/test.clj
Expand Up @@ -11,8 +11,7 @@
(:require [cljs.env :as env]
[cljs.analyzer :as ana]
[planck.test.ana-api :as ana-api]
[planck.test.template]
[planck.core]))
[planck.test.template]))

;; =============================================================================
;; Assertion Macros
Expand Down Expand Up @@ -86,7 +85,7 @@
`(do
(def ~(vary-meta name assoc :test `(fn [] ~@body))
(fn [] (cljs.test/test-var (@cljs.test$macros/vars ~id))))
(swap! vars assoc ~id (planck.core/eval ~(list 'var name)))
(swap! vars assoc ~id (~'var ~name))
nil))))

(defmacro async
Expand Down Expand Up @@ -194,7 +193,7 @@
(filter (fn [[_ v]] (:test v)))
(sort-by (fn [[_ v]] (:line v)))
(map (fn [[k _]]
`(planck.core/eval ~(list 'var (symbol (name ns) (name k)))))))])
`(~'var ~(symbol (name ns) (name k))))))])
[(fn []
(when (nil? env#)
(cljs.test/clear-env!)))]))))
Expand Down

0 comments on commit bed0734

Please sign in to comment.