luciano/mount
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaning macros (thx @DomKM)

Browse source 
removing reader conditionals from defstate, since this part of the macro is compiled by clojure (not cljs)

adding ":require-macros [mount.core :refer [defstate]]" to itself (mount.core) to obviate a need for mount clients to do ":require-macros"
This commit is contained in:
anatoly 2015-12-15 00:27:57 -05:00
parent d342b43f23
commit dc5b6c2614
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mount/core.cljc
View file

@ -2,7 +2,8 @@
#?(:clj (:require [mount.tools.macro :refer [on-error throw-runtime] :as macro]) #?(:clj (:require [mount.tools.macro :refer [on-error throw-runtime] :as macro])
:cljs (:require [mount.tools.macro :as macro] :cljs (:require [mount.tools.macro :as macro]
[mount.tools.cljs :as cljs])) [mount.tools.cljs :as cljs]))
#?(:cljs (:require-macros [mount.tools.macro :refer [on-error throw-runtime]]))) #?(:cljs (:require-macros [mount.tools.macro :refer [on-error throw-runtime]]
[mount.core :refer [defstate]])))
(defonce ^:private -args (atom :no-args)) ;; mostly for command line args and external files (defonce ^:private -args (atom :no-args)) ;; mostly for command line args and external files
(defonce ^:private state-seq (atom 0)) (defonce ^:private state-seq (atom 0))
@ -130,8 +131,7 @@
(defmacro defstate [state & body] (defmacro defstate [state & body]
(let [[state params] (macro/name-with-attributes state body) (let [[state params] (macro/name-with-attributes state body)
{:keys [start stop suspend resume] :as lifecycle} (apply hash-map params) {:keys [start stop suspend resume] :as lifecycle} (apply hash-map params)
state-name (with-ns #?(:clj *ns* state-name (with-ns *ns* state)
:cljs (cljs/this-ns)) state) ;; on cljs side (cljs.analyzer/*cljs-ns*) may do it, but still might not be good for :advanced
order (make-state-seq state-name) order (make-state-seq state-name)
sym (str state)] sym (str state)]
(validate lifecycle) (validate lifecycle)