Added coercions for nil

weavejester · Mar 4, 2012 · db6c5a8 · db6c5a8
1 parent 3adacf5
commit db6c5a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/evaljs/rhino.clj b/src/evaljs/rhino.clj
@@ -17,7 +17,9 @@
   NativeArray
   (as-clojure [x] (vec (map as-clojure x)))
   Object
-  (as-clojure [x] x))
+  (as-clojure [x] x)
+  nil
+  (as-clojure [_] nil))
 
 (defprotocol AsJavascript
   (as-javascript [x]))
@@ -46,7 +48,9 @@
   Map
   (as-javascript [x] (native-object (for [[k v] x] [k (as-javascript v)])))
   Object
-  (as-javascript [x] x))
+  (as-javascript [x] x)
+  nil
+  (as-javascript [_] nil))
 
 (deftype RhinoContext [context scope]
   JSContext

diff --git a/test/evaljs/test/core.clj b/test/evaljs/test/core.clj
@@ -13,13 +13,15 @@
     (is (= (evaljs "10") 10))
     (is (= (evaljs "\"foo\"") "foo"))
     (is (= (evaljs "[1, 2]") [1 2]))
-    (is (= (evaljs "x={a:2};x") {"a" 2}))))
+    (is (= (evaljs "x={a:2};x") {"a" 2}))
+    (is (= (evaljs "null") nil))))
 
 (deftest import-vars
-  (with-context (rhino-context {:x 1, :s "foo", :k :a})
+  (with-context (rhino-context {:x 1, :s "foo", :k :a, :n nil})
     (is (= (evaljs "x") 1))
     (is (= (evaljs "s") "foo"))
-    (is (= (evaljs "k") "a")))
+    (is (= (evaljs "k") "a"))
+    (is (= (evaljs "n") nil)))
   (with-context (rhino-context {:x [1 2]})
     (is (= (evaljs "x") [1 2]))
     (is (= (evaljs "x[0]") 1)))