Skip to content

Commit d77bc71

Browse files
author
dnolen
committed
CLJS-1733: Macro inference issue for macros & runtime vars with the same name
:rename pass must also check that found renames may also be macros
1 parent b49c198 commit d77bc71

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/clojure/cljs/analyzer.cljc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1824,11 +1824,15 @@
18241824
(defn check-rename-macros-inferring-missing
18251825
[{:keys [name renames] :as ast} env]
18261826
(let [missing-renames (when (and *analyze-deps* (seq renames))
1827-
(missing-renames (:renames ast) env))
1827+
(missing-renames renames env))
1828+
maybe-macros (apply dissoc renames (keys missing-renames))
18281829
missing-rename-macros (inferred-rename-macros missing-renames env)
18291830
remove-missing-renames #(apply dissoc % (keys missing-renames))
18301831
ast' (-> ast
1831-
(update-in [:rename-macros] merge missing-rename-macros)
1832+
(update-in [:rename-macros]
1833+
#(-> %
1834+
(merge missing-rename-macros)
1835+
(merge (inferred-rename-macros maybe-macros env))))
18321836
(update-in [:renames] remove-missing-renames))]
18331837
(swap! env/*compiler*
18341838
#(-> %

0 commit comments

Comments
 (0)