change names for maintainability

Author: bobzhang

jscomp/core/lam_convert.ml

@@ -32,6 +32,10 @@ let prim = Lam.prim
 let lam_extension_id loc (head : Lam.t) =
   prim ~primitive:lam_caml_id ~args:[head] loc    
 
+let lazy_block_info : Lam_tag_info.t = 
+  Blk_record 
+    [|Literals.lazy_done; 
+      Literals.lazy_val|]  
 
 let unbox_extension info (args : Lam.t list) mutable_flag loc =
     prim ~primitive:(Pmakeblock (0,info,mutable_flag)) ~args loc 
@@ -281,15 +285,15 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
           [ Lam.const Const_js_true ; 
            result
           ] in 
-        prim ~primitive:(Pmakeblock (tag,Blk_record [|"RE_LAZY_DONE";"value"|],Mutable)) ~args loc  
+        prim ~primitive:(Pmakeblock (tag,lazy_block_info,Mutable)) ~args loc  
       | [computation] -> 
         let args = 
           [ Lam.const Const_js_false ; 
             (* FIXME: arity 0 does not get proper supported*)
             prim ~primitive:(Pjs_fn_make 0) ~args:[Lam.function_ ~arity:1 ~params:[Ident.create "param"] ~body:computation] 
             loc             
           ] in 
-        prim ~primitive:(Pmakeblock (tag,Blk_record [|"RE_LAZY_DONE";"value"|],Mutable)) ~args loc  
+        prim ~primitive:(Pmakeblock (tag,lazy_block_info,Mutable)) ~args loc  
 
       | _ -> assert false
       end

jscomp/ext/literals.ml

@@ -146,4 +146,7 @@ let polyvar_value = "VAL"
 
 let cons = "::"
 let hd = "hd"
-let tl = "tl"
+let tl = "tl"
+
+let lazy_done = "LAZY_DONE"
+let lazy_val = "VAL"

jscomp/ext/literals.mli

@@ -144,4 +144,6 @@ val polyvar_value : string
 
 val cons : string
 val hd : string
-val tl : string
+val tl : string
+val lazy_done : string
+val lazy_val : string

jscomp/stdlib-406/camlinternalLazy.ml

@@ -26,9 +26,10 @@
 
 (* Internals of forcing lazy values. *)
 type 'a t = {
-  mutable tag : bool [@bs.as "RE_LAZY_DONE"] ; 
+  mutable tag : bool [@bs.as "LAZY_DONE"] ; 
   (* Invariant: name  *)
-  mutable value : 'a (* its type is ['a] or [unit -> 'a ] *)
+  mutable value : 'a [@bs.as "VAL"]
+  (* its type is ['a] or [unit -> 'a ] *)
 }