change params definition to not saving label names when it's not relevant

Author: bobzhang

jscomp/core/lam.ml

@@ -783,7 +783,7 @@ let sequand l r = if_ l r false_
    if it does not we wrap it in a nomral way otherwise
 *)
 let rec no_auto_uncurried_arg_types
-    (xs : External_arg_spec.t list)  =
+    (xs : External_arg_spec.params)  =
   match xs with
   | [] -> true
   | {arg_type = Fn_uncurry_arity _ } :: _ ->
@@ -802,7 +802,7 @@ let result_wrap loc (result_type : External_ffi_types.return_wrapper) result  =
   | Return_identity ->
     result
 
-let rec transform_uncurried_arg_type loc (arg_types : External_arg_spec.t list)
+let rec transform_uncurried_arg_type loc (arg_types : External_arg_spec.params)
     (args : t list ) =
   match arg_types,args with
   | { arg_type = Fn_uncurry_arity n ; arg_label } :: xs,
@@ -826,7 +826,7 @@ let rec transform_uncurried_arg_type loc (arg_types : External_arg_spec.t list)
 
 
 let handle_bs_non_obj_ffi
-    (arg_types : External_arg_spec.t list)
+    (arg_types : External_arg_spec.params)
     (result_type : External_ffi_types.return_wrapper)
     ffi
     args

jscomp/core/lam.mli

@@ -86,7 +86,7 @@ val inner_map :  t -> (t -> t) -> t
 
 
 val handle_bs_non_obj_ffi:
-  External_arg_spec.t list ->
+  External_arg_spec.params ->
   External_ffi_types.return_wrapper ->
   External_ffi_types.external_spec -> 
   t list -> 

jscomp/core/lam_compile_external_call.ml

@@ -91,12 +91,12 @@ let append_list  x xs =
      This would not work with [NonNullString]
 *)
 let ocaml_to_js_eff 
-    ({arg_label;  arg_type }:  External_arg_spec.t)
+    ({arg_label;  arg_type }:  External_arg_spec.t_noname)
     (raw_arg : E.t)
   : arg_expression * E.t list  =
   let arg =
     match arg_label with
-    | Optional label -> 
+    | Optional  -> 
       Js_of_lam_option.get_default_undefined_from_optional raw_arg
     | Label {cst = None;_} | Empty -> raw_arg
     | Label {cst = Some _;_}
@@ -107,7 +107,7 @@ let ocaml_to_js_eff
   | Fn_uncurry_arity _ -> assert false  
   (* has to be preprocessed by {!Lam} module first *)
   | Extern_unit ->  
-    (if arg_label = External_arg_spec.empty_label then 
+    (if arg_label = Empty then 
       Splice0 else Splice1 E.unit), 
     (if Js_analyzer.no_side_effect_expression arg then 
        []
@@ -133,7 +133,7 @@ let ocaml_to_js_eff
   | Unwrap ->
     let single_arg =
       match arg_label with
-      | Optional label ->
+      | Optional  ->
         (**
            If this is an optional arg (like `?arg`), we have to potentially do
            2 levels of unwrapping:
@@ -158,7 +158,7 @@ let add_eff eff e =
   | Some v -> E.seq v e 
 
 
-type specs = External_arg_spec.t list
+type specs = External_arg_spec.params
 
 type exprs = E.t list 
 (* TODO: fix splice, 
@@ -179,13 +179,13 @@ let assemble_args_no_splice call_loc ffi
     | { arg_label =  Label {cst = Some cst;_}; _} :: labels, args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
-    | ({arg_label = Empty  | Label {cst = None;_} | Optional _ ;_ } as arg_kind) ::labels,
+    | ({arg_label = Empty  | Label {cst = None;_} | Optional  ;_ } as arg_kind) ::labels,
        arg :: args
       ->  
         let accs, eff = aux labels args in 
         let acc, new_eff = ocaml_to_js_eff arg_kind arg in 
         append_list acc  accs, Ext_list.append new_eff  eff
-    | { arg_label = Empty  | Label {cst = None;_} | Optional _  ; _ } :: _ , [] 
+    | { arg_label = Empty  | Label {cst = None;_} | Optional   ; _ } :: _ , [] 
       -> assert false 
   in 
   let args, eff = aux arg_types args  in 
@@ -205,7 +205,7 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
     | { arg_label =  Label {cst = Some cst;_}; _} :: labels  , args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
-    | ({arg_label = Empty | Label {cst = None;_} | Optional _ ;_ } as arg_kind) ::labels,
+    | ({arg_label = Empty | Label {cst = None;_} | Optional  ;_ } as arg_kind) ::labels,
       arg :: args
       ->  
       let accs, eff = aux labels args in 
@@ -217,7 +217,7 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
           let acc, new_eff = ocaml_to_js_eff arg_kind arg in 
           append_list acc  accs, Ext_list.append new_eff  eff 
       end
-    | { arg_label = Empty | Label {cst = None;_} | Optional _  ; _ } :: _ , [] 
+    | { arg_label = Empty | Label {cst = None;_} | Optional   ; _ } :: _ , [] 
       -> assert false 
   in 
   let args, eff = aux arg_types args  in 

jscomp/core/lam_compile_external_call.mli

@@ -31,14 +31,14 @@
 
 (** Compile ocaml external function call to JS IR. *) 
 val ocaml_to_js_eff : 
-  External_arg_spec.t -> 
+  External_arg_spec.t_noname -> 
   J.expression -> 
   Js_of_lam_variant.arg_expression * J.expression list  
 
 val translate_ffi :
   Location.t -> 
   Lam_compile_context.t -> 
-  External_arg_spec.t list -> 
+  External_arg_spec.params -> 
   External_ffi_types.external_spec -> 
   J.expression list -> 
   J.expression 

jscomp/core/lam_primitive.ml

@@ -47,7 +47,7 @@ type t =
   | Pccall of  Primitive_compat.t
   | Pjs_call of
       { prim_name : string ;
-        arg_types : External_arg_spec.t list ;
+        arg_types : External_arg_spec.params ;
         ffi : External_ffi_types.external_spec }
   | Pjs_object_create of External_arg_spec.t list
   (* Exceptions *)

jscomp/core/lam_primitive.mli

@@ -46,7 +46,7 @@ type t =
   | Pjs_call of
     (* Location.t *  [loc] is passed down *)
     { prim_name : string;
-      arg_types : External_arg_spec.t list ;
+      arg_types : External_arg_spec.params ;
       ffi : External_ffi_types.external_spec}
   | Pjs_object_create of External_arg_spec.t list
 

jscomp/syntax/ast_derive_abstract.ml

@@ -148,7 +148,7 @@ let handleTdcl
                      ["" ; (* Not needed actually*)
                       External_ffi_types.to_string 
                         (Ffi_bs (
-                            [{arg_type = Nothing; arg_label = External_arg_spec.empty_label}],
+                            [{arg_type = Nothing; arg_label = Empty}],
                             Return_identity,
                             Js_get {js_get_name = prim_as_name; js_get_scopes = []}
                           ))] )

jscomp/syntax/ast_external_process.ml

@@ -513,7 +513,7 @@ let external_desc_of_non_obj
     (prim_name_or_pval_prim : bundle_source)
     (arg_type_specs_length : int) 
     arg_types_ty 
-    (arg_type_specs : External_arg_spec.t list) : External_ffi_types.external_spec =
+    (arg_type_specs : External_arg_spec.params) : External_ffi_types.external_spec =
   match st with
   | {set_index = true;
      val_name = `Nm_na;
@@ -855,7 +855,7 @@ let handle_attributes
   else
     let splice = external_desc.splice in
     let arg_type_specs, new_arg_types_ty, arg_type_specs_length   =
-      let init : External_arg_spec.t list * Ast_compatible.param_type list * int  = 
+      let init : External_arg_spec.params * Ast_compatible.param_type list * int  = 
         match external_desc.val_send_pipe with
         | Some obj ->
           let new_ty, arg_type = refine_arg_type ~nolabel:true obj in
@@ -864,7 +864,7 @@ let handle_attributes
               Location.raise_errorf ~loc:obj.ptyp_loc "[@bs.as] is not supported in bs.send type "
             | _ ->
               (* more error checking *)
-              [External_arg_spec.empty_kind arg_type],
+              [{arg_label = Empty; arg_type}],
               [{label = Nolabel;
                 ty = new_ty;
                 attr =  [];
@@ -891,7 +891,7 @@ let handle_attributes
                   -> ()
                 | _ -> Location.raise_errorf ~loc "[@@@@bs.splice] expect the last type to be an array";
              end ; 
-           let arg_label, arg_type, new_arg_types =
+           let (arg_label : External_arg_spec.label_noname), arg_type, new_arg_types =
              match arg_label with
              | Optional s  ->
                let arg_type = get_opt_arg_type ~nolabel:false ty in
@@ -902,22 +902,22 @@ let handle_attributes
                      ~loc
                      "[@@bs.string] does not work with optional when it has arities in label %s" s
                  | _ ->
-                   External_arg_spec.optional s, arg_type,
+                   Optional, arg_type,
                    param_type :: arg_types end
              | Labelled s  ->
                begin match refine_arg_type ~nolabel:false ty with
                  | new_ty, (Arg_cst i as arg_type)  ->
-                   External_arg_spec.label s (Some i), arg_type, arg_types
+                   Label {cst = Some i}, arg_type, arg_types
                  | new_ty, arg_type ->
-                   External_arg_spec.label s None, arg_type, 
+                   Label {cst = None}, arg_type, 
                    {param_type with ty = new_ty} :: arg_types
                end
              | Nolabel ->
                begin match refine_arg_type ~nolabel:true ty with
                  | new_ty , (Arg_cst i as arg_type) ->
-                   External_arg_spec.empty_lit i , arg_type,  arg_types
+                   EmptyCst i , arg_type,  arg_types
                  | new_ty , arg_type ->
-                   External_arg_spec.empty_label, arg_type, {param_type with ty = new_ty} :: arg_types
+                   Empty, arg_type, {param_type with ty = new_ty} :: arg_types
                end
            in
            ({ arg_label  ;

jscomp/syntax/external_arg_spec.ml

@@ -32,6 +32,13 @@ type cst =
   | Arg_js_true
   | Arg_js_false
   | Arg_js_json of string
+
+type label_noname = 
+  | Label of { cst : cst option }
+  | Empty 
+  | EmptyCst of cst 
+  | Optional
+  
 type label = 
   | Label of {name : string ; cst : cst option }
   | Empty 
@@ -51,13 +58,21 @@ type attr =
   | Ignore
   | Unwrap
 
+type t_noname = {
+  arg_type : attr;
+  arg_label : label_noname
+}   
+
 type t = 
   {
     arg_type : attr;
     arg_label : label
   }
 
 
+
+type params = t_noname list 
+
 exception Error of Location.t * Ext_json_parse.error
 
 let pp_invaild_json fmt err = 

jscomp/syntax/external_arg_spec.mli

@@ -50,12 +50,25 @@ type attr =
   | Ignore
   | Unwrap
 
+
+type label_noname = 
+  | Label of { cst : cst option }
+  | Empty 
+  | EmptyCst of cst 
+  | Optional
+
 type t = 
   {
     arg_type : attr;
     arg_label :label
   }
 
+type t_noname = {
+  arg_type : attr;
+  arg_label : label_noname
+} 
+type params = t_noname list 
+
 val cst_json : Location.t -> string -> cst 
 val cst_int : int -> cst 
 val cst_string : string -> cst