diff options
| -rw-r--r-- | src/clj/clojure/core_deftype.clj | 9 | ||||
| -rw-r--r-- | src/clj/clojure/core_proxy.clj | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/clj/clojure/core_deftype.clj b/src/clj/clojure/core_deftype.clj index 4ca47637..d0ae7c39 100644 --- a/src/clj/clojure/core_deftype.clj +++ b/src/clj/clojure/core_deftype.clj @@ -23,8 +23,9 @@ psig (fn [[name [& args]]] (vector name (vec (map tag args)) (tag name) (map meta args))) cname (with-meta (symbol (str (namespace-munge *ns*) "." name)) (meta name))] - `(do (gen-interface :name ~cname :methods ~(vec (map psig sigs))) - (import ~cname)))) + `(let [] + (gen-interface :name ~cname :methods ~(vec (map psig sigs))) + (import ~cname)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; reify/deftype ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -294,7 +295,7 @@ tag (keyword (str *ns*) (str name)) hinted-fields fields fields (vec (map #(with-meta % nil) fields))] - `(do + `(let [] ~(emit-defrecord name gname (vec hinted-fields) (vec interfaces) methods) (defmethod print-method ~classname [o# w#] ((var print-defrecord) o# w#)) @@ -386,7 +387,7 @@ tag (keyword (str *ns*) (str name)) hinted-fields fields fields (vec (map #(with-meta % nil) fields))] - `(do + `(let [] ~(emit-deftype* name gname (vec hinted-fields) (vec interfaces) methods) (import ~classname)))) diff --git a/src/clj/clojure/core_proxy.clj b/src/clj/clojure/core_proxy.clj index c88b1fe3..dc3514de 100644 --- a/src/clj/clojure/core_proxy.clj +++ b/src/clj/clojure/core_proxy.clj @@ -331,6 +331,8 @@ (clojure.lang.Compiler/writeClassFile cname bytecode))) pc-effect (apply get-proxy-class bases) pname (proxy-name super interfaces)] + ;remember the class to prevent it from disappearing before use + (intern *ns* (symbol pname) pc-effect) `(let [;pc# (get-proxy-class ~@class-and-interfaces) p# (new ~(symbol pname) ~@args)] ;(construct-proxy pc# ~@args)] (init-proxy p# |