Fix #817: mutation should be visible in protocol method

babashka · Oct 20, 2022 · b29e94a · b29e94a
1 parent 7c9dbd9
commit b29e94a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/sci/impl/resolve.cljc b/src/sci/impl/resolve.cljc
@@ -143,9 +143,16 @@
                               :cljs (:mutable m))))
               v (if call? ;; resolve-symbol is already handled in the call case
                   (mark-resolve-sym k idx)
-                  (let [v (cond-> (->Node
-                                   (aget ^objects bindings idx)
-                                   nil)
+                  (let [v (cond-> (if mutable?
+                                    (let [ext-map (second (lookup ctx '__sci_this false))]
+                                      (->Node
+                                       (let [this (sci.impl.types/eval ext-map ctx bindings)
+                                             inner (sci.impl.types/getVal this)]
+                                         (get inner sym))
+                                       nil))
+                                    (->Node
+                                     (aget ^objects bindings idx)
+                                     nil))
                             #?@(:clj [tag (with-meta
                                             {:tag tag})])
                             mutable? (vary-meta assoc :mutable true))]

diff --git a/test/sci/records_test.cljc b/test/sci/records_test.cljc
@@ -189,6 +189,12 @@
       (tu/eval* (str/replace "(defprotocol IFoo (setField [_]) (getField [_])) (deftype Foo [^:volatile-mutable a] IFoo (setField [_] (set! a 10)) (getField [_] a)) (getField (doto (->Foo) (setField)))"
                              "^:volatile-mutable" #?(:clj "^:volatile-mutable"
                                                      :cljs "^:mutable")) {})))
+  (is (= [1 2 2]
+         (tu/eval* (str/replace "(defprotocol ICounter (inc! [_])) (deftype Cnt [^:volatile-mutable n] ICounter (inc! [_] (let [old-n n new-n-set (set! n (inc n)) new-n n] [old-n new-n-set new-n]))) (inc! (->Cnt 1))"
+                                "^:volatile-mutable" #?(:clj "^:volatile-mutable"
+                                                        :cljs "^:mutable"))
+                   {})))
+
   #?(:clj
      (is (re-find #"#object\[user.Foo" (sci/with-out-str (sci/eval-string "(deftype Foo []) (prn (->Foo))" {:namespaces {'clojure.core {'print-method print-method}} :classes {:allow :all}})))))
   #?(:clj