yooo

Author: borkdude

src/sci/impl/copy_vars.cljc

@@ -4,7 +4,7 @@
    [sci.impl.cljs]
    [sci.impl.macros :as macros]
    [sci.impl.utils :as utils :refer [clojure-core-ns]]
-   [sci.lang])
+   [sci.lang :as lang])
   #?(:cljs (:require-macros [sci.impl.copy-vars :refer [copy-var copy-core-var macrofy]])))
 
 #?(:clj (set! *warn-on-reflection* true))
@@ -106,14 +106,14 @@
       ;; NOTE: emit as little code as possible, so our JS bundle is as small as possible
       (if macro
         (macros/? :clj
-                  #?(:clj  `(sci.lang.Var. ~(deref the-var) ~nm ~varm false ~ctx nil)
-                     :cljs `(sci.lang.Var. ~init ~nm ~varm false ~ctx nil))
-                  :cljs `(sci.lang.Var. ~init ~nm ~varm false ~ctx nil))
+                  #?(:clj  `(utils/->Var ~(deref the-var) ~nm ~varm false ~ctx nil)
+                     :cljs `(utils/->Var ~init ~nm ~varm false ~ctx nil))
+                  :cljs `(utils/->Var ~init ~nm ~varm false ~ctx nil))
         (if elide-vars
             (if (or dyn ctx)
-              `(sci.lang.Var. ~init ~nm ~varm false ~ctx nil)
+              `(utils/->Var ~init ~nm ~varm false ~ctx nil)
               sym)
-           `(sci.lang.Var. ~init ~nm ~varm false ~ctx nil)))))
+            `(utils/->Var ~init ~nm ~varm false ~ctx nil)))))
   (defmacro copy-core-var
     [sym]
     `(copy-var ~sym clojure-core-ns {:copy-meta-from ~(core-sym sym)}))

src/sci/impl/namespaces.cljc

@@ -1931,19 +1931,19 @@
  (def clojure-edn-namespace (sci.lang/->Namespace 'clojure.edn nil))
 
  (def macroexpand-all
-   (sci.lang.Var. (fn [ctx form]
-                    (clojure.walk/prewalk
-                     (fn [x]
-                       (if (seq? x)
-                         (@sci.impl.utils/macroexpand* ctx x) x))
-                     form))
-                  'macroexpand-all
-                  {:ns clojure-walk-namespace
-                   :name 'macroexpand-all
-                   :doc "Recursively performs all possible macroexpansions in form."}
-                  false
-                  true
-                  nil))
+   (utils/->Var (fn [ctx form]
+                  (clojure.walk/prewalk
+                   (fn [x]
+                     (if (seq? x)
+                       (@sci.impl.utils/macroexpand* ctx x) x))
+                   form))
+                'macroexpand-all
+                {:ns clojure-walk-namespace
+                 :name 'macroexpand-all
+                 :doc "Recursively performs all possible macroexpansions in form."}
+                false
+                true
+                nil))
 
  (def clojure-walk-ns
    {:obj clojure-walk-namespace
@@ -1963,7 +1963,7 @@
  )
 
 (macros/usetime
- 
+
  ;; #_#?(:clj (alter-var-root #'clojure-core assoc
  ;;                       'locking (macrofy 'locking locking*)
  ;;                       '-locking-impl (copy-var -locking-impl clojure-core-ns))

src/sci/impl/utils.cljc

@@ -1,6 +1,6 @@
 (ns sci.impl.utils
   {:no-doc true}
-  (:refer-clojure :exclude [eval demunge var?])
+  (:refer-clojure :exclude [eval demunge var? ->Var])
   (:require [clojure.string :as str]
             [sci.impl.macros :as macros]
             [sci.impl.types :as t]
@@ -276,13 +276,17 @@
   (let [curr-ns @current-ns]
     (if (symbol? curr-ns) curr-ns (t/getName curr-ns))))
 
+(defn ->Var [root sym meta thread-bound needs-ctx watches]
+  (let [root (if needs-ctx (vars/->CtxFn root) root)]
+    (sci.lang.Var. root sym meta thread-bound needs-ctx watches)))
+
 (defn new-var
   "Returns a new sci var."
   ([name] (doto (new-var name nil nil false)
             (vars/unbind)))
   ([name init-val] (new-var name init-val (meta name) false))
   ([name init-val meta] (new-var name init-val meta false))
-  ([name init-val meta ctx?] (sci.lang.Var. init-val name (assoc meta :name (unqualify-symbol name)) false ctx? nil)))
+  ([name init-val meta ctx?] (->Var init-val name (assoc meta :name (unqualify-symbol name)) false ctx? nil)))
 
 (defn var? [x]
   (instance? sci.lang.Var x))

src/sci/impl/vars.cljc

@@ -74,8 +74,7 @@
   (dynamic? [this]))
 
 (defprotocol CtxVar
-  (needs-ctx? [this])
-  (needs-ctx! [this]))
+  (needs-ctx? [this]))
 
 (extend-type #?(:clj Object :cljs default)
   DynVar
@@ -206,6 +205,57 @@
 (defn built-in-var? [var-meta]
   (:sci/built-in var-meta))
 
+(deftype CtxFn [f]
+  ;; #?(:cljs Fn) ;; In the real CLJS this is there... why?
+  #?(:clj clojure.lang.IFn :cljs IFn)
+  (#?(:clj invoke :cljs -invoke) [_this]
+    (f))
+  (#?(:clj invoke :cljs -invoke) [_this a]
+    (f a))
+  (#?(:clj invoke :cljs -invoke) [_this a b]
+    (f a b))
+  (#?(:clj invoke :cljs -invoke) [_this a b c]
+    (f a b c))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d]
+    (f a b c d))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e]
+    (f a b c d e))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f]
+    (f a b c d e f))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g]
+    (f a b c d e f g))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h]
+    (f a b c d e f g h))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i]
+    (f a b c d e f g h i))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j]
+    (f a b c d e f g h i j))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k]
+    (f a b c d e f g h i j k))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l]
+    (f a b c d e f g h i j k l))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m]
+    (f a b c d e f g h i j k l m))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n]
+    (f a b c d e f g h i j k l m n))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o]
+    (f a b c d e f g h i j k l m n o))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p]
+    (f a b c d e f g h i j k l m n o p))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p q]
+    (f a b c d e f g h i j k l m n o p q))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p q r]
+    (f a b c d e f g h i j k l m n o p q r))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p q r s]
+    (f a b c d e f g h i j k l m n o p q r s))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p q r s t]
+    (f a b c d e f g h i j k l m n o p q r s t))
+  (#?(:clj invoke :cljs -invoke) [_this a b c d e f g h i j k l m n o p q r s t rest]
+    (apply f a b c d e f g h i j k l m n o p q r s t rest))
+  #?(:clj
+     (applyTo [_this args]
+              (apply f args))))
+
 (macros/deftime
   (defmacro with-writeable-var
     [the-var var-meta & body]

src/sci/lang.cljc

@@ -251,8 +251,8 @@
      (applyTo [this args]
               (apply @this args)))
   vars/CtxVar
-  (needs-ctx? [_] needs-ctx)
-  (needs-ctx! [_] (set! needs-ctx true)))
+  (needs-ctx? [_] (when needs-ctx
+                    (instance? sci.impl.vars.CtxFn root))))
 
 #?(:clj
    ;; Use public interface for print-method so it can be overriden in bb itself