Merge pull request #3764 from BuckleScript/renaming

avoid leaking magic number to user when compiling lazy evaluation

Author: bobzhang

jscomp/bsb_helper/bsb_arg.ml renamed to jscomp/bsb_helper/bsb_helper_arg.ml

@@ -63,6 +63,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
             | "caml_obj_dup"
             | "caml_array_dup"
             | "caml_obj_block"
+            | "caml_lazy_make"
             ), _  -> true 
           | "caml_ml_open_descriptor_in", [Lconst (  (Const_int 0))] -> true 
           | "caml_ml_open_descriptor_out", 

jscomp/bsb_helper/bsb_arg.mli renamed to jscomp/bsb_helper/bsb_helper_arg.mli

@@ -77,9 +77,12 @@ let rec convert_constant ( const : Lambda.structured_constant) : Lam_constant.t
     | Blk_extension_slot -> 
       let t : Lam_tag_info.t = Blk_extension_slot in 
       Const_block (i,t, Ext_list.map xs convert_constant )      
+    | Blk_lazy_general 
+    | Blk_lazy_forward
     | Blk_na -> 
       let t : Lam_tag_info.t = Blk_na in 
       Const_block (i,t, Ext_list.map xs convert_constant )      
+    
 #if OCAML_VERSION =~ ">4.03.0" then
     | Blk_record_inlined (s,ctor,ix)  -> 
       let t : Lam_tag_info.t = Blk_record_inlined (s, ctor,ix) in 

jscomp/core/lam_analysis.ml

@@ -219,6 +219,7 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
     | Blk_record s -> 
       let info : Lam_tag_info.t = Blk_record s in
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc
+    
 #if OCAML_VERSION =~ ">4.03.0"  then
     | Blk_record_inlined (s,ctor,i) ->
       let info : Lam_tag_info.t = Blk_record_inlined (s, ctor,i) in
@@ -243,7 +244,13 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
 #end       
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc
       )
-
+    | Blk_lazy_general  
+      ->       
+        prim 
+          ~primitive:(Pccall {prim_name="caml_lazy_make"; prim_arity = 1; prim_native_name = ""})
+          ~args loc          
+    | Blk_lazy_forward
+    
     | Blk_na -> 
       let info : Lam_tag_info.t = Blk_na in
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc

jscomp/core/lam_constant_convert.ml

@@ -737,6 +737,7 @@ let translate loc (prim_name : string)
     | "caml_update_dummy"
     | "caml_obj_truncate"
     | "caml_lazy_make_forward"  
+    | "caml_lazy_make"
       -> 
       call Js_runtime_modules.obj_runtime
 

jscomp/core/lam_convert.ml

@@ -62,7 +62,7 @@ let link link_byte_or_native =
   end
 #end  
 let () =
-  Bsb_arg.parse_exn [
+  Bsb_helper_arg.parse_exn [
     "-g",  Set_int dev_group ,
     " Set the dev group (default to be 0)"
     ;

jscomp/core/lam_dispatch_primitive.ml

@@ -105,6 +105,12 @@ let caml_obj_truncate (x : Caml_obj_extern.t) (new_size : int) =
 
 let caml_lazy_make_forward x = lazy x
 
+let caml_lazy_make (fn : _ -> _) = 
+    let block = Caml_obj_extern.repr [|fn|] in 
+    Caml_obj_extern.set_tag block 246 (* Obj.lazy_tag*);
+    block
+
+
 (** 
    For the empty dummy object, whether it's 
    [[]] or [{}] depends on how 

jscomp/main/bsb_helper_main.ml

@@ -41,6 +41,10 @@ val caml_obj_truncate : Caml_obj_extern.t -> int -> unit
 
 val caml_lazy_make_forward : 'a -> 'a lazy_t
 
+val caml_lazy_make : 
+  (t -> t) -> 
+  t
+
 val caml_update_dummy : Caml_obj_extern.t -> Caml_obj_extern.t -> unit
 
 

jscomp/runtime/caml_obj.ml

@@ -7,6 +7,7 @@ var Bytes = require("../../lib/js/bytes.js");
 var Curry = require("../../lib/js/curry.js");
 var Format = require("../../lib/js/format.js");
 var $$String = require("../../lib/js/string.js");
+var Caml_obj = require("../../lib/js/caml_obj.js");
 var Caml_sys = require("../../lib/js/caml_sys.js");
 var Filename = require("../../lib/js/filename.js");
 var Caml_bytes = require("../../lib/js/caml_bytes.js");
@@ -25,9 +26,9 @@ var node_parent = "..";
 
 var node_current = ".";
 
-var cwd = Block.__(246, [(function (param) {
+var cwd = Caml_obj.caml_lazy_make((function (param) {
         return Caml_sys.caml_sys_getcwd(/* () */0);
-      })]);
+      }));
 
 function path_as_directory(x) {
   if (x === "" || Ext_string_test.ends_with(x, Filename.dir_sep)) {
@@ -39,15 +40,7 @@ function path_as_directory(x) {
 
 function absolute_path(s) {
   var s$1 = s;
-  var s$2;
-  if (Curry._1(Filename.is_relative, s$1)) {
-    var tag = cwd.tag | 0;
-    s$2 = Filename.concat(tag === 250 ? cwd[0] : (
-            tag === 246 ? CamlinternalLazy.force_lazy_block(cwd) : cwd
-          ), s$1);
-  } else {
-    s$2 = s$1;
-  }
+  var s$2 = Curry._1(Filename.is_relative, s$1) ? Filename.concat(CamlinternalLazy.force(cwd), s$1) : s$1;
   var aux = function (_s) {
     while(true) {
       var s = _s;
@@ -234,13 +227,10 @@ function find_package_json_dir(cwd) {
   return find_root_filename(cwd, Test_literals.bsconfig_json);
 }
 
-var package_dir = Block.__(246, [(function (param) {
-        var tag = cwd.tag | 0;
-        var cwd$1 = tag === 250 ? cwd[0] : (
-            tag === 246 ? CamlinternalLazy.force_lazy_block(cwd) : cwd
-          );
+var package_dir = Caml_obj.caml_lazy_make((function (param) {
+        var cwd$1 = CamlinternalLazy.force(cwd);
         return find_root_filename(cwd$1, Test_literals.bsconfig_json);
-      })]);
+      }));
 
 function module_name_of_file(file) {
   var s = Filename.chop_extension(Curry._1(Filename.basename, file));