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 283
283
(reset! -cljs-macros-loaded true )
284
284
(if *cljs-macros-is-classpath*
285
285
(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))
288
288
289
289
(defmacro with-core-macros
290
290
[path & body]
1459
1459
(select-keys ns-info merge-keys))))
1460
1460
ns-info))
1461
1461
ns-info)]
1462
- (swap! env/*compiler* assoc -in [::namespaces name] ns-info)
1462
+ (swap! env/*compiler* update -in [::namespaces name] merge ns-info)
1463
1463
(merge {:env env :op :ns :form form}
1464
1464
(cond-> ns-info
1465
1465
(@reload :use )
Original file line number Diff line number Diff line change 20
20
(try
21
21
(ana/resolve-var env sym
22
22
(ana/confirm-var-exists-throw ))
23
- (catch Exception e)))
23
+ (catch Exception e
24
+ (ana/resolve-macro-var env sym))))
24
25
25
26
(defn all-ns
26
27
" Return all namespaces. Analagous to clojure.core/all-ns but
You can’t perform that action at this time.
0 commit comments