done: place holder for array and string (+2 squashed commits)

Squashed commits:
[bd951a8] WIP
[68f337e] WIP: move tests locally and start bindings to array

Author: Hongbo Zhang

docs/OCaml-call-JS.md

@@ -712,13 +712,13 @@ We introduced `bs.re` for Javascript regex expresion:
 let f  = [%bs.re "/b/g"]
 ```
 
-The compiler will infer `f` has type `Js.re` and generate code as below
+The compiler will infer `f` has type `Js_re.t` and generate code as below
 
 ```
 var f = /b/g
 ```
 
-> Note that `Js.re` is an abstract type, we are working on providing bindings for it
+> Note that `Js_re.t` is an abstract type, we are working on providing bindings for it
 
 ## Examples:
 

jscomp/Makefile

@@ -95,7 +95,7 @@ install:
 	cp  ./bin/bsc ../bin/
 	cp ./runtime/*.cmt* ../lib/ocaml/
 	cp ./runtime/*.cmj* ../lib/ocaml/
-	cp ./runtime/js.cmi  ../lib/ocaml/	
+	cp ./runtime/js.cmi ./runtime/js_array.cmi ./runtime/js_string.cmi ./runtime/js_re.cmi ../lib/ocaml/	
 	cp ./stdlib/*.cm* ../lib/ocaml/
 
 TMP_OCAMLLIB=$(shell ocamlopt.opt -where)

jscomp/build.sh

@@ -46,7 +46,7 @@ cd ./test/
 # ./build.sh 2>> ../build.compile
 make $TARGET.cmj 2>> ../build.compile
 
-cat ../../lib/js/test/$TARGET.js >> ../build.compile
+cat $TARGET.js >> ../build.compile
 make -j30 all 2>>../build.compile
 make depend 2>>../build.compile
 echo "<<Test finished" >> ../build.compile

jscomp/common/js_config.ml

@@ -197,7 +197,6 @@ let stdlib_set = String_set.of_list [
     "stdLabels";
     "camlinternalLazy";
     "map";
-
     (* "std_exit"; *)
     (* https://developer.mozilla.org/de/docs/Web/Events/beforeunload *)
     "camlinternalMod";

jscomp/common/js_config.mli

@@ -120,7 +120,7 @@ val get_no_any_assert : unit -> bool
 (** Internal use *)
 val runtime_set : String_set.t
 val stdlib_set : String_set.t
-
+(** only used in {!Js_generate_require} *)
 
 val block : string
 val int32 : string

jscomp/runtime/.runtimedepend

@@ -21,9 +21,14 @@ caml_string.cmi :
 caml_sys.cmi :
 caml_utils.cmi :
 caml_weak.cmi :
+js_array.cmi :
 js_primitive.cmi : js.cmj
+js_re.cmi :
+js_string.cmi :
 block.cmj : block.cmi
 block.cmx : block.cmi
+bs_string.cmj :
+bs_string.cmx :
 caml_array.cmj : caml_array.cmi
 caml_array.cmx : caml_array.cmi
 caml_backtrace.cmj : caml_backtrace.cmi
@@ -36,26 +41,26 @@ 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_float.cmj caml_float.cmi
 caml_float.cmx : typed_array.cmx js_float.cmx caml_float.cmi
-caml_format.cmj : js_string.cmj js_nativeint.cmj js_int64.cmj js_int.cmj \
-    js_float.cmj caml_utils.cmi caml_format.cmi
-caml_format.cmx : js_string.cmx js_nativeint.cmx js_int64.cmx js_int.cmx \
-    js_float.cmx caml_utils.cmx caml_format.cmi
+caml_format.cmj : js_nativeint.cmj js_int64.cmj js_int.cmj js_float.cmj \
+    caml_utils.cmi bs_string.cmj caml_format.cmi
+caml_format.cmx : js_nativeint.cmx js_int64.cmx js_int.cmx js_float.cmx \
+    caml_utils.cmx bs_string.cmx caml_format.cmi
 caml_gc.cmj : caml_gc.cmi
 caml_gc.cmx : caml_gc.cmi
-caml_hash.cmj : js_string.cmj js_obj.cmj js.cmj caml_queue.cmi caml_hash.cmi
-caml_hash.cmx : js_string.cmx js_obj.cmx js.cmx caml_queue.cmx caml_hash.cmi
+caml_hash.cmj : js_obj.cmj js.cmj caml_queue.cmi bs_string.cmj caml_hash.cmi
+caml_hash.cmx : js_obj.cmx js.cmx caml_queue.cmx bs_string.cmx caml_hash.cmi
 caml_int32.cmj : caml_int32.cmi
 caml_int32.cmx : caml_int32.cmi
-caml_int64.cmj : typed_array.cmj js_string.cmj js_float.cmj caml_utils.cmi \
-    caml_int32.cmi caml_int64.cmi
-caml_int64.cmx : typed_array.cmx js_string.cmx js_float.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_int64.cmj : typed_array.cmj js_float.cmj caml_utils.cmi caml_int32.cmi \
+    bs_string.cmj caml_int64.cmi
+caml_int64.cmx : typed_array.cmx js_float.cmx caml_utils.cmx caml_int32.cmx \
+    bs_string.cmx caml_int64.cmi
+caml_io.cmj : js.cmj bs_string.cmj
+caml_io.cmx : js.cmx bs_string.cmx
 caml_lexer.cmj : caml_lexer.cmi
 caml_lexer.cmx : caml_lexer.cmi
-caml_md5.cmj : js_string.cmj caml_md5.cmi
-caml_md5.cmx : js_string.cmx caml_md5.cmi
+caml_md5.cmj : bs_string.cmj caml_md5.cmi
+caml_md5.cmx : bs_string.cmx caml_md5.cmi
 caml_module.cmj :
 caml_module.cmx :
 caml_obj.cmj : js_obj.cmj js.cmj caml_obj.cmi
@@ -68,8 +73,8 @@ 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_string.cmj caml_string.cmi
-caml_string.cmx : js_string.cmx caml_string.cmi
+caml_string.cmj : bs_string.cmj caml_string.cmi
+caml_string.cmx : bs_string.cmx caml_string.cmi
 caml_sys.cmj : js_float.cmj caml_sys.cmi
 caml_sys.cmx : js_float.cmx caml_sys.cmi
 caml_utils.cmj : caml_utils.cmi
@@ -80,6 +85,8 @@ curry.cmj : caml_oo.cmi caml_array.cmi
 curry.cmx : caml_oo.cmx caml_array.cmx
 js.cmj :
 js.cmx :
+js_array.cmj : js_array.cmi
+js_array.cmx : js_array.cmi
 js_float.cmj :
 js_float.cmx :
 js_int.cmj :
@@ -92,14 +99,18 @@ js_obj.cmj : js.cmj
 js_obj.cmx : 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_re.cmj : js_re.cmi
+js_re.cmx : js_re.cmi
+js_string.cmj : js_string.cmi
+js_string.cmx : js_string.cmi
 js_unsafe.cmj : js.cmj
 js_unsafe.cmx : js.cmx
 typed_array.cmj :
 typed_array.cmx :
 block.cmo : block.cmi
 block.cmj : block.cmi
+bs_string.cmo :
+bs_string.cmj :
 caml_array.cmo : caml_array.cmi
 caml_array.cmj : caml_array.cmi
 caml_backtrace.cmo : caml_backtrace.cmi
@@ -112,26 +123,26 @@ 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_float.cmo caml_float.cmi
 caml_float.cmj : typed_array.cmj js_float.cmj caml_float.cmi
-caml_format.cmo : js_string.cmo js_nativeint.cmo js_int64.cmo js_int.cmo \
-    js_float.cmo caml_utils.cmi caml_format.cmi
-caml_format.cmj : js_string.cmj js_nativeint.cmj js_int64.cmj js_int.cmj \
-    js_float.cmj caml_utils.cmj caml_format.cmi
+caml_format.cmo : js_nativeint.cmo js_int64.cmo js_int.cmo js_float.cmo \
+    caml_utils.cmi bs_string.cmo caml_format.cmi
+caml_format.cmj : js_nativeint.cmj js_int64.cmj js_int.cmj js_float.cmj \
+    caml_utils.cmj bs_string.cmj caml_format.cmi
 caml_gc.cmo : caml_gc.cmi
 caml_gc.cmj : caml_gc.cmi
-caml_hash.cmo : js_string.cmo js_obj.cmo js.cmo caml_queue.cmi caml_hash.cmi
-caml_hash.cmj : js_string.cmj js_obj.cmj js.cmj caml_queue.cmj caml_hash.cmi
+caml_hash.cmo : js_obj.cmo js.cmo caml_queue.cmi bs_string.cmo caml_hash.cmi
+caml_hash.cmj : js_obj.cmj js.cmj caml_queue.cmj bs_string.cmj caml_hash.cmi
 caml_int32.cmo : caml_int32.cmi
 caml_int32.cmj : caml_int32.cmi
-caml_int64.cmo : typed_array.cmo js_string.cmo js_float.cmo caml_utils.cmi \
-    caml_int32.cmi caml_int64.cmi
-caml_int64.cmj : typed_array.cmj js_string.cmj js_float.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_int64.cmo : typed_array.cmo js_float.cmo caml_utils.cmi caml_int32.cmi \
+    bs_string.cmo caml_int64.cmi
+caml_int64.cmj : typed_array.cmj js_float.cmj caml_utils.cmj caml_int32.cmj \
+    bs_string.cmj caml_int64.cmi
+caml_io.cmo : js.cmo bs_string.cmo
+caml_io.cmj : js.cmj bs_string.cmj
 caml_lexer.cmo : caml_lexer.cmi
 caml_lexer.cmj : caml_lexer.cmi
-caml_md5.cmo : js_string.cmo caml_md5.cmi
-caml_md5.cmj : js_string.cmj caml_md5.cmi
+caml_md5.cmo : bs_string.cmo caml_md5.cmi
+caml_md5.cmj : bs_string.cmj caml_md5.cmi
 caml_module.cmo :
 caml_module.cmj :
 caml_obj.cmo : js_obj.cmo js.cmo caml_obj.cmi
@@ -144,8 +155,8 @@ 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_string.cmo caml_string.cmi
-caml_string.cmj : js_string.cmj caml_string.cmi
+caml_string.cmo : bs_string.cmo caml_string.cmi
+caml_string.cmj : bs_string.cmj caml_string.cmi
 caml_sys.cmo : js_float.cmo caml_sys.cmi
 caml_sys.cmj : js_float.cmj caml_sys.cmi
 caml_utils.cmo : caml_utils.cmi
@@ -156,6 +167,8 @@ curry.cmo : caml_oo.cmi caml_array.cmi
 curry.cmj : caml_oo.cmj caml_array.cmj
 js.cmo :
 js.cmj :
+js_array.cmo : js_array.cmi
+js_array.cmj : js_array.cmi
 js_float.cmo :
 js_float.cmj :
 js_int.cmo :
@@ -168,8 +181,10 @@ js_obj.cmo : js.cmo
 js_obj.cmj : 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_re.cmo : js_re.cmi
+js_re.cmj : js_re.cmi
+js_string.cmo : js_string.cmi
+js_string.cmj : js_string.cmi
 js_unsafe.cmo : js.cmo
 js_unsafe.cmj : js.cmj
 typed_array.cmo :

jscomp/runtime/Makefile

@@ -9,7 +9,7 @@ OTHERS= caml_array caml_string \
 	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_string  js_float js_obj js_nativeint js_int
+	bs_string  js_float js_obj js_nativeint js_int js_array js_string js_re
 
 SOURCE_LIST= $(OTHERS) caml_builtin_exceptions  block  js 
 

jscomp/runtime/bs_string.ml

@@ -0,0 +1,63 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+external string_of_char : char -> string = "js_string_of_char"
+(** TODO: check with {!String.of_char} 
+    it's quite common that we have
+    {[ Bs_string.of_char x.[0] ]}
+    It would be nice to generate code as below    
+    {[ x[0]
+    ]}
+*)
+
+external of_char : char -> string = "String.fromCharCode" 
+    [@@bs.call]
+external toUpperCase : string -> string = "toUpperCase" [@@bs.send]
+external of_int : int -> base:int -> string = "toString" [@@bs.send]
+external of_nativeint : nativeint -> base:int -> string = "toString" [@@bs.send]
+external slice : string -> int -> int -> string = "slice" 
+    [@@bs.send]
+external slice_rest : string -> int -> string = "slice" 
+    [@@bs.send]
+external index_of : string -> string -> int = "indexOf"
+    [@@bs.send]
+external append : string -> string -> string = "js_string_append"
+external of_small_int_array : int array -> string = "js_string_of_small_int_array"
+external of_small_int32_array : int32 array -> string = "js_string_of_small_int_array"
+external lastIndexOf : string -> string -> int = "lastIndexOf"
+    [@@bs.send]    
+external of_any : 'a -> string = "js_anything_to_string"
+
+
+(***********************)
+(* replaced primitives *)
+external length : string -> int = "%string_length"
+external get : string -> int -> char = "%string_safe_get"
+external create : int -> bytes = "caml_create_string"
+external unsafe_get : string -> int -> char = "%string_unsafe_get"
+external unsafe_set : bytes -> int -> char -> unit = "%bytes_unsafe_set"
+external unsafe_blit : string -> int ->  bytes -> int -> int -> unit
+  = "caml_blit_string" "noalloc"
+external unsafe_fill : bytes -> int -> int -> char -> unit
+  = "caml_fill_string" "noalloc"