make sure rest is used and move logic to its own files

Author: tsnobip

compiler/core/lam_analysis.ml

@@ -53,7 +53,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
     (* whether it's mutable or not *)
     | Pfield _ | Pval_from_option | Pval_from_option_not_nest
     (* NOP The compiler already [t option] is the same as t *)
-    | Pduprecord | Precord_spread_new _
+    | Pduprecord | Precord_rest _
     (* generic primitives *)
     | Pobjcomp _ | Pobjorder | Pobjmin | Pobjmax | Pobjtag | Pobjsize
     (* bool primitives *)

compiler/core/lam_compile_primitive.ml

@@ -603,7 +603,7 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
     match args with
     | [e1] -> E.obj ~dup:e1 []
     | _ -> assert false)
-  | Precord_spread_new excluded -> (
+  | Precord_rest excluded -> (
     match args with
     | [e1] ->
       (* Generate: (({field1: __unused0, ...__rest}) => __rest)(source)

compiler/core/lam_convert.ml

@@ -205,8 +205,7 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Pfield (id, info) -> prim ~primitive:(Pfield (id, info)) ~args loc
   | Psetfield (id, info) -> prim ~primitive:(Psetfield (id, info)) ~args loc
   | Pduprecord -> prim ~primitive:Pduprecord ~args loc
-  | Precord_spread_new excluded ->
-    prim ~primitive:(Precord_spread_new excluded) ~args loc
+  | Precord_rest excluded -> prim ~primitive:(Precord_rest excluded) ~args loc
   | Praise _ -> prim ~primitive:Praise ~args loc
   | Pobjcomp x -> prim ~primitive:(Pobjcomp x) ~args loc
   | Pobjorder -> prim ~primitive:Pobjorder ~args loc

compiler/core/lam_primitive.ml

@@ -40,7 +40,7 @@ type t =
   | Psetfield of int * Lam_compat.set_field_dbg_info
   (* could have field info at least for record *)
   | Pduprecord
-  | Precord_spread_new of string list
+  | Precord_rest of string list
   (* External call *)
   | Pjs_call of {
       prim_name: string;
@@ -227,7 +227,7 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
   | Pnull_to_opt | Pnull_undefined_to_opt | Pis_null | Pis_not_none | Psome
   | Psome_not_nest | Pis_undefined | Pis_null_undefined | Pimport | Ptypeof
   | Pfn_arity | Pis_poly_var_block | Pdebugger | Pinit_mod | Pupdate_mod
-  | Pduprecord | Precord_spread_new _ | Pmakearray | Parraylength | Parrayrefu
+  | Pduprecord | Precord_rest _ | Pmakearray | Parraylength | Parrayrefu
   | Parraysetu | Parrayrefs | Parraysets | Pjs_fn_make_unit | Pjs_fn_method
   | Phash | Phash_mixstring | Phash_mixint | Phash_finalmix ->
     rhs = lhs

compiler/core/lam_primitive.mli

@@ -36,7 +36,7 @@ type t =
   | Pfield of int * Lambda.field_dbg_info
   | Psetfield of int * Lambda.set_field_dbg_info
   | Pduprecord
-  | Precord_spread_new of string list
+  | Precord_rest of string list
   | Pjs_call of {
       (* Location.t *  [loc] is passed down *)
       prim_name: string;

compiler/core/lam_print.ml

@@ -81,8 +81,8 @@ let primitive ppf (prim : Lam_primitive.t) =
     let instr = "setfield " in
     fprintf ppf "%s%i" instr n
   | Pduprecord -> fprintf ppf "duprecord"
-  | Precord_spread_new excluded ->
-    fprintf ppf "record_spread_new(%s)" (String.concat ", " excluded)
+  | Precord_rest excluded ->
+    fprintf ppf "record_rest(%s)" (String.concat ", " excluded)
   | Pjs_call {prim_name} -> fprintf ppf "%s[js]" prim_name
   | Pjs_object_create _ -> fprintf ppf "[js.obj]"
   | Praise -> fprintf ppf "raise"

compiler/frontend/ast_tuple_pattern_flatten.ml

@@ -65,7 +65,7 @@ let flattern_tuple_pattern_vb (self : Bs_ast_mapper.mapper)
           :: acc)
     | _ -> {pvb_pat; pvb_expr; pvb_loc = vb.pvb_loc; pvb_attributes} :: acc)
   | Ppat_record (_, _, Some rest), Pexp_pack {pmod_desc = Pmod_ident _} ->
-    Location.raise_errorf ~loc:rest.ppat_loc
+    Location.raise_errorf ~loc:rest.rest_loc
       "Record rest patterns are not supported when destructuring modules. Bind \
        the module fields explicitly."
   | Ppat_record (lid_pats, _, None), Pexp_pack {pmod_desc = Pmod_ident id} ->

compiler/frontend/bs_ast_mapper.ml

@@ -430,7 +430,13 @@ module P = struct
         ?rest:
           (match rest with
           | None -> None
-          | Some p -> Some (sub.pat sub p))
+          | Some {rest_loc; rest_name; rest_type} ->
+            Some
+              {
+                rest_loc = sub.location sub rest_loc;
+                rest_name = map_loc sub rest_name;
+                rest_type = map_opt (sub.typ sub) rest_type;
+              })
         (List.map
            (fun {lid; x = p; opt} ->
              {lid = map_loc sub lid; x = sub.pat sub p; opt})

compiler/ml/ast_helper.mli

@@ -102,7 +102,7 @@ module Pat : sig
   val record :
     ?loc:loc ->
     ?attrs:attrs ->
-    ?rest:pattern ->
+    ?rest:record_pat_rest ->
     pattern record_element list ->
     closed_flag ->
     pattern

compiler/ml/ast_iterator.ml

@@ -404,7 +404,11 @@ module P = struct
           iter_loc sub lid;
           sub.pat sub pat)
         lpl;
-      iter_opt (sub.pat sub) rest
+      iter_opt
+        (fun {rest_name; rest_type; _} ->
+          iter_loc sub rest_name;
+          iter_opt (sub.typ sub) rest_type)
+        rest
     | Ppat_array pl -> List.iter (sub.pat sub) pl
     | Ppat_or (p1, p2) ->
       sub.pat sub p1;