Skip to content

Commit 5e7fd72

Browse files
authored
- add ana/get-aliases helper (#123)
- use consistently
1 parent c260cea commit 5e7fd72

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

src/main/clojure/cljs/analyzer.cljc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@
674674
(with-meta {:sym reader-fn}))]))
675675
(into {})))))
676676

677-
#?(:clj
677+
#?(:clj
678678
(def load-data-readers (memoize load-data-readers*)))
679679

680680
#?(:clj
@@ -4369,6 +4369,12 @@
43694369
(resolve-var (assoc @env/*compiler* :ns (get-namespace *cljs-ns*))
43704370
sym)))))
43714371

4372+
(defn get-aliases
4373+
"Get all alias maps for a namespace."
4374+
[ns]
4375+
(apply merge
4376+
((juxt :requires :require-macros :as-aliases)
4377+
(get-namespace ns))))
43724378

43734379
#?(:clj
43744380
(defn forms-seq*
@@ -4391,10 +4397,7 @@
43914397
(lazy-seq
43924398
(let [form (binding [*ns* (create-ns *cljs-ns*)
43934399
reader/*data-readers* data-readers
4394-
reader/*alias-map*
4395-
(apply merge
4396-
((juxt :requires :require-macros :as-aliases)
4397-
(get-namespace *cljs-ns*)))
4400+
reader/*alias-map* (get-aliases *cljs-ns*)
43984401
reader/resolve-symbol resolve-symbol]
43994402
(reader/read opts pbr))]
44004403
(if (identical? form eof-sentinel)

src/main/clojure/cljs/core/server.clj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,7 @@
9393
reader/resolve-symbol ana/resolve-symbol
9494
reader/*data-readers* (merge tags/*cljs-data-readers*
9595
(ana/load-data-readers))
96-
reader/*alias-map*
97-
(apply merge
98-
((juxt :requires :require-macros :as-aliases)
99-
(ana/get-namespace ana/*cljs-ns*)))]
96+
reader/*alias-map* (ana/get-aliases ana/*cljs-ns*)]
10097
(reader/read+string {:eof EOF :read-cond :allow :features #{:cljs}}
10198
in-reader))]
10299
(try

src/main/clojure/cljs/repl.cljc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,10 +1145,7 @@
11451145
reader/resolve-symbol ana/resolve-symbol
11461146
reader/*data-readers* (merge tags/*cljs-data-readers*
11471147
(ana/load-data-readers))
1148-
reader/*alias-map*
1149-
(apply merge
1150-
((juxt :requires :require-macros :as-aliases)
1151-
(ana/get-namespace ana/*cljs-ns*)))]
1148+
reader/*alias-map* (ana/get-aliases ana/*cljs-ns*)]
11521149
(try
11531150
(read request-prompt request-exit)
11541151
(catch Throwable e

0 commit comments

Comments
 (0)