renaming

Author: bobzhang

jscomp/Makefile

@@ -278,7 +278,7 @@ CORE_SRCS= js_runtime_modules \
 	lam_compile_util \
 	lam_id_kind \
 	lam_stats \
-	lam_compile_defs \
+	lam_compile_context\
 	js_map js_fold js_fold_basic js_pass_scope\
 	js_op_util js_analyzer js_shake js_exp_make js_long js_of_lam_exception js_of_lam_module js_of_lam_array js_of_lam_block js_of_lam_string\
 	js_of_lam_tuple js_of_lam_record js_of_lam_float_record js_arr lam_compile_const \

jscomp/all.depend

@@ -301,7 +301,7 @@ core/lam_compile_util.cmi : core/js_op.cmx
 core/lam_id_kind.cmi : core/lam_arity.cmi core/lam.cmi
 core/lam_stats.cmi : core/lam_id_kind.cmi ext/ident_set.cmi \
     ext/ident_hashtbl.cmi
-core/lam_compile_defs.cmi : core/lam_stats.cmi core/lam.cmi core/j.cmx \
+core/lam_compile_context.cmi : core/lam_stats.cmi core/lam.cmi core/j.cmx \
     ext/ident_map.cmi
 core/js_fold_basic.cmi : core/lam_module_ident.cmi core/j.cmx \
     ext/ident_set.cmi
@@ -353,18 +353,18 @@ core/js_dump_program.cmi : core/js_packages_info.cmi core/j.cmx \
     ext/ext_pp.cmi
 core/js_pass_debug.cmi : core/j.cmx
 core/js_of_lam_option.cmi : core/j.cmx
-core/js_output.cmi : core/lam_compile_defs.cmi core/lam.cmi core/j.cmx
+core/js_output.cmi : core/lam_compile_context.cmi core/lam.cmi core/j.cmx
 core/lam_compile_global.cmi : core/lam.cmi core/j.cmx
 core/lam_dispatch_primitive.cmi : core/j.cmx
 core/lam_bounded_vars.cmi : core/lam.cmi ext/ident_hashtbl.cmi
 core/lam_beta_reduce.cmi : core/lam_stats.cmi core/lam_closure.cmi \
     core/lam.cmi ext/ident_map.cmi
-core/lam_compile_external_call.cmi : core/lam_compile_defs.cmi core/j.cmx \
+core/lam_compile_external_call.cmi : core/lam_compile_context.cmi core/j.cmx \
     syntax/ast_ffi_types.cmi syntax/ast_arg.cmi
 core/lam_compile_external_obj.cmi : core/j.cmx syntax/ast_arg.cmi
-core/lam_compile_primitive.cmi : core/lam_compile_defs.cmi core/lam.cmi \
+core/lam_compile_primitive.cmi : core/lam_compile_context.cmi core/lam.cmi \
     core/j.cmx
-core/lam_compile.cmi : core/lam_compile_defs.cmi core/lam.cmi \
+core/lam_compile.cmi : core/lam_compile_context.cmi core/lam.cmi \
     core/js_output.cmi core/j.cmx
 core/lam_pass_exits.cmi : core/lam.cmi
 core/lam_pass_count.cmi : core/lam.cmi ext/ident_hashtbl.cmi
@@ -430,9 +430,9 @@ core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
 core/lam_id_kind.cmx : core/lam_arity.cmx core/lam.cmx core/lam_id_kind.cmi
 core/lam_stats.cmx : core/lam_id_kind.cmx ext/ident_set.cmx \
     ext/ident_hashtbl.cmx core/lam_stats.cmi
-core/lam_compile_defs.cmx : core/lam_stats.cmx core/lam.cmx core/j.cmx \
+core/lam_compile_context.cmx : core/lam_stats.cmx core/lam.cmx core/j.cmx \
     ext/int_map.cmx ext/ident_map.cmx ext/ext_list.cmx \
-    core/lam_compile_defs.cmi
+    core/lam_compile_context.cmi
 core/js_map.cmx : core/j.cmx
 core/js_fold.cmx : core/j.cmx
 core/js_fold_basic.cmx : core/lam_module_ident.cmx \
@@ -560,7 +560,7 @@ core/js_pass_debug.cmx : core/js_dump_program.cmx common/js_config.cmx \
     core/js_pass_debug.cmi
 core/js_of_lam_option.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
     core/js_analyzer.cmx core/j.cmx core/js_of_lam_option.cmi
-core/js_output.cmx : core/lam_compile_defs.cmx core/lam_analysis.cmx \
+core/js_output.cmx : core/lam_compile_context.cmx core/lam_analysis.cmx \
     core/lam.cmx core/js_stmt_make.cmx core/js_exp_make.cmx core/js_dump.cmx \
     core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx core/js_output.cmi
 core/lam_compile_global.cmx : core/type_util.cmx core/lam_module_ident.cmx \
@@ -580,7 +580,7 @@ core/lam_beta_reduce.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_analysis.cmx core/lam.cmx ext/ident_map.cmx \
     ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_beta_reduce.cmi
 core/lam_compile_external_call.cmx : core/lam_compile_env.cmx \
-    core/lam_compile_defs.cmx core/lam_compile_const.cmx \
+    core/lam_compile_context.cmx core/lam_compile_const.cmx \
     core/js_runtime_modules.cmx core/js_of_lam_variant.cmx \
     core/js_of_lam_option.cmx core/js_exp_make.cmx core/js_arr.cmx \
     core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx ext/ext_ident.cmx \
@@ -593,7 +593,7 @@ core/lam_compile_external_obj.cmx : core/lam_compile_external_call.cmx \
     core/lam_compile_external_obj.cmi
 core/lam_compile_primitive.cmx : core/lam_print.cmx \
     core/lam_dispatch_primitive.cmx core/lam_compile_external_call.cmx \
-    core/lam_compile_defs.cmx core/lam.cmx core/js_runtime_modules.cmx \
+    core/lam_compile_context.cmx core/lam.cmx core/js_runtime_modules.cmx \
     core/js_op_util.cmx core/js_of_lam_string.cmx core/js_of_lam_record.cmx \
     core/js_of_lam_option.cmx core/js_of_lam_float_record.cmx \
     core/js_of_lam_exception.cmx core/js_of_lam_block.cmx \
@@ -604,7 +604,7 @@ core/lam_compile.cmx : ext/literals.cmx core/lam_util.cmx \
     common/lam_methname.cmx core/lam_exit_code.cmx \
     core/lam_eta_conversion.cmx core/lam_compile_primitive.cmx \
     core/lam_compile_global.cmx core/lam_compile_external_obj.cmx \
-    core/lam_compile_env.cmx core/lam_compile_defs.cmx \
+    core/lam_compile_env.cmx core/lam_compile_context.cmx \
     core/lam_compile_const.cmx core/lam_closure.cmx core/lam_beta_reduce.cmx \
     core/lam_arity.cmx core/lam_analysis.cmx core/lam.cmx \
     core/js_stmt_make.cmx core/js_runtime_modules.cmx core/js_output.cmx \
@@ -642,7 +642,7 @@ core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
     core/lam_pass_exits.cmx core/lam_pass_deep_flatten.cmx \
     core/lam_pass_collect.cmx core/lam_pass_alpha_conversion.cmx \
     core/lam_module_ident.cmx core/lam_group.cmx core/lam_compile_env.cmx \
-    core/lam_compile_defs.cmx core/lam_compile.cmx core/lam_coercion.cmx \
+    core/lam_compile_context.cmx core/lam_compile.cmx core/lam_coercion.cmx \
     core/lam_analysis.cmx core/lam.cmx core/js_stmt_make.cmx \
     core/js_shake.cmx core/js_runtime_modules.cmx \
     core/js_pass_tailcall_inline.cmx core/js_pass_scope.cmx \

jscomp/bin/whole_compiler.ml

@@ -88666,11 +88666,11 @@ type cxt = {
   meta : Lam_stats.t ;
 }
 
-val empty_handler_map : jmp_table 
+ val empty_handler_map : jmp_table  
 
 val add_jmps :
     Ident.t * (jbl_label * 'a * Ident.t list) list ->
-    jmp_table -> jmp_table * (int * 'a) list
+    jmp_table -> jmp_table * (jbl_label * 'a) list
 
 val find_exn : jbl_label -> cxt -> value
 end = struct
@@ -88702,17 +88702,8 @@ end = struct
 
 
 
-
-
-
-
 type jbl_label = int 
 
-(* module HandlerMap = Map.Make(struct 
-    type t = jbl_label
-    let compare x y= compare (x : int) y 
-  end )
- *)
 module HandlerMap = Int_map
 type value = {
   exit_id : Ident.t ;
@@ -88758,20 +88749,13 @@ type cxt = {
   should_return : return_type;
   jmp_table : jmp_table;
   meta : Lam_stats.t ;
-  (* include_alias :  *)
-  (*   (\** It's correct to add more, we can do this in lambda optimization pass *)
-  (*    *\) *)
-  (*   (Ident.t , Ident.t) Hashtbl.t *)
-  (* Used when compiling [Lstaticraise]  *)
 }
 
 let empty_handler_map = HandlerMap.empty
 
 
 
-(* 
-always keep key id positive, specifically no [0] generated
-   *)
+(* always keep key id positive, specifically no [0] generated *)
 let add_jmps (exit_id, code_table)   
     (m : value HandlerMap.t) = 
   let map, handlers = 

jscomp/core/js_output.ml

@@ -46,7 +46,7 @@ type t  =  {
      *)
 }
 
-type st = Lam_compile_defs.st 
+type st = Lam_compile_context.st 
 
 let make ?value ?(finished=False) block = {block ; value ; finished }
 
@@ -59,7 +59,7 @@ let dummy = {value = None; block = []; finished = Dummy }
 
 let handle_name_tail 
     (name : st)
-    (should_return : Lam_compile_defs.return_type)
+    (should_return : Lam_compile_context.return_type)
     lam (exp : J.expression) : t =
   begin match name, should_return with 
   | EffectCall, ReturnFalse -> 
@@ -79,7 +79,7 @@ let handle_name_tail
 
 let handle_block_return 
     (st : st) 
-    (should_return : Lam_compile_defs.return_type)
+    (should_return : Lam_compile_context.return_type)
     (lam : Lam.t) (block : J.block) exp : t = 
   match st, should_return with 
   | Declare (kind,n), ReturnFalse -> 

jscomp/core/js_output.mli

@@ -35,7 +35,7 @@
    containing that step
  *)
 
-type st = Lam_compile_defs.st 
+type st = Lam_compile_context.st 
 
 type finished = 
   | True 
@@ -66,13 +66,13 @@ val dummy : t
 
 
 val handle_name_tail :
-    Lam_compile_defs.st ->
-    Lam_compile_defs.return_type ->
+    Lam_compile_context.st ->
+    Lam_compile_context.return_type ->
     Lam.t ->  J.expression -> t
 
 val handle_block_return : 
-    Lam_compile_defs.st ->
-    Lam_compile_defs.return_type ->
+    Lam_compile_context.st ->
+    Lam_compile_context.return_type ->
     Lam.t ->
     J.block -> J.expression -> t
 

jscomp/core/lam_compile.ml

@@ -113,7 +113,7 @@ type default_case =
 *)    
 let rec  
   compile_external_field 
-    (cxt : Lam_compile_defs.cxt) 
+    (cxt : Lam_compile_context.cxt) 
     lam 
     (id : Ident.t)
     (pos : int)
@@ -164,7 +164,7 @@ let rec
 *)
 
 and compile_external_field_apply 
-    (cxt : Lam_compile_defs.cxt) 
+    (cxt : Lam_compile_context.cxt) 
     lam 
     args_lambda
     (id : Ident.t)
@@ -237,7 +237,7 @@ and compile_external_field_apply
                args (List.length args ))
       )
 
-and  compile_let let_kind (cxt : Lam_compile_defs.cxt) id (arg : Lam.t) : Js_output.t =
+and  compile_let let_kind (cxt : Lam_compile_context.cxt) id (arg : Lam.t) : Js_output.t =
   compile_lambda {cxt with st = Declare (let_kind, id); should_return = ReturnFalse } arg 
 (** 
     The second return values are values which need to be wrapped using 
@@ -248,7 +248,7 @@ and  compile_let let_kind (cxt : Lam_compile_defs.cxt) id (arg : Lam.t) : Js_out
 
 *)
 and compile_recursive_let ~all_bindings
-    (cxt : Lam_compile_defs.cxt)
+    (cxt : Lam_compile_context.cxt)
     (id : Ident.t)
     (arg : Lam.t)   : Js_output.t * Ident.t list = 
   match arg with 
@@ -264,7 +264,7 @@ and compile_recursive_let ~all_bindings
     *)
     Js_output.handle_name_tail (Declare (Alias, id)) ReturnFalse arg
       (
-        let ret : Lam_compile_defs.return_label = 
+        let ret : Lam_compile_context.return_label = 
           {id; 
            label = continue_label; 
            params;
@@ -276,7 +276,7 @@ and compile_recursive_let ~all_bindings
             { cxt with 
               st = EffectCall;  
               should_return = ReturnTrue (Some ret );
-              jmp_table = Lam_compile_defs.empty_handler_map}  body in
+              jmp_table = Lam_compile_context.empty_handler_map}  body in
         if ret.triggered then 
           let body_block = Js_output.to_block output in
           E.ocaml_fun
@@ -407,14 +407,14 @@ and compile_general_cases :
   'a . 
   ('a -> J.expression) ->
   (J.expression -> J.expression -> J.expression) -> 
-  Lam_compile_defs.cxt -> 
+  Lam_compile_context.cxt -> 
   (?default:J.block ->
    ?declaration:Lam.let_kind * Ident.t  -> 
    _ -> 'a J.case_clause list ->  J.statement) -> 
   _ -> 
   ('a * Lam.t) list -> default_case -> J.block 
   = fun f eq cxt switch v table default -> 
-    let wrap (cxt : Lam_compile_defs.cxt) k =
+    let wrap (cxt : Lam_compile_context.cxt) k =
       let cxt, define =
         match cxt.st with 
         | Declare (kind, did)
@@ -494,7 +494,7 @@ and compile_string_cases cxt = compile_general_cases E.str E.string_equal cxt
     for high order currying *)
 and
   compile_lambda
-    ({st ; should_return; jmp_table; meta = {env ; _} } as cxt : Lam_compile_defs.cxt)
+    ({st ; should_return; jmp_table; meta = {env ; _} } as cxt : Lam_compile_context.cxt)
     (lam : Lam.t)  : Js_output.t  =
   begin
     match lam with 
@@ -509,7 +509,7 @@ and
               ( compile_lambda
                   { cxt with st = EffectCall;  
                              should_return = ReturnTrue None; (* Refine*)
-                             jmp_table = Lam_compile_defs.empty_handler_map}  body)))
+                             jmp_table = Lam_compile_context.empty_handler_map}  body)))
 
 
     | Lapply{
@@ -837,7 +837,7 @@ and
                   ( compile_lambda
                       { cxt with st = EffectCall;  
                                  should_return = ReturnTrue None; 
-                                 jmp_table = Lam_compile_defs.empty_handler_map} 
+                                 jmp_table = Lam_compile_context.empty_handler_map} 
                       body)))
         | _ -> assert false 
       end
@@ -1128,7 +1128,7 @@ and
           if Ext_list.length_ge sw_blocks sw_numblocks
           then Complete
           else Default x in 
-      let compile_whole  ({st; _} as cxt  : Lam_compile_defs.cxt ) =
+      let compile_whole  ({st; _} as cxt  : Lam_compile_context.cxt ) =
         match sw_numconsts, sw_numblocks, 
               compile_lambda {cxt with should_return = ReturnFalse; st = NeedValue}
                 lam with 
@@ -1178,7 +1178,7 @@ and
     | Lstaticraise(i, largs) ->  (* TODO handlding *largs*)
       (* [i] is the jump table, [largs] is the arguments passed to [Lstaticcatch]*)
       begin
-        match Lam_compile_defs.find_exn i cxt  with 
+        match Lam_compile_context.find_exn i cxt  with 
         | {exit_id; args ; order_id} -> 
           let args_code  =
             (Js_output.concat @@ List.map2 (
@@ -1240,7 +1240,7 @@ and
       (* TODO: handle NeedValue *)
       let exit_id =   Ext_ident.create_tmp ~name:"exit" () in
       let exit_expr = E.var exit_id in
-      let jmp_table, handlers =  Lam_compile_defs.add_jmps (exit_id, code_table) jmp_table in
+      let jmp_table, handlers =  Lam_compile_context.add_jmps (exit_id, code_table) jmp_table in
 
       (* Declaration First, body and handler have the same value *)
       (* There is a bug in google closure compiler:

jscomp/core/lam_compile.mli

@@ -33,11 +33,11 @@
 
 val compile_let : 
   Lam.let_kind ->
-  Lam_compile_defs.cxt -> 
+  Lam_compile_context.cxt -> 
   J.ident -> 
   Lam.t -> 
   Js_output.t
 
-val compile_recursive_lets : Lam_compile_defs.cxt -> (Ident.t * Lam.t) list -> Js_output.t
+val compile_recursive_lets : Lam_compile_context.cxt -> (Ident.t * Lam.t) list -> Js_output.t
 
-val compile_lambda : Lam_compile_defs.cxt -> Lam.t -> Js_output.t
+val compile_lambda : Lam_compile_context.cxt -> Lam.t -> Js_output.t

jscomp/core/lam_compile_defs.ml jscomp/core/lam_compile_context.ml

@@ -25,17 +25,8 @@
 
 
 
-
-
-
-
 type jbl_label = int 
 
-(* module HandlerMap = Map.Make(struct 
-    type t = jbl_label
-    let compare x y= compare (x : int) y 
-  end )
- *)
 module HandlerMap = Int_map
 type value = {
   exit_id : Ident.t ;
@@ -81,20 +72,13 @@ type cxt = {
   should_return : return_type;
   jmp_table : jmp_table;
   meta : Lam_stats.t ;
-  (* include_alias :  *)
-  (*   (\** It's correct to add more, we can do this in lambda optimization pass *)
-  (*    *\) *)
-  (*   (Ident.t , Ident.t) Hashtbl.t *)
-  (* Used when compiling [Lstaticraise]  *)
 }
 
 let empty_handler_map = HandlerMap.empty
 
 
 
-(* 
-always keep key id positive, specifically no [0] generated
-   *)
+(* always keep key id positive, specifically no [0] generated *)
 let add_jmps (exit_id, code_table)   
     (m : value HandlerMap.t) = 
   let map, handlers = 

jscomp/core/lam_compile_defs.mli jscomp/core/lam_compile_context.mli

@@ -84,10 +84,10 @@ type cxt = {
   meta : Lam_stats.t ;
 }
 
-val empty_handler_map : jmp_table 
+ val empty_handler_map : jmp_table  
 
 val add_jmps :
     Ident.t * (jbl_label * 'a * Ident.t list) list ->
-    jmp_table -> jmp_table * (int * 'a) list
+    jmp_table -> jmp_table * (jbl_label * 'a) list
 
 val find_exn : jbl_label -> cxt -> value