clean up js_output

Author: bobzhang

jscomp/core/js_output.ml

@@ -41,53 +41,56 @@ type t  =  {
   block : J.block ;
   value : J.expression option;
   finished : finished ; 
-    (** When [finished] is true the block is already terminated, value does not make sense
-        default is false, false is  an conservative approach 
-     *)
+
 }
 
-type cont = Lam_compile_context.cont
+type continuation = Lam_compile_context.continuation
 
-let make ?value ?(finished=False) block = {block ; value ; finished }
+let make ?value ?(finished=False) block =
+    { block ; value ; finished }
 
-let of_stmt ?value ?(finished = False) stmt = {block = [stmt] ; value ; finished }
+let of_stmt ?value ?(finished = False) stmt = 
+    { block = [stmt] ; value ; finished }
 
 let of_block ?value ?(finished = False) block = 
-  {block  ; value ; finished }
+    { block  ; value ; finished }
 
-let dummy = {value = None; block = []; finished = Dummy }
+let dummy = 
+    {value = None; block = []; finished = Dummy }
 
-let handle_name_tail 
-    (name : cont)
+let output_of_expression 
+    (continuation : continuation)
     (should_return : Lam_compile_context.return_type)
-    lam (exp : J.expression) : t =
-  begin match name, should_return with 
+    (lam : Lam.t) (exp : J.expression) : t =
+  begin match continuation, should_return with 
   | EffectCall, ReturnFalse -> 
       if Lam_analysis.no_side_effects lam 
       then dummy
       else {block = []; value  = Some exp ; finished = False}
-  | EffectCall, ReturnTrue _ ->
-      make [S.return_stmt  exp] ~finished:True
   | Declare (kind, n), ReturnFalse -> 
       make [ S.define_variable ~kind n  exp]
   | Assign n ,ReturnFalse -> 
       make [S.assign n exp ]
+  | EffectCall, ReturnTrue _ ->
+      make [S.return_stmt  exp] ~finished:True    
   | (Declare _ | Assign _ ), ReturnTrue _ -> 
       make [S.unknown_lambda lam] ~finished:True
-  | NeedValue, _ -> {block = []; value = Some exp; finished = False }
+  | NeedValue, _ -> 
+    {block = []; value = Some exp; finished = False }
   end
 
-let handle_block_return 
-    (st : cont) 
+let output_of_block_and_expression 
+    (continuation : continuation) 
     (should_return : Lam_compile_context.return_type)
     (lam : Lam.t) (block : J.block) exp : t = 
-  match st, should_return with 
+  match continuation, should_return with 
+  | EffectCall, ReturnFalse -> make block ~value:exp
   | Declare (kind,n), ReturnFalse -> 
     make (block @ [ S.define_variable ~kind  n exp])
-  | Assign n, ReturnFalse -> make (block @ [S.assign n exp])
-  | (Declare _ | Assign _), ReturnTrue _ -> make [S.unknown_lambda lam] ~finished:True
-  | EffectCall, ReturnFalse -> make block ~value:exp
+  | Assign n, ReturnFalse -> make (block @ [S.assign n exp])  
   | EffectCall, ReturnTrue _ -> make (block @ [S.return_stmt exp]) ~finished:True
+  | (Declare _ | Assign _), ReturnTrue _ ->
+     make [S.unknown_lambda lam] ~finished:True
   | NeedValue, _ ->  make block ~value:exp
 
 let statement_of_opt_expr (x : J.expression option) : J.statement =

jscomp/core/js_output.mli

@@ -35,7 +35,6 @@
    containing that step
  *)
 
-type cont = Lam_compile_context.cont
 
 type finished = 
   | True 
@@ -47,16 +46,36 @@ type t  =  {
   value : J.expression option;
   finished : finished
 }
-
-val make : ?value: J.expression -> ?finished:finished -> J.block -> t
-
-val of_stmt : ?value: J.expression -> ?finished:finished -> J.statement -> t
-
-val of_block : ?value:J.expression -> ?finished:finished -> J.block -> t
-
-val to_block : t -> J.block
-
-val to_break_block : t -> J.block * bool 
+(** When [finished] is true the block is already terminated, 
+    value does not make sense
+    [finished]  default to false, which is conservative
+*)
+
+val make :
+  ?value: J.expression ->
+  ?finished:finished ->
+  J.block ->
+  t
+
+val of_stmt :
+  ?value: J.expression ->
+  ?finished:finished ->
+  J.statement ->
+  t
+
+val of_block :
+  ?value:J.expression ->
+  ?finished:finished ->
+  J.block ->
+  t
+
+val to_block :
+  t ->
+  J.block
+
+val to_break_block :
+  t ->
+  J.block * bool 
 
 module Ops : sig 
   val (++) : t -> t -> t 
@@ -65,17 +84,25 @@ end
 val dummy : t 
 
 
-val handle_name_tail :
-    Lam_compile_context.cont ->
+val output_of_expression :
+    Lam_compile_context.continuation ->
     Lam_compile_context.return_type ->
-    Lam.t ->  J.expression -> t
+    Lam.t -> (* original lambda *)
+    J.expression -> (* compiled expression *)
+    t
 
-val handle_block_return : 
-    Lam_compile_context.cont ->
+val output_of_block_and_expression : 
+    Lam_compile_context.continuation ->
     Lam_compile_context.return_type ->
     Lam.t ->
-    J.block -> J.expression -> t
+    J.block ->
+    J.expression ->
+    t
 
-val concat : t list -> t
+val concat :
+  t list ->
+  t
 
-val to_string : t -> string
+val to_string :
+  t ->
+  string