fix: return JS null value from Expression.null (#83)

grain-lang · Mar 16, 2021 · 61861e2 · 61861e2
1 parent 3bdb23d
commit 61861e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/js/expression.ml b/js/expression.ml
@@ -179,8 +179,7 @@ let tuple_extract wasm_mod tuple index =
 let pop wasm_mod typ =
   meth_call global##.binaryen "_BinaryenPop" [| inject wasm_mod; inject typ |]
 
-(* TODO: Figure this out *)
-let null () = Obj.magic ()
+let null () = pure_js_expr "null"
 
 let print expr =
   let text = meth_call global##.binaryen "emitText" [| inject expr |] in

diff --git a/test/test.expected b/test/test.expected
@@ -5,6 +5,10 @@
  (export "memory" (memory $0))
  (func $adder (param $0 i32) (param $1 i32) (result i32)
   (block $add (result i32)
+   (if
+    (i32.const 0)
+    (unreachable)
+   )
    (i32.add
     (select
      (local.get $0)

diff --git a/test/test.ml b/test/test.ml
@@ -20,7 +20,10 @@ let select =
 
 let bin = Expression.binary wasm_mod Op.add_int32 select (y ())
 
-let add = Expression.block wasm_mod ~return_type:Type.int32 "add" [ bin ]
+let add = Expression.block wasm_mod ~return_type:Type.int32 "add" [
+  Expression.if_ wasm_mod (Expression.const wasm_mod (Literal.int32 0l)) (Expression.unreachable wasm_mod) (Expression.null ());
+  bin 
+]
 
 (* Create the add function *)
 let adder = Function.add_function wasm_mod "adder" params results [||] add