move float primitive into runtime

Author: bobzhang

jscomp/runtime/.depend

@@ -2,8 +2,8 @@ caml_array.cmj : caml_array.cmi
 caml_string.cmj : bs_string.cmj caml_string.cmi
 caml_bytes.cmj : caml_bytes.cmi
 caml_obj.cmj : js.cmj caml_array.cmj bs_obj.cmj caml_obj.cmi
-caml_int64.cmj : js.cmj caml_utils.cmj caml_int32.cmj bs_string.cmj \
-    caml_int64.cmi
+caml_int64.cmj : js.cmj caml_utils.cmj caml_int32.cmj caml_float.cmj \
+    bs_string.cmj caml_int64.cmi
 caml_exceptions.cmj : js.cmj caml_builtin_exceptions.cmj bs_obj.cmj \
     caml_exceptions.cmi
 caml_js_exceptions.cmj : caml_exceptions.cmj

jscomp/runtime/bs_stdlib_mini.mli

@@ -65,14 +65,6 @@ external ( -. ) : float -> float -> float = "%subfloat"
 external ( *. ) : float -> float -> float = "%mulfloat"
 external ( /. ) : float -> float -> float = "%divfloat"
 
-
-external log : float -> float =  "log" [@@bs.val] [@@bs.scope "Math"]
-external ceil : float -> float =  "ceil" [@@bs.val] [@@bs.scope "Math"]
-external floor : float -> float =  "floor" [@@bs.val] [@@bs.scope "Math"]
-external exp : float -> float =  "exp" [@@bs.val] [@@bs.scope "Math"]
-external sqrt : float -> float =  "sqrt" [@@bs.val] [@@bs.scope "Math"]
-
-
 external float : int -> float = "%floatofint"
 
 external int_of_float : float -> int = "%intoffloat"

jscomp/runtime/caml_float.ml

@@ -29,8 +29,10 @@
 external _LOG2E : float = "Math.LOG2E" [@@bs.val]
 external _LOG10E : float = "Math.LOG10E" [@@bs.val]
 external abs_float : float -> float = "Math.abs" [@@bs.val]
-external floor_float : float -> float = "Math.floor" [@@bs.val]
+external floor : float -> float = "Math.floor" [@@bs.val]
+external exp : float -> float =  "exp" [@@bs.val] [@@bs.scope "Math"]
 external log : float -> float = "Math.log" [@@bs.val]
+external sqrt : float -> float =  "sqrt" [@@bs.val] [@@bs.scope "Math"] 
 external max_float : float -> float -> float = "Math.max" [@@bs.val]
 external min_float : float -> float -> float = "Math.min" [@@bs.val]
 external pow_float : base:float -> exp:float -> float = "Math.pow" [@@bs.val]
@@ -86,7 +88,7 @@ let caml_frexp_float (x: float): float * int =
   else begin
     let neg = x < 0. in
     let x' = ref (abs_float x) in
-    let exp = ref (floor_float (_LOG2E *. log !x') +. 1.) in
+    let exp = ref (floor (_LOG2E *. log !x') +. 1.) in
     begin
       x' := !x' *. pow_float ~base:2. ~exp:(-.(!exp));
       if !x' < 0.5 then begin

jscomp/runtime/caml_float.mli

@@ -27,7 +27,7 @@
 
 
 (** *)
-
+external floor : float -> float = "Math.floor" [@@bs.val] 
 val caml_int32_float_of_bits : int32 -> float
 val caml_int32_bits_of_float : float -> int32
 

jscomp/runtime/caml_int64.ml

@@ -319,7 +319,9 @@ let rec of_float (x : float) : t =
          ~hi:(Nativeint.of_float (x /. two_ptr_32_dbl))
 
 
-external log2 : float = "Math.LN2" [@@bs.val]  
+external log2 : float = "LN2" [@@bs.val]  [@@bs.scope "Math"]
+external log : float -> float =  "log" [@@bs.val] [@@bs.scope "Math"]
+external ceil : float -> float =  "ceil" [@@bs.val] [@@bs.scope "Math"]
 (* external maxFloat : float -> float -> float = "Math.max" [@@bs.val] *)
 
 let rec div self other =
@@ -363,7 +365,7 @@ let rec div self other =
       (* assert false *)
       while ge !rem other  do
         let approx = ref ( Pervasives.max 1.
-             (floor (to_float !rem /. to_float other) )) in
+             (Caml_float.floor (to_float !rem /. to_float other) )) in
         let log2 = ceil (log !approx /. log2) in
         let delta =
           if log2 <= 48. then 1.

jscomp/test/caml_format_test.js

@@ -8,7 +8,6 @@ var Int64 = require("../../lib/js/int64.js");
 var $$Buffer = require("../../lib/js/buffer.js");
 var Format = require("../../lib/js/format.js");
 var Printf = require("../../lib/js/printf.js");
-var Caml_float = require("../../lib/js/caml_float.js");
 var Caml_int64 = require("../../lib/js/caml_int64.js");
 var Pervasives = require("../../lib/js/pervasives.js");
 var Caml_format = require("../../lib/js/caml_format.js");
@@ -189,7 +188,7 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at(/* :: */[
             (function (param) {
                 return /* Eq */Block.__(0, [
                           true,
-                          Caml_float.caml_classify_float(Caml_format.caml_float_of_string("nan")) === /* FP_nan */4
+                          Pervasives.classify_float(Caml_format.caml_float_of_string("nan")) === /* FP_nan */4
                         ]);
               })
           ],
@@ -213,7 +212,7 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at(/* :: */[
                                 (function (param) {
                                     return /* Eq */Block.__(0, [
                                               a,
-                                              Caml_float.caml_classify_float(Caml_format.caml_float_of_string(b))
+                                              Pervasives.classify_float(Caml_format.caml_float_of_string(b))
                                             ]);
                                   })
                               ];

jscomp/test/float_test.js

@@ -147,7 +147,7 @@ function from_pairs(ps) {
 
 var float_compare = Caml_primitive.caml_float_compare;
 
-var param = Caml_float.caml_classify_float(3);
+var param = Pervasives.classify_float(3);
 
 Mt_global.collect_eq(test_id, suites, "File \"float_test.ml\", line 47, characters 5-12", param, /* FP_normal */0);
 

jscomp/test/test_pervasive.js

@@ -56,6 +56,7 @@ var Pervasives$1 = /* module */[
   /* min_int */Pervasives.min_int,
   /* lnot */Pervasives.lnot,
   /* epsilon_float */Pervasives.epsilon_float,
+  /* classify_float */Pervasives.classify_float,
   /* char_of_int */Pervasives.char_of_int,
   /* string_of_bool */Pervasives.string_of_bool,
   /* bool_of_string */Pervasives.bool_of_string,

jscomp/test/test_pervasives2.js

@@ -57,6 +57,7 @@ var List$1 = /* module */[
   /* min_int */Pervasives.min_int,
   /* lnot */Pervasives.lnot,
   /* epsilon_float */Pervasives.epsilon_float,
+  /* classify_float */Pervasives.classify_float,
   /* char_of_int */Pervasives.char_of_int,
   /* string_of_bool */Pervasives.string_of_bool,
   /* bool_of_string */Pervasives.bool_of_string,
@@ -145,6 +146,7 @@ var U = /* module */[
   /* min_int */Pervasives.min_int,
   /* lnot */Pervasives.lnot,
   /* epsilon_float */Pervasives.epsilon_float,
+  /* classify_float */Pervasives.classify_float,
   /* char_of_int */Pervasives.char_of_int,
   /* string_of_bool */Pervasives.string_of_bool,
   /* bool_of_string */Pervasives.bool_of_string,

jscomp/test/test_pervasives3.js

@@ -12,6 +12,7 @@ var Pervasives$1 = /* module */[
   /* min_int */Pervasives.min_int,
   /* lnot */Pervasives.lnot,
   /* epsilon_float */Pervasives.epsilon_float,
+  /* classify_float */Pervasives.classify_float,
   /* char_of_int */Pervasives.char_of_int,
   /* string_of_bool */Pervasives.string_of_bool,
   /* bool_of_string */Pervasives.bool_of_string,

lib/whole_compiler.ml

@@ -95052,7 +95052,7 @@ let translate loc (prim_name : string)
       ->  Js_long.max args      
     | "caml_int32_float_of_bits"
     | "caml_int32_bits_of_float"
-    | "caml_classify_float"
+
     | "caml_modf_float"
     | "caml_ldexp_float"
     | "caml_frexp_float"