fix rescript-lang#5021

Author: bobzhang

jscomp/core/js_long.ml

@@ -73,14 +73,19 @@ let of_int32 (args : J.expression list) =
   | _ -> int64_call  "of_int32" args
 
 let comp (cmp : Lam_compat.comparison) args = 
-  E.runtime_call  Js_runtime_modules.int64
+  E.runtime_call  Js_runtime_modules.caml_primitive
     (match cmp with 
-     | Ceq -> "eq"
-     | Cneq -> "neq"
-     | Clt -> "lt"
-     | Cgt -> "gt"
-     | Cle -> "le"
-     | Cge -> "ge") args 
+     | Ceq -> "i64_eq"
+     | Cneq -> "i64_neq"
+     | Clt -> "i64_lt"
+     | Cgt -> "i64_gt"
+     | Cle -> "i64_le"
+     | Cge -> "i64_ge") args 
+let min args = 
+  E.runtime_call Js_runtime_modules.caml_primitive "i64_min" args 
+let max args = 
+  E.runtime_call Js_runtime_modules.caml_primitive "i64_max" args   
+  
 
 let neg args = 
   int64_call "neg" args
@@ -161,10 +166,6 @@ let compare (args : J.expression list) =
 (* let get64 = int64_call "get64" *)
 let float_of_bits  =  int64_call "float_of_bits" 
 let bits_of_float = int64_call "bits_of_float"
-let min args = 
-  int64_call "min" args 
-let max args = 
-  int64_call "max" args
 
 
 let equal_null args =   

jscomp/ext/js_runtime_modules.ml

@@ -39,7 +39,7 @@ let hash = "Caml_hash"
 
 let curry = "Curry"
 
-let caml_primitive = "Caml_primitive"
+let caml_primitive = "Caml"
 let int64 = "Caml_int64"
 let md5 = "Caml_md5"
 let int32 = "Caml_int32"

jscomp/runtime/caml_primitive.ml jscomp/runtime/caml.ml

@@ -72,7 +72,27 @@ let caml_string_max (x : string) y =
   if x > y then x else y 
 let caml_int32_max (x : int32) y   = 
   if x > y then x else y 
+type i64 = Caml_int64_extern.t
+let i64_eq ( x : i64) (y : i64) = 
+  x.lo = y.lo && x.hi = y.hi
 
+let  i64_ge ( {hi; lo } : i64)  ( {hi = other_hi; lo = other_lo}: i64) : bool =
+  if hi > other_hi then true
+  else if hi < other_hi then false
+  else  lo  >=  other_lo
 
+let i64_neq x y = Pervasives.not (i64_eq x y)
+let i64_lt x y  = Pervasives.not (i64_ge x y)
+let i64_gt ( x : i64) ( y : i64) =
+  if x.hi > y.hi then
+    true
+  else if x.hi < y.hi  then
+    false
+  else
+    x.lo >  y.lo
 
 
+let i64_le x y = Pervasives.not (i64_gt x y)
+
+let i64_min x y = if i64_lt x  y then x else y 
+let i64_max x y = if i64_gt x y then x else y 

jscomp/runtime/caml_primitive.mli jscomp/runtime/caml.mli

@@ -54,3 +54,13 @@ val caml_float_max : float selector
 val caml_string_max : string selector  
 
 val caml_int32_max : int32 selector 
+
+val i64_eq : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+val i64_neq : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+val i64_lt : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+val i64_gt : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+val i64_le : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+val i64_ge : Caml_int64_extern.t -> Caml_int64_extern.t -> bool
+
+val i64_min : Caml_int64_extern.t -> Caml_int64_extern.t -> Caml_int64_extern.t
+val i64_max : Caml_int64_extern.t -> Caml_int64_extern.t -> Caml_int64_extern.t

jscomp/runtime/caml_int64.ml

@@ -34,9 +34,19 @@
 
 
 
-let (>>>~) = Caml_nativeint_extern.shift_right_logical
-let ( +~ ) = Caml_nativeint_extern.add
-let ( *~ ) = Caml_nativeint_extern.mul
+let %private 
+{
+  shift_right_logical =  (>>>~);
+  add = (+~);
+  mul = ( *~ )
+} = 
+  (module Caml_nativeint_extern)
+
+let {i64_eq = eq ;
+  i64_ge = ge;
+  i64_gt = gt;
+  } = (module Caml) 
+
 let lognot x =  x lxor (-1)
 
 (* [hi] is signed 
@@ -45,7 +55,9 @@ let lognot x =  x lxor (-1)
    signedness does not matter when they are doing int32 bits operation   
    however, they are different when doing comparison
 *)
-type t =   {  hi : int ; [@as "0"] lo : int ; [@as "1" ]  }
+type t =   Caml_int64_extern.t = {
+  hi : int ; [@as "0"] lo : int ; [@as "1" ] 
+}
 
 external unsafe_to_int64 : t -> int64 = "%identity"           
 external unsafe_of_int64 : int64 -> t = "%identity"
@@ -109,7 +121,7 @@ let add
 
 (* let not ( {lo; hi })  = mk ~lo:(lognot lo) ~hi:(lognot hi) *)
 
-let eq ( x) ( y) = x.hi = y.hi && x.lo = y.lo
+
 
 let equal_null x y =    
   match Js.nullToOption y with 
@@ -276,29 +288,11 @@ let and_ ( {lo = this_lo; hi= this_hi}) ( {lo = other_lo; hi = other_hi}) =
    however (x>>>0 >>>0) is not that bad
 *)
 
-type comparison = t -> t -> bool
 
-let  ge ( {hi; lo } : t)  ( {hi = other_hi; lo = other_lo}) : bool =
-  if hi > other_hi then true
-  else if hi < other_hi then false
-  else  lo  >=  other_lo
 
 
 
-let neq x y = Pervasives.not (eq x y)
-let lt x y  = Pervasives.not (ge x y)
-let gt ( x) ( y) =
-  if x.hi > y.hi then
-    true
-  else if x.hi < y.hi  then
-    false
-  else
-    x.lo >  y.lo
-
 
-let le x y = Pervasives.not (gt x y)
-let min x y = if lt x  y then x else y 
-let max x y = if gt x y then x else y 
 
 let to_float ( {hi; lo} : t) = 
   Caml_nativeint_extern.to_float ( hi *~ [%raw{|0x100000000|}] +~ lo)

jscomp/runtime/caml_int64.mli

@@ -54,21 +54,13 @@ val or_ : t -> t -> t
 val and_ : t -> t -> t 
 
 
-type comparison = t -> t -> bool 
-val ge : comparison
-val eq : comparison
-val neq : comparison
-val lt : comparison
-val gt : comparison
-val le : comparison
+
 
 
 val equal_null : t -> t Js.null -> bool 
 val equal_undefined : t -> t Js.undefined -> bool 
 val equal_nullable : t -> t Js.nullable -> bool 
 
-val min : t -> t -> t 
-val max : t -> t -> t
 
 val to_float : t -> float
 val of_float : float -> t

jscomp/runtime/caml_int64_extern.ml

@@ -1,8 +1,12 @@
+
+
 external of_int : int -> int64 = "%int64_of_int"
 external add : int64 -> int64 -> int64 = "%int64_add"
 external sub : int64 -> int64 -> int64 = "%int64_sub"
 external mul : int64 -> int64 -> int64 = "%int64_mul"
 external div : int64 -> int64 -> int64 = "%int64_div"
 external logor : int64 -> int64 -> int64 = "%int64_or"
 external neg : int64 -> int64 = "%int64_neg"
-external to_int : int64 -> int = "%int64_to_int"
+external to_int : int64 -> int = "%int64_to_int"
+
+type t = {  hi : int ; [@as "0"] lo : int ; [@as "1" ]  }

jscomp/runtime/release.ninja

@@ -13,21 +13,23 @@ o runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.mli
     bsc_flags = -nostdlib -nopervasives
 o runtime/js.cmj runtime/js.cmi : cc runtime/js.ml
     bsc_flags = $bsc_no_open_flags
+o runtime/caml.cmj : cc_cmi runtime/caml.ml | runtime/caml.cmi runtime/caml_int64_extern.cmj
+o runtime/caml.cmi : cc runtime/caml.mli | runtime/bs_stdlib_mini.cmi runtime/caml_int64_extern.cmj runtime/js.cmi runtime/js.cmj
 o runtime/caml_array.cmj : cc_cmi runtime/caml_array.ml | runtime/caml_array.cmi runtime/caml_array_extern.cmj
 o runtime/caml_array.cmi : cc runtime/caml_array.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.ml | runtime/caml_bytes.cmi runtime/caml_string_extern.cmj
 o runtime/caml_bytes.cmi : cc runtime/caml_bytes.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float.cmj : cc_cmi runtime/caml_float.ml | runtime/caml_float.cmi runtime/caml_float_extern.cmj
 o runtime/caml_float.cmi : cc runtime/caml_float.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
+o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
 o runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/js.cmj
 o runtime/caml_hash.cmi : cc runtime/caml_hash.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml | runtime/caml_hash_primitive.cmi runtime/caml_string_extern.cmj
 o runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 o runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
+o runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
 o runtime/caml_int64.cmi : cc runtime/caml_int64.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
 o runtime/caml_io.cmi : cc runtime/caml_io.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -37,14 +39,12 @@ o runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.ml | runtime/caml_array_extern.
 o runtime/caml_md5.cmi : cc runtime/caml_md5.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_module.cmj : cc_cmi runtime/caml_module.ml | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
 o runtime/caml_module.cmi : cc runtime/caml_module.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/caml_primitive.cmj runtime/js.cmj
+o runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml.cmj runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
 o runtime/caml_obj.cmi : cc runtime/caml_obj.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_option.cmj : cc_cmi runtime/caml_option.ml | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 o runtime/caml_option.cmi : cc runtime/caml_option.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
 o runtime/caml_parser.cmj : cc_cmi runtime/caml_parser.ml | runtime/caml_parser.cmi
 o runtime/caml_parser.cmi : cc runtime/caml_parser.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_primitive.cmj : cc_cmi runtime/caml_primitive.ml | runtime/caml_primitive.cmi
-o runtime/caml_primitive.cmi : cc runtime/caml_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_splice_call.cmj : cc_cmi runtime/caml_splice_call.ml | runtime/caml_splice_call.cmi
 o runtime/caml_splice_call.cmi : cc runtime/caml_splice_call.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_string.cmj : cc_cmi runtime/caml_string.ml | runtime/caml_string.cmi runtime/caml_string_extern.cmj
@@ -62,4 +62,4 @@ o runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runti
 o runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
+o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj

jscomp/test/array_test.js

@@ -1,12 +1,12 @@
 'use strict';
 
 var Mt = require("./mt.js");
+var Caml = require("../../lib/js/caml.js");
 var List = require("../../lib/js/list.js");
 var $$Array = require("../../lib/js/array.js");
 var Curry = require("../../lib/js/curry.js");
 var Caml_obj = require("../../lib/js/caml_obj.js");
 var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_primitive = require("../../lib/js/caml_primitive.js");
 var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
@@ -323,7 +323,7 @@ var array_suites_1 = {
                           0,
                           1
                         ];
-                        $$Array.sort(Caml_primitive.caml_int_compare, u);
+                        $$Array.sort(Caml.caml_int_compare, u);
                         return {
                                 TAG: /* Eq */0,
                                 _0: Caml_obj.caml_equal([
@@ -342,7 +342,7 @@ var array_suites_1 = {
                           var v = $$Array.init(4, (function (i) {
                                   return i % 17;
                                 }));
-                          $$Array.sort(Caml_primitive.caml_int_compare, v);
+                          $$Array.sort(Caml.caml_int_compare, v);
                           return {
                                   TAG: /* Eq */0,
                                   _0: true,

jscomp/test/bs_array_test.js

@@ -1,14 +1,14 @@
 'use strict';
 
 var Mt = require("./mt.js");
+var Caml = require("../../lib/js/caml.js");
 var Curry = require("../../lib/js/curry.js");
 var Js_list = require("../../lib/js/js_list.js");
 var Caml_obj = require("../../lib/js/caml_obj.js");
 var Belt_List = require("../../lib/js/belt_List.js");
 var Js_vector = require("../../lib/js/js_vector.js");
 var Belt_Array = require("../../lib/js/belt_Array.js");
 var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_primitive = require("../../lib/js/caml_primitive.js");
 
 var suites = {
   contents: /* [] */0
@@ -1518,7 +1518,7 @@ b("File \"bs_array_test.ml\", line 327, characters 4-11", Belt_Array.cmp([
           1,
           2,
           3
-        ], Caml_primitive.caml_int_compare) < 0);
+        ], Caml.caml_int_compare) < 0);
 
 b("File \"bs_array_test.ml\", line 328, characters 4-11", Belt_Array.cmp([
           0,
@@ -1529,7 +1529,7 @@ b("File \"bs_array_test.ml\", line 328, characters 4-11", Belt_Array.cmp([
           1,
           2,
           3
-        ], Caml_primitive.caml_int_compare) > 0);
+        ], Caml.caml_int_compare) > 0);
 
 b("File \"bs_array_test.ml\", line 329, characters 4-11", Belt_Array.cmp([
           1,
@@ -1539,7 +1539,7 @@ b("File \"bs_array_test.ml\", line 329, characters 4-11", Belt_Array.cmp([
           0,
           1,
           2
-        ], Caml_primitive.caml_int_compare) > 0);
+        ], Caml.caml_int_compare) > 0);
 
 b("File \"bs_array_test.ml\", line 330, characters 4-11", Belt_Array.cmp([
           1,
@@ -1549,7 +1549,7 @@ b("File \"bs_array_test.ml\", line 330, characters 4-11", Belt_Array.cmp([
           1,
           2,
           3
-        ], Caml_primitive.caml_int_compare) === 0);
+        ], Caml.caml_int_compare) === 0);
 
 b("File \"bs_array_test.ml\", line 331, characters 4-11", Belt_Array.cmp([
           1,
@@ -1559,7 +1559,7 @@ b("File \"bs_array_test.ml\", line 331, characters 4-11", Belt_Array.cmp([
           1,
           2,
           3
-        ], Caml_primitive.caml_int_compare) > 0);
+        ], Caml.caml_int_compare) > 0);
 
 eq("File \"bs_array_test.ml\", line 334, characters 5-12", Belt_Array.getBy([
           1,

jscomp/test/bs_hashmap_test.js

@@ -1,12 +1,12 @@
 'use strict';
 
 var Mt = require("./mt.js");
+var Caml = require("../../lib/js/caml.js");
 var Belt_Id = require("../../lib/js/belt_Id.js");
 var Hashtbl = require("../../lib/js/hashtbl.js");
 var Belt_Array = require("../../lib/js/belt_Array.js");
 var Belt_HashMap = require("../../lib/js/belt_HashMap.js");
 var Belt_SortArray = require("../../lib/js/belt_SortArray.js");
-var Caml_primitive = require("../../lib/js/caml_primitive.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js");
 
@@ -32,7 +32,7 @@ function eq(x, y) {
 
 var hash = Hashtbl.hash;
 
-var cmp = Caml_primitive.caml_int_compare;
+var cmp = Caml.caml_int_compare;
 
 var Y = Belt_Id.hashable(hash, eq);
 

jscomp/test/bs_hashtbl_string_test.js

@@ -1,10 +1,10 @@
 'use strict';
 
+var Caml = require("../../lib/js/caml.js");
 var Belt_Id = require("../../lib/js/belt_Id.js");
 var Hashtbl = require("../../lib/js/hashtbl.js");
 var Belt_HashMap = require("../../lib/js/belt_HashMap.js");
 var Belt_MapDict = require("../../lib/js/belt_MapDict.js");
-var Caml_primitive = require("../../lib/js/caml_primitive.js");
 var Belt_HashMapInt = require("../../lib/js/belt_HashMapInt.js");
 var Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js");
 var Belt_HashMapString = require("../../lib/js/belt_HashMapString.js");
@@ -139,7 +139,7 @@ function bench3(m) {
       };
 }
 
-var Sx = Belt_Id.comparable(Caml_primitive.caml_string_compare);
+var Sx = Belt_Id.comparable(Caml.caml_string_compare);
 
 function bench4(param) {
   var table = Belt_internalBucketsType.make(undefined, undefined, 1000000);