move obj from bs_stdlib_mini to caml_obj

Author: bobzhang

jscomp/runtime/.depend

@@ -1,4 +1,4 @@
-block.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+block.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj
 caml_array.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_basic.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_builtin_exceptions.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
@@ -7,23 +7,23 @@ caml_exceptions.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_e
 caml_float.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_format.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_gc.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-caml_hash.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_hash.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj
 caml_hash_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_int32.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_int64.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_lexer.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_md5.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_missing_polyfill.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-caml_obj.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_obj.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj
 caml_oo.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-caml_parser.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_parser.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj
 caml_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_queue.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_string.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_sys.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_utils.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_weak.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-js_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+js_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj
 block.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj block.cmi
 bs_obj.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 bs_string.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
@@ -41,22 +41,22 @@ caml_hash_primitive.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe cam
 caml_int32.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_int32.cmi caml_nativeint.cmj
 caml_int64.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_int32.cmj caml_utils.cmj caml_primitive.cmj caml_builtin_exceptions.cmj caml_int64.cmi caml_nativeint.cmj caml_float.cmj caml_char.cmj bs_string.cmj
 caml_io.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe curry.cmj caml_builtin_exceptions.cmj bs_string.cmj
-caml_js_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe js_primitive.cmj caml_exceptions.cmj
+caml_js_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe js_primitive.cmj caml_exceptions.cmj bs_obj.cmj
 caml_lexer.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_lexer.cmi
 caml_md5.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_char.cmj caml_array.cmj bs_string.cmj caml_md5.cmi
 caml_missing_polyfill.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_missing_polyfill.cmi
-caml_module.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_builtin_exceptions.cmj caml_array.cmj
+caml_module.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_builtin_exceptions.cmj caml_array.cmj bs_obj.cmj
 caml_nativeint.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_obj.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe block.cmj caml_primitive.cmj caml_builtin_exceptions.cmj caml_obj.cmi caml_array.cmj bs_obj.cmj
 caml_oo.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_array.cmj caml_builtin_exceptions.cmj caml_oo.cmi bs_obj.cmj
 caml_oo_curry.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe curry.cmj caml_oo.cmj
-caml_parser.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_parser.cmi
+caml_parser.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj caml_parser.cmi
 caml_primitive.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_bytes.cmj caml_primitive.cmi
 caml_queue.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_queue.cmi
 caml_string.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_string.cmi caml_char.cmj bs_string.cmj
 caml_sys.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_sys.cmi caml_nativeint.cmj caml_array.cmj
 caml_utils.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_utils.cmi
-caml_weak.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_array.cmj js_primitive.cmj caml_weak.cmi
+caml_weak.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_array.cmj js_primitive.cmj caml_weak.cmi bs_obj.cmj
 curry.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_array.cmj
 js_int64.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 js_nativeint.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe

jscomp/runtime/block.mli

@@ -28,14 +28,14 @@
 
 (** *)
 
-val __ : int -> Obj.t -> Obj.t
+val __ : int -> Bs_obj.t -> Bs_obj.t
 
-val record : 'a -> Obj.t -> Obj.t
+val record : 'a -> Bs_obj.t -> Bs_obj.t
 
-val variant : 'a -> int ->  Obj.t -> Obj.t
+val variant : 'a -> int ->  Bs_obj.t -> Bs_obj.t
 
-val simpleVariant : 'a -> Obj.t -> Obj.t
+val simpleVariant : 'a -> Bs_obj.t -> Bs_obj.t
 
-val localModule : 'a -> Obj.t -> Obj.t 
+val localModule : 'a -> Bs_obj.t -> Bs_obj.t 
 
-val polyVar : 'a -> Obj.t -> Obj.t
+val polyVar : 'a -> Bs_obj.t -> Bs_obj.t

jscomp/runtime/bs_obj.ml

@@ -24,21 +24,20 @@
 
 (** *)
 
-type any = Obj.t
+type t 
+external tag : t -> int = "caml_obj_tag" 
+external repr : 'a -> t = "%identity"
+external field : t -> int -> t = "%obj_field"
+external set_field : t -> int -> t -> unit = "%obj_set_field"
 
-external set_length : any -> int -> unit = "length" [@@bs.set]
-external length : any -> int = "#obj_length"
-
-(** The same as {!Obj.tag} *)
-external tag : any -> int = "caml_obj_tag"
+external set_length : t -> int -> unit = "length" [@@bs.set]
+external length : t -> int = "#obj_length"
 
 (** The same as {!Obj.set_tag} *)
-external set_tag : any -> int -> unit = "tag" [@@bs.set]
+external set_tag : t -> int -> unit = "tag" [@@bs.set]
 
-external size_of_any : any -> 'a Js.undefined =
+external size_of_t : t -> 'a Js.undefined =
   "length" [@@bs.get]
 
-external tag_of_any : any -> 'a Js.undefined =
-  "tag" [@@bs.get]
 
 external magic : 'a -> 'b = "%identity"

jscomp/runtime/bs_stdlib_mini.mli

@@ -8,17 +8,7 @@
 
   
   Types defined here but should not export:
-
   - ref (make sure not exported in public others/*.mli)
-  - in_channel (runtime only)
-  - fpclass (runtime only)
-  - Obj.t (runtime only)
-  - Lexing.lex_tables, Lexing.lexbuf (runtime only)
-  - Parsing.parse_tables, Parsing.parser_env (runtime only)
-  - Printexc.raw_backtrace_slot,  Printexc.backtrace_slot (runtiem only)
-  - Gc.stat, Gc.control (runtime only) 
-  - CamlinternalOO.obj CamlinternalOO.closure (runtime only)
-  - CamlinternalMod.shape (runtime only)
 *)
 
 external (^) : string -> string -> string = "#string_append"
@@ -65,21 +55,8 @@ external ( -. ) : float -> float -> float = "%subfloat"
 external ( *. ) : float -> float -> float = "%mulfloat"
 external ( /. ) : float -> float -> float = "%divfloat"
 
-
-
-module String : sig 
-  external unsafe_get : string -> int -> char = "%string_unsafe_get"
-  external length : string -> int = "%string_length"
-end 
-
-module Obj : sig 
-  type t 
-  external magic : 'a -> 'b = "%identity"
-  external repr : 'a -> t = "%identity"
-  external field : t -> int -> t = "%obj_field"
-  external set_field : t -> int -> t -> unit = "%obj_set_field"
-  external tag : t -> int = "caml_obj_tag"
-  external dup : t -> t = "caml_obj_dup"
+module Obj : sig   
+  external magic : 'a -> 'b = "%identity"  
 end 
 
 

jscomp/runtime/caml_builtin_exceptions.ml

@@ -46,18 +46,18 @@ let assert_failure =  "Assert_failure", -10n
 let undefined_recursive_module =  "Undefined_recursive_module", -11n
 
 let () =
-    Bs_obj.set_tag (Obj.repr out_of_memory ) object_tag;
-    Bs_obj.set_tag (Obj.repr sys_error) object_tag;
-    Bs_obj.set_tag (Obj.repr failure) object_tag;
-    Bs_obj.set_tag (Obj.repr invalid_argument) object_tag;
-    Bs_obj.set_tag (Obj.repr end_of_file) object_tag;
-    Bs_obj.set_tag (Obj.repr division_by_zero) object_tag;
-    Bs_obj.set_tag (Obj.repr not_found) object_tag ; 
-    Bs_obj.set_tag (Obj.repr match_failure) object_tag;
-    Bs_obj.set_tag (Obj.repr stack_overflow) object_tag;
-    Bs_obj.set_tag (Obj.repr sys_blocked_io) object_tag;
-    Bs_obj.set_tag (Obj.repr assert_failure) object_tag;
-    Bs_obj.set_tag (Obj.repr undefined_recursive_module) object_tag
+    Bs_obj.set_tag (Bs_obj.repr out_of_memory ) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr sys_error) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr failure) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr invalid_argument) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr end_of_file) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr division_by_zero) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr not_found) object_tag ; 
+    Bs_obj.set_tag (Bs_obj.repr match_failure) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr stack_overflow) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr sys_blocked_io) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr assert_failure) object_tag;
+    Bs_obj.set_tag (Bs_obj.repr undefined_recursive_module) object_tag
 
 (**: 
    1. Is it necessary to tag [248] here

jscomp/runtime/caml_exceptions.ml

@@ -48,7 +48,7 @@ let id = ref 0n
 
    ]}*)
 let caml_set_oo_id (b : Caml_builtin_exceptions.exception_block)  = 
-  Obj.set_field (Obj.repr b) 1 (Obj.repr !id);
+  Bs_obj.set_field (Bs_obj.repr b) 1 (Bs_obj.repr !id);
   id := Caml_nativeint.add !id  1n; 
   b
 
@@ -60,12 +60,12 @@ let object_tag = 248
 
 let create (str : string) : Caml_builtin_exceptions.exception_block = 
   let v = ( str, caml_fresh_oo_id ()) in 
-  Bs_obj.set_tag (Obj.repr v) object_tag;
+  Bs_obj.set_tag (Bs_obj.repr v) object_tag;
   v 
 
 (* let makeExtension (str : string) : Caml_builtin_exceptions.exception_block =  *)
 (*   let v = ( str, get_id ()) in  *)
-(*   Bs_obj.set_tag (Obj.repr v) object_tag; *)
+(*   Bs_obj.set_tag (Bs_obj.repr v) object_tag; *)
 (*   v  *)
 
 
@@ -104,10 +104,10 @@ let create (str : string) : Caml_builtin_exceptions.exception_block =
 let caml_is_extension e = 
   if  Obj.magic e = Js.undefined then false 
   else 
-    Obj.tag (Obj.repr e) = object_tag  (* nullary exception *)
+    Bs_obj.tag (Bs_obj.repr e) = object_tag  (* nullary exception *)
     ||
-    let slot = Obj.field (Obj.repr e) 0 in 
+    let slot = Bs_obj.field (Bs_obj.repr e) 0 in 
     not (Obj.magic slot = Js.undefined) &&
-    (Obj.tag slot = object_tag)
+    (Bs_obj.tag slot = object_tag)
 
 

jscomp/runtime/caml_format.ml

@@ -64,6 +64,7 @@ let int_of_string_base = function
   | Bin -> 2
 
 let parse_sign_and_base (s : string) = 
+  let module String = Bs_string in 
   let sign = ref 1n in
   let base = ref Dec in
   let i  = ref 0 in
@@ -89,6 +90,7 @@ let parse_sign_and_base (s : string) =
 
 
 let caml_int_of_string s = 
+  let module String = Bs_string in 
   let i, sign, hbase = parse_sign_and_base s in
   let base  = Caml_nativeint.of_int (int_of_string_base hbase) in
   let threshold = (-1n >>> 0) in 
@@ -122,6 +124,7 @@ let caml_int_of_string s =
 
 
 let caml_int64_of_string s = 
+  let module String = Bs_string in 
   let i, sign, hbase = parse_sign_and_base s in
   let base  = Int64.of_int (int_of_string_base hbase) in
   let sign = Int64.of_nativeint sign in
@@ -193,6 +196,7 @@ let lowercase c =
   else c
 
 let parse_format fmt = 
+  let module String = Bs_string in 
   let len =Bs_string.length fmt in 
   if len > 31 then 
     raise  (Invalid_argument "format_int: format too long") ;
@@ -296,7 +300,7 @@ let finish_formatting (config : fmt) rawbuffer =
     prec;
     conv
   } = config in  
-  let len = ref (String.length rawbuffer) in 
+  let len = ref (Bs_string.length rawbuffer) in 
   if signedconv && (sign < 0 || signstyle <> "-") then 
     incr len;
   if alternate then 
@@ -374,6 +378,7 @@ let caml_format_int fmt i =
     aux f i 
 
 let caml_int64_format fmt x =
+  let module String = Bs_string in 
   let f = parse_format fmt in
   let x =
     if f.signedconv &&  x < 0L then
@@ -492,6 +497,7 @@ let caml_int64_format fmt x =
   finish_formatting f !s
 
 let caml_format_float fmt x = 
+  let module String = Bs_string in 
   let f = parse_format fmt in 
   let prec = if f.prec < 0 then 6 else f.prec in 
   let x = if x < 0. then (f.sign <- (-1); -. x) else x in 

jscomp/runtime/caml_hash.ml

@@ -28,7 +28,7 @@ external ( +~ ) : nativeint -> nativeint -> nativeint =
    "caml_int32_add"
 
 (*ATTENTION: refer {!Oo.id} *)
-external oo_id : Obj.t -> int  = "%field1"
+external oo_id : Bs_obj.t -> int  = "%field1"
 
 open Caml_hash_primitive
 
@@ -76,11 +76,11 @@ let caml_hash count _limit seed obj =
       else if Js.typeof obj = "function" then
         () 
       else 
-        let size = Bs_obj.size_of_any obj in 
+        let size = Bs_obj.size_of_t obj in 
         match Js.undefinedToOption size with
         | None -> ()
         | Some size -> 
-          let obj_tag = Obj.tag obj in
+          let obj_tag = Bs_obj.tag obj in
           let tag = (size lsl 10) lor obj_tag in 
           if tag = 248 (* Obj.object_tag*) then 
             hash := caml_hash_mix_int !hash (Caml_nativeint.of_int (oo_id  obj))
@@ -90,7 +90,7 @@ let caml_hash count _limit seed obj =
               let block = 
                 let v = size - 1 in if v <  !num then v else !num in 
               for i = 0 to block do
-                Caml_queue.push (Obj.field obj i ) queue
+                Caml_queue.push (Bs_obj.field obj i ) queue
               done 
             end
     done;

jscomp/runtime/caml_hash.mli

@@ -26,4 +26,4 @@
 
 
 (** *)
-val caml_hash : int -> 'a -> nativeint -> Obj.t -> nativeint
+val caml_hash : int -> 'a -> nativeint -> Bs_obj.t -> nativeint

jscomp/runtime/caml_hash_primitive.ml

@@ -56,6 +56,7 @@ let caml_hash_final_mix h =
   (* Caml_nativeint.logand  (!h ^ (!h >>> 16)) 0x3FFFFFFFn *)
 
 let caml_hash_mix_string h  s = 
+  let module String = Bs_string in 
   let len =Bs_string.length s in
   let block = len / 4 - 1  in
   let hash = ref h in  

jscomp/runtime/caml_int64.ml

@@ -445,6 +445,7 @@ let  bits_of_float : float -> t  = fun x ->
 
 (** used by "%caml_string_get64" *)
 let get64 (s : string) (i:int) : t =
+  let module String = Bs_string in 
   mk ~lo:
     (Caml_nativeint.logor
        (Caml_nativeint.logor

jscomp/runtime/caml_io.ml

@@ -37,6 +37,7 @@ type out_channel  = {
 let stdout = {
   buffer = "";
   output = (fun _ s ->
+    let module String = Bs_string in
     let v =Bs_string.length s - 1 in
     if [%bs.raw{| (typeof process !== "undefined") && process.stdout && process.stdout.write|}] then
       ([%bs.raw{| process.stdout.write |} ] : string -> unit [@bs]) s [@bs]
@@ -49,6 +50,7 @@ let stdout = {
 let stderr = {
   buffer = "";
   output = fun _ s ->
+    let module String = Bs_string in
     let v =Bs_string.length s - 1 in     
     if s.[v] = '\n' then
       Js.log (Bs_string.slice s 0 v) (* TODO: change to Js.error*)

jscomp/runtime/caml_js_exceptions.ml

@@ -9,16 +9,16 @@ exception Error of t
    {[
      exception A of int;;
      let v = A  3 ;;
-     Obj.tag (Obj.field (Obj.repr v) 0);;
+     Bs_obj.tag (Bs_obj.field (Bs_obj.repr v) 0);;
      - : int = 248
    ]}
    This function has to be in this module Since 
    [Error] is defined here 
 *)
-let internalToOCamlException (e : Obj.t) =
+let internalToOCamlException (e : Bs_obj.t) =
   if Caml_exceptions.caml_is_extension e  then
     (Obj.magic e  : exn)
-  else Error (Obj.magic (e : Obj.t) : t) 
+  else Error (Obj.magic (e : Bs_obj.t) : t) 
 
 let caml_as_js_exn exn =   
   match exn with 

jscomp/runtime/caml_md5.ml

@@ -156,6 +156,7 @@ let md5blk = [|
   |] 
 
 let caml_md5_string s start len = 
+  let module String = Bs_string in 
   let module Array = Caml_array (* reuse the sugar .. *)
   in