compress external names when all are dummy

Author: bobzhang

jscomp/core/lam_convert.ml

@@ -456,6 +456,10 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
       let args = Ext_list.map args  convert_aux in
       prim ~primitive:(Pjs_object_create labels) ~args loc
     | Ffi_bs(arg_types, result_type, ffi) ->
+      let arg_types = 
+        match arg_types with 
+        | Params ls -> ls 
+        | Param_number i -> Ext_list.init i (fun _ -> External_arg_spec.dummy )   in 
       let args = Ext_list.map args convert_aux in
       Lam.handle_bs_non_obj_ffi arg_types result_type ffi args loc prim_name
     | Ffi_inline_const i -> Lam.const i

jscomp/main/builtin_cmi_datasets.ml

@@ -145,13 +145,12 @@ let handleTdcl
                       {pld_name with txt = pld_name.txt ^ "Get"}
                    ) ~attrs:get_attrs
                    ~prim:(
-                     ["" ; (* Not needed actually*)
-                      External_ffi_types.to_string 
-                        (Ffi_bs (
-                            [{arg_type = Nothing; arg_label = Arg_empty}],
-                            Return_identity,
-                            Js_get {js_get_name = prim_as_name; js_get_scopes = []}
-                          ))] )
+                      (* Not needed actually*)
+                      External_ffi_types.ffi_bs_as_prims 
+                            [External_arg_spec.dummy]
+                            Return_identity
+                            (Js_get {js_get_name = prim_as_name; js_get_scopes = []})                      
+                           )
                    (Ast_compatible.arrow ~loc  core_type pld_type))
                 :: acc                
               )

jscomp/main/builtin_cmj_datasets.ml

@@ -503,7 +503,7 @@ let process_obj
         (* result type can not be labeled *)
     in
     Ast_compatible.mk_fn_type new_arg_types_ty result,
-    External_ffi_types.Ffi_obj_create arg_kinds
+    External_ffi_types.ffi_obj_create arg_kinds
   | _ -> Location.raise_errorf ~loc "Attribute found that conflicts with [@@bs.obj]"
 
 
@@ -938,7 +938,7 @@ let handle_attributes
        return type, in the future we may  *)
     let return_wrapper = check_return_wrapper loc external_desc.return_wrapper result_type in
     Ast_compatible.mk_fn_type new_arg_types_ty result_type,  
-    Ffi_bs (arg_type_specs, return_wrapper, ffi),
+    External_ffi_types.ffi_bs arg_type_specs return_wrapper ffi,
     unused_attrs,
     relative 
 
@@ -972,9 +972,8 @@ let pval_prim_of_labels (labels : string Asttypes.loc list) =
           {obj_arg_type = Nothing ;
            obj_arg_label  } :: arg_kinds
       ) in
-  let encoding =
-    External_ffi_types.to_string (Ffi_obj_create arg_kinds) in
-  [""; encoding]
+  External_ffi_types.ffi_obj_as_prims arg_kinds
+
 
 let pval_prim_of_option_labels
     (labels : (bool * string Asttypes.loc) list)
@@ -995,7 +994,6 @@ let pval_prim_of_option_labels
           in
           {obj_arg_type = Nothing ;
            obj_arg_label  } :: arg_kinds) in
-  let encoding =
-    External_ffi_types.to_string (Ffi_obj_create arg_kinds) in
-  [""; encoding]
+  External_ffi_types.ffi_obj_as_prims arg_kinds
+  
 

jscomp/syntax/ast_derive_abstract.ml

@@ -113,3 +113,5 @@ let obj_label name  =
 let optional name = Obj_optional {name}
 
 let empty_kind obj_arg_type = { obj_arg_label = empty_label ; obj_arg_type }
+let dummy = 
+  {arg_type = Nothing; arg_label = Arg_empty}  

jscomp/syntax/ast_external_process.ml

@@ -80,3 +80,4 @@ val empty_label : label
 val obj_label :  string -> label
 val optional  : string -> label
 val empty_kind : attr -> obj_param
+val dummy : param

jscomp/syntax/external_arg_spec.ml

@@ -119,8 +119,12 @@ type return_wrapper =
   | Return_null_undefined_to_opt
   | Return_replaced_with_unit
 
+type params = 
+  | Params of   External_arg_spec.params
+  | Param_number of int 
+
 type t  =
-  | Ffi_bs of External_arg_spec.params  *
+  | Ffi_bs of params  *
      return_wrapper * external_spec
   (**  [Ffi_bs(args,return,attr) ]
        [return] means return value is unit or not,
@@ -301,5 +305,29 @@ let inline_int_primitive i : string list =
   [""; 
     to_string 
     (Ffi_inline_const 
-      (Lam_constant.Const_int32 (Int32.of_int i)))
-  ]
+      (Const_int32 (Int32.of_int i)))
+  ]
+
+
+let rec ffi_bs_aux acc (params : External_arg_spec.params) = 
+  match params with 
+  | {arg_type = Nothing; arg_label = Arg_empty} 
+  (* same as External_arg_spec.dummy*)
+    :: rest -> 
+      ffi_bs_aux (acc + 1) rest 
+  | _ :: _ -> -1    
+  | [] -> acc         
+
+let ffi_bs (params : External_arg_spec.params) return attr =
+  let n = ffi_bs_aux 0 params in 
+  if n < 0 then  Ffi_bs (Params params,return,attr)  
+  else Ffi_bs (Param_number n, return, attr) 
+
+let ffi_bs_as_prims params return attr = 
+  [""; to_string (ffi_bs params return attr)]
+
+let ffi_obj_create obj_params =
+   Ffi_obj_create obj_params
+
+let ffi_obj_as_prims obj_params = 
+  ["";to_string (Ffi_obj_create obj_params)]

jscomp/syntax/external_arg_spec.mli

@@ -100,9 +100,13 @@ type return_wrapper =
   | Return_null_undefined_to_opt
   | Return_replaced_with_unit
 
-type t  =
+type params = 
+  | Params of   External_arg_spec.params
+  | Param_number of int 
+
+type t  = private
   | Ffi_bs of
-      External_arg_spec.params  *
+      params  *
       return_wrapper *
       external_spec
   | Ffi_obj_create of External_arg_spec.obj_params
@@ -131,4 +135,24 @@ val inline_bool_primitive :
 
 val inline_int_primitive :   
   int -> 
+  string list
+
+val ffi_bs:
+  External_arg_spec.params ->
+  return_wrapper -> 
+  external_spec -> 
+  t
+
+val ffi_bs_as_prims:  
+  External_arg_spec.params ->
+  return_wrapper -> 
+  external_spec -> 
+  string list 
+  
+val ffi_obj_create:
+  External_arg_spec.obj_params ->
+  t 
+
+val ffi_obj_as_prims:
+  External_arg_spec.obj_params ->
   string list