Merge pull request #440 from bloomberg/bs_lambda

provide indirection for lambda -> bs_lambda

Author: bobzhang

jscomp/bin/compiler.ml

@@ -7,9 +7,9 @@ config_util
 
 
 
-
+lam
 lam_mk
-lam_comb
+lam_print
 lam_compile_env
 lam_dispatch_primitive
 lam_stats

jscomp/compiler.odocl

@@ -32,7 +32,7 @@
 (* TODO: add a magic number *)
 type cmj_value = {
   arity : Lam_stats.function_arities ;
-  closed_lambda : Lambda.lambda option ; 
+  closed_lambda : Lam.t option ; 
   (** Either constant or closed functor *)
 }
 

jscomp/core.mllib

@@ -54,7 +54,7 @@
 
 type cmj_value = {
   arity : Lam_stats.function_arities ;
-  closed_lambda : Lambda.lambda option ; 
+  closed_lambda : Lam.t option ; 
   (* Either constant or closed functor *)
 }
 

jscomp/js_cmj_format.ml

@@ -76,7 +76,7 @@ let implementation ppf sourcefile outputprefix =
           match           
           Lam_compile_group.lambda_as_module
             finalenv current_signature 
-            sourcefile  outputprefix lambda with
+            sourcefile  outputprefix ((* Obj.magic *) lambda ) with
           | e -> e 
           | exception e -> 
             (* Save to a file instead so that it will not scare user *)            

jscomp/js_cmj_format.mli

@@ -80,7 +80,7 @@ let handle_name_tail
 let handle_block_return 
     (st : st) 
     (should_return : Lam_compile_defs.return_type)
-    (lam : Lambda.lambda) (block : J.block) exp : t = 
+    (lam : Lam.t) (block : J.block) exp : t = 
   match st, should_return with 
   | Declare (kind,n), False -> 
     make (block @ [ S.define ~kind  n exp])

jscomp/js_implementation.ml

@@ -68,12 +68,12 @@ val dummy : t
 val handle_name_tail :
     Lam_compile_defs.st ->
     Lam_compile_defs.return_type ->
-    Lambda.lambda ->  J.expression -> t
+    Lam.t ->  J.expression -> t
 
 val handle_block_return : 
     Lam_compile_defs.st ->
     Lam_compile_defs.return_type ->
-    Lambda.lambda ->
+    Lam.t ->
     J.block -> J.expression -> t
 
 val concat : t list -> t

jscomp/js_output.ml

@@ -347,7 +347,7 @@ let try_ ?comment   ?with_ ?finally body : t =
     comment
   }
 
-let unknown_lambda ?(comment="unknown")  (lam : Lambda.lambda ) : t = 
+let unknown_lambda ?(comment="unknown")  (lam : Lam.t ) : t = 
   exp @@ E.str ~comment ~pure:false (Lam_util.string_of_lambda lam) 
 
 (* TODO: 

jscomp/js_output.mli

@@ -95,7 +95,7 @@ val exp : ?comment:string  -> J.expression -> t
 
 val return : ?comment:string  -> J.expression -> t
 
-val unknown_lambda : ?comment:string  -> Lambda.lambda -> t
+val unknown_lambda : ?comment:string  -> Lam.t -> t
 
 val return_unit : ?comment:string -> unit -> t
 (** for ocaml function which returns unit