define as primitive

jscomp/core/js_of_lam_array.ml

@@ -49,6 +49,10 @@ module E = Js_exp_make
 (* Parrayref(u|s) *)
 let make_array mt args = E.array mt args
 
+let spread_array args = match args with
+| [e] -> {e with J.expression_desc = Spread e}
+| _ -> assert false
+
 let set_array e e0 e1 = E.assign (E.array_index e e0) e1
 
 let ref_array e e0 = E.array_index e e0

jscomp/core/js_of_lam_array.mli

@@ -27,6 +27,9 @@
 val make_array : J.mutable_flag -> J.expression list -> J.expression
 (** create an array *)
 
+val spread_array : J.expression list -> J.expression
+(** spread 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

jscomp/core/lam_analysis.ml

@@ -82,7 +82,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
       | Pbigintcomp _
       (* String operations *)
       | Pstringlength | Pstringrefu | Pstringrefs | Pbyteslength | Pbytesrefu
-      | Pbytesrefs | Pmakearray | Parraylength | Parrayrefu | Parrayrefs
+      | Pbytesrefs | Pmakearray | Parrayspread | Parraylength | Parrayrefu | Parrayrefs 
       (* Test if the argument is a block or an immediate integer *)
       | Pisint | Pis_poly_var_block
       (* Test if the (integer) argument is outside an interval *)

jscomp/core/lam_compile_primitive.ml

@@ -355,6 +355,7 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   | Parrayrefs -> E.runtime_call Js_runtime_modules.array "get" args
   | Parraysets -> E.runtime_call Js_runtime_modules.array "set" args
   | Pmakearray -> Js_of_lam_array.make_array Mutable args
+  | Parrayspread -> Js_of_lam_array.spread_array args
   | Parraysetu -> (
       match args with
       (* wrong*)

jscomp/core/lam_convert.ml

@@ -272,6 +272,7 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Poffsetref x -> prim ~primitive:(Poffsetref x) ~args loc
   | Pfloatcomp x -> prim ~primitive:(Pfloatcomp x) ~args loc
   | Pmakearray _mutable_flag (*FIXME*) -> prim ~primitive:Pmakearray ~args loc
+  | Parrayspread -> prim ~primitive:Parrayspread ~args loc
   | Parraylength -> prim ~primitive:Parraylength ~args loc
   | Parrayrefu -> prim ~primitive:Parrayrefu ~args loc
   | Parraysetu -> prim ~primitive:Parraysetu ~args loc

jscomp/core/lam_dispatch_primitive.ml

@@ -264,10 +264,6 @@ let translate loc (prim_name : string) (args : J.expression list) : J.expression
       match args with
       | [e] -> {e with expression_desc = Await e}
       | _ -> assert false)
-  | "?array_spread" -> (
-      match args with
-      | [e] -> {e with expression_desc = Spread e}
-      | _ -> assert false)
   | "?create_dict" -> (
     match args with
     | [{expression_desc = Array (items, _)}] ->

jscomp/core/lam_primitive.ml

@@ -112,6 +112,7 @@ type t =
   | Pbytessets
   (* Array operations *)
   | Pmakearray
+  | Parrayspread
   | Parraylength
   | Parrayrefu
   | Parraysetu
@@ -307,6 +308,7 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
   | Poffsetint i0 -> ( match rhs with Poffsetint i1 -> i0 = i1 | _ -> false)
   | Poffsetref i0 -> ( match rhs with Poffsetref i1 -> i0 = i1 | _ -> false)
   | Pmakearray -> rhs = Pmakearray
+  | Parrayspread -> rhs = Parrayspread
   | Parraylength -> rhs = Parraylength
   | Parrayrefu -> rhs = Parrayrefu
   | Parraysetu -> rhs = Parraysetu

jscomp/core/lam_primitive.mli

@@ -101,6 +101,7 @@ type t =
   | Pbytessets
   (* Array operations *)
   | Pmakearray
+  | Parrayspread
   | Parraylength
   | Parrayrefu
   | Parraysetu

jscomp/core/lam_print.ml

@@ -168,6 +168,7 @@ let primitive ppf (prim : Lam_primitive.t) =
   | Pbytessets -> fprintf ppf "bytes.set"
   | Parraylength -> fprintf ppf "array.length"
   | Pmakearray -> fprintf ppf "makearray"
+  | Parrayspread -> fprintf ppf "array.spread"
   | Parrayrefu -> fprintf ppf "array.unsafe_get"
   | Parraysetu -> fprintf ppf "array.unsafe_set"
   | Parrayrefs -> fprintf ppf "array.get"

jscomp/ml/lambda.ml

@@ -240,6 +240,7 @@ type primitive =
   | Pbyteslength | Pbytesrefu | Pbytessetu | Pbytesrefs | Pbytessets
   (* Array operations *)
   | Pmakearray of  Asttypes.mutable_flag
+  | Parrayspread
   | Parraylength 
   | Parrayrefu 
   | Parraysetu 

jscomp/ml/lambda.mli

@@ -206,6 +206,7 @@ type primitive =
   | Pbyteslength | Pbytesrefu | Pbytessetu | Pbytesrefs | Pbytessets
   (* Array operations *)
   | Pmakearray of  mutable_flag
+  | Parrayspread
   | Parraylength 
   | Parrayrefu 
   | Parraysetu 

jscomp/ml/printlambda.ml

@@ -206,6 +206,7 @@ let primitive ppf = function
   | Parraylength  -> fprintf ppf "array.length" 
   | Pmakearray Mutable -> fprintf ppf "makearray" 
   | Pmakearray Immutable -> fprintf ppf "makearray_imm" 
+  | Parrayspread -> fprintf ppf "array.spread"
   | Parrayrefu -> fprintf ppf "array.unsafe_get" 
   | Parraysetu -> fprintf ppf "array.unsafe_set" 
   | Parrayrefs -> fprintf ppf "array.get" 
@@ -316,6 +317,7 @@ let name_of_primitive = function
   | Pbytessets -> "Pbytessets"
   | Parraylength -> "Parraylength"
   | Pmakearray _-> "Pmakearray"
+  | Parrayspread -> "Parrayspread"
   | Parrayrefu -> "Parrayrefu"
   | Parraysetu -> "Parraysetu"
   | Parrayrefs -> "Parrayrefs"

jscomp/ml/translcore.ml

@@ -396,6 +396,7 @@ let primitives_table =
       ("%array_safe_set", Parraysets);
       ("%array_unsafe_get", Parrayrefu);
       ("%array_unsafe_set", Parraysetu);
+      ("%array_spread", Parrayspread);
       ("%floatarray_length", Parraylength);
       ("%floatarray_safe_get", Parrayrefs);
       ("%floatarray_safe_set", Parraysets);

jscomp/runtime/caml_array.res

@@ -106,4 +106,4 @@ let blit = (a1, i1, a2, i2, len) =>
     }
   }
 
-external unsafe_spread: array<'a> => 'a = "?array_spread"
+external unsafe_spread: array<'a> => 'a = "%array_spread"

jscomp/runtime/caml_array.resi

@@ -38,4 +38,4 @@ let get: (array<'a>, int) => 'a
 
 let set: (array<'a>, int, 'a) => unit
 
-external unsafe_spread: array<'a> => 'a = "?array_spread"
+external unsafe_spread: array<'a> => 'a = "%array_spread"