Merge pull request #4402 from BuckleScript/caml_oo

move caml_set_oo_id into caml_oo module

Author: bobzhang

jscomp/core/js_of_lam_exception.ml

@@ -45,7 +45,3 @@ let make exception_str  : J.expression =
 
 
 
-(* TODO: only used in camlinternalOO, split it off as a separate module? *)
-let caml_set_oo_id args = 
-   E.runtime_call Js_runtime_modules.exceptions "caml_set_oo_id" args 
-    

jscomp/core/js_of_lam_exception.mli

@@ -23,8 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val caml_set_oo_id : 
-  J.expression list -> J.expression
 
 
 val make : J.expression  -> J.expression

jscomp/core/lam_dispatch_primitive.ml

@@ -584,7 +584,7 @@ let translate loc (prim_name : string)
       call Js_runtime_modules.caml_js_exceptions  
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
-      Js_of_lam_exception.caml_set_oo_id args 
+      call Js_runtime_modules.oo
 
     | "caml_sys_get_argv" 
     (** TODO: refine

jscomp/main/builtin_cmi_datasets.ml

@@ -32,7 +32,7 @@ type obj = Caml_obj_extern.t
 (* Note that when we introduce it in {!Js_dump} 
    we need introduce dependency properly *)
 let __ tag block = 
-  Caml_obj_extern.set_tag block tag; block
+  Obj.set_tag block tag; block
 
 
 

jscomp/main/builtin_cmj_datasets.ml

@@ -53,7 +53,14 @@ external ( -. ) : float -> float -> float = "%subfloat"
 external ( *. ) : float -> float -> float = "%mulfloat"
 external ( /. ) : float -> float -> float = "%divfloat"
 
-module Obj : sig   
+module Obj : sig
+  type t 
+  external field : t -> int -> t = "%obj_field" 
+  external set_field : t -> int -> t -> unit = "%obj_set_field"
+  external tag : t -> int = "caml_obj_tag" 
+  (* The compiler ensures (|0) operation *)
+  external set_tag : t -> int -> unit = "tag" [@@bs.set]  
+  external repr : 'a -> t = "%identity"
   external magic : 'a -> 'b = "%identity"  
 end 
 

jscomp/runtime/block.ml

@@ -154,7 +154,7 @@ let __ = Block.__
 
 let variant meta tag xs =
   setupOnce () [@bs];
-  xs |. Caml_obj_extern.set_tag tag;
+  xs |. Obj.set_tag tag;
   xs |. addProp (cacheSymbol "BsVariant") {value = meta }
 
 let simpleVariant meta xs =

jscomp/runtime/bs_stdlib_mini.mli

@@ -36,23 +36,7 @@ type t = {
    {[ a = caml_set_oo_id([248,"tag", caml_oo_last_id++]) ]}
 *)
 
-let%private id = ref 0
-
-
-(* see  #251
-   {[
-     CAMLprim value caml_set_oo_id (value obj) {
-       Field(obj, 1) = oo_last_id;
-       oo_last_id += 2;
-       return obj;
-     }
-
-   ]}*)
-let caml_set_oo_id (b : Caml_obj_extern.t)  : Caml_obj_extern.t = 
-  Caml_obj_extern.set_field (Caml_obj_extern.repr b) 1 (Caml_obj_extern.repr id.contents);
-  id .contents <-  id.contents  + 1; 
-  b
-(* FXIME: this is only relevant to OO module now *)
+let id = ref 0
 
 
 let create (str : string) : string = 

jscomp/runtime/caml_chrome_debugger.ml

@@ -125,15 +125,15 @@ let caml_hash (count : int) _limit (seed : nativeint)
       else if Js.typeof obj = "undefined" then 
         ()
       else if Js.typeof obj = "symbol" then 
-        assert false (* TODO *)
+        ()
       else if Js.typeof obj = "function" then
         () 
       else 
         let size = Caml_obj_extern.size_of_t obj in 
         match Js.undefinedToOption size with
         | None -> ()
         | Some size -> 
-          let obj_tag = Caml_obj_extern.tag obj in
+          let obj_tag = Obj.tag obj in
           let tag = (size lsl 10) lor obj_tag in 
           if tag = 248 (* Obj.object_tag*) then 
             hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int (oo_id  obj))
@@ -143,7 +143,7 @@ let caml_hash (count : int) _limit (seed : nativeint)
               let block = 
                 let v = size - 1 in if v <  num.contents then v else num.contents in 
               for i = 0 to block do
-                 push_back queue (Caml_obj_extern.field obj i ) 
+                 push_back queue (Obj.field obj i ) 
               done 
             end
     done;