Adding Js.Int.toFloat (continue slimming bs_stdlib_mini)

Author: bobzhang

jscomp/others/belt_internalAVLset.ml

@@ -57,9 +57,10 @@ let rec copy n =
   | None -> n
   | Some n ->
     let l,r = n |. (leftGet , rightGet) in
-    return @@ node
+    node
       ~left:(copy l) ~right:(copy r)
       ~value:(valueGet n) ~height:(heightGet n)
+    |. return  
 (* Creates a new node with leftGet son l, value v and right son r.
    We must have all elements of l < v < all elements of r.
    l and r must be balanced and | treeHeight l - treeHeight r | <= 2.
@@ -68,9 +69,10 @@ let rec copy n =
 let create (l : _ t) v (r : _ t) =
   let hl = match toOpt l with None -> 0 | Some n -> heightGet n in
   let hr = match toOpt r with None -> 0 | Some n -> heightGet n in
-  return @@ node ~left:l ~value:v ~right:r ~height:(if hl >= hr then hl + 1 else hr + 1)
+  node ~left:l ~value:v ~right:r ~height:(if hl >= hr then hl + 1 else hr + 1)
+  |. return
 
-let singleton x = return @@ node ~left:empty ~value:x ~right:empty ~height:1
+let singleton x = node ~left:empty ~value:x ~right:empty ~height:1 |. return
 
 let heightGe l r =
   match toOpt l, toOpt r with
@@ -106,7 +108,7 @@ let bal l v r =
       create (create l v rll) rlv (create rlr rv rr)
     end
   end else
-    return @@ node ~left:l ~value:v ~right:r ~height:(if hl >= hr then hl + 1 else hr + 1)
+    return (node ~left:l ~value:v ~right:r ~height:(if hl >= hr then hl + 1 else hr + 1))
 
 
 

jscomp/others/js_int.ml

@@ -156,6 +156,8 @@ let _ = Js.log \@\@ Js.Int.toStringWithRadix 123456 ~radix:36
 *)
 external toStringWithRadix : int -> radix:int -> string = "toString" [@@bs.send]
 
+external toFloat : int -> float = "%floatofint"
+
 let equal (x: int) y = x = y
 
 let max : int = 2147483647

jscomp/others/js_list.ml

@@ -71,7 +71,7 @@ let rec mapRevAux f acc ls =
 
 let mapRev f ls = mapRevAux f [] ls 
 
-let rec map f ls = rev @@ mapRevAux f [] ls 
+let rec map f ls = rev (mapRevAux f [] ls )
 
 let rec iter f = function
     [] -> ()
@@ -125,7 +125,7 @@ let rec filterRevAux f acc xs =
       | true -> filterRevAux f  (y::acc) ys
     end 
 
-let filter f xs  =  rev @@ filterRevAux f [] xs 
+let filter f xs  =  rev (filterRevAux f [] xs )
 
 let rec filterMapRevAux (f:  'a -> 'b option [@bs]) acc xs =   
   match xs with 
@@ -137,7 +137,7 @@ let rec filterMapRevAux (f:  'a -> 'b option [@bs]) acc xs =
     end 
 
 let rec filterMap f xs = 
-  rev @@ filterMapRevAux f [] xs
+  rev (filterMapRevAux f [] xs)
 
 
 let rec countByAux f acc xs = 
@@ -149,7 +149,7 @@ let rec countByAux f acc xs =
 let rec countBy f xs = countByAux f 0 xs    
 
 let init n f = 
-  Js_vector.toList @@ Js_vector.init n f 
+  Js_vector.toList (Js_vector.init n f )
 
 external createUnsafe : int -> 'a Js_vector.t =
   "Array" [@@bs.new]

jscomp/others/js_math.ml

@@ -82,9 +82,9 @@ external unsafe_ceil_int : float -> int = "ceil" [@@bs.val] [@@bs.scope "Math"]
 let unsafe_ceil = unsafe_ceil_int
 [@@ocaml.deprecated "Please use `unsafe_ceil_int` instead"]
 (** smallest int greater than or equal to the argument *)
-let ceil_int f =
-  if f > float Js_int.max then Js_int.max
-  else if f < float Js_int.min then Js_int.min
+let ceil_int (f : float) : int =
+  if f > Js_int.toFloat Js_int.max then Js_int.max
+  else if f < Js_int.toFloat Js_int.min then Js_int.min
   else unsafe_ceil_int f
 let ceil = ceil_int
 [@@ocaml.deprecated "Please use `ceil_int` instead"]
@@ -113,8 +113,8 @@ let unsafe_floor = unsafe_floor_int
 [@@ocaml.deprecated "Please use `unsafe_floor_int` instead"]
 (** largest int greater than or equal to the arugment *)
 let floor_int f =
-  if f > float Js_int.max then Js_int.max
-  else if f < float Js_int.min then Js_int.min
+  if f > Js_int.toFloat Js_int.max then Js_int.max
+  else if f < Js_int.toFloat Js_int.min then Js_int.min
   else unsafe_floor f
 let floor = floor_int
 [@@ocaml.deprecated "Please use `floor_int` instead"]
@@ -171,7 +171,7 @@ external pow_float : base:float -> exp:float -> float = "pow" [@@bs.val] [@@bs.s
 external random : unit -> float = "random" [@@bs.val] [@@bs.scope "Math"]
 (** random number in \[min,max) *)
 let random_int min max =
-  floor ((random ()) *. (float (max - min))) + min
+  floor ((random ()) *. (Js_int.toFloat (max - min))) + min
 
 (** rounds to nearest integer, returns a value not representable as [int] if NaN *)
 external unsafe_round : float -> int = "round" [@@bs.val] [@@bs.scope "Math"]

jscomp/others/js_vector.ml

@@ -46,13 +46,13 @@ let filterInPlace p a =
       end;
     incr i 
   done;
-  ignore @@ Js_array.removeFromInPlace ~pos:!j a 
+  Js_array.removeFromInPlace ~pos:!j a |. ignore
 
 let empty a  = 
-  ignore @@ Js.Array.removeFromInPlace ~pos:0 a
+  Js.Array.removeFromInPlace ~pos:0 a |. ignore
 
 let pushBack x xs = 
-  ignore @@ Js.Array.push x xs 
+  Js.Array.push x xs |. ignore
 
 (** Find by JS (===)  equality *)
 let memByRef x xs = 

jscomp/runtime/.depend

@@ -13,8 +13,8 @@ caml_io.cmj : js.cmj bs_string.cmj
 caml_float.cmj : caml_float.cmi
 caml_lexer.cmj : caml_lexer.cmi
 caml_parser.cmj : caml_parser.cmi
-caml_format.cmj : js_nativeint.cmj js_int64.cmj caml_utils.cmj bs_string.cmj \
-    caml_format.cmi
+caml_format.cmj : js_nativeint.cmj js_int64.cmj caml_utils.cmj \
+    caml_float.cmj bs_string.cmj caml_format.cmi
 caml_md5.cmj : bs_string.cmj caml_md5.cmi
 caml_queue.cmj : caml_queue.cmi
 caml_hash_primitive.cmj : bs_string.cmj caml_hash_primitive.cmi

jscomp/runtime/bs_stdlib_mini.mli

@@ -65,9 +65,9 @@ external ( -. ) : float -> float -> float = "%subfloat"
 external ( *. ) : float -> float -> float = "%mulfloat"
 external ( /. ) : float -> float -> float = "%divfloat"
 
-external float : int -> float = "%floatofint"
 
-external int_of_float : float -> int = "%intoffloat"
+
+
 
 module Bytes : sig
   external unsafe_get : bytes -> int -> char = "%bytes_unsafe_get"
@@ -156,9 +156,6 @@ module Int64 : sig
   external to_int : int64 -> int = "%int64_to_int"
 end 
 
-module Oo : sig 
-  external id : < .. > -> int = "%field1"
-end 
 
 
 

jscomp/runtime/caml_float.ml

@@ -36,8 +36,8 @@ 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]
-
-
+external int_of_float : float -> int = "%intoffloat"
+external float_of_int : int -> float = "%floatofint"
 
 let caml_int32_float_of_bits : int32 -> float = fun%raw x -> {|
     return new Float32Array(new Int32Array([x]).buffer)[0] 
@@ -66,7 +66,7 @@ let caml_modf_float (x : float) : float * float =
   else (1. /. x , x)
 
 let caml_ldexp_float (x: float) (exp: int) : float =
-  let x', exp' = ref x, ref (float exp) in
+  let x', exp' = ref x, ref (float_of_int exp) in
   if !exp' > 1023. then begin
     exp' := !exp' -. 1023.;
     x' := !x' *. pow_float ~base:2. ~exp:1023.;

jscomp/runtime/caml_float.mli

@@ -28,6 +28,8 @@
 
 (** *)
 external floor : float -> float = "Math.floor" [@@bs.val] 
+external int_of_float : float -> int = "%intoffloat"
+external float_of_int : int -> float = "%floatofint"
 val caml_int32_float_of_bits : int32 -> float
 val caml_int32_bits_of_float : float -> int32
 

jscomp/runtime/caml_format.ml

@@ -90,11 +90,11 @@ let parse_sign_and_base (s : string) =
 
 let caml_int_of_string s = 
   let i, sign, hbase = parse_sign_and_base s in
-  let base  = Nativeint.of_int @@ int_of_string_base hbase in
+  let base  = Nativeint.of_int (int_of_string_base hbase) in
   let threshold = (-1n >>> 0) in 
   let len =Bs_string.length s in  
   let c = if i < len then s.[i] else '\000' in
-  let d = to_nat @@ parse_digit c in
+  let d = to_nat (parse_digit c) in
   let () =
     if d < 0n || d >=  base then
       caml_failwith "int_of_string" in
@@ -105,7 +105,7 @@ let caml_int_of_string s =
       let a = s.[k] in
       if a  = '_' then aux acc ( k +  1) 
       else 
-        let v = to_nat @@ parse_digit a in  
+        let v = to_nat  (parse_digit a) in  
         if v < 0n || v >=  base then 
           caml_failwith "int_of_string"
         else 
@@ -123,7 +123,7 @@ let caml_int_of_string s =
 
 let caml_int64_of_string s = 
   let i, sign, hbase = parse_sign_and_base s in
-  let base  = Int64.of_int @@ int_of_string_base hbase in
+  let base  = Int64.of_int (int_of_string_base hbase) in
   let sign = Int64.of_nativeint sign in
   let threshold =
     match hbase with
@@ -138,7 +138,7 @@ let caml_int64_of_string s =
   in 
   let len =Bs_string.length s in  
   let c = if i < len then s.[i] else '\000' in
-  let d = Int64.of_int @@ parse_digit c in
+  let d = Int64.of_int (parse_digit c) in
   let () =
     if d < 0L || d >=  base then
       caml_failwith "int64_of_string" in
@@ -151,7 +151,7 @@ let caml_int64_of_string s =
       let a = s.[k] in
       if a  = '_' then aux acc ( k +  1) 
       else     
-        let v = Int64.of_int @@ parse_digit a in  
+        let v = Int64.of_int (parse_digit a) in  
         if v < 0L || v >=  base || acc > threshold then 
           caml_failwith "int64_of_string"
         else 
@@ -195,7 +195,7 @@ let lowercase c =
 let parse_format fmt = 
   let len =Bs_string.length fmt in 
   if len > 31 then 
-    raise @@ Invalid_argument "format_int: format too long" ;
+    raise  (Invalid_argument "format_int: format too long") ;
   let rec aux (f : fmt) i : fmt = 
     if i >= len then  f
     else
@@ -357,7 +357,7 @@ let aux f (i : nativeint)  =
       else 
         Nativeint.shift_right_logical i 0 
     else  i  in
-  let s = ref @@ Bs_string.of_nativeint i ~base:(int_of_base f.base) in 
+  let s = ref (Bs_string.of_nativeint i ~base:(int_of_base f.base)) in 
   if f.prec >= 0 then 
     begin 
       f.filter <- " ";
@@ -501,7 +501,7 @@ let caml_format_float fmt x =
       s := "nan";
       f.filter <- " "
     end
-  else if not @@ FloatRT.isFinite x then
+  else if not (FloatRT.isFinite x) then
     begin 
       s := "inf";
       f.filter <- " " 
@@ -533,7 +533,7 @@ let caml_format_float fmt x =
         let prec = if prec <> 0 then prec else 1 in
         s := FloatRT.toExponentialWithPrecision x ~digits:(prec - 1);
         let j = Bs_string.index_of !s "e" in 
-        let  exp = int_of_float @@ FloatRT.fromString @@ Bs_string.slice_rest !s (j + 1)  in 
+        let  exp = Caml_float.int_of_float (FloatRT.fromString (Bs_string.slice_rest !s (j + 1)))  in 
         if exp < -4 || x >= 1e21 ||Bs_string.length (FloatRT.toFixed x) > prec then 
           let i = ref (j - 1)  in
           while !s.[!i] = '0' do 
@@ -558,7 +558,7 @@ let caml_format_float fmt x =
               decr p
             done ;
           if !p <> 0 then 
-            let k = ref @@Bs_string.length !s - 1 in 
+            let k = ref (Bs_string.length !s - 1) in 
             while !s.[!k] = '0' do 
               decr k
             done ;

jscomp/runtime/caml_hash.ml

@@ -27,6 +27,9 @@
 external ( +~ ) : nativeint -> nativeint -> nativeint =
    "caml_int32_add"
 
+(*ATTENTION: refer {!Oo.id} *)
+external oo_id : Obj.t -> int  = "%field1"
+
 open Caml_hash_primitive
 
 let caml_hash count _limit seed obj = 
@@ -51,7 +54,7 @@ let caml_hash count _limit seed obj =
       Caml_queue.push obj queue; 
       decr num 
     in 
-    while not @@ Caml_queue.is_empty queue && !num > 0 do
+    while not (Caml_queue.is_empty queue) && !num > 0 do
       let obj = Caml_queue.unsafe_pop queue in 
       if Js.typeof obj = "number" then
         begin 
@@ -80,7 +83,7 @@ let caml_hash count _limit seed obj =
           let obj_tag = Obj.tag obj in
           let tag = (size lsl 10) lor obj_tag in 
           if tag = 248 (* Obj.object_tag*) then 
-            hash := caml_hash_mix_int !hash (Nativeint.of_int (Oo.id (Obj.magic obj)))
+            hash := caml_hash_mix_int !hash (Nativeint.of_int (oo_id  obj))
           else 
             begin 
               hash := caml_hash_mix_int !hash (Nativeint.of_int tag) ;

jscomp/runtime/caml_int64.ml

@@ -408,7 +408,7 @@ let to_int32 x = Nativeint.logor x.lo  0n (* signed integer *)
 
 let to_hex x =
   let aux v =
-    Bs_string.of_int (Nativeint.to_int @@ Nativeint.shift_right_logical v 0) ~base:16
+    Bs_string.of_int (Nativeint.to_int (Nativeint.shift_right_logical v 0)) ~base:16
   in
   match x.hi, x.lo with
   | 0n, 0n -> "0"

jscomp/runtime/caml_io.ml

@@ -106,10 +106,10 @@ let caml_ml_output_char (oc : out_channel)  (char : char) : unit =
   caml_ml_output oc (Bs_string.of_char char) 0 1 
 
 let caml_ml_input (ic : in_channel) (bytes : bytes) offset len : int = 
-  raise @@ Failure  "caml_ml_input ic not implemented"
+  raise (Failure  "caml_ml_input ic not implemented")
 
 let caml_ml_input_char (ic : in_channel) : char = 
-  raise @@ Failure "caml_ml_input_char not implemnted"
+  raise  (Failure "caml_ml_input_char not implemnted")
 
 let caml_ml_out_channels_list () : out_channel list  =
   [stdout; stderr]  

jscomp/runtime/caml_obj.ml

@@ -219,7 +219,7 @@ let rec caml_compare (a : Obj.t) (b : Obj.t) : int =
              (* Some None < Some ..*) 
              -1 
         else if tag_a = 248 (* object/exception *)  then
-          Pervasives.compare (Obj.magic @@ Obj.field a 1 : int) (Obj.magic @@ Obj.field b 1 )
+          Pervasives.compare (Obj.magic (Obj.field a 1) : int) (Obj.magic (Obj.field b 1 ))
         else if tag_a = 251 (* abstract_tag *) then
           raise (Invalid_argument "equal: abstract value")
         else if tag_a <> tag_b then
@@ -312,7 +312,7 @@ let rec caml_equal (a : Obj.t) (b : Obj.t) : bool =
         else if tag_b = 250 then
           caml_equal a (Obj.field b 0)
         else if tag_a = 248 (* object/exception *)  then
-          (Obj.magic @@ Obj.field a 1) ==  (Obj.magic @@ Obj.field b 1 )
+          (Obj.magic  (Obj.field a 1)) ==  (Obj.magic (Obj.field b 1 ))
         else if tag_a = 251 (* abstract_tag *) then
           raise (Invalid_argument "equal: abstract value")
         else if tag_a <> tag_b then

jscomp/runtime/caml_sys.ml

@@ -99,10 +99,10 @@ let caml_sys_exit :int -> 'a = fun exit_code ->
 
 
 let caml_sys_is_directory _s = 
-  raise @@ Failure "caml_sys_is_directory not implemented"
+  raise (Failure "caml_sys_is_directory not implemented")
 
 (** Need polyfill to make cmdliner work 
     {!Sys.is_directory} or {!Sys.file_exists} {!Sys.command} 
 *)
 let caml_sys_file_exists _s = 
-  raise @@ Failure "caml_sys_file_exists not implemented"
+  raise ( Failure "caml_sys_file_exists not implemented")

lib/js/belt_internalAVLset.js

@@ -390,7 +390,7 @@ function checkInvariantInternal(_v) {
       var r = v.right;
       var diff = treeHeight(l) - treeHeight(r) | 0;
       if (!(diff <= 2 && diff >= -2)) {
-        throw new Error("File \"belt_internalAVLset.ml\", line 302, characters 6-12");
+        throw new Error("File \"belt_internalAVLset.ml\", line 304, characters 6-12");
       }
       checkInvariantInternal(l);
       _v = r;

lib/js/caml_hash.js

@@ -37,7 +37,7 @@ function caml_hash(count, _limit, seed, obj) {
                   Caml_builtin_exceptions.assert_failure,
                   /* tuple */[
                     "caml_hash.ml",
-                    72,
+                    75,
                     8
                   ]
                 ];