Emit Var objects from dynamic defs

brandonbloom · Mar 18, 2012 · ea71556 · ea71556
1 parent 1c60dbc
commit ea71556
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/clj/cljs/compiler.clj b/src/clj/cljs/compiler.clj
@@ -344,8 +344,12 @@
   [{:keys [name init env doc export dynamic]}]
   (when init
     (emit-comment doc (:jsdoc init)))
-  (print name)
-  (print (str " = " (if init (emits init) "undefined")))
+  (print name "="
+    (let [inits (if init (emits init) "undefined")]
+      (if dynamic
+        (let [syms (with-out-str (emit-constant (symbol name)))]
+          (str "new cljs.core.Var(" syms ", " inits ")"))
+        inits)))
   (when-not (= :expr (:context env))
     (print ";\n"))
   (when export

diff --git a/src/cljs/cljs/core.cljs b/src/cljs/cljs/core.cljs
@@ -3046,6 +3046,8 @@ reduces them without incurring seq initialization"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Reference Types ;;;;;;;;;;;;;;;;
 
+(deftype Var [sym root])
+
 (deftype Atom [state meta validator watches]
   IEquiv
   (-equiv [o other] (identical? o other))