more tests

Author: bobzhang

jscomp/runtime/js.ml

@@ -62,7 +62,7 @@ type + 'a null_undefined = 'a nullable
     this type is the same as {!Js.Null_undefined.t}*)
 
 external toOpt : 'a nullable  -> 'a option = "#null_undefined_to_opt"
-external nullable : 'a nullable -> bool = "#is_nil_undef"
+external test : 'a nullable -> bool = "#is_nil_undef"
 
 type boolean
 (** The JS boolean type, can be [Js.true_] or [Js.false_] *)

jscomp/runtime/js.mli

@@ -74,7 +74,7 @@ type + 'a nullable
 type + 'a null_undefined = 'a nullable    
 
 external toOpt : 'a nullable  -> 'a option = "#null_undefined_to_opt"
-external nullable : 'a nullable -> bool = "#is_nil_undef"
+external test : 'a nullable -> bool = "#is_nil_undef"
 
 type boolean
 (** The value could be either  {!Js.true_} or {!Js.false_}.

jscomp/test/.depend

@@ -310,6 +310,7 @@ js_math_test.cmj : mt.cmj ../runtime/js.cmj
 js_null_test.cmj : mt.cmj ../runtime/js_null.cmj
 js_null_undefined_test.cmj : mt.cmj ../others/js_null_undefined.cmj \
     ../runtime/js.cmj
+js_nullable_test.cmj : mt.cmj ../runtime/js.cmj
 js_obj_test.cmj : mt.cmj ../others/js_obj.cmj ../stdlib/array.cmj
 js_option_test.cmj : mt.cmj ../runtime/js.cmj
 js_promise_basic_test.cmj : ../stdlib/obj.cmj mt.cmj ../stdlib/list.cmj \

jscomp/test/Makefile

@@ -179,7 +179,8 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	gpr_1817_test\
 	gpr_1822_test\
 	bs_unwrap_test\
-	dollar_escape_test
+	dollar_escape_test\
+	js_nullable_test
 
 # bs_uncurry_test
 # needs Lam to get rid of Uncurry arity first

jscomp/test/js_null_undefined_test.js

@@ -92,7 +92,7 @@ var suites_001 = /* :: */[
                   (function () {
                       return /* Eq */Block.__(0, [
                                 /* false */0,
-                                +(/* () */0 == null)
+                                /* false */0
                               ]);
                     })
                 ],
@@ -249,7 +249,7 @@ var suites_001 = /* :: */[
                                             /* tuple */[
                                               "File \"js_null_undefined_test.ml\", line 42, characters 2-9",
                                               (function () {
-                                                  return /* Ok */Block.__(4, [1 - +(3 == null)]);
+                                                  return /* Ok */Block.__(4, [/* true */1]);
                                                 })
                                             ],
                                             /* [] */0

jscomp/test/js_null_undefined_test.ml

@@ -42,7 +42,7 @@ let suites = Mt.[
   __LOC__, (fun _ -> 
     Ok(
       let null =3 in 
-      not (Js.nullable (Js.Nullable.return null ))
+      not (Js.test (Js.Nullable.return null ))
     )
   )
 ]

jscomp/test/js_nullable_test.js

@@ -0,0 +1,46 @@
+'use strict';
+
+var Mt    = require("./mt.js");
+var Block = require("../../lib/js/block.js");
+
+var suites = [/* [] */0];
+
+var test_id = [0];
+
+function eq(loc, x, y) {
+  test_id[0] = test_id[0] + 1 | 0;
+  suites[0] = /* :: */[
+    /* tuple */[
+      loc + (" id " + test_id[0]),
+      (function () {
+          return /* Eq */Block.__(0, [
+                    x,
+                    y
+                  ]);
+        })
+    ],
+    suites[0]
+  ];
+  return /* () */0;
+}
+
+function f(x, y) {
+  console.log("no inline");
+  return x + y | 0;
+}
+
+eq("File \"js_nullable_test.ml\", line 13, characters 7-14", /* false */0, /* false */0);
+
+eq("File \"js_nullable_test.ml\", line 15, characters 7-14", +(f(1, 2) == null), /* false */0);
+
+eq("File \"js_nullable_test.ml\", line 17, characters 6-13", +((null) == null), /* true */1);
+
+eq("File \"js_nullable_test.ml\", line 21, characters 3-10", /* false */0, /* false */0);
+
+Mt.from_pair_suites("js_nullable_test.ml", suites[0]);
+
+exports.suites  = suites;
+exports.test_id = test_id;
+exports.eq      = eq;
+exports.f       = f;
+/*  Not a pure module */

jscomp/test/js_nullable_test.ml

@@ -0,0 +1,22 @@
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = 
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
+
+let f x y = 
+  Js.log "no inline";
+  Js.Nullable.return (x + y)
+
+;; eq  __LOC__ (Js.test (Js.Nullable.return 3 )) false
+
+;; eq  __LOC__ (Js.test ((f 1 2) )) false
+
+;; eq __LOC__ (Js.test [%raw "null"]) true 
+
+;; let null2 = Js.Nullable.return 3 in 
+let null = null2 in 
+eq __LOC__ (Js.test null) false
+;; Mt.from_pair_suites __FILE__ !suites

jscomp/test/test_zero_nullable.js

@@ -262,7 +262,7 @@ function f10$2(x) {
   return +(x == null);
 }
 
-var f11$2 = +(3 == null);
+var f11$2 = /* false */0;
 
 var Test_null_def = /* module */[
   /* f1 */f1$2,