clean up && deprecate the usage of @ which is not stack safe

Author: bobzhang

jscomp/stdlib-406/pervasives.ml

@@ -16,16 +16,6 @@
 (* type 'a option = None | Some of 'a *)
 
 (* Exceptions *)
-#if BS
-#else
-external register_named_value : string -> 'a -> unit
-                              = "caml_register_named_value"
-
-let () =
-  (* for asmrun/fail.c *)
-  register_named_value "Pervasives.array_bound_error"
-    (Invalid_argument "index out of bounds")
-#end
 
 external raise : exn -> 'a = "%raise"
 external raise_notrace : exn -> 'a = "%raise_notrace"
@@ -61,16 +51,8 @@ external ( > ) : 'a -> 'a -> bool = "%greaterthan"
 external ( <= ) : 'a -> 'a -> bool = "%lessequal"
 external ( >= ) : 'a -> 'a -> bool = "%greaterequal"
 external compare : 'a -> 'a -> int = "%compare"
-
-#if BS
 external min : 'a -> 'a -> 'a = "%bs_min"
 external max : 'a -> 'a -> 'a = "%bs_max"
-#else
-let min x y = if x <= y then x else y
-let max x y = if x >= y then x else y
-
-#end
-
 external ( == ) : 'a -> 'a -> bool = "%eq"
 external ( != ) : 'a -> 'a -> bool = "%noteq"
 
@@ -117,34 +99,19 @@ external ( +. ) : float -> float -> float = "%addfloat"
 external ( -. ) : float -> float -> float = "%subfloat"
 external ( *. ) : float -> float -> float = "%mulfloat"
 external ( /. ) : float -> float -> float = "%divfloat"
-#if BS
+
 external ( ** ) : float -> float -> float = "pow" [@@bs.val] [@@bs.scope "Math"]
 external exp : float -> float = "exp" [@@bs.val][@@bs.scope "Math"]
-#else
-external ( ** ) : float -> float -> float = "caml_power_float" "pow"
-  [@@unboxed] [@@noalloc]
-external exp : float -> float = "caml_exp_float" "exp" [@@unboxed] [@@noalloc]
-#end
 external expm1 : float -> float = "caml_expm1_float" "caml_expm1"
   [@@unboxed] [@@noalloc]
-#if BS
+
 external acos : float -> float =  "acos" [@@bs.val] [@@bs.scope "Math"]
 external asin : float -> float = "asin" [@@bs.val] [@@bs.scope "Math"]
 external atan : float -> float = "atan" [@@bs.val] [@@bs.scope "Math"]
 external atan2 : float -> float -> float = "atan2" [@@bs.val] [@@bs.scope "Math"]
-#else
-external acos : float -> float = "caml_acos_float" "acos"
-  [@@unboxed] [@@noalloc]
-external asin : float -> float = "caml_asin_float" "asin"
-  [@@unboxed] [@@noalloc]
-external atan : float -> float = "caml_atan_float" "atan"
-  [@@unboxed] [@@noalloc]
-external atan2 : float -> float -> float = "caml_atan2_float" "atan2"
-  [@@unboxed] [@@noalloc]
-#end  
 external hypot : float -> float -> float
                = "caml_hypot_float" "caml_hypot" [@@unboxed] [@@noalloc]
-#if BS
+
 external cos : float -> float = "cos" [@@bs.val] [@@bs.scope "Math"]
 external cosh : float -> float = "cosh" [@@bs.val] [@@bs.scope "Math"]
 external log : float -> float =  "log" [@@bs.val] [@@bs.scope "Math"]
@@ -158,29 +125,6 @@ external tanh : float -> float =  "tanh" [@@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 abs_float : float -> float = "abs"[@@bs.val] [@@bs.scope "Math"]
-#else               
-external cos : float -> float = "caml_cos_float" "cos" [@@unboxed] [@@noalloc]
-external cosh : float -> float = "caml_cosh_float" "cosh"
-  [@@unboxed] [@@noalloc]
-external log : float -> float = "caml_log_float" "log" [@@unboxed] [@@noalloc]
-external log10 : float -> float = "caml_log10_float" "log10"
-  [@@unboxed] [@@noalloc]
-external log1p : float -> float = "caml_log1p_float" "caml_log1p"
-  [@@unboxed] [@@noalloc]
-external sin : float -> float = "caml_sin_float" "sin" [@@unboxed] [@@noalloc]
-external sinh : float -> float = "caml_sinh_float" "sinh"
-  [@@unboxed] [@@noalloc]
-external sqrt : float -> float = "caml_sqrt_float" "sqrt"
-  [@@unboxed] [@@noalloc]
-external tan : float -> float = "caml_tan_float" "tan" [@@unboxed] [@@noalloc]
-external tanh : float -> float = "caml_tanh_float" "tanh"
-  [@@unboxed] [@@noalloc]
-external ceil : float -> float = "caml_ceil_float" "ceil"
-  [@@unboxed] [@@noalloc]
-external floor : float -> float = "caml_floor_float" "floor"
-  [@@unboxed] [@@noalloc]
-external abs_float : float -> float = "%absfloat"
-#end
 external copysign : float -> float -> float
                   = "caml_copysign_float" "caml_copysign"
                   [@@unboxed] [@@noalloc]
@@ -195,34 +139,14 @@ external float_of_int : int -> float = "%floatofint"
 external truncate : float -> int = "%intoffloat"
 external int_of_float : float -> int = "%intoffloat"
 
-#if BS (* better unused finding *)
-#else
-external float_of_bits : int64 -> float
-  = "caml_int64_float_of_bits" "caml_int64_float_of_bits_unboxed"
-  [@@unboxed] [@@noalloc]
-#end
-#if BS 
+
 let infinity = 0x1p2047
 let neg_infinity = -0x1p2047
 external nan : float = "NaN"
 [@@bs.val]  [@@bs.scope "Number"]
 let max_float = 1.79769313486231571e+308 (*0x1.ffff_ffff_ffff_fp+1023*)
 let min_float = 2.22507385850720138e-308 (* 0x1p-1022 *)
 let epsilon_float = 2.22044604925031308e-16 (* 0x1p-52 *)
-#else  
-let infinity =
-  float_of_bits 0x7F_F0_00_00_00_00_00_00L
-let neg_infinity =
-  float_of_bits 0xFF_F0_00_00_00_00_00_00L
-let nan =
-  float_of_bits 0x7F_F0_00_00_00_00_00_01L
-let max_float =
-  float_of_bits 0x7F_EF_FF_FF_FF_FF_FF_FFL
-let min_float =
-  float_of_bits 0x00_10_00_00_00_00_00_00L
-let epsilon_float =
-  float_of_bits 0x3C_B0_00_00_00_00_00_00L
-#end
 
 
 
@@ -232,7 +156,7 @@ type fpclass =
   | FP_zero
   | FP_infinite
   | FP_nan
-#if BS  
+
 let classify_float (x : float) : fpclass =   
   if ([%raw{|isFinite|}] : _ -> _ [@bs]) x [@bs] then
     if abs_float x >= (* 0x1p-1022 *) (* 2.22507385850720138e-308*) min_float  then
@@ -243,10 +167,7 @@ let classify_float (x : float) : fpclass =
   if ([%raw{|isNaN|}] : _ -> _ [@bs])  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"
@@ -285,10 +206,6 @@ type ('a, 'b) result = ('a, 'b) Belt.Result.t =
   | Error of 'b
 
 (* String conversion functions *)
-#if BS 
-#else
-external format_int : string -> int -> string = "caml_format_int"
-#end
 external format_float : string -> float -> string = "caml_format_float"
 
 let string_of_bool b =
@@ -303,12 +220,9 @@ let bool_of_string_opt = function
   | "false" -> Some false
   | _ -> None
 
-#if BS
+
 external string_of_int : int -> string = "String" [@@bs.val]
-#else  
-let string_of_int n =
-  format_int "%d" n
-#end
+
 external int_of_string : string -> int = "caml_int_of_string"
 
 let int_of_string_opt s =

jscomp/stdlib-406/pervasives.mli

@@ -620,12 +620,9 @@ val infinity : float
 val neg_infinity : float
 (** Negative infinity. *)
 
-#if BS then
+
 external nan : float = "NaN" [@@bs.val]  [@@bs.scope "Number"]
 (* we could also use [0.  /. 0.] *)
-#else
-val nan : float
-#end
 (** A special floating-point value denoting the result of an
    undefined operation such as [0.0 /. 0.0].  Stands for
    'not a number'.  Any floating-point operation with [nan] as
@@ -652,12 +649,8 @@ 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. *)
 
@@ -666,11 +659,7 @@ external classify_float : (float [@unboxed]) -> fpclass =
 
    More string operations are provided in module {!String}.
 *)
-#if BS then
 external (^) : string -> string -> string = "#string_append"
-#else
-val ( ^ ) : string -> string -> string
-#end
 (** String concatenation.
     Right-associative operator at precedence level 5/11. *)
 
@@ -719,11 +708,8 @@ val bool_of_string_opt: string -> bool option
     @since 4.05
 *)
 
-#if BS then    
+
 external string_of_int : int -> string = "String" [@@bs.val]
-#else
-val string_of_int : int -> string
-#end
 (** Return the string representation of an integer, in decimal. *)
 
 external int_of_string : string -> int = "caml_int_of_string"
@@ -791,9 +777,11 @@ external snd : 'a * 'b -> 'b = "%field1"
 *)
 
 val ( @ ) : 'a list -> 'a list -> 'a list
-(** List concatenation.  Not tail-recursive (length of the first argument).
+[@@ocaml.deprecated "Use Belt.List.append instead"]    
+(** List concatenation.  Tail-recursive (length of the first argument).
     Right-associative operator at precedence level 5/11. *)
 
+
 type int32 = int
 
 
@@ -867,79 +855,6 @@ type ('a, 'b) result = ('a, 'b) Belt.Result.t =
   | Ok of 'a
   | Error of 'b
 
-(** {1 Operations on format strings} *)
-
-(** Format strings are character strings with special lexical conventions
-  that defines the functionality of formatted input/output functions. Format
-  strings are used to read data with formatted input functions from module
-  {!Scanf} and to print data with formatted output functions from modules
-  {!Printf} and {!Format}.
-
-  Format strings are made of three kinds of entities:
-  - {e conversions specifications}, introduced by the special character ['%']
-    followed by one or more characters specifying what kind of argument to
-    read or print,
-  - {e formatting indications}, introduced by the special character ['@']
-    followed by one or more characters specifying how to read or print the
-    argument,
-  - {e plain characters} that are regular characters with usual lexical
-    conventions. Plain characters specify string literals to be read in the
-    input or printed in the output.
-
-  There is an additional lexical rule to escape the special characters ['%']
-  and ['@'] in format strings: if a special character follows a ['%']
-  character, it is treated as a plain character. In other words, ["%%"] is
-  considered as a plain ['%'] and ["%@"] as a plain ['@'].
-
-  For more information about conversion specifications and formatting
-  indications available, read the documentation of modules {!Scanf},
-  {!Printf} and {!Format}.
-*)
-
-(** Format strings have a general and highly polymorphic type
-    [('a, 'b, 'c, 'd, 'e, 'f) format6].
-    The two simplified types, [format] and [format4] below are
-    included for backward compatibility with earlier releases of
-    OCaml.
-
-    The meaning of format string type parameters is as follows:
-
-    - ['a] is the type of the parameters of the format for formatted output
-      functions ([printf]-style functions);
-      ['a] is the type of the values read by the format for formatted input
-      functions ([scanf]-style functions).
-
-    - ['b] is the type of input source for formatted input functions and the
-      type of output target for formatted output functions.
-      For [printf]-style functions from module {!Printf}, ['b] is typically
-      [out_channel];
-      for [printf]-style functions from module {!Format}, ['b] is typically
-      {!Format.formatter};
-      for [scanf]-style functions from module {!Scanf}, ['b] is typically
-      {!Scanf.Scanning.in_channel}.
-
-      Type argument ['b] is also the type of the first argument given to
-      user's defined printing functions for [%a] and [%t] conversions,
-      and user's defined reading functions for [%r] conversion.
-
-    - ['c] is the type of the result of the [%a] and [%t] printing
-      functions, and also the type of the argument transmitted to the
-      first argument of [kprintf]-style functions or to the
-      [kscanf]-style functions.
-
-    - ['d] is the type of parameters for the [scanf]-style functions.
-
-    - ['e] is the type of the receiver function for the [scanf]-style functions.
-
-    - ['f] is the final result type of a formatted input/output function
-      invocation: for the [printf]-style functions, it is typically [unit];
-      for the [scanf]-style functions, it is typically the result type of the
-      receiver function.
-*)
-
-
-
-
 
 (** {1 Program termination} *)