[#440] Aliases in protocol functions should work

babashka · Nov 10, 2020 · c7c223a · c7c223a
1 parent 31acbf0
commit c7c223a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/src/sci/impl/protocols.cljc b/src/sci/impl/protocols.cljc
@@ -62,7 +62,7 @@
         `(do ~@(map (fn [[type & meths]]
                       `(do
                          ~@(map (fn [meth]
-                                  `(defmethod ~(fq-meth-name (str (first meth)))
+                                  `(defmethod ~(fq-meth-name (name (first meth)))
                                      ~type
                                      ~(second meth) ~@(nnext meth)))
                                 meths)))
@@ -101,7 +101,7 @@
                         fq-meth-name #(symbol pns %)]
                     `(do
                        ~@(map (fn [meth]
-                                `(defmethod ~(fq-meth-name (str (first meth)))
+                                `(defmethod ~(fq-meth-name (name (first meth)))
                                    ~type ~(second meth) ~@(nnext meth)))
                               meths)))) proto+meths))))
 

diff --git a/test/sci/protocols_test.cljc b/test/sci/protocols_test.cljc
@@ -91,7 +91,40 @@
                           (str/replace "String" "js/String")))]
     (is (true? (tu/eval* prog #?(:clj {}
                                  :cljs {:classes {:allow :all
-                                                  'js #js {:String js/String}}}))))))
+                                                  'js #js {:String js/String}}})))))
+  (testing "Aliases are allowed and ignored"
+    (let [prog "
+(ns foo) (defprotocol Foo (foo [this]))
+(ns bar (:require [foo :as f]))
+
+(extend-type String
+  f/Foo
+  (f/foo [this] (subs this 0 1)))
+
+(= \"f\" (f/foo \"foo\"))
+"
+          prog #?(:clj prog
+                  :cljs (-> prog
+                            (str/replace "String" "js/String")))]
+      (is (true? (tu/eval* prog #?(:clj {}
+                                   :cljs {:classes {:allow :all
+                                                    'js #js {:String js/String}}})))))
+    (let [prog "
+(ns foo) (defprotocol Foo (foo [this]))
+(ns bar (:require [foo :as f]))
+
+(extend-protocol f/Foo
+  String
+  (f/foo [this] (subs this 0 1)))
+
+(= \"f\" (f/foo \"foo\"))
+"
+          prog #?(:clj prog
+                  :cljs (-> prog
+                            (str/replace "String" "js/String")))]
+      (is (true? (tu/eval* prog #?(:clj {}
+                                   :cljs {:classes {:allow :all
+                                                    'js #js {:String js/String}}})))))))
 
 (deftest extend-via-metadata-test
   (let [prog "