clean up arity, remove gen_tds which was never prod ready

Author: bobzhang

jscomp/all.depend

@@ -572,11 +572,10 @@ core/lam_stats_export.cmx : ext/string_map.cmx core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_module_ident.cmx core/lam_inline_util.cmx \
     core/lam_id_kind.cmx core/lam_compile_env.cmx core/lam_closure.cmx \
     core/lam_arity.cmx core/lam_analysis.cmx core/lam.cmx \
-    core/js_packages_state.cmx common/js_config.cmx core/js_cmj_format.cmx \
-    ext/ident_set.cmx ext/ident_map.cmx ext/ident_hashtbl.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
-    ext/ext_option.cmx common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    ext/ext_array.cmx core/lam_stats_export.cmi
+    core/js_packages_state.cmx core/js_cmj_format.cmx ext/ident_set.cmx \
+    ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_option.cmx \
+    common/ext_log.cmx ext/ext_list.cmx ext/ext_array.cmx \
+    core/lam_stats_export.cmi
 core/lam_pass_alpha_conversion.cmx : core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_eta_conversion.cmx core/lam.cmx \
     ext/ext_list.cmx core/lam_pass_alpha_conversion.cmi

jscomp/common/js_config.ml

@@ -65,7 +65,6 @@ let (//) = Filename.concat
 
 (* let get_packages_info () = !packages_info *)
 
-let default_gen_tds = ref false
 let no_builtin_ppx_ml = ref false
 let no_builtin_ppx_mli = ref false
 

jscomp/common/js_config.mli

@@ -57,9 +57,6 @@ val get_diagnose : unit -> bool
 val set_diagnose : bool -> unit 
 
 
-(** generate tds option *)
-val default_gen_tds : bool ref
-
 (** options for builtin ppx *)
 val no_builtin_ppx_ml : bool ref 
 val no_builtin_ppx_mli : bool ref 

jscomp/core/js_main.ml

@@ -192,10 +192,6 @@ let buckle_script_flags : (string * Arg.spec * string) list =
    Arg.Set Js_config.cross_module_inline, 
    "enable cross module inlining(experimental), default(false)")
   :: 
-  ("-bs-gen-tds",
-   Arg.Set Js_config.default_gen_tds, 
-   " set will generate `.d.ts` file for typescript (experimental)")
-  :: 
   ("-bs-diagnose",
    Arg.Set Js_config.diagnose, 
    " More verbose output")

jscomp/core/lam_arity.ml

@@ -24,7 +24,7 @@
 
 
 type t = 
-  | Determin of bool * (int * Ident.t list option) list  * bool
+  | Determin of bool * int  list  * bool
     (**
       when the first argument is true, it is for sure 
       the last one means it can take any params later, 
@@ -47,7 +47,7 @@ let print (fmt : Format.formatter) (x : t) =
          pp fmt "~");
       pp fmt "[";
       Format.pp_print_list ~pp_sep:(fun fmt () -> pp fmt ",")
-        (fun fmt  (x,_) -> Format.pp_print_int fmt x)
+        (fun fmt  x -> Format.pp_print_int fmt x)
         fmt ls ;
       if tail 
       then pp fmt "@ *";

jscomp/core/lam_arity.mli

@@ -24,7 +24,7 @@
 
 
 type t = 
-  | Determin of bool * (int * Ident.t list option) list  * bool
+  | Determin of bool * int list  * bool
     (**
       when the first argument is true, it is for sure 
       the last one means it can take any params later, 

jscomp/core/lam_compile.ml

@@ -181,7 +181,7 @@ and compile_external_field_apply
         match arity, len with
         | _, 0 ->
           acc (** All arguments consumed so far *)
-        | Determin (a, (x,_) :: rest, b), len   ->
+        | Determin (a, x :: rest, b), len   ->
           let x =
             if x = 0
             then 1

jscomp/core/lam_pass_alpha_conversion.ml

@@ -44,7 +44,7 @@ let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
           let len = List.length ll in 
           let rec take args = 
             match args with 
-            | (x,_) :: xs -> 
+            | x :: xs -> 
               if x = len 
               then 
                 Lam.apply (simpl l1)
@@ -77,7 +77,7 @@ let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
       ; loc } -> 
 
       begin match Lam_stats_util.get_arity meta arg with       
-      | Determin (b, (x,_)::_, tail)
+      | Determin (b, x::_, tail)
         -> 
         let arg = simpl arg in
           Lam_eta_conversion.unsafe_adjust_to_arity loc 

jscomp/core/lam_stats_export.ml

@@ -32,26 +32,7 @@ let pp = Format.fprintf
 
 (* let meaningless_names  = ["*opt*"; "param";] *)
 
-let rec dump_ident fmt (id : Ident.t) (arity : Lam_arity.t)  = 
-  pp fmt  "@[<2>export var %s:@ %a@ ;@]" (Ext_ident.convert id.name ) dump_arity arity
-
-and dump_arity fmt (arity : Lam_arity.t) = 
-  match arity with 
-  | NA -> pp fmt "any"
-  | Determin (_, [], _) -> pp fmt "any"
-  | Determin (_, (n,args)::xs, _) -> 
-    let args = match args with 
-      | Some args -> args 
-      | None -> Ext_list.init n (fun _ -> Ident.create "param") in
-    pp fmt "@[(%a)@ =>@ any@]" 
-      (Format.pp_print_list  
-         ~pp_sep:(fun fmt _ -> 
-             Format.pp_print_string fmt ",";
-             Format.pp_print_space fmt ();
-           )
-         (fun fmt ident -> pp fmt "@[%s@ :@ any@]" 
-             (Ext_ident.convert  @@ Ident.name ident))
-      ) args 
+
 
 let single_na = Js_cmj_format.single_na
 
@@ -134,14 +115,7 @@ let get_effect (meta : Lam_stats.t) maybe_pure external_ids =
                         ) external_ids) (fun x -> Lam_module_ident.name x)
   | Some _ -> maybe_pure
 
-let rec dump meta fmt ids = 
-  (* TODO: also use {[Ext_pp]} module instead *)
-  match ids with 
-  | [] -> ()
-  | x::xs -> 
-    dump_ident fmt x (Lam_stats_util.get_arity meta (Lam.var x)) ; 
-    Format.pp_print_space fmt ();
-    dump meta fmt xs
+
 
 (* Note that 
    [lambda_exports] is 
@@ -162,12 +136,6 @@ let export_to_cmj
     cmj_case
   : Js_cmj_format.t = 
   let values =  values_of_export meta export_map in
-  let () =
-    if !Js_config.default_gen_tds && not ( Ext_string.is_empty meta.filename) then
-      Ext_pervasives.with_file_as_pp
-        (Ext_path.chop_extension ~loc:__LOC__ meta.filename ^ ".d.ts")
-      @@ fun fmt ->
-      pp fmt "@[<v>%a@]@." (dump meta) meta.exports in
   let effect = get_effect meta maybe_pure external_ids in
   {values; 
    effect ; 

jscomp/core/lam_stats_util.ml

@@ -24,11 +24,11 @@
 
 
 let merge 
-    ((n : int ), params as y)
+    (n : int )
     (x : Lam_arity.t) : Lam_arity.t = 
   match x with 
-  | NA -> Determin(false, [y], false)
-  | Determin (b,xs,tail) -> Determin (b, y :: xs, tail)
+  | NA -> Determin(false, [n], false)
+  | Determin (b,xs,tail) -> Determin (b, n :: xs, tail)
 
 
 let arity_of_var (meta : Lam_stats.t) (v : Ident.t)  =
@@ -110,15 +110,12 @@ let rec get_arity
       | Determin (b, xs, tail ) -> 
         let rec take (xs : _ list) arg_length = 
           match xs with 
-          | (x,y) :: xs ->
+          | (x) :: xs ->
             if arg_length = x then Lam_arity.Determin (b, xs, tail) 
             else if arg_length > x then
               take xs (arg_length - x)
             else Determin (b, 
-                           ((x -  arg_length ), 
-                            (match y with
-                            | Some y -> Some (Ext_list.drop arg_length y) 
-                            | None -> None)) :: xs ,
+                           (x -  arg_length ) :: xs ,
                            tail)
           | [] -> 
             if tail then Determin(b, [], tail)
@@ -135,7 +132,7 @@ let rec get_arity
         take xs (List.length args) 
     end
   | Lfunction {arity; function_kind; params; body = l} -> 
-    merge (arity, Some params)  (get_arity meta l)
+    merge arity  (get_arity meta l)
   | Lswitch(l, {sw_failaction; 
                 sw_consts; 
                 sw_blocks;