Merge pull request #2740 from BuckleScript/clean_arity

clean arity handling

Author: bobzhang

jscomp/Makefile

@@ -298,7 +298,7 @@ CORE_SRCS= js_runtime_modules \
 	lam_group \
 	lam_pass_deep_flatten\
 	js_stmt_make js_pass_flatten\
-	js_pass_tailcall_inline js_of_lam_variant js_pass_flatten_and_mark_dead js_ast_util lam_dce lam_group_pass lam_compile_env lam_stats_util\
+	js_pass_tailcall_inline js_of_lam_variant js_pass_flatten_and_mark_dead js_ast_util lam_dce lam_group_pass lam_compile_env lam_arity_analysis\
 	lam_stats_export lam_pass_alpha_conversion lam_pass_collect\
 	js_dump_lit\
 	js_dump_string\

jscomp/all.depend

@@ -387,7 +387,8 @@ core/lam_dce.cmi : core/lam_group.cmi
 core/lam_compile_env.cmi : core/ocaml_types.cmi core/lam_module_ident.cmi \
     core/lam.cmi core/js_packages_info.cmi core/js_cmj_format.cmi \
     syntax/external_ffi_types.cmi
-core/lam_stats_util.cmi : core/lam_stats.cmi core/lam_arity.cmi core/lam.cmi
+core/lam_arity_analysis.cmi : core/lam_stats.cmi core/lam_arity.cmi \
+    core/lam.cmi
 core/lam_stats_export.cmi : core/lam_stats.cmi core/lam_module_ident.cmi \
     core/lam.cmi core/js_cmj_format.cmi ext/ident_map.cmi
 core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
@@ -565,24 +566,24 @@ core/lam_compile_env.cmx : ext/string_map.cmx core/ocaml_types.cmx \
     core/js_stmt_make.cmx core/js_exp_make.cmx common/js_config.cmx \
     core/js_cmj_load.cmx core/js_cmj_format.cmx syntax/external_ffi_types.cmx \
     ext/ext_string.cmx ext/ext_modulename.cmx core/lam_compile_env.cmi
-core/lam_stats_util.cmx : core/lam_stats.cmx core/lam_compile_env.cmx \
+core/lam_arity_analysis.cmx : core/lam_stats.cmx core/lam_compile_env.cmx \
     core/lam_arity.cmx core/lam.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
-    core/lam_stats_util.cmi
-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_analysis.cmi
+core/lam_stats_export.cmx : ext/string_map.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_analysis.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/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
-core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
-    core/lam_stats.cmx core/lam_arity.cmx core/lam.cmx ext/ident_set.cmx \
-    ext/ident_hashtbl.cmx core/lam_pass_collect.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.cmx \
+    core/lam_eta_conversion.cmx core/lam_arity_analysis.cmx \
+    core/lam_arity.cmx core/lam.cmx ext/ext_list.cmx \
+    core/lam_pass_alpha_conversion.cmi
+core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats.cmx \
+    core/lam_arity_analysis.cmx core/lam_arity.cmx core/lam.cmx \
+    ext/ident_set.cmx ext/ident_hashtbl.cmx core/lam_pass_collect.cmi
 core/js_dump_lit.cmx : ext/literals.cmx ext/ext_string.cmx
 core/js_dump_string.cmx : ext/ext_pp.cmx core/js_dump_string.cmi
 core/js_dump_property.cmx : core/js_dump_string.cmx core/js_dump_lit.cmx \
@@ -682,10 +683,10 @@ core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     ext/ident_set.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
     core/lam_pass_remove_alias.cmi
 core/lam_coercion.cmx : ext/string_hash_set.cmx core/lam_util.cmx \
-    core/lam_stats_util.cmx core/lam_stats.cmx core/lam_group.cmx \
-    core/lam_dce.cmx core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
-    ext/ident_hashtbl.cmx ext/ext_list.cmx depends/bs_exception.cmx \
-    core/lam_coercion.cmi
+    core/lam_stats.cmx core/lam_group.cmx core/lam_dce.cmx \
+    core/lam_arity_analysis.cmx core/lam_arity.cmx core/lam.cmx \
+    ext/ident_set.cmx ext/ident_map.cmx ext/ident_hashtbl.cmx \
+    ext/ext_list.cmx depends/bs_exception.cmx core/lam_coercion.cmi
 core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
     core/lam_stats_export.cmx core/lam_stats.cmx \
     core/lam_pass_remove_alias.cmx core/lam_pass_lets_dce.cmx \

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_cmj_format.ml

@@ -41,7 +41,7 @@ type cmj_value = {
 type effect = string option
 
 
-let single_na = Single NA
+let single_na = Single Lam_arity.na
 (** we don't force people to use package *)
 type cmj_case = Ext_namespace.file_kind
 

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,38 +24,96 @@
 
 
 type t = 
-  | Determin of bool * (int * Ident.t list option) list  * bool
-    (**
-      when the first argument is true, it is for sure 
-      the last one means it can take any params later, 
-      for an exception: it is (Determin (true,[], true))
-      1. approximation sound but not complete 
-      
-   *)
-  | NA 
+  | Arity_info of  int  list  * bool
+  (**
+     the last one means it can take any params later, 
+     for an exception: it is (Determin (true,[], true))
+     1. approximation sound but not complete 
+
+  *)
+  | Arity_na
 
 let pp = Format.fprintf
 
 let print (fmt : Format.formatter) (x : t) = 
   match x with 
-  | NA -> pp fmt "?"
-  | Determin (b,ls,tail) -> 
+  | Arity_na -> pp fmt "?"
+  | Arity_info (ls,tail) -> 
     begin 
       pp fmt "@[";
-      (if not b 
-       then 
-         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 "@ *";
       pp fmt "]@]";
     end
-  
-  let print_arities_tbl 
+
+let print_arities_tbl 
     (fmt : Format.formatter) 
     (arities_tbl : (Ident.t, t ref) Hashtbl.t) = 
   Hashtbl.fold (fun (i:Ident.t) (v : t ref) _ -> 
       pp Format.err_formatter "@[%s -> %a@]@."i.name print !v ) arities_tbl ()
+
+
+
+
+
+let merge 
+    (n : int )
+    (x : t) : t = 
+  match x with 
+  | Arity_na -> Arity_info ( [n], false)
+  | Arity_info (xs,tail) -> Arity_info ( n :: xs, tail)
+
+
+let non_function_arity_info =   
+  Arity_info ([], false)
+
+let raise_arity_info =   
+  Arity_info ([],true)
+
+let na = Arity_na
+
+let info args b1 = 
+  Arity_info ( args, b1)
+
+
+let first_arity_na ( x : t ) =   
+  match x with 
+  | Arity_na 
+  | Arity_info ( [], _) -> true
+  | _ -> false
+
+let get_first_arity (x : t) =   
+  match x with 
+  | Arity_na 
+  | Arity_info ( [], _) -> None
+  | Arity_info ( x::_, _) ->  Some x
+
+let extract_arity ( x : t) =   
+  match x with 
+  | Arity_na  -> []
+  | Arity_info(xs,_) ->  xs 
+
+(* let update_arity (x : t) xs =    *)
+
+let rec
+  merge_arities_aux 
+    (acc : int list) 
+    (xs : int list) (ys : int list) (tail : bool) (tail2 : bool) = 
+  match xs,ys with
+  | [], [] -> 
+    info (List.rev acc) (tail && tail2) 
+  | [], y::ys when tail  -> 
+    merge_arities_aux (y::acc)   [] ys tail tail2
+  | x::xs, [] when tail2 -> 
+    merge_arities_aux (x::acc)   [] xs tail tail2
+  | x::xs, y::ys when x = y ->
+    merge_arities_aux (y :: acc)   xs ys tail tail2
+  | _, _  -> 
+  info (List.rev acc) false
+
+let merge_arities  xs ys t t2 = 
+  merge_arities_aux []  xs ys t t2

jscomp/core/lam_arity.mli

@@ -23,20 +23,41 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type t = 
-  | Determin of bool * (int * Ident.t list option) list  * bool
+type t = private
+  | Arity_info of int list  * bool
     (**
       when the first argument is true, it is for sure 
       the last one means it can take any params later, 
-      for an exception: it is (Determin (true,[], true))
-      1. approximation sound but not complete 
-      
+      for an exception: it is (Arity_info([], true))
+       approximation sound but not complete       
    *)
-  | NA 
+  | Arity_na 
 
 val print : Format.formatter -> t -> unit   
 
 val print_arities_tbl : 
   Format.formatter -> 
   (Ident.t, t ref) Hashtbl.t -> 
   unit 
+
+val merge : int -> t -> t   
+
+val non_function_arity_info : t
+
+val raise_arity_info : t 
+
+val na : t
+val info : int list -> bool -> t 
+
+val first_arity_na :  t -> bool
+val get_first_arity : t -> int option 
+
+(** when [NA] return  empty list*)
+val extract_arity : t -> int list 
+
+val merge_arities : 
+  int list -> 
+  int list -> 
+  bool -> 
+  bool -> 
+  t