remove function_kind which does not make sense

Author: bobzhang

jscomp/core/lam_convert.ml

@@ -713,9 +713,8 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
       (* we need do this eargly in case [aux fn] add some wrapper *)
       Lam.apply (convert_aux fn) (Ext_list.map args convert_aux ) {ap_loc = loc; ap_inlined = (convert_inline_attr ap_inlined); ap_status =  App_na}
     | Lfunction 
-        {kind; params; body ; attr }
+        { params; body ; attr }
       ->  
-      assert (kind = Curried);
       let new_map,body = rename_optional_parameters Map_ident.empty params body in 
       let attr = convert_fn_attribute attr in 
       if Map_ident.is_empty new_map then

jscomp/ml/lambda.ml

@@ -239,7 +239,7 @@ type specialise_attribute =
   | Never_specialise (* [@specialise never] *)
   | Default_specialise (* no [@specialise] attribute *)
 
-type function_kind = Curried | Tupled
+
 
 type let_kind = Strict | Alias | StrictOpt | Variable
 
@@ -276,7 +276,7 @@ type lambda =
   | Lsend of string * lambda * Location.t
 
 and lfunction =
-  { kind: function_kind;
+  { 
     params: Ident.t list;
     body: lambda;
     attr: function_attribute; (* specified with [@inline] attribute *)
@@ -598,8 +598,8 @@ let subst_lambda s lam =
   | Lapply ap ->
       Lapply{ap with ap_func = subst ap.ap_func;
                      ap_args = List.map subst ap.ap_args}
-  | Lfunction{kind; params; body; attr; loc} ->
-      Lfunction{kind; params; body = subst body; attr; loc}
+  | Lfunction{ params; body; attr; loc} ->
+      Lfunction{ params; body = subst body; attr; loc}
   | Llet(str, k, id, arg, body) -> Llet(str, k, id, subst arg, subst body)
   | Lletrec(decl, body) -> Lletrec(List.map subst_decl decl, subst body)
   | Lprim(p, args, loc) -> Lprim(p, List.map subst args, loc)
@@ -645,8 +645,8 @@ let rec map f lam =
           ap_inlined;
           ap_specialised;
         }
-    | Lfunction { kind; params; body; attr; loc; } ->
-        Lfunction { kind; params; body = map f body; attr; loc; }
+    | Lfunction {  params; body; attr; loc; } ->
+        Lfunction {  params; body = map f body; attr; loc; }
     | Llet (str, k, v, e1, e2) ->
         Llet (str, k, v, map f e1, map f e2)
     | Lletrec (idel, e2) ->

jscomp/ml/lambda.mli

@@ -264,7 +264,7 @@ type specialise_attribute =
   | Never_specialise (* [@specialise never] *)
   | Default_specialise (* no [@specialise] attribute *)
 
-type function_kind = Curried | Tupled
+
 
 type let_kind = Strict | Alias | StrictOpt | Variable
 (* Meaning of kinds for let x = e in e':
@@ -315,7 +315,7 @@ type lambda =
   | Lsend of string * lambda *  Location.t
 
 and lfunction =
-  { kind: function_kind;
+  {
     params: Ident.t list;
     body: lambda;
     attr: function_attribute; (* specified with [@inline] attribute *)

jscomp/ml/printlambda.ml

@@ -418,20 +418,10 @@ let rec lam ppf = function
         apply_tailcall_attribute ap.ap_should_be_tailcall
         apply_inlined_attribute ap.ap_inlined
         apply_specialised_attribute ap.ap_specialised
-  | Lfunction{kind; params; body; attr} ->
+  | Lfunction{ params; body; attr} ->
       let pr_params ppf params =
-        match kind with
-        | Curried ->
             List.iter (fun param -> fprintf ppf "@ %a" Ident.print param) params
-        | Tupled ->
-            fprintf ppf " (";
-            let first = ref true in
-            List.iter
-              (fun param ->
-                if !first then first := false else fprintf ppf ",@ ";
-                Ident.print ppf param)
-              params;
-            fprintf ppf ")" in
+      in
       fprintf ppf "@[<2>(function%a@ %a%a)@]" pr_params params
         function_attribute attr lam body
   | Llet(str, k, id, arg, body) ->

jscomp/ml/translcore.ml

@@ -425,7 +425,7 @@ let transl_primitive loc p env ty path =
   match prim with
   | Plazyforce ->
       let parm = Ident.create "prim" in
-      Lfunction{kind = Curried; params = [parm];
+      Lfunction{ params = [parm];
                 body = Matching.inline_lazy_force (Lvar parm) Location.none;
                 loc = loc;
                 attr = default_stub_attribute }
@@ -435,7 +435,7 @@ let transl_primitive loc p env ty path =
       | 0 -> lam
       | 1 -> (* TODO: we should issue a warning ? *)
         let param = Ident.create "prim" in
-        Lfunction{kind = Curried; params = [param];
+        Lfunction{ params = [param];
                   attr = default_stub_attribute;
                   loc = loc;
                   body = Lprim(Pmakeblock(0, Lambda.Blk_tuple, Immutable, None),
@@ -450,7 +450,7 @@ let transl_primitive loc p env ty path =
         let params = 
           if prim_arity = 1 then [Ident.create "prim"]  
           else  make_params prim_arity prim_arity in
-        Lfunction{ kind = Curried; params;
+        Lfunction{ params;
                    attr = default_stub_attribute;
                    loc = loc;
                    body = Lprim(prim, List.map (fun id -> Lvar id) params, loc) }
@@ -629,7 +629,7 @@ and transl_exp0 e =
   | Texp_let(rec_flag, pat_expr_list, body) ->
       transl_let rec_flag pat_expr_list (event_before body (transl_exp body))
   | Texp_function { arg_label = _; param; cases; partial; } ->
-      let ((kind, params), body) =        
+      let ( params, body) =        
             let pl = push_defaults e.exp_loc [] cases partial in
             transl_function e.exp_loc  partial
               param pl
@@ -641,7 +641,7 @@ and transl_exp0 e =
       }
       in
       let loc = e.exp_loc in
-      Lfunction{kind; params; body; attr; loc}
+      Lfunction{ params; body; attr; loc}
   | Texp_apply({ exp_desc = Texp_ident(path, _, {val_kind = Val_prim p});
                 exp_type = prim_type } as funct, oargs)
     when List.length oargs >= p.prim_arity
@@ -954,11 +954,11 @@ and transl_apply ?(should_be_tailcall=false) ?(inlined = Default_inline)
         and id_arg = Ident.create "param" in
         let body =
           match build_apply handle ((Lvar id_arg, optional)::args') l with
-            Lfunction{kind = Curried; params = ids; body = lam; attr; loc} ->
-              Lfunction{kind = Curried; params = id_arg::ids; body = lam; attr;
+            Lfunction{params = ids; body = lam; attr; loc} ->
+              Lfunction{params = id_arg::ids; body = lam; attr;
                         loc}
           | lam ->
-              Lfunction{kind = Curried; params = [id_arg]; body = lam;
+              Lfunction{params = [id_arg]; body = lam;
                         attr = default_stub_attribute; loc = loc}
         in
         List.fold_left
@@ -980,12 +980,12 @@ and transl_function loc   partial param cases =
       c_rhs={exp_desc = Texp_function { arg_label = _; param = param'; cases;
         partial = partial'; }} as exp}]
     when Parmatch.inactive ~partial pat ->
-      let ((_, params), body) =
+      let (params, body) =
         transl_function exp.exp_loc   partial' param' cases in
-      ((Curried, param :: params),
+      ((param :: params),
        Matching.for_function loc None (Lvar param) [pat, body] partial)
   | _ ->
-      ((Curried, [param]),
+      ([param],
        Matching.for_function loc None (Lvar param)
          (transl_cases cases) partial)
 

jscomp/ml/translmod.ml

@@ -111,7 +111,7 @@ and apply_coercion_result loc strict funct params args cc_res =
       (param :: params) (arg :: args) cc_res
   | _ ->
     name_lambda strict funct (fun id ->
-      Lfunction{kind = Curried; params = List.rev params;
+      Lfunction{ params = List.rev params;
                 attr = { default_function_attribute with
                          is_a_functor = true;
                          stub = true; };
@@ -425,7 +425,6 @@ let rec compile_functor mexp coercion root_path loc =
       functor_params_rev
   in
   Lfunction {
-    kind = Curried;
     params;
     attr = {
       inline = inline_attribute;