make js interface clean

Author: Hongbo Zhang

Diff for: jscomp/runtime/.runtimedepend

@@ -24,8 +24,8 @@ caml_weak.cmi :
 js_primitive.cmi : js.cmj
 block.cmj : block.cmi
 block.cmx : block.cmi
-caml_array.cmj : js.cmj caml_array.cmi
-caml_array.cmx : js.cmx caml_array.cmi
+caml_array.cmj : caml_array.cmi
+caml_array.cmx : caml_array.cmi
 caml_backtrace.cmj : caml_backtrace.cmi
 caml_backtrace.cmx : caml_backtrace.cmi
 caml_basic.cmj : js.cmj caml_basic.cmi
@@ -36,58 +36,60 @@ caml_exceptions.cmj : caml_builtin_exceptions.cmi caml_exceptions.cmi
 caml_exceptions.cmx : caml_builtin_exceptions.cmx caml_exceptions.cmi
 caml_float.cmj : typed_array.cmj js.cmj caml_float.cmi
 caml_float.cmx : typed_array.cmx js.cmx caml_float.cmi
-caml_format.cmj : js.cmj caml_utils.cmi caml_format.cmi
-caml_format.cmx : js.cmx caml_utils.cmx caml_format.cmi
+caml_format.cmj : js_string.cmj js.cmj caml_utils.cmi caml_format.cmi
+caml_format.cmx : js_string.cmx js.cmx caml_utils.cmx caml_format.cmi
 caml_gc.cmj : caml_gc.cmi
 caml_gc.cmx : caml_gc.cmi
-caml_hash.cmj : js.cmj caml_queue.cmi caml_hash.cmi
-caml_hash.cmx : js.cmx caml_queue.cmx caml_hash.cmi
+caml_hash.cmj : js_string.cmj js.cmj caml_queue.cmi caml_hash.cmi
+caml_hash.cmx : js_string.cmx js.cmx caml_queue.cmx caml_hash.cmi
 caml_int32.cmj : caml_int32.cmi
 caml_int32.cmx : caml_int32.cmi
-caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmi caml_int32.cmi \
-    caml_int64.cmi
-caml_int64.cmx : typed_array.cmx js.cmx caml_utils.cmx caml_int32.cmx \
-    caml_int64.cmi
-caml_io.cmj : js.cmj
-caml_io.cmx : js.cmx
+caml_int64.cmj : typed_array.cmj js_string.cmj js.cmj caml_utils.cmi \
+    caml_int32.cmi caml_int64.cmi
+caml_int64.cmx : typed_array.cmx js_string.cmx js.cmx caml_utils.cmx \
+    caml_int32.cmx caml_int64.cmi
+caml_io.cmj : js_string.cmj js.cmj
+caml_io.cmx : js_string.cmx js.cmx
 caml_lexer.cmj : caml_lexer.cmi
 caml_lexer.cmx : caml_lexer.cmi
-caml_md5.cmj : js.cmj caml_md5.cmi
-caml_md5.cmx : js.cmx caml_md5.cmi
+caml_md5.cmj : js_string.cmj caml_md5.cmi
+caml_md5.cmx : js_string.cmx caml_md5.cmi
 caml_module.cmj :
 caml_module.cmx :
 caml_obj.cmj : js.cmj caml_obj.cmi
 caml_obj.cmx : js.cmx caml_obj.cmi
-caml_oo.cmj : js.cmj caml_oo.cmi
-caml_oo.cmx : js.cmx caml_oo.cmi
+caml_oo.cmj : js.cmj caml_array.cmi caml_oo.cmi
+caml_oo.cmx : js.cmx caml_array.cmx caml_oo.cmi
 caml_parser.cmj : caml_parser.cmi
 caml_parser.cmx : caml_parser.cmi
 caml_primitive.cmj : caml_primitive.cmi
 caml_primitive.cmx : caml_primitive.cmi
 caml_queue.cmj : caml_queue.cmi
 caml_queue.cmx : caml_queue.cmi
-caml_string.cmj : js.cmj caml_string.cmi
-caml_string.cmx : js.cmx caml_string.cmi
+caml_string.cmj : js_string.cmj js.cmj caml_string.cmi
+caml_string.cmx : js_string.cmx js.cmx caml_string.cmi
 caml_sys.cmj : js.cmj caml_sys.cmi
 caml_sys.cmx : js.cmx caml_sys.cmi
 caml_utils.cmj : caml_utils.cmi
 caml_utils.cmx : caml_utils.cmi
 caml_weak.cmj : js.cmj caml_array.cmi caml_weak.cmi
 caml_weak.cmx : js.cmx caml_array.cmx caml_weak.cmi
-curry.cmj : js.cmj caml_oo.cmi
-curry.cmx : js.cmx caml_oo.cmx
+curry.cmj : caml_oo.cmi caml_array.cmi
+curry.cmx : caml_oo.cmx caml_array.cmx
 js.cmj :
 js.cmx :
 js_primitive.cmj : js.cmj js_primitive.cmi
 js_primitive.cmx : js.cmx js_primitive.cmi
+js_string.cmj :
+js_string.cmx :
 js_unsafe.cmj : js.cmj
 js_unsafe.cmx : js.cmx
 typed_array.cmj :
 typed_array.cmx :
 block.cmo : block.cmi
 block.cmj : block.cmi
-caml_array.cmo : js.cmo caml_array.cmi
-caml_array.cmj : js.cmj caml_array.cmi
+caml_array.cmo : caml_array.cmi
+caml_array.cmj : caml_array.cmi
 caml_backtrace.cmo : caml_backtrace.cmi
 caml_backtrace.cmj : caml_backtrace.cmi
 caml_basic.cmo : js.cmo caml_basic.cmi
@@ -98,50 +100,52 @@ caml_exceptions.cmo : caml_builtin_exceptions.cmi caml_exceptions.cmi
 caml_exceptions.cmj : caml_builtin_exceptions.cmj caml_exceptions.cmi
 caml_float.cmo : typed_array.cmo js.cmo caml_float.cmi
 caml_float.cmj : typed_array.cmj js.cmj caml_float.cmi
-caml_format.cmo : js.cmo caml_utils.cmi caml_format.cmi
-caml_format.cmj : js.cmj caml_utils.cmj caml_format.cmi
+caml_format.cmo : js_string.cmo js.cmo caml_utils.cmi caml_format.cmi
+caml_format.cmj : js_string.cmj js.cmj caml_utils.cmj caml_format.cmi
 caml_gc.cmo : caml_gc.cmi
 caml_gc.cmj : caml_gc.cmi
-caml_hash.cmo : js.cmo caml_queue.cmi caml_hash.cmi
-caml_hash.cmj : js.cmj caml_queue.cmj caml_hash.cmi
+caml_hash.cmo : js_string.cmo js.cmo caml_queue.cmi caml_hash.cmi
+caml_hash.cmj : js_string.cmj js.cmj caml_queue.cmj caml_hash.cmi
 caml_int32.cmo : caml_int32.cmi
 caml_int32.cmj : caml_int32.cmi
-caml_int64.cmo : typed_array.cmo js.cmo caml_utils.cmi caml_int32.cmi \
-    caml_int64.cmi
-caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmj caml_int32.cmj \
-    caml_int64.cmi
-caml_io.cmo : js.cmo
-caml_io.cmj : js.cmj
+caml_int64.cmo : typed_array.cmo js_string.cmo js.cmo caml_utils.cmi \
+    caml_int32.cmi caml_int64.cmi
+caml_int64.cmj : typed_array.cmj js_string.cmj js.cmj caml_utils.cmj \
+    caml_int32.cmj caml_int64.cmi
+caml_io.cmo : js_string.cmo js.cmo
+caml_io.cmj : js_string.cmj js.cmj
 caml_lexer.cmo : caml_lexer.cmi
 caml_lexer.cmj : caml_lexer.cmi
-caml_md5.cmo : js.cmo caml_md5.cmi
-caml_md5.cmj : js.cmj caml_md5.cmi
+caml_md5.cmo : js_string.cmo caml_md5.cmi
+caml_md5.cmj : js_string.cmj caml_md5.cmi
 caml_module.cmo :
 caml_module.cmj :
 caml_obj.cmo : js.cmo caml_obj.cmi
 caml_obj.cmj : js.cmj caml_obj.cmi
-caml_oo.cmo : js.cmo caml_oo.cmi
-caml_oo.cmj : js.cmj caml_oo.cmi
+caml_oo.cmo : js.cmo caml_array.cmi caml_oo.cmi
+caml_oo.cmj : js.cmj caml_array.cmj caml_oo.cmi
 caml_parser.cmo : caml_parser.cmi
 caml_parser.cmj : caml_parser.cmi
 caml_primitive.cmo : caml_primitive.cmi
 caml_primitive.cmj : caml_primitive.cmi
 caml_queue.cmo : caml_queue.cmi
 caml_queue.cmj : caml_queue.cmi
-caml_string.cmo : js.cmo caml_string.cmi
-caml_string.cmj : js.cmj caml_string.cmi
+caml_string.cmo : js_string.cmo js.cmo caml_string.cmi
+caml_string.cmj : js_string.cmj js.cmj caml_string.cmi
 caml_sys.cmo : js.cmo caml_sys.cmi
 caml_sys.cmj : js.cmj caml_sys.cmi
 caml_utils.cmo : caml_utils.cmi
 caml_utils.cmj : caml_utils.cmi
 caml_weak.cmo : js.cmo caml_array.cmi caml_weak.cmi
 caml_weak.cmj : js.cmj caml_array.cmj caml_weak.cmi
-curry.cmo : js.cmo caml_oo.cmi
-curry.cmj : js.cmj caml_oo.cmj
+curry.cmo : caml_oo.cmi caml_array.cmi
+curry.cmj : caml_oo.cmj caml_array.cmj
 js.cmo :
 js.cmj :
 js_primitive.cmo : js.cmo js_primitive.cmi
 js_primitive.cmj : js.cmj js_primitive.cmi
+js_string.cmo :
+js_string.cmj :
 js_unsafe.cmo : js.cmo
 js_unsafe.cmj : js.cmj
 typed_array.cmo :

Diff for: jscomp/runtime/Makefile

@@ -8,7 +8,8 @@ OTHERS= caml_array caml_string \
 	caml_float caml_lexer caml_parser caml_primitive\
 	caml_format caml_md5 caml_queue caml_hash caml_weak\
 	caml_backtrace caml_int32 caml_gc typed_array \
-	js_primitive caml_basic caml_oo curry caml_module js_unsafe 
+	js_primitive caml_basic caml_oo curry caml_module js_unsafe \
+	js_string
 
 SOURCE_LIST= $(OTHERS) caml_builtin_exceptions  block  js 
 
@@ -18,6 +19,9 @@ caml_format.cmj caml_io.cmj: curry.cmj
 
 $(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj  block.cmj js.cmj 
 
+## since we use ppx
+$(addsuffix .cmi, $(OTHERS)): js.cmi
+
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) 
 
 

Diff for: jscomp/runtime/caml_array.ml

@@ -24,10 +24,13 @@
 
 
 
+external new_uninitialized : int -> 'a array = "js_create_array"
+external append : 'a array -> 'a array -> 'a array = "js_array_append"
+external make : int -> 'a -> 'a array = "caml_make_vect"
 
 
 let caml_array_sub (x : 'a array) (offset : int) (len : int) = 
-  let result = Js.Array.new_uninitialized len  in
+  let result = new_uninitialized len  in
   let j = ref 0 and i = ref offset in
   while !j < len do
     result.(!j) <- x.(!i);
@@ -58,7 +61,7 @@ let rec fill arr i l =
 
 let  caml_array_concat (l : 'a array list) : 'a array =
   let v = len 0 l in
-  let result = Js.Array.new_uninitialized v in
+  let result = new_uninitialized v in
   fill result 0 l ;
   result
 
@@ -73,7 +76,7 @@ let caml_array_get xs index =
   else xs.(index)
 
 let caml_make_vect len init = 
-  let b = Js.Array.new_uninitialized len in
+  let b = new_uninitialized len in
   for i = 0 to len - 1 do 
     b.(i) <- init
   done;

Diff for: jscomp/runtime/caml_array.mli

@@ -25,9 +25,9 @@
 
 
 
-
-
-
+external new_uninitialized : int -> 'a array = "js_create_array"
+external append : 'a array -> 'a array -> 'a array = "js_array_append"
+external make : int -> 'a -> 'a array = "caml_make_vect"
 
 val caml_array_sub : 'a array -> int -> int -> 'a array
 

Diff for: jscomp/runtime/caml_format.ml

@@ -32,7 +32,7 @@
 let repeat = Caml_utils.repeat
 let caml_failwith s = raise (Failure  s)
 let caml_invalid_argument s= raise (Invalid_argument s )
-let (^) = Js.String.append
+let (^) = Js_string.append
 let (>>>) = Nativeint.shift_right_logical
 
 let to_nat x = Nativeint.of_int x 
@@ -89,7 +89,7 @@ let caml_int_of_string s =
   let i, sign, hbase = parse_sign_and_base s in
   let base  = Nativeint.of_int @@ int_of_string_base hbase in
   let threshold = (-1n >>> 0) in 
-  let len =Js.String.length s in  
+  let len =Js_string.length s in  
   let c = if i < len then s.[i] else '\000' in
   let d = to_nat @@ parse_digit c in
   let () =
@@ -133,7 +133,7 @@ let caml_int64_of_string s =
     | Bin ->
       9223372036854775807L
   in 
-  let len =Js.String.length s in  
+  let len =Js_string.length s in  
   let c = if i < len then s.[i] else '\000' in
   let d = Int64.of_int @@ parse_digit c in
   let () =
@@ -192,7 +192,7 @@ let lowercase c =
   else c
 
 let parse_format fmt = 
-  let len =Js.String.length fmt in 
+  let len =Js_string.length fmt in 
   if len > 31 then 
     raise @@ Invalid_argument "format_int: format too long" ;
   let rec aux (f : fmt) i : fmt = 
@@ -205,7 +205,7 @@ let parse_format fmt =
         aux f (i + 1)
       | '+'|' ' 
         ->
-        f.signstyle <- Js.String.of_char c ; 
+        f.signstyle <- Js_string.of_char c ; 
         aux f (i + 1)
       | '#' -> 
         f.alternate <- true;
@@ -256,13 +256,13 @@ let parse_format fmt =
       | 'e' | 'f' | 'g' 
         -> 
         f.signedconv <- true;
-        f.conv <- Js.String.of_char c ;
+        f.conv <- Js_string.of_char c ;
         aux  f (i + 1)
       | 'E' | 'F' | 'G' 
         -> 
         f.signedconv <- true;
         f.uppercase <- true;
-        f.conv <- Js.String.of_char (lowercase c);
+        f.conv <- Js_string.of_char (lowercase c);
         aux f (i + 1)
       | _ -> 
         aux f (i + 1) 
@@ -332,7 +332,7 @@ let finish_formatting ({
     done;
   begin 
     if uppercase then 
-      buffer := !buffer ^ Js.String.toUpperCase rawbuffer
+      buffer := !buffer ^ Js_string.toUpperCase rawbuffer
     else
       buffer := !buffer ^ rawbuffer
   end;
@@ -355,11 +355,11 @@ let aux f (i : nativeint)  =
       else 
         Nativeint.shift_right_logical i 0 
     else  i  in
-  let s = ref @@ Js.String.of_nativeint i ~base:(int_of_base f.base) in 
+  let s = ref @@ Js_string.of_nativeint i ~base:(int_of_base f.base) in 
   if f.prec >= 0 then 
     begin 
       f.filter <- " ";
-      let n = f.prec -Js.String.length !s in 
+      let n = f.prec -Js_string.length !s in 
       if n > 0 then
         s :=  repeat n "0" [@bs]  ^ !s
     end ;
@@ -482,7 +482,7 @@ let caml_int64_format fmt x =
   if f.prec >= 0 then
     begin
       f.filter <- " ";
-      let n = f.prec -Js.String.length !s in
+      let n = f.prec -Js_string.length !s in
       if n > 0 then
         s := repeat n "0" [@bs] ^ !s
     end;
@@ -517,10 +517,10 @@ let caml_format_float fmt x =
                3.3e+00
            ]}
         *)
-        let  i =Js.String.length !s in 
+        let  i =Js_string.length !s in 
         if !s.[i-3] = 'e' then
           begin 
-            s := Js.String.slice !s 0 (i - 1) ^ "0" ^ Js.String.slice_rest !s (i - 1)
+            s := Js_string.slice !s 0 (i - 1) ^ "0" ^ Js_string.slice_rest !s (i - 1)
           end
       | "f"
         -> 
@@ -530,19 +530,19 @@ let caml_format_float fmt x =
       | "g" -> 
         let prec = if prec <> 0 then prec else 1 in
         s := Js.Float.to_exponential x (prec - 1);
-        let j = Js.String.index_of !s "e" in 
-        let  exp = Js.to_number @@ Js.String.slice_rest !s (j + 1)  in 
-        if exp < -4 || x >= 1e21 ||Js.String.length (Js.Float.to_fixed x 0) > prec then 
+        let j = Js_string.index_of !s "e" in 
+        let  exp = Js.to_number @@ Js_string.slice_rest !s (j + 1)  in 
+        if exp < -4 || x >= 1e21 ||Js_string.length (Js.Float.to_fixed x 0) > prec then 
           let i = ref (j - 1)  in
           while !s.[!i] = '0' do 
             decr i 
           done;
           if !s.[!i] = '.' then 
             decr i ;
-          s := Js.String.slice !s 0 (!i+1) ^ Js.String.slice_rest !s j ;
-          let i =Js.String.length !s in 
+          s := Js_string.slice !s 0 (!i+1) ^ Js_string.slice_rest !s j ;
+          let i =Js_string.length !s in 
           if !s.[i - 3] = 'e' then 
-            s := Js.String.slice !s 0 (i - 1) ^ "0" ^ Js.String.slice_rest !s (i - 1) 
+            s := Js_string.slice !s 0 (i - 1) ^ "0" ^ Js_string.slice_rest !s (i - 1) 
           else ()
         else 
           let p = ref prec in 
@@ -552,17 +552,17 @@ let caml_format_float fmt x =
               s := Js.Float.to_fixed x !p 
             end
           else 
-            while (s := Js.Float.to_fixed x !p;Js.String.length !s > prec + 1) do 
+            while (s := Js.Float.to_fixed x !p;Js_string.length !s > prec + 1) do 
               decr p
             done ;
           if !p <> 0 then 
-            let k = ref @@Js.String.length !s - 1 in 
+            let k = ref @@Js_string.length !s - 1 in 
             while !s.[!k] = '0' do 
               decr k
             done ;
             if !s.[!k] = '.' then 
               decr k ;
-            s := Js.String.slice !s 0 (!k + 1) 
+            s := Js_string.slice !s 0 (!k + 1) 
 
       | _ -> ()
     end;

Diff for: jscomp/runtime/caml_hash.ml

@@ -59,7 +59,7 @@ let final_mix h =
   (* Nativeint.logand  (!h ^ (!h >>> 16)) 0x3FFFFFFFn *)
 
 let caml_hash_mix_string h  s = 
-  let len =Js.String.length s in
+  let len =Js_string.length s in
   let block = len / 4 - 1  in
   let hash = ref h in  
   for i = 0 to block  do