continue to make stdlib_mini small

Author: bobzhang

jscomp/runtime/Makefile

@@ -28,7 +28,7 @@ caml_primitive.cmj: caml_primitive.cmi
 caml_int64.cmj : caml_obj.cmj
 bs_obj.cmj: js.cmi
 # or we can do a post-processing to add missing cmj dependency manually
-js_exn.cmj caml_js_exceptions.cmj : caml_exceptions.cmj
+caml_js_exceptions.cmj : caml_exceptions.cmj
 $(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj  block.cmj js.cmj  caml_primitive.cmj
 
 ## since we use ppx

jscomp/runtime/bs_stdlib_mini.mli

@@ -77,14 +77,6 @@ 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"]
 
-type in_channel
-
-type fpclass =
-    FP_normal           (** Normal number, none of the below *)
-  | FP_subnormal        (** Number very close to 0.0, has reduced precision *)
-  | FP_zero             (** Number is 0.0 or -0.0 *)
-  | FP_infinite         (** Number is positive or negative infinity *)
-  | FP_nan              (** Not a number: result of an undefined operation *)
 
 external float : int -> float = "%floatofint"
 

jscomp/runtime/caml_float.ml

@@ -39,7 +39,7 @@ external pow_float : base:float -> exp:float -> float = "Math.pow" [@@bs.val]
 
 let caml_int32_float_of_bits : int32 -> float = fun%raw x -> {|
     return new Float32Array(new Int32Array([x]).buffer)[0] 
-    |}
+|}
   (* let int32 = Int32_array.make [| x |] in
   let float32 = Float32_array.fromBuffer ( Int32_array.buffer int32) in
   Float32_array.unsafe_get float32 0 *)
@@ -50,17 +50,6 @@ let caml_int32_bits_of_float : float -> int32 = fun%raw x -> {|
   (* let float32 = Float32_array.make [|x|] in
   Int32_array.unsafe_get (Int32_array.fromBuffer (Float32_array.buffer float32)) 0 *)
 
-let caml_classify_float x : fpclass  =
-  if FloatRT.isFinite x then
-    if abs_float x >= 2.2250738585072014e-308  then
-      FP_normal
-    else if x <> 0. then FP_subnormal
-    else FP_zero
-  else
-  if FloatRT.isNaN x then
-    FP_nan
-  else FP_infinite
-
 
 let caml_modf_float (x : float) : float * float =
   if FloatRT.isFinite x then

jscomp/runtime/caml_float.mli

@@ -31,7 +31,6 @@
 val caml_int32_float_of_bits : int32 -> float
 val caml_int32_bits_of_float : float -> int32
 
-val caml_classify_float : float -> fpclass
 val caml_modf_float : float -> float * float
 
 val caml_ldexp_float : float -> int -> float

jscomp/runtime/caml_io.ml

@@ -24,7 +24,7 @@
 
 
 
-
+type in_channel
 
 
 (** *)

jscomp/stdlib-402/pervasives.ml

@@ -210,8 +210,21 @@ type fpclass =
   | FP_zero
   | FP_infinite
   | FP_nan
+#if BS then  
+let classify_float (x : float) : fpclass =   
+  if [%raw{|isFinite|}] x [@bs] then
+    if abs_float x >= 2.2250738585072014e-308  then
+      FP_normal
+    else if x <> 0. then FP_subnormal
+    else FP_zero
+  else
+  if [%raw{|isNaN|}] x [@bs] then
+    FP_nan
+  else FP_infinite
+  
+#else
 external classify_float : float -> fpclass = "caml_classify_float"
-
+#end
 (* String and byte sequence operations -- more in modules String and Bytes *)
 
 external string_length : string -> int = "%string_length"

jscomp/stdlib-402/pervasives.mli

@@ -597,8 +597,11 @@ type fpclass =
   | FP_nan              (** Not a number: result of an undefined operation *)
 (** The five classes of floating-point numbers, as determined by
    the {!Pervasives.classify_float} function. *)
-
+#if BS then
+val classify_float : float -> fpclass 
+#else
 external classify_float : float -> fpclass = "caml_classify_float"
+#end
 (** Return the class of the given floating-point number:
    normal, subnormal, zero, infinite, or not a number. *)
 

jscomp/stdlib-406/pervasives.ml

@@ -229,9 +229,21 @@ type fpclass =
   | FP_zero
   | FP_infinite
   | FP_nan
+#if BS then  
+let classify_float (x : float) : fpclass =   
+  if [%raw{|isFinite|}] x [@bs] then
+    if abs_float x >= 0x1p-1022(* 2.2250738585072014e-308*)  then
+      FP_normal
+    else if x <> 0. then FP_subnormal
+    else FP_zero
+  else
+  if [%raw{|isNaN|}] x [@bs] then
+    FP_nan
+  else FP_infinite  
+#else  
 external classify_float : (float [@unboxed]) -> fpclass =
   "caml_classify_float" "caml_classify_float_unboxed" [@@noalloc]
-
+#end
 (* String and byte sequence operations -- more in modules String and Bytes *)
 
 external string_length : string -> int = "%string_length"

jscomp/stdlib-406/pervasives.mli

@@ -652,9 +652,12 @@ type fpclass =
   | FP_nan              (** Not a number: result of an undefined operation *)
 (** The five classes of floating-point numbers, as determined by
    the {!Pervasives.classify_float} function. *)
-
+#if BS then
+val classify_float : float -> fpclass
+#else
 external classify_float : (float [@unboxed]) -> fpclass =
   "caml_classify_float" "caml_classify_float_unboxed" [@@noalloc]
+#end  
 (** Return the class of the given floating-point number:
    normal, subnormal, zero, infinite, or not a number. *)
 

lib/js/caml_float.js

@@ -3,28 +3,12 @@
 
 function caml_int32_float_of_bits (x){
     return new Float32Array(new Int32Array([x]).buffer)[0] 
-    };
+};
 
 function caml_int32_bits_of_float (x){ 
   return new Int32Array(new Float32Array([x]).buffer)[0] 
 };
 
-function caml_classify_float(x) {
-  if (isFinite(x)) {
-    if (Math.abs(x) >= 2.2250738585072014e-308) {
-      return /* FP_normal */0;
-    } else if (x !== 0) {
-      return /* FP_subnormal */1;
-    } else {
-      return /* FP_zero */2;
-    }
-  } else if (isNaN(x)) {
-    return /* FP_nan */4;
-  } else {
-    return /* FP_infinite */3;
-  }
-}
-
 function caml_modf_float(x) {
   if (isFinite(x)) {
     var neg = 1 / x < 0;
@@ -136,7 +120,6 @@ function caml_log10_float(x) {
 
 exports.caml_int32_float_of_bits = caml_int32_float_of_bits;
 exports.caml_int32_bits_of_float = caml_int32_bits_of_float;
-exports.caml_classify_float = caml_classify_float;
 exports.caml_modf_float = caml_modf_float;
 exports.caml_ldexp_float = caml_ldexp_float;
 exports.caml_frexp_float = caml_frexp_float;

lib/js/camlinternalFormat.js

@@ -9,7 +9,6 @@ var $$String = require("./string.js");
 var Caml_io = require("./caml_io.js");
 var Caml_obj = require("./caml_obj.js");
 var Caml_bytes = require("./caml_bytes.js");
-var Caml_float = require("./caml_float.js");
 var Caml_int32 = require("./caml_int32.js");
 var Pervasives = require("./pervasives.js");
 var Caml_format = require("./caml_format.js");
@@ -2957,7 +2956,7 @@ function convert_float(fconv, prec, x) {
         }
       };
     };
-    var match = Caml_float.caml_classify_float(x);
+    var match = Pervasives.classify_float(x);
     if (match !== 3) {
       if (match >= 4) {
         return "nan";

lib/js/pervasives.js

@@ -40,6 +40,22 @@ function lnot(x) {
 
 var min_int = -2147483648;
 
+function classify_float(x) {
+  if (isFinite(x)) {
+    if (Math.abs(x) >= 2.2250738585072014e-308) {
+      return /* FP_normal */0;
+    } else if (x !== 0) {
+      return /* FP_subnormal */1;
+    } else {
+      return /* FP_zero */2;
+    }
+  } else if (isNaN(x)) {
+    return /* FP_nan */4;
+  } else {
+    return /* FP_infinite */3;
+  }
+}
+
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw [
@@ -562,6 +578,7 @@ exports.max_int = max_int;
 exports.min_int = min_int;
 exports.lnot = lnot;
 exports.epsilon_float = epsilon_float;
+exports.classify_float = classify_float;
 exports.char_of_int = char_of_int;
 exports.string_of_bool = string_of_bool;
 exports.bool_of_string = bool_of_string;