add :ns meta to more vars (#604)

Co-authored-by: Michiel Borkent <[email protected]>
babashka · Aug 8, 2021 · ed26afa · ed26afa
1 parent bbf3588
commit ed26afa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/sci/addons/future.clj b/src/sci/addons/future.clj
@@ -1,9 +1,11 @@
 (ns sci.addons.future
   {:no-doc true}
   (:refer-clojure :exclude [future pmap])
+  (:require [sci.impl.namespaces :refer [copy-core-var core-var]])
   (:require [sci.impl.vars :as vars]))
 
-(def future* ^:sci/macro
+(def future* ^{:sci/macro true
+               :ns vars/clojure-core-ns}
   (fn [_ _ & body]
     `(let [f# (~'binding-conveyor-fn (fn [] ~@body))]
        (~'future-call f#))))
@@ -38,9 +40,9 @@
   (update-in opts [:namespaces 'clojure.core]
              assoc
              'future future*
-             'future-call future-call
-             'future-cancel future-cancel
-             'future-cancelled? future-cancelled?
-             'future-done? future-done?
-             'future? future?
-             'pmap pmap))
+             'future-call (copy-core-var future-call)
+             'future-cancel (copy-core-var future-cancel)
+             'future-cancelled? (copy-core-var future-cancelled?)
+             'future-done? (copy-core-var future-done?)
+             'future? (copy-core-var future?)
+             'pmap (core-var 'pmap pmap)))
diff --git a/src/sci/impl/opts.cljc b/src/sci/impl/opts.cljc
@@ -25,7 +25,8 @@
                      namespaces (-> namespaces
                                     (update 'user assoc :aliases aliases)
                                     (update 'clojure.core assoc 'global-hierarchy
-                                            (vars/->SciVar (make-hierarchy) 'global-hierarchy nil false)))
+                                            (vars/->SciVar (make-hierarchy) 'global-hierarchy
+                                              {:ns vars/clojure-core-ns} false)))
                      imports (if-let [env-imports (:imports env)]
                                (merge env-imports imports)
                                imports)]