add string test, prepare utf16le encoding support

Author: bobzhang

jscomp/others/js_json.ml

@@ -34,18 +34,20 @@ type _ kind =
   | Null : Js_types.null_val kind
 
 let reify_type (type a) (x : 'a) : (a kind * a ) = 
-  if Js.typeof x = "string" then 
-    (Obj.magic String, Obj.magic x) else
+  (if Js.typeof x = "string" then 
+    Obj.magic String else
   if Js.typeof x = "number" then 
-    (Obj.magic Number, Obj.magic x ) else 
-  if Js.typeof x = "boolean" then (* which one is faster, save [Js.typeof] or not *)
-    (Obj.magic Boolean, Obj.magic x) else
-  if (Obj.magic x) == Js.null then  (* providing a universal function *)
-    (Obj.magic Null, Obj.magic x) else 
+    Obj.magic Number  else 
+  if Js.typeof x = "boolean" then
+    (* which one is faster, save [Js.typeof] or not *)
+    Obj.magic Boolean else
+  if (Obj.magic x) == Js.null then
+    (* providing a universal function *)
+    Obj.magic Null else 
   if Js.to_bool @@ Js_array.isArray x  then 
-    (Obj.magic Array, Obj.magic x ) 
+    Obj.magic Array 
   else 
-    (Obj.magic Object, Obj.magic x )
+    Obj.magic Object ), Obj.magic x
 
 let test (type a) (x : 'a) (v : a kind) : bool =
   match v with

jscomp/others/js_string.ml

@@ -51,7 +51,8 @@ external charAt : int ->  t = "" [@@bs.send.pipe: t]
 
 external charCodeAt : int -> float  = "" [@@bs.send.pipe: t]
 (** type it as [float] due to that it may return NAN  *)
-external concat :  t -> t = "" [@@bs.send.pipe: t]
+external concat :  t array -> t = ""
+[@@bs.send.pipe: t] [@@bs.splice]
 
 external indexOf :  t -> int = "" [@@bs.send.pipe: t]
 external indexOf_from :  t -> int -> int = "indexOf" [@@bs.send.pipe: t]

jscomp/test/.depend

@@ -364,6 +364,8 @@ js_json_test.cmj : ../runtime/js.cmj
 js_json_test.cmx : ../runtime/js.cmx
 js_obj_test.cmj : mt.cmi
 js_obj_test.cmx : mt.cmx
+js_string_test.cmj : mt.cmi ../runtime/js.cmj
+js_string_test.cmx : mt.cmx ../runtime/js.cmx
 js_val.cmj :
 js_val.cmx :
 jsoo_400_test.cmj : ../stdlib/string.cmi mt.cmi
@@ -600,6 +602,8 @@ string_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/list.cmi \
     ext_string.cmj ../stdlib/bytes.cmi
 string_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/list.cmx \
     ext_string.cmx ../stdlib/bytes.cmx
+string_unicode_test.cmj : ../runtime/js.cmj
+string_unicode_test.cmx : ../runtime/js.cmx
 stringmatch_test.cmj : ../stdlib/string.cmi
 stringmatch_test.cmx : ../stdlib/string.cmx
 swap_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \
@@ -1192,6 +1196,8 @@ js_json_test.cmo : ../runtime/js.cmo
 js_json_test.cmj : ../runtime/js.cmj
 js_obj_test.cmo : mt.cmi
 js_obj_test.cmj : mt.cmj
+js_string_test.cmo : mt.cmi ../runtime/js.cmo
+js_string_test.cmj : mt.cmj ../runtime/js.cmj
 js_val.cmo :
 js_val.cmj :
 jsoo_400_test.cmo : ../stdlib/string.cmi mt.cmi
@@ -1428,6 +1434,8 @@ string_test.cmo : ../stdlib/string.cmi mt.cmi ../stdlib/list.cmi \
     ext_string.cmo ../stdlib/bytes.cmi
 string_test.cmj : ../stdlib/string.cmj mt.cmj ../stdlib/list.cmj \
     ext_string.cmj ../stdlib/bytes.cmj
+string_unicode_test.cmo : ../runtime/js.cmo
+string_unicode_test.cmj : ../runtime/js.cmj
 stringmatch_test.cmo : ../stdlib/string.cmi
 stringmatch_test.cmj : ../stdlib/string.cmj
 swap_test.cmo : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \

jscomp/test/Makefile

@@ -67,7 +67,7 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	ppx_this_obj_field single_module_alias \
 	sexpm sexpm_test sexp js_json_test array_subtle_test  \
 	bytes_split_gpr_743_test module_splice_test hello.foo \
-	ffi_splice_test node_path_test
+	ffi_splice_test node_path_test js_string_test string_unicode_test
 
 
 

jscomp/test/js_string_test.js

@@ -0,0 +1,40 @@
+'use strict';
+
+var Mt    = require("./mt");
+var Block = require("../../lib/js/block");
+
+var suites = [/* [] */0];
+
+var test_id = [0];
+
+function eq(loc, _z) {
+  var y = _z[1];
+  var x = _z[0];
+  console.log(_z);
+  test_id[0] = test_id[0] + 1 | 0;
+  suites[0] = /* :: */[
+    /* tuple */[
+      loc + (" id " + test_id[0]),
+      function () {
+        return /* Eq */Block.__(0, [
+                  x,
+                  y
+                ]);
+      }
+    ],
+    suites[0]
+  ];
+  return /* () */0;
+}
+
+eq('File "js_string_test.ml", line 13, characters 5-12', /* tuple */[
+      "012",
+      "0".concat("1", "2")
+    ]);
+
+Mt.from_pair_suites("js_string_test.ml", suites[0]);
+
+exports.suites  = suites;
+exports.test_id = test_id;
+exports.eq      = eq;
+/*  Not a pure module */

jscomp/test/js_string_test.ml

@@ -0,0 +1,16 @@
+
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+
+let eq loc ((x, y) as _z) =
+  Js.log _z;
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
+
+let () =
+  eq __LOC__ ("012", "0" |> Js.String.concat  [|"1";"2"|])
+
+let () =
+  Mt.from_pair_suites __FILE__ !suites

jscomp/test/string_unicode_test.js

@@ -0,0 +1,6 @@
+'use strict';
+
+
+console.log("\xe4\xbd\xa0\xe5\xa5\xbd");
+
+/*  Not a pure module */

jscomp/test/string_unicode_test.ml

@@ -0,0 +1,2 @@
+
+Js.log "你好"

lib/js/js_json.js

@@ -2,42 +2,18 @@
 
 
 function reify_type(x) {
-  if (typeof x === "string") {
-    return /* tuple */[
-            /* String */0,
-            x
-          ];
-  }
-  else if (typeof x === "number") {
-    return /* tuple */[
-            /* Number */1,
-            x
-          ];
-  }
-  else if (typeof x === "boolean") {
-    return /* tuple */[
-            /* Boolean */4,
-            x
-          ];
-  }
-  else if (x === null) {
-    return /* tuple */[
-            /* Null */5,
-            x
-          ];
-  }
-  else if (Array.isArray(x)) {
-    return /* tuple */[
-            /* Array */3,
-            x
-          ];
-  }
-  else {
-    return /* tuple */[
-            /* Object */2,
-            x
-          ];
-  }
+  return /* tuple */[
+          typeof x === "string" ? /* String */0 : (
+              typeof x === "number" ? /* Number */1 : (
+                  typeof x === "boolean" ? /* Boolean */4 : (
+                      x === null ? /* Null */5 : (
+                          Array.isArray(x) ? /* Array */3 : /* Object */2
+                        )
+                    )
+                )
+            ),
+          x
+        ];
 }
 
 function test(x, v) {