CLJS-405: fix reify regression caused by CLJS-369 and add test.

clojure · Oct 23, 2012 · a6fa901 · a6fa901
1 parent a7715c6
commit a6fa901
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/clj/cljs/compiler.clj b/src/clj/cljs/compiler.clj
@@ -49,12 +49,10 @@
                       shadow (recur (inc d) shadow)
                       (@ns-first-segments (str name)) (inc d)
                       :else d))
-            name (if field
-                   (str "self__." name)
-                   name)]
-        (if (zero? depth)
-          (munge name reserved)
-          (symbol (str (munge name reserved) "__$" depth))))
+            munged-name (munge (if field (str "self__." name) name) reserved)]
+        (if (or field (zero? depth))
+          munged-name
+          (symbol (str munged-name "__$" depth))))
       ; String munging
       (let [ss (string/replace (str s) #"\/(.)" ".$1") ; Division is special
             ss (apply str (map #(if (reserved %) (str % "$") %)

diff --git a/test/cljs/cljs/core_test.cljs b/test/cljs/cljs/core_test.cljs
@@ -1687,5 +1687,17 @@
         uuid (UUID. uuid-str)]
     (assert (= (pr-str uuid) (str "#uuid \"" uuid-str "\""))))
 
+  ;; CLJS-405
+
+  (defprotocol IBar (-bar [this x]))
+
+  (defn baz [f]
+    (reify
+      IBar
+      (-bar [_ x]
+        (f x))))
+
+  (assert (= 2 (-bar (baz inc) 1)))
+
   :ok
   )