Skip to content

CLJS-3401: dedupe '+ and '_PLUS symbols with :optimize-constants #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2023
Merged

CLJS-3401: dedupe '+ and '_PLUS symbols with :optimize-constants #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/clojure/cljs/analyzer.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,16 @@
(symbol? value) "cst$sym$"
:else
(throw
#?(:clj (Exception. (str "constant type " (type value) " not supported"))
:cljs (js/Error. (str "constant type " (type value) " not supported")))))
#?(:clj (Exception. (str "constant type " (type value) " not supported"))
:cljs (js/Error. (str "constant type " (type value) " not supported")))))
name (if (keyword? value)
(subs (str value) 1)
(str value))
name (if (= "." name)
"_DOT_"
(-> name
(string/replace "_" "__")
(string/replace "$" "$$")
(string/replace "-" "_DASH_")
(munge)
(string/replace "." "$")
Expand Down
6 changes: 6 additions & 0 deletions src/test/clojure/cljs/analyzer_tests.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,3 +1512,9 @@
(Foo. nil nil)))))
(is (= 1 (count @ws)))
(is (string/starts-with? (first @ws) "Wrong number of args (2) passed to Foo"))))

(deftest test-cljs-3401
(is (not= (ana/gen-constant-id '_PLUS_)
(ana/gen-constant-id '+)))
(is (not= (ana/gen-constant-id 'foo.bar)
(ana/gen-constant-id 'foo$bar))))