better names

Author: bobzhang

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 Arity_na
 (** we don't force people to use package *)
 type cmj_case = Ext_namespace.file_kind
 

jscomp/core/lam_arity.ml

@@ -24,22 +24,22 @@
 
 
 type t = 
-  | 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, 
-      for an exception: it is (Determin (true,[], true))
-      1. approximation sound but not complete 
-      
-   *)
-  | NA 
+  | Arity_info 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, 
+     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 (b,ls,tail) -> 
     begin 
       pp fmt "@[";
       (if not b 
@@ -53,9 +53,20 @@ let print (fmt : Format.formatter) (x : t) =
       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 (false, [n], false)
+  | Arity_info (b,xs,tail) -> Arity_info (b, n :: xs, tail)

jscomp/core/lam_arity.mli

@@ -24,19 +24,21 @@
 
 
 type t = 
-  | Determin of bool * int list  * bool
+  | Arity_info 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, 
       for an exception: it is (Determin (true,[], true))
       1. 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   

jscomp/core/lam_coercion.ml

@@ -136,10 +136,9 @@ let handle_exports (meta : Lam_stats.t)
               *)
              let newid = Ident.rename original_export_id in
              (match Lam_stats_util.get_arity meta lam with
-             | NA
-             | Determin(_,[],_) ->
-              ()
-             | Determin _ as v  ->
+             | Arity_na
+             | Arity_info(_,[],_) -> ()
+             | Arity_info _ as v  ->
               Ident_hashtbl.add meta.ident_tbl newid
                 (FunctionId{
                  arity = v; lambda = lam;

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   ->
+        | Arity_info (a, x :: rest, b), len   ->
           let x =
             if x = 0
             then 1
@@ -191,7 +191,7 @@ and compile_external_field_apply
             let first_part, continue =  Ext_list.split_at x args in
             aux
               (E.call ~info:{arity=Full; call_info = Call_ml} acc first_part)
-              (Determin (a, rest, b))
+              (Arity_info (a, rest, b))
               continue (len - x)
           else (* GPR #1423 *)
           if List.for_all Js_analyzer.is_okay_to_duplicate args then
@@ -204,10 +204,10 @@ and compile_external_field_apply
         (* alpha conversion now? --
            Since we did an alpha conversion before so it is not here
         *)
-        | Determin (a, [], b ), _ ->
+        | Arity_info (a, [], b ), _ ->
           (* can not happen, unless it's an exception ? *)
           E.call ~info:Js_call_info.dummy acc args
-        | NA, _ ->
+        | Arity_na, _ ->
           E.call ~info:Js_call_info.dummy acc args
       in
       Js_output.output_of_block_and_expression
@@ -218,7 +218,7 @@ and compile_external_field_apply
         (
           aux
             (E.ml_var_dot id name)
-            (match arity with Single x -> x | Submodule _ -> NA)
+            (match arity with Single x -> x | Submodule _ -> Arity_na)
             args (List.length args ))
 
 

jscomp/core/lam_pass_alpha_conversion.ml

@@ -38,9 +38,9 @@ let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
       -> (* detect functor application *)
       begin 
         match Lam_stats_util.get_arity meta l1 with 
-        | NA -> 
+        | Arity_na -> 
           Lam.apply (simpl  l1) (Ext_list.map simpl  ll) loc status
-        | Determin (b, args, tail) -> 
+        | Arity_info (b, args, tail) -> 
           let len = List.length ll in 
           let rec take args = 
             match args with 
@@ -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)
+      | Arity_info (b, x::_, tail)
         -> 
         let arg = simpl arg in
           Lam_eta_conversion.unsafe_adjust_to_arity loc 

jscomp/core/lam_stats_export.ml

@@ -49,7 +49,7 @@ let values_of_export
          | Some (ImmutableBlock(elems,_)) ->  
            Submodule(elems |> Array.map (fun (x : Lam_id_kind.element) -> 
                match x with 
-               | NA -> Lam_arity.NA
+               | NA -> Lam_arity.Arity_na
                | SimpleForm lam -> Lam_stats_util.get_arity  meta lam)
              )
          | Some _ 

jscomp/core/lam_stats_util.ml

@@ -22,14 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-      
-let merge 
-    (n : int )
-    (x : Lam_arity.t) : Lam_arity.t = 
-  match x with 
-  | 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)  =
     (** for functional parameter, if it is a high order function,
@@ -42,7 +34,7 @@ let arity_of_var (meta : Lam_stats.t) (v : Ident.t)  =
       | None ->
         (* Format.fprintf Format.err_formatter *)
         (*   "@[%s %a is not function/functor@]@." meta.filename Ident.print v ; *)
-        (NA : Lam_arity.t)
+        Arity_na 
 
     end
 
@@ -56,7 +48,7 @@ let rec get_arity
     (lam : Lam.t) : 
   Lam_arity.t = 
   match lam with 
-  | Lconst _ -> Determin (true,[], false)
+  | Lconst _ -> Arity_info (true,[], false)
   | Lvar v -> arity_of_var meta v 
   | Llet(_,_,_, l ) -> get_arity meta l 
 
@@ -70,22 +62,22 @@ let rec get_arity
            args =  [ Lglobal_module id  ]; _} ->
     begin match (Lam_compile_env.cached_find_ml_id_pos id n meta.env).arity with 
     | Single x -> x 
-    | Submodule _ -> NA
+    | Submodule _ -> Arity_na
     end
   | Lprim {primitive = Pfield (m,_); 
            args =  [ Lprim{primitive = Pfield(n,_); 
             args = [ Lglobal_module id]}  ]
            ; _} ->
     begin match (Lam_compile_env.cached_find_ml_id_pos id n meta.env).arity with 
       | Submodule subs -> subs.(m)
-      | Single _ -> NA       
+      | Single _ -> Arity_na
   end
 
-  | Lprim {primitive = Pfield _; _} -> NA (** TODO *)
-  | Lprim {primitive = Praise ;  _} -> Determin(true,[], true)
-  | Lprim {primitive = Pccall _; _} -> Determin(false, [], false)
+  | Lprim {primitive = Pfield _; _} -> Arity_na (** TODO *)
+  | Lprim {primitive = Praise ;  _} -> Arity_info (true,[], true)
+  | Lprim {primitive = Pccall _; _} -> Arity_info (false, [], false)
   | Lglobal_module _ (* TODO: fix me never going to happen assert false  *)
-  | Lprim _  -> Determin(true,[] ,false)
+  | Lprim _  -> Arity_info (true,[] ,false)
   (* shall we handle primitive in a direct way, 
       since we know all the information
       Invariant: all primitive application is fully applied, 
@@ -106,22 +98,22 @@ let rec get_arity
   | Lapply{fn = app;  args; _ } -> (* detect functor application *)
     let fn = get_arity meta app in 
     begin match fn with 
-      | NA -> NA 
-      | Determin (b, xs, tail ) -> 
+      | Arity_na -> Arity_na
+      | Arity_info (b, xs, tail ) -> 
         let rec take (xs : _ list) arg_length = 
           match xs with 
           | (x) :: xs ->
-            if arg_length = x then Lam_arity.Determin (b, xs, tail) 
+            if arg_length = x then Lam_arity.Arity_info (b, xs, tail) 
             else if arg_length > x then
               take xs (arg_length - x)
-            else Determin (b, 
+            else Arity_info (b, 
                            (x -  arg_length ) :: xs ,
                            tail)
           | [] -> 
-            if tail then Determin(b, [], tail)
+            if tail then Arity_info (b, [], tail)
             else if not b then 
-              NA
-            else NA
+              Arity_na
+            else Arity_na
             (* Actually, you can not have truly deministic arities
                for example [fun x -> x ]
             *)
@@ -132,7 +124,7 @@ let rec get_arity
         take xs (List.length args) 
     end
   | Lfunction {arity; function_kind; params; body = l} -> 
-    merge arity  (get_arity meta l)
+    Lam_arity.merge arity  (get_arity meta l)
   | Lswitch(l, {sw_failaction; 
                 sw_consts; 
                 sw_blocks;
@@ -149,31 +141,31 @@ let rec get_arity
       | None -> all_lambdas meta (Ext_list.map snd  sw )
       | Some v -> all_lambdas meta (v:: Ext_list.map snd  sw)
     end
-  | Lstaticraise _ -> NA (* since it will not be in tail position *)
+  | Lstaticraise _ -> Arity_na (* since it will not be in tail position *)
   | Lstaticcatch(_, _, handler) -> get_arity meta handler
   | Ltrywith(l1, _, l2) -> 
     all_lambdas meta [l1;l2]
   | Lifthenelse(l1, l2, l3) ->
     all_lambdas meta [l2;l3]
   | Lsequence(_, l2) -> get_arity meta l2 
-  | Lsend(u, m, o, ll, v) -> NA
-  | Lifused(v, l) -> NA 
+  | Lsend(u, m, o, ll, v) -> Arity_na
+  | Lifused(v, l) -> Arity_na 
   | Lwhile _ 
   | Lfor _  
-  | Lassign _ -> Determin(true,[], false)
+  | Lassign _ -> Arity_info (true,[], false)
 
 and all_lambdas meta (xs : Lam.t list) = 
   match xs with 
   | y :: ys -> 
     let arity =  get_arity meta y in 
     List.fold_left (fun exist (v : Lam.t) -> 
         match (exist : Lam_arity.t) with 
-        | NA -> NA 
-        | Determin (b, xs, tail) -> 
+        | Arity_na -> Arity_na
+        | Arity_info (b, xs, tail) -> 
           begin 
             match get_arity meta v with 
-            | NA -> NA 
-            | Determin (u,ys,tail2) -> 
+            | Arity_na -> Arity_na 
+            | Arity_info (u,ys,tail2) -> 
               let rec aux (b,acc) xs ys = 
                 match xs,ys with
                 | [], [] -> (b, List.rev acc, tail && tail2) 
@@ -184,7 +176,7 @@ and all_lambdas meta (xs : Lam.t list) =
                 | x::xs, y::ys when x = y -> aux (b, (y :: acc)) xs ys 
                 | _, _  -> (false, List.rev acc, false) in 
               let (b,acc, tail3)  = aux ( u &&b, []) xs ys in 
-              Determin (b,acc, tail3)
+              Arity_info (b,acc, tail3)
           end
       ) arity ys 
   | _ -> assert false