remove caml_char module

Author: bobzhang

jscomp/ext/js_runtime_modules.ml

@@ -33,7 +33,6 @@ let array = "Caml_array"
 let format = "Caml_format"
 let string = "Caml_string"
 let bytes = "Caml_bytes"
-let char = "Caml_char"
 let float = "Caml_float"
 let hash_primitive = "Caml_hash_primitive" 
 let hash = "Caml_hash"

jscomp/runtime/caml_char.ml

@@ -24,7 +24,16 @@
 
 
 
+external (.![]) : string -> int -> int = "%string_unsafe_get" 
 
+let code_0 = "0".![0]
+let code_a = "a".![0]
+let code_A = "A".![0]
+
+module Caml_char = struct 
+  external code : char -> int = "%identity"  
+  external unsafe_chr : int -> char = "%identity"
+end  
 
 let caml_failwith s = raise (Failure  s)
 (* let caml_invalid_argument s= raise (Invalid_argument s ) *)
@@ -39,11 +48,11 @@ let ( *~ ) = Caml_nativeint_extern.mul
 let parse_digit c = 
   match c with 
   | '0' .. '9' 
-    -> Caml_char.code c - Caml_char.code '0'
+    -> Caml_char.code c - code_0
   | 'A' .. 'Z'
-    -> Caml_char.code c - (Caml_char.code 'A' - 10)
+    -> Caml_char.code c - (code_A - 10)
   | 'a' .. 'z'
-    -> Caml_char.code c - (Caml_char.code 'a' - 10 )
+    -> Caml_char.code c - (code_a - 10 )
   | _ -> -1
 
 type of_string_base =
@@ -183,7 +192,7 @@ type fmt = {
   mutable conv : string
 }
 
-let lowercase c =
+let lowercase (c : char) : char =
   if (c >= 'A' && c <= 'Z')
   || (c >= '\192' && c <= '\214')
   || (c >= '\216' && c <= '\222')
@@ -219,8 +228,8 @@ let parse_format fmt =
           f.width <- 0;
           let j = ref i in 
 
-          while (let w = Caml_char.code fmt.[j.contents] - Caml_char.code '0' in w >=0 && w <= 9  ) do 
-            f.width <- f.width * 10 + Caml_char.code fmt.[j.contents] - Caml_char.code '0';
+          while (let w = fmt.![j.contents] - code_0  in w >=0 && w <= 9  ) do 
+            f.width <- f.width * 10 + fmt.![j.contents] - code_0;
             j.contents <- j.contents + 1
           done;
           aux f j.contents
@@ -229,8 +238,8 @@ let parse_format fmt =
         -> 
         f.prec <- 0;
         let j = ref (i + 1 ) in 
-        while (let w = Caml_char.code fmt.[j.contents] - Caml_char.code '0' in w >=0 && w <= 9  ) do 
-          f.prec <- f.prec * 10 + Caml_char.code fmt.[j.contents] - Caml_char.code '0';
+        while (let w = fmt.![j.contents] - code_0 in w >=0 && w <= 9  ) do 
+          f.prec <- f.prec * 10 + fmt.![j.contents] - code_0;
           j.contents <- j.contents + 1;
         done;
         aux f j.contents 

jscomp/runtime/caml_format.ml

@@ -37,7 +37,7 @@ external ( +~ ) : nativeint -> nativeint -> nativeint = "caml_int32_add"
 let rotl32 (x : nativeint) n  = 
   (x << n) |~ (x >>> (32 - n))
 
-
+external (.![]) : string -> int -> int = "charCodeAt" [@@bs.send]
 let caml_hash_mix_int h  d = 
   let d = ref d in 
   d.contents <- d.contents *~ 0xcc9e2d51n ;
@@ -63,10 +63,10 @@ let caml_hash_mix_string h  s =
   for i = 0 to block  do 
     let j = 4 * i in 
     let w = 
-      Caml_char.code s.[j] lor 
-      (Caml_char.code s.[j+1] lsl 8) lor 
-      (Caml_char.code s.[j+2] lsl 16) lor 
-      (Caml_char.code s.[j+3] lsl 24)
+      s.![j] lor 
+      (s.![j+1] lsl 8) lor 
+      (s.![j+2] lsl 16) lor 
+      (s.![j+3] lsl 24)
     in
     hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int w)
   done ;
@@ -75,13 +75,13 @@ let caml_hash_mix_string h  s =
     begin 
       let w =
         if modulo = 3 then 
-          (Caml_char.code s.[len - 1] lsl 16) lor 
-          (Caml_char.code s.[len - 2] lsl 8) lor
-          (Caml_char.code s.[len - 3])
+          (s.![len - 1] lsl 16) lor 
+          (s.![len - 2] lsl 8) lor
+          s.![len - 3]
         else if modulo = 2 then 
-          (Caml_char.code s.[len -1] lsl 8) lor 
-          Caml_char.code s.[len -2]
-        else Caml_char.code s.[len - 1] 
+          (s.![len -1] lsl 8) lor 
+           s.![len -2]
+        else  s.![len - 1] 
       in 
       hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int w)
     end;

jscomp/runtime/caml_hash_primitive.ml

@@ -524,30 +524,3 @@ let float_of_bits ( x : t) : float =
 let  bits_of_float : float -> t  = fun x -> 
     let lo,hi = ([%raw{|function(x){return new Int32Array(new Float64Array([x]).buffer)}|}] : _ -> _) x in 
     mk ~lo ~hi
-  (* let to_nat (x : int32) = x |> Caml_int32_extern.to_int |>  Caml_nativeint_extern.of_int in
-
-  let u = Float64_array.make [| x |] in
-  let int32 = Int32_array.fromBuffer (Float64_array.buffer u) in
-  mk ~lo:(to_nat (Int32_array.unsafe_get int32 0))
-    ~hi:( to_nat (Int32_array.unsafe_get int32 1)) *)
-
-(** used by "%caml_string_get64" *)
-(* let get64 (s : string) (i:int) : t =
-  let module String = Caml_string_extern in 
-  mk ~lo:
-    (Caml_nativeint_extern.logor
-       (Caml_nativeint_extern.logor
-          (Caml_nativeint_extern.of_int (Caml_char.code s.[i]))
-          (Caml_nativeint_extern.of_int (Caml_char.code s.[i+1]) << 8))
-       (Caml_nativeint_extern.logor
-          (Caml_nativeint_extern.of_int (Caml_char.code s.[i+2]) << 16 )
-          (Caml_nativeint_extern.of_int (Caml_char.code s.[i+3]) << 24 )))
-    ~hi:
-      (Caml_nativeint_extern.logor
-         (Caml_nativeint_extern.logor
-            (Caml_nativeint_extern.of_int (Caml_char.code s.[i+4]) << 32)
-            (Caml_nativeint_extern.of_int (Caml_char.code s.[i+5]) << 40))
-         (Caml_nativeint_extern.logor
-            (Caml_nativeint_extern.of_int (Caml_char.code s.[i+6]) << 48 )
-            (Caml_nativeint_extern.of_int (Caml_char.code s.[i+7]) << 56 )))
- *)

jscomp/runtime/caml_int64.ml

@@ -19,13 +19,13 @@ build runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.ml | runtime/caml_bytes
 build runtime/caml_bytes.cmi : cc runtime/caml_bytes.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_float.cmj : cc_cmi runtime/caml_float.ml | runtime/caml_float.cmi runtime/caml_float_extern.cmj
 build runtime/caml_float.cmi : cc runtime/caml_float.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_char.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
+build runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
 build runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_gc.cmj : cc_cmi runtime/caml_gc.ml | runtime/caml_gc.cmi
 build runtime/caml_gc.cmi : cc runtime/caml_gc.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/js.cmj
 build runtime/caml_hash.cmi : cc runtime/caml_hash.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml | runtime/caml_char.cmj runtime/caml_hash_primitive.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
+build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml | runtime/caml_hash_primitive.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 build runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
@@ -57,7 +57,6 @@ build runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.ml | runtime/caml_array_ext
 build runtime/caml_sys.cmi : cc runtime/caml_sys.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj : cc runtime/caml_array_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_bytes_extern.cmi runtime/caml_bytes_extern.cmj : cc runtime/caml_bytes_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_char.cmi runtime/caml_char.cmj : cc runtime/caml_char.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj : cc runtime/caml_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc runtime/caml_external_polyfill.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
@@ -69,4 +68,4 @@ build runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj : cc runtime/caml_oo_c
 build runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
-build runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_gc.cmi runtime/caml_gc.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_oo.cmi runtime/caml_oo.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bytes_extern.cmi runtime/caml_bytes_extern.cmj runtime/caml_char.cmi runtime/caml_char.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
+build runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_gc.cmi runtime/caml_gc.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_oo.cmi runtime/caml_oo.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bytes_extern.cmi runtime/caml_bytes_extern.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj