Merge pull request #4403 from BuckleScript/caml_oo

clean up, keep runtime exposure minimal to prepare data representation changes

Author: bobzhang

jscomp/core/lam_dispatch_primitive.ml

@@ -684,7 +684,6 @@ let translate loc (prim_name : string)
     (*   "caml_alloc_dummy"; *)
     (* TODO:   "caml_alloc_dummy_float"; *)
     | "caml_obj_dup" 
-    | "caml_obj_truncate"
       -> 
       call Js_runtime_modules.obj_runtime
 
@@ -766,14 +765,6 @@ let translate loc (prim_name : string)
       -> call Js_runtime_modules.hash_primitive
     | "caml_hash"
       -> call Js_runtime_modules.hash 
-    | "caml_weak_set"
-    | "caml_weak_create"
-    | "caml_weak_get"
-    | "caml_weak_check"
-    | "caml_weak_blit"
-    | "caml_weak_get_copy"
-      -> call Js_runtime_modules.weak
-
     | "caml_ml_open_descriptor_in" when   
       args_const_unbox_approx_int_zero args -> 
       E.runtime_ref Js_runtime_modules.io "stdin"
@@ -782,60 +773,7 @@ let translate loc (prim_name : string)
       E.runtime_ref Js_runtime_modules.io "stdout"
     | "caml_ml_open_descriptor_out" when 
       args_const_unbox_approx_int_two args -> 
-      E.runtime_ref Js_runtime_modules.io "stderr"
-
-    | "caml_ba_create"
-    | "caml_ba_get_generic"
-    | "caml_ba_set_generic"
-    | "caml_ba_num_dims"
-    | "caml_ba_dim"
-    | "caml_ba_kind"
-    | "caml_ba_layout"
-    | "caml_ba_sub"
-    | "caml_ba_slice"
-    | "caml_ba_blit"
-    | "caml_ba_fill"
-    | "caml_ba_reshape"
-    | "caml_ba_map_file_bytecode"
-
-    (* caml_ba_get_1,  (\* %caml_ba_ref_1 *\) *)
-    (* caml_ba_get_2, *)
-    (* caml_ba_get_3, *)
-
-    (* caml_ba_set_1,  // %caml_ba_set_1 *)
-    (* caml_ba_set_2, *)
-    (* caml_ba_set_3, *)
-
-    (* caml_ba_dim_1, // %caml_ba_dim_1 *)
-    (* caml_ba_dim_2,  *)
-    (* caml_ba_dim_3,  *)
-    | "caml_output_value_to_buffer"
-    | "caml_marshal_data_size"
-    | "caml_input_value_from_string"
-    | "caml_output_value"
-    | "caml_input_value"
-    | "caml_output_value_to_string"
-    | "caml_md5_chan"
-    | "caml_hash_univ_param"
-    | "caml_sys_close"
-    | "caml_sys_open"
-    | "caml_ml_input"
-    | "caml_ml_input_scan_line"
-    | "caml_ml_input_int"
-    | "caml_ml_close_channel"
-    | "caml_ml_output_int"
-
-    | "caml_ml_channel_size_64"
-    | "caml_ml_channel_size"
-    | "caml_ml_pos_in_64"
-    | "caml_ml_pos_in"
-    | "caml_ml_seek_in"
-    | "caml_ml_seek_in_64"
-    | "caml_ml_pos_out"
-    | "caml_ml_pos_out_64"
-    | "caml_ml_seek_out"
-    | "caml_ml_seek_out_64"
-    | "caml_ml_set_binary_mode"    
+      E.runtime_ref Js_runtime_modules.io "stderr"       
     | _ -> 
       Bs_warnings.warn_missing_primitive loc prim_name  ;
       E.resolve_and_apply prim_name args

jscomp/ext/js_runtime_modules.ml

@@ -43,8 +43,6 @@ let caml_oo_curry = "Caml_oo_curry"
 let caml_primitive = "Caml_primitive"
 let int64 = "Caml_int64"
 let md5 = "Caml_md5"
-let weak = "Caml_weak"
-
 let gc = "Caml_gc"
 let int32 = "Caml_int32"
 let block = "Block"

jscomp/main/builtin_cmi_datasets.ml

@@ -27,7 +27,7 @@
 
 
 
-type obj = Caml_obj_extern.t
+type obj = Obj.t
 
 (* Note that when we introduce it in {!Js_dump} 
    we need introduce dependency properly *)

jscomp/main/builtin_cmj_datasets.ml

@@ -27,7 +27,7 @@
 
 
 (** *)
-type obj = Caml_obj_extern.t
+type obj = Obj.t
 
 val __ : int -> obj -> obj
 

jscomp/runtime/block.ml

@@ -62,6 +62,7 @@ module Obj : sig
   external set_tag : t -> int -> unit = "tag" [@@bs.set]  
   external repr : 'a -> t = "%identity"
   external magic : 'a -> 'b = "%identity"  
+  external size : t -> int = "#obj_length"
 end 
 
 

jscomp/runtime/block.mli

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type obj = Caml_obj_extern.t
+type obj = Obj.t
 
 let setupChromeDebugger : unit -> unit [@bs]= [%raw{|
   function () {

jscomp/runtime/bs_stdlib_mini.mli

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type obj = Caml_obj_extern.t
+type obj = Obj.t
 
 val __ : int -> obj -> obj
 

jscomp/runtime/caml_chrome_debugger.ml

@@ -80,12 +80,12 @@ external ( +~ ) : nativeint -> nativeint -> nativeint =
    "caml_int32_add"
 
 (*ATTENTION: refer {!Oo.id} *)
-external oo_id : Caml_obj_extern.t -> int  = "%field1"
+external oo_id : Obj.t -> int  = "%field1"
 
 open Caml_hash_primitive
 
 let caml_hash (count : int) _limit (seed : nativeint) 
-  (obj : Caml_obj_extern.t) : nativeint = 
+  (obj : Obj.t) : nativeint = 
   let hash = ref seed in 
   if Js.typeof obj = "number" then
     begin 
@@ -129,10 +129,8 @@ let caml_hash (count : int) _limit (seed : nativeint)
       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 size = Obj.size obj in 
+        if size <> 0 then         
           let obj_tag = Obj.tag obj in
           let tag = (size lsl 10) lor obj_tag in 
           if tag = 248 (* Obj.object_tag*) then 
@@ -143,7 +141,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 (Obj.field obj i ) 
+                push_back queue (Obj.field obj i ) 
               done 
             end
     done;