Merge pull request #4600 from BuckleScript/fix_4599

fix #4599

Author: bobzhang

jscomp/core/lam_compile_primitive.ml

@@ -492,25 +492,22 @@ let translate  loc
      Bytes is an int array in javascript
   *)
   | Pbytessetu
-  | Pbytessets -> 
+    -> 
     (match args with
      | [e;e0;e1] -> ensure_value_unit cxt.continuation 
                       (Js_of_lam_string.set_byte e e0 e1)
      | _ -> assert false)
+  | Pbytessets ->
+    E.runtime_call Js_runtime_modules.bytes "set" args
   | Pbytesrefu ->
     (match args with
      | [e;e1] -> Js_of_lam_string.ref_byte e e1
      | _ -> assert false)
-
-
   | Pbytesrefs ->
-    begin match args with
-      | [e ; e1] ->
-        if !Clflags.fast then
-          Js_of_lam_string.ref_byte e e1
-        else E.runtime_call Js_runtime_modules.bytes "get" args            
-      | _ -> assert false         
-    end
+    E.runtime_call Js_runtime_modules.bytes "get" args            
+  | Pstringrefs ->
+    E.runtime_call Js_runtime_modules.string "get" args          
+
   (* For bytes and string, they both return [int] in ocaml 
       we need tell Pbyteref from Pstringref
       1. Pbyteref -> a[i]
@@ -521,19 +518,8 @@ let translate  loc
       | [e;e1] -> Js_of_lam_string.ref_string e e1 
       | _ -> assert false
     end
-
-  | Pstringrefs ->
-    begin match args with
-      | [e;e1] ->
-        if !Clflags.fast then
-          Js_of_lam_string.ref_string e e1             
-        else       
-          E.runtime_call Js_runtime_modules.string "get" args          
-      | _ -> assert false
-    end
   (** only when Lapply -> expand = true*)
   | Praise  -> assert false (* handled before here *)
-
   (* Runtime encoding relevant *)
   | Parraylength -> 
     E.array_length (Ext_list.singleton_exn args)      

jscomp/runtime/caml_bytes.ml

@@ -22,17 +22,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-open Caml_bytes_extern
+
+external new_uninitialized : int -> bytes = "Array"  [@@bs.new]
+
+external (.![]) : bytes -> int -> char = "%bytes_unsafe_get"
+external (.![]<-) : bytes -> int -> char -> unit = "%bytes_unsafe_set"
+external length : bytes -> int = "%bytes_length" 
+
+
+let set s i ch =
+  if i < 0 || i >= length s then  
+    raise (Invalid_argument "index out of bounds")
+  else s.![i] <- ch 
 
 let get s i =
   if i < 0 || i >= length s then
     raise (Invalid_argument "index out of bounds")
-  else unsafe_get s i      
+  else s.![i]      
 
 let caml_fill_bytes (s : bytes) i l (c : char) = 
   if l > 0 then
     for k = i to l + i - 1 do 
-      unsafe_set s k c 
+      s.![k] <- c 
     done
 
 let caml_create_bytes len : bytes = 
@@ -41,7 +52,7 @@ let caml_create_bytes len : bytes =
   else 
     let result = new_uninitialized len in 
     for i = 0 to  len - 1 do 
-      unsafe_set result i '\000'
+      result.![i] <- '\000'
     done ;
     result 
 
@@ -53,14 +64,14 @@ let copyWithin (s1 : bytes) i1 i2 len =
     let range_b = len - 1 in         
     let range = if range_a > range_b then range_b else range_a in
     for j = range downto 0 do
-      unsafe_set s1 (i2 + j) (unsafe_get s1 (i1 + j))
+      s1.![i2 + j] <- s1.![i1 + j]
     done
   else if i1 > i2 then
     let range_a = length s1 - i1 - 1 in 
     let range_b = len - 1 in 
     let range = if range_a > range_b then range_b else range_a in 
     for k = 0 to range  do 
-      unsafe_set s1 (i2 + k) (unsafe_get s1 (i1 + k))
+      s1.![i2 + k] <- s1.![i1 + k]
     done
 
 (* TODO: when the compiler could optimize small function calls, 
@@ -74,20 +85,20 @@ let caml_blit_bytes (s1:bytes) i1 (s2:bytes) i2 len =
       let off1 = length s1 - i1 in
       if len <= off1 then 
         for i = 0 to len - 1 do 
-          unsafe_set s2 (i2 + i) (unsafe_get s1 (i1 + i))
+          s2.![i2 + i] <-  s1.![i1 + i]
         done
       else 
         begin
           for i = 0 to off1 - 1 do 
-            unsafe_set s2 (i2 + i) (unsafe_get s1 (i1 + i))
+             s2.![i2 + i] <- s1.![i1 + i]
           done;
           for i = off1 to len - 1 do 
-            unsafe_set s2 (i2 + i) '\000'
+             s2.![i2 + i] <- '\000'
           done
         end    
 
 external to_int_array : bytes -> int array = "%identity"
-let string_of_large_bytes bytes i len = 
+let string_of_large_bytes (bytes : bytes) i len = 
   let s = ref "" in
   let s_len = ref len in
   let seg = 1024 in
@@ -118,15 +129,15 @@ let caml_blit_string (s1 : string) i1 (s2 : bytes) i2 (len : int ) =
     let off1 = Caml_string_extern.length s1 - i1 in
     if len <= off1 then 
       for i = 0 to len - 1 do 
-        unsafe_set s2 (i2 + i) (Caml_string_extern.unsafe_get s1 (i1 + i))
+        s2.![i2 + i] <- Caml_string_extern.unsafe_get s1 (i1 + i)
       done
     else 
       begin
         for i = 0 to off1 - 1 do 
-          unsafe_set s2 (i2 + i) (Caml_string_extern.unsafe_get s1 (i1 + i))
+          s2.![i2 + i] <- Caml_string_extern.unsafe_get s1 (i1 + i)
         done;
         for i = off1 to len - 1 do 
-          unsafe_set s2 (i2 + i) '\000'
+          s2.![i2 + i] <- '\000'
         done
       end
 
@@ -135,7 +146,7 @@ let bytes_of_string  s =
   let len = Caml_string_extern.length s in
   let res = new_uninitialized len  in
   for i = 0 to len - 1 do 
-    unsafe_set res i (Caml_string_extern.unsafe_get s i)
+    res.![i] <- Caml_string_extern.unsafe_get s i
       (* Note that when get a char and convert it to int immedately, should be optimized
          should be [s.charCodeAt[i]]
        *)
@@ -145,7 +156,7 @@ let bytes_of_string  s =
 
   let rec caml_bytes_compare_aux (s1 : bytes) (s2 : bytes) off len def =   
     if off < len then 
-      let a, b = Caml_bytes_extern.unsafe_get s1 off, Caml_bytes_extern.unsafe_get s2 off in  
+      let a, b = s1.![off], s2.![off] in  
       if a > b then 1
       else if a < b then -1 
       else caml_bytes_compare_aux s1 s2 (off + 1) len def 
@@ -160,7 +171,7 @@ let bytes_of_string  s =
 
 *)
 let caml_bytes_compare (s1 : bytes) (s2 : bytes) : int =  
-  let len1, len2 = Caml_bytes_extern.length s1, Caml_bytes_extern.length s2 in 
+  let len1, len2 = length s1, length s2 in 
   if len1 = len2 then 
     caml_bytes_compare_aux s1 s2 0 len1 0 
   else if len1 < len2 then   
@@ -171,12 +182,12 @@ let caml_bytes_compare (s1 : bytes) (s2 : bytes) : int =
 let rec caml_bytes_equal_aux (s1 : bytes) s2 (off : int) len =      
   if off = len then true 
   else 
-    let a, b = Caml_bytes_extern.unsafe_get s1 off, Caml_bytes_extern.unsafe_get s2 off in  
+    let a, b = s1.![off], s2.![off] in  
     a = b
     && caml_bytes_equal_aux s1 s2 (off + 1) len 
 
 let caml_bytes_equal (s1 : bytes) (s2 : bytes) : bool = 
-  let len1, len2 = Caml_bytes_extern.length s1, Caml_bytes_extern.length s2 in 
+  let len1, len2 = length s1, length s2 in 
   len1 = len2 &&
   caml_bytes_equal_aux s1 s2 0 len1 
 

jscomp/runtime/caml_bytes.mli

@@ -26,6 +26,11 @@
 val caml_create_bytes : int -> bytes
 val caml_fill_bytes :  bytes -> int -> int -> char -> unit
 val get : bytes -> int -> char
+val set : 
+  bytes -> 
+  int -> 
+  char -> 
+  unit
 val bytes_to_string : bytes -> string 
 val caml_blit_bytes : bytes -> int -> bytes -> int -> int -> unit
 

jscomp/runtime/caml_bytes_extern.ml

@@ -15,7 +15,7 @@ build runtime/js.cmj runtime/js.cmi : cc runtime/js.ml
     bsc_flags = $bsc_no_open_flags
 build runtime/caml_array.cmj : cc_cmi runtime/caml_array.ml | runtime/caml_array.cmi runtime/caml_array_extern.cmj
 build runtime/caml_array.cmi : cc runtime/caml_array.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.ml | runtime/caml_bytes.cmi runtime/caml_bytes_extern.cmj runtime/caml_string_extern.cmj
+build runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.ml | runtime/caml_bytes.cmi runtime/caml_string_extern.cmj
 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
@@ -56,7 +56,6 @@ build runtime/caml_string.cmi : cc runtime/caml_string.mli | runtime/bs_stdlib_m
 build runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.ml | runtime/caml_array_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 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_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
@@ -68,4 +67,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_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_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

jscomp/runtime/release.ninja

@@ -38,11 +38,11 @@ var b = [
   0
 ];
 
-b[0] = /* "a" */97;
+Caml_bytes.set(b, 0, /* "a" */97);
 
-b[1] = /* "b" */98;
+Caml_bytes.set(b, 1, /* "b" */98);
 
-b[2] = /* "c" */99;
+Caml_bytes.set(b, 2, /* "c" */99);
 
 Bytes.blit(b, 0, b, 1, 2);
 
@@ -61,11 +61,11 @@ var b$1 = [
   0
 ];
 
-b$1[0] = /* "a" */97;
+Caml_bytes.set(b$1, 0, /* "a" */97);
 
-b$1[1] = /* "b" */98;
+Caml_bytes.set(b$1, 1, /* "b" */98);
 
-b$1[2] = /* "c" */99;
+Caml_bytes.set(b$1, 2, /* "c" */99);
 
 Bytes.blit(b$1, 1, b$1, 0, 2);
 

jscomp/test/bytes_split_gpr_743_test.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var Bytes = require("../../lib/js/bytes.js");
+var Caml_bytes = require("../../lib/js/caml_bytes.js");
 
 function gray_encode(b) {
   return b ^ (b >>> 1);
@@ -29,7 +30,7 @@ function bool_string(len, n) {
     var n$1 = _n;
     var i = _i;
     if ((n$1 & 1) === 1) {
-      s[i] = /* "1" */49;
+      Caml_bytes.set(s, i, /* "1" */49);
     }
     if (i <= 0) {
       return s;

jscomp/test/gray_code_test.js

@@ -12018,7 +12018,7 @@ function remove_underscores(s) {
     }
     var c = Caml_string.get(s, src);
     if (c !== 95) {
-      b[dst] = c;
+      Caml_bytes.set(b, dst, c);
       _dst = dst + 1 | 0;
       _src = src + 1 | 0;
       continue ;

jscomp/test/ocaml_parsetree_test.js

@@ -1781,9 +1781,8 @@ function is_charset(_param) {
 function split(s, cm) {
   var _t = s;
   var f = function (i, j) {
-    cm[i] = /* "\001" */1;
-    cm[j + 1 | 0] = /* "\001" */1;
-    
+    Caml_bytes.set(cm, i, /* "\001" */1);
+    return Caml_bytes.set(cm, j + 1 | 0, /* "\001" */1);
   };
   while(true) {
     var t = _t;
@@ -1902,14 +1901,14 @@ function flatten_cmap(cm) {
   var c = Caml_bytes.caml_create_bytes(256);
   var col_repr = Caml_bytes.caml_create_bytes(256);
   var v = 0;
-  c[0] = /* "\000" */0;
-  col_repr[0] = /* "\000" */0;
+  Caml_bytes.set(c, 0, /* "\000" */0);
+  Caml_bytes.set(col_repr, 0, /* "\000" */0);
   for(var i = 1; i <= 255; ++i){
     if (Caml_bytes.get(cm, i) !== /* "\000" */0) {
       v = v + 1 | 0;
     }
-    c[i] = Char.chr(v);
-    col_repr[v] = Char.chr(i);
+    Caml_bytes.set(c, i, Char.chr(v));
+    Caml_bytes.set(col_repr, v, Char.chr(i));
   }
   return [
           c,

jscomp/test/ocaml_re_test.js

@@ -23255,7 +23255,7 @@ function remove_underscores(s) {
     }
     var c = Caml_string.get(s, src);
     if (c !== 95) {
-      b[dst] = c;
+      Caml_bytes.set(b, dst, c);
       _dst = dst + 1 | 0;
       _src = src + 1 | 0;
       continue ;