Merge pull request rescript-lang#982 from bloomberg/gpr_974

fix grr rescript-lang#974

Author: bobzhang

Diff for: .travis.yml

@@ -9,5 +9,6 @@ node_js:
 # This delays notification
 
 # Not a very reliable service..  
-script: npm run coveralls
+# script: npm run coveralls
+# FIXME: instrumentation takes too much time
 

Diff for: jscomp/all.depend

@@ -353,8 +353,7 @@ core/lam_dispatch_primitive.cmx : core/js_stmt_make.cmx \
     core/js_of_lam_tuple.cmx core/js_of_lam_option.cmx \
     core/js_of_lam_exception.cmx core/js_of_lam_array.cmx core/js_long.cmx \
     core/js_exp_make.cmx common/js_config.cmx core/js_analyzer.cmx core/j.cmx \
-    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    core/lam_dispatch_primitive.cmi
+    common/ext_log.cmx ext/ext_list.cmx core/lam_dispatch_primitive.cmi
 core/lam_exit_code.cmx : core/lam.cmx core/lam_exit_code.cmi
 core/lam_group.cmx : core/lam_util.cmx core/lam_print.cmx core/lam.cmx \
     core/js_number.cmx ext/ident_set.cmx core/lam_group.cmi

Diff for: jscomp/bin/whole_compiler.ml

@@ -79063,6 +79063,9 @@ There are two things we need consider:
 2.  For some standard library functions, we prefer to replace with javascript primitives
     For example [Pervasives["^"] -> ^]
     We can collect all mli files in OCaml and replace it with an efficient javascript runtime
+
+TODO: return type to be expression is ugly, 
+   we should allow return block    
 *)
 let translate (prim_name : string) 
     (args : J.expression list) : J.expression  =
@@ -80027,10 +80030,13 @@ let translate (prim_name : string)
         | Var _ -> 
           E.econd (E.is_undef e) Js_of_lam_option.none (Js_of_lam_option.some e)
         | _ -> 
+          call Js_config.js_primitive  
+        (* # GPR 974
           let id = Ext_ident.create "v" in
           let tmp = E.var id in
           E.(seq (assign tmp e ) 
                (econd (is_undef tmp) Js_of_lam_option.none (Js_of_lam_option.some tmp)) )
+        *)
         end
 
       | _ -> assert false 
@@ -80042,11 +80048,14 @@ let translate (prim_name : string)
         begin match e.expression_desc with 
         | Var _ -> 
           E.econd (E.is_nil e) Js_of_lam_option.none (Js_of_lam_option.some e)
-        | _ -> 
+        | _ ->
+          call Js_config.js_primitive
+         (* GPR #974
           let id = Ext_ident.create "v" in
           let tmp = E.var id in
           E.(seq (assign tmp e ) 
                (econd (is_nil tmp) Js_of_lam_option.none (Js_of_lam_option.some tmp)) )
+          *)
         end
 
       | _ -> assert false 

Diff for: jscomp/core/lam_dispatch_primitive.ml

@@ -40,6 +40,9 @@ There are two things we need consider:
 2.  For some standard library functions, we prefer to replace with javascript primitives
     For example [Pervasives["^"] -> ^]
     We can collect all mli files in OCaml and replace it with an efficient javascript runtime
+
+TODO: return type to be expression is ugly, 
+   we should allow return block    
 *)
 let translate (prim_name : string) 
     (args : J.expression list) : J.expression  =
@@ -1004,10 +1007,13 @@ let translate (prim_name : string)
         | Var _ -> 
           E.econd (E.is_undef e) Js_of_lam_option.none (Js_of_lam_option.some e)
         | _ -> 
+          call Js_config.js_primitive  
+        (* # GPR 974
           let id = Ext_ident.create "v" in
           let tmp = E.var id in
           E.(seq (assign tmp e ) 
                (econd (is_undef tmp) Js_of_lam_option.none (Js_of_lam_option.some tmp)) )
+        *)
         end
 
       | _ -> assert false 
@@ -1019,11 +1025,14 @@ let translate (prim_name : string)
         begin match e.expression_desc with 
         | Var _ -> 
           E.econd (E.is_nil e) Js_of_lam_option.none (Js_of_lam_option.some e)
-        | _ -> 
+        | _ ->
+          call Js_config.js_primitive
+         (* GPR #974
           let id = Ext_ident.create "v" in
           let tmp = E.var id in
           E.(seq (assign tmp e ) 
                (econd (is_nil tmp) Js_of_lam_option.none (Js_of_lam_option.some tmp)) )
+          *)
         end
 
       | _ -> assert false 

Diff for: jscomp/runtime/js_primitive.ml

@@ -35,6 +35,13 @@ let js_from_nullable_def ( x : 'a Js.null_undefined) =
     None 
   else Some (Obj.magic x : 'a)
 
+let js_from_def ( x : 'a Js.undefined) = 
+    if (Obj.magic x) == Js.undefined then None 
+    else Some (Obj.magic x : 'a)
+
+let js_from_nullable ( x : 'a Js.null) = 
+  if (Obj.magic x) == Js.null then None 
+  else Some (Obj.magic x : 'a) 
 
 let option_get (x : 'a option) : 'a Js_undefined.t = 
   match x with 

Diff for: jscomp/runtime/js_primitive.mli

@@ -29,4 +29,8 @@ val js_is_nil_undef : 'a Js.null_undefined -> bool
 
 val js_from_nullable_def : 'a Js.null_undefined -> 'a option
 
+val js_from_def : 'a Js.undefined -> 'a option 
+
+val js_from_nullable : 'a Js.null -> 'a option
+
 val option_get : 'a option -> 'a Js_undefined.t 

Diff for: jscomp/test/.depend

@@ -183,6 +183,7 @@ gpr_658.cmj : ../runtime/js.cmj
 gpr_858_test.cmj : ../stdlib/list.cmj
 gpr_858_unit2_test.cmj :
 gpr_904_test.cmj : mt.cmj
+gpr_974_test.cmj : ../runtime/js.cmj
 guide_for_ext.cmj :
 hamming_test.cmj : ../stdlib/printf.cmj mt.cmj ../stdlib/lazy.cmj \
     ../stdlib/int64.cmj ../stdlib/buffer.cmj

Diff for: jscomp/test/Makefile

@@ -71,7 +71,7 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	flow_parser_reg_test	utf8_decode_test stream_parser_test condition_compilation_test semver_test update_record_test installation_test app_root_finder derive_projector_test\
 	gpr_904_test gpr_858_unit2_test inner_unused \
 	bal_set_common bal_tree string_set string_set_test \
-	math_test bal_set_mini
+	math_test bal_set_mini gpr_974_test
 
 
 

Diff for: jscomp/test/gpr_974_test.js

@@ -0,0 +1,40 @@
+'use strict';
+
+var Caml_obj                = require("../../lib/js/caml_obj");
+var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
+var Js_primitive            = require("../../lib/js/js_primitive");
+
+if (!Caml_obj.caml_equal(Js_primitive.js_from_nullable_def(""), /* Some */[""])) {
+  throw [
+        Caml_builtin_exceptions.assert_failure,
+        [
+          "gpr_974_test.ml",
+          5,
+          4
+        ]
+      ];
+}
+
+if (!Caml_obj.caml_equal(Js_primitive.js_from_def(""), /* Some */[""])) {
+  throw [
+        Caml_builtin_exceptions.assert_failure,
+        [
+          "gpr_974_test.ml",
+          6,
+          4
+        ]
+      ];
+}
+
+if (!Caml_obj.caml_equal(Js_primitive.js_from_nullable(""), /* Some */[""])) {
+  throw [
+        Caml_builtin_exceptions.assert_failure,
+        [
+          "gpr_974_test.ml",
+          7,
+          4
+        ]
+      ];
+}
+
+/*  Not a pure module */

Diff for: jscomp/test/gpr_974_test.ml

@@ -0,0 +1,8 @@
+
+
+let _ = 
+  begin 
+    assert (Js.Null_undefined.to_opt (Js.Null_undefined.return "" ) = Some "");
+    assert (Js.Undefined.to_opt (Js.Undefined.return "" ) = Some "");
+    assert (Js.Null.to_opt (Js.Null.return "") = Some "") 
+  end

Diff for: jscomp/test/map_test.ml

@@ -30,7 +30,7 @@ let int_map_suites = let open Mt in Int_map.[
 
   "iteration", (fun _ -> 
     let m = ref String_map.empty in
-    let count = 10000 in
+    let count = 1_0000 in
     for i = 0 to count do 
       m := String_map.add (string_of_int i) (string_of_int i) !m
     done;

Diff for: lib/js/caml_weak.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var Caml_obj   = require("./caml_obj");
-var Caml_array = require("./caml_array");
+var Caml_obj     = require("./caml_obj");
+var Caml_array   = require("./caml_array");
+var Js_primitive = require("./js_primitive");
 
 function caml_weak_create(n) {
   return new Array(n);
@@ -18,13 +19,7 @@ function caml_weak_set(xs, i, v) {
 }
 
 function caml_weak_get(xs, i) {
-  v = xs[i];
-  if (v === undefined) {
-    return /* None */0;
-  }
-  else {
-    return [v];
-  }
+  return Js_primitive.js_from_def(xs[i]);
 }
 
 function caml_weak_get_copy(xs, i) {

Diff for: lib/js/js_primitive.js

@@ -19,6 +19,24 @@ function js_from_nullable_def(x) {
   }
 }
 
+function js_from_def(x) {
+  if (x === undefined) {
+    return /* None */0;
+  }
+  else {
+    return /* Some */[x];
+  }
+}
+
+function js_from_nullable(x) {
+  if (x === null) {
+    return /* None */0;
+  }
+  else {
+    return /* Some */[x];
+  }
+}
+
 function option_get(x) {
   if (x) {
     return x[0];
@@ -30,5 +48,7 @@ function option_get(x) {
 
 exports.js_is_nil_undef      = js_is_nil_undef;
 exports.js_from_nullable_def = js_from_nullable_def;
+exports.js_from_def          = js_from_def;
+exports.js_from_nullable     = js_from_nullable;
 exports.option_get           = option_get;
 /* No side effect */