File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 283283 (reset! -cljs-macros-loaded true )
284284 (if *cljs-macros-is-classpath*
285285 (load *cljs-macros-path*)
286- (load-file *cljs-macros-path*))
287- (intern-macros 'cljs.core) ))
286+ (load-file *cljs-macros-path*)))
287+ (intern-macros 'cljs.core))
288288
289289(defmacro with-core-macros
290290 [path & body]
14591459 (select-keys ns-info merge-keys))))
14601460 ns-info))
14611461 ns-info)]
1462- (swap! env/*compiler* assoc -in [::namespaces name] ns-info)
1462+ (swap! env/*compiler* update -in [::namespaces name] merge ns-info)
14631463 (merge {:env env :op :ns :form form}
14641464 (cond-> ns-info
14651465 (@reload :use )
Original file line number Diff line number Diff line change 2020 (try
2121 (ana/resolve-var env sym
2222 (ana/confirm-var-exists-throw ))
23- (catch Exception e)))
23+ (catch Exception e
24+ (ana/resolve-macro-var env sym))))
2425
2526(defn all-ns
2627 " Return all namespaces. Analagous to clojure.core/all-ns but
You can’t perform that action at this time.
0 commit comments