remove floatarray

Author: cometkim

jscomp/core/js_of_lam_array.ml

@@ -22,28 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-(*
-   construct array,
-   set array,
-   ref array,
-
-   Also make sure, don't call any primitive array method, i.e [E.array_index_by_int] 
-
-   We also need check primitive [caml_make_vect], i.e, 
-   [Caml_primitive['caml_make_vect']] see if it's correct 
-
-   [caml_make_vect]
-   [caml_array_sub]
-   [caml_array_append]
-   [caml_array_concat]
-   [caml_make_float_vect]
-   [caml_array_blit]
-
-   research: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Typed_arrays
-
-
- *)
-
 module E = Js_exp_make
 
 (* Parrayref(u|s) *)

jscomp/core/js_of_lam_array.mli

@@ -28,8 +28,5 @@ val make_array : J.mutable_flag -> J.expression list -> J.expression
 (** create an array *)
 
 val set_array : J.expression -> J.expression -> J.expression -> J.expression
-(** Here we don't care about [array_kind],  
-    In the future, we might used TypedArray for FloatArray
-*)
 
 val ref_array : J.expression -> J.expression -> J.expression

jscomp/core/lam_dispatch_primitive.ml

@@ -178,9 +178,6 @@ let translate loc (prim_name : string) (args : J.expression list) : J.expression
       like normal one to set the identifier *)
   | "?exn_slot_name" | "?is_extension" -> call Js_runtime_modules.exceptions
   | "?as_js_exn" -> call Js_runtime_modules.caml_js_exceptions
-  | "?make_float_vect"
-  | "?floatarray_create" (* TODO: compile float array into TypedArray*) ->
-      E.runtime_call Js_runtime_modules.array "make_float" args
   | "?array_sub" -> E.runtime_call Js_runtime_modules.array "sub" args
   | "?array_concat" -> E.runtime_call Js_runtime_modules.array "concat" args
   (*external concat: 'a array list -> 'a array

jscomp/ml/predef.ml

@@ -40,16 +40,12 @@ and ident_list = ident_create "list"
 and ident_option = ident_create "option"
 and ident_result = ident_create "result"
 and ident_dict = ident_create "dict"
-
 and ident_int64 = ident_create "int64"
 and ident_bigint = ident_create "bigint"
 and ident_lazy_t = ident_create "lazy_t"
 and ident_string = ident_create "string"
 and ident_extension_constructor = ident_create "extension_constructor"
-and ident_floatarray = ident_create "floatarray"
-
 and ident_unknown = ident_create "unknown"
-
 and ident_promise = ident_create "promise"
 and ident_uncurried = ident_create "function$"
 
@@ -58,18 +54,17 @@ type test =
   | For_sure_no 
   | NA
 
-let type_is_builtin_path_but_option (p : Path.t) : test  =
+let type_is_builtin_path_but_option (p : Path.t) : test =
   match p with
-  | Pident {stamp} ->
-      if 
-        stamp >= ident_int.stamp
-        && stamp  <= ident_floatarray.stamp    
-      then    
-        if  (stamp = ident_option.stamp)
-         || (stamp = ident_unit.stamp) then 
-          For_sure_no
-        else For_sure_yes
-      else NA 
+  | Pident {stamp}
+    when stamp = ident_option.stamp
+    -> For_sure_no
+  | Pident {stamp}
+    when stamp = ident_unit.stamp
+    -> For_sure_no
+  | Pident {stamp}
+    when stamp >= ident_int.stamp && stamp <= ident_uncurried.stamp
+    -> For_sure_yes
   | _ -> NA
 
 let path_int = Pident ident_int
@@ -83,17 +78,12 @@ and path_list = Pident ident_list
 and path_option = Pident ident_option
 and path_result = Pident ident_result
 and path_dict = Pident ident_dict
-
-
 and path_int64 = Pident ident_int64
 and path_bigint = Pident ident_bigint
 and path_lazy_t = Pident ident_lazy_t
 and path_string = Pident ident_string
-
 and path_unkonwn = Pident ident_unknown
 and path_extension_constructor = Pident ident_extension_constructor
-and path_floatarray = Pident ident_floatarray
-
 and path_promise = Pident ident_promise
 and path_uncurried = Pident ident_uncurried
 
@@ -117,7 +107,6 @@ and type_string = newgenty (Tconstr(path_string, [], ref Mnil))
 and type_unknown = newgenty (Tconstr(path_unkonwn, [], ref Mnil))
 and type_extension_constructor =
       newgenty (Tconstr(path_extension_constructor, [], ref Mnil))
-and type_floatarray = newgenty (Tconstr(path_floatarray, [], ref Mnil))
 
 let ident_match_failure = ident_create_predef_exn "Match_failure"
 
@@ -316,9 +305,8 @@ let common_initial_env add_type add_extension empty_env =
   add_type ident_string decl_abstr (
   add_type ident_int decl_abstr_imm (
   add_type ident_extension_constructor decl_abstr (
-  add_type ident_floatarray decl_abstr (
     add_type ident_promise decl_promise (
-      empty_env))))))))))))))))))))))))))))
+      empty_env)))))))))))))))))))))))))))
 
 let build_initial_env add_type add_exception empty_env =
   let common = common_initial_env add_type add_exception empty_env in

jscomp/ml/predef.mli

@@ -34,7 +34,6 @@ val type_int64: type_expr
 val type_bigint: type_expr
 val type_lazy_t: type_expr -> type_expr
 val type_extension_constructor:type_expr
-val type_floatarray:type_expr
 
 val path_int: Path.t
 val path_char: Path.t
@@ -53,7 +52,6 @@ val path_int64: Path.t
 val path_bigint: Path.t
 val path_lazy_t: Path.t
 val path_extension_constructor: Path.t
-val path_floatarray: Path.t
 val path_promise: Path.t
 val path_uncurried: Path.t
 

jscomp/ml/translcore.ml

@@ -346,11 +346,6 @@ let primitives_table =
       ("%array_safe_set", Parraysets);
       ("%array_unsafe_get", Parrayrefu);
       ("%array_unsafe_set", Parraysetu);
-      ("%floatarray_length", Parraylength);
-      ("%floatarray_safe_get", Parrayrefs);
-      ("%floatarray_safe_set", Parraysets);
-      ("%floatarray_unsafe_get", Parrayrefu);
-      ("%floatarray_unsafe_set", Parraysetu);
       ("%lazy_force", Plazyforce);
       ("%int64_of_int", Pbintofint Pint64);
       ("%int64_to_int", Pintofbint Pint64);

jscomp/runtime/caml_array.res

@@ -87,14 +87,6 @@ let make = (len, init) => {
   b
 }
 
-let make_float = len => {
-  let b = Caml_array_extern.new_uninitialized(len)
-  for i in 0 to len - 1 {
-    b->unsafe_set(i, 0.)
-  }
-  b
-}
-
 let blit = (a1, i1, a2, i2, len) =>
   if i2 <= i1 {
     for j in 0 to len - 1 {

jscomp/runtime/caml_array.resi

@@ -30,8 +30,6 @@ let concat: list<array<'a>> => array<'a>
 
 let make: (int, 'a) => array<'a>
 
-let make_float: int => array<float>
-
 let blit: (array<'a>, int, array<'a>, int, int) => unit
 
 let get: (array<'a>, int) => 'a

jscomp/stdlib-406/array.res

@@ -28,17 +28,6 @@ external unsafe_sub: (array<'a>, int, int) => array<'a> = "?array_sub"
 
 external concat: list<array<'a>> => array<'a> = "?array_concat"
 external unsafe_blit: (array<'a>, int, array<'a>, int, int) => unit = "?array_blit"
-external create_float: int => array<float> = "?make_float_vect"
-let make_float = create_float
-
-module Floatarray = {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
 
 let init = (l, f) =>
   if l == 0 {

jscomp/stdlib-406/array.resi

@@ -52,15 +52,6 @@ external make: (int, 'a) => array<'a> = "?make_vect"
 /** @deprecated [Array.create] is an alias for {!Array.make}. */
 external create: (int, 'a) => array<'a> = "?make_vect"
 
-/** [Array.create_float n] returns a fresh float array of length [n],
-    with uninitialized data.
-    @since 4.03 */
-external create_float: int => array<float> = "?make_float_vect"
-
-@deprecated("Use Array.create_float instead.")
-/** @deprecated [Array.make_float] is an alias for {!Array.create_float}. */
-let make_float: int => array<float>
-
 /** [Array.init n f] returns a fresh array of length [n],
    with element number [i] initialized to the result of [f i].
    In other terms, [Array.init n f] tabulates the results of [f]
@@ -253,12 +244,3 @@ let fast_sort: (('a, 'a) => int, array<'a>) => unit
 
 external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
 external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-module Floatarray: {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}

jscomp/stdlib-406/arrayLabels.res

@@ -28,17 +28,6 @@ external unsafe_sub: (array<'a>, int, int) => array<'a> = "?array_sub"
 
 external concat: list<array<'a>> => array<'a> = "?array_concat"
 external unsafe_blit: (array<'a>, int, array<'a>, int, int) => unit = "?array_blit"
-external create_float: int => array<float> = "?make_float_vect"
-let make_float = create_float
-
-module Floatarray = {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
 
 let init = (l, ~f) =>
   if l == 0 {

jscomp/stdlib-406/arrayLabels.resi

@@ -194,16 +194,6 @@ let mem: ('a, ~set: array<'a>) => bool
    @since 4.03.0 */
 let memq: ('a, ~set: array<'a>) => bool
 
-/** [Array.create_float n] returns a fresh float array of length [n],
-    with uninitialized data.
-    @since 4.03 */
-external create_float: int => array<float> = "?make_float_vect"
-
-@deprecated("Use Array.create_float instead.")
-/** @deprecated [Array.make_float] is an alias for
-    {!Array.create_float}. */
-let make_float: int => array<float>
-
 /* {1 Sorting} */
 
 /** Sort an array in increasing order according to a comparison
@@ -253,12 +243,3 @@ let fast_sort: (~cmp: ('a, 'a) => int, array<'a>) => unit
 
 external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
 external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-module Floatarray: {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}

jscomp/test/array_test.js

@@ -54,13 +54,7 @@ module Make = (Array: ARRAY) => {
         },
       ),
       ("concat", _ => Eq([0, 1, 2, 3, 4, 5], Array.concat(list{[0, 1, 2], [3, 4], [], [5]}))),
-      (
-        "make",
-        _ => Eq(
-          (Array.make(100, 'a'), Array.make_float(100)),
-          (Array.init(100, _ => 'a'), Array.init(100, _ => 0.)),
-        ),
-      ),
+      ("make", _ => Eq(Array.make(100, 'a'), Array.init(100, _ => 'a'))),
       ("sub", _ => Eq(Array.sub([0, 1, 2, 3, 4], 2, 2), [2, 3])),
       (
         "blit",