move bytes function around, mini optimization of caml_bytes_create

Author: bobzhang

jscomp/core/lam_dispatch_primitive.ml

@@ -477,11 +477,19 @@ let translate loc (prim_name : string)
           Also, it's creating a [bytes] which is a js array actually.
       *)
       begin match args with
-        | [{expression_desc = Number (Int {i = 0l; _}); _}] 
+        | [{expression_desc = Number (Int {i; _}); _}] 
+          when i < 8l
           ->
-          E.array NA []
+          (*Invariants: assuming bytes are [int array]*)
+          E.array NA 
+            (if i = 0l then []
+            else 
+            Ext_list.init 
+              (Int32.to_int i)
+              (fun i -> E.zero_int_literal)
+            )
         | _ -> 
-          E.runtime_call Js_runtime_modules.string 
+          E.runtime_call Js_runtime_modules.bytes
             "caml_create_bytes" args
       end
     | "caml_bool_compare" ->   
@@ -537,7 +545,7 @@ let translate loc (prim_name : string)
     | "caml_fill_bytes"
       -> 
         E.runtime_call 
-          Js_runtime_modules.string "caml_fill_bytes" args
+          Js_runtime_modules.bytes "caml_fill_bytes" args
     | "caml_is_printable" 
       -> 
       call Js_runtime_modules.char

jscomp/runtime/.depend

@@ -31,7 +31,7 @@ caml_array.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin
 caml_basic.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe js_primitive.cmj caml_basic.cmi
 caml_builtin_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe bs_obj.cmj caml_builtin_exceptions.cmi
 caml_bytes.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_bytes.cmi
-caml_char.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_char.cmj
+caml_char.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_nativeint.cmj caml_builtin_exceptions.cmj bs_obj.cmj caml_exceptions.cmi
 caml_float.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_float.cmi
 caml_format.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_int32.cmj caml_int64.cmj caml_utils.cmj caml_builtin_exceptions.cmj caml_format.cmi js_nativeint.cmj js_int64.cmj caml_nativeint.cmj caml_float.cmj caml_char.cmj bs_string.cmj

jscomp/runtime/caml_bytes.ml

@@ -21,7 +21,7 @@
  * 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 new_uninitialized : int -> bytes = "Array"  [@@bs.new]
 
 external unsafe_get : bytes -> int -> char = "%bytes_unsafe_get"
 external unsafe_set : bytes -> int -> char -> unit = "%bytes_unsafe_set"
@@ -31,3 +31,19 @@ let get s i =
   if i < 0 || i >= length s then
     raise (Invalid_argument "index out of bounds")
   else unsafe_get 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 
+    done
+  
+let caml_create_bytes len : bytes = 
+  (* Node raise [RangeError] exception *)
+  if len < 0 then raise (Invalid_argument "String.create")
+  else 
+    let result = new_uninitialized len in 
+    for i = 0 to  len - 1 do 
+      unsafe_set result i '\000'
+    done ;
+    result 

jscomp/runtime/caml_bytes.mli

@@ -27,5 +27,6 @@ external unsafe_set : bytes -> int -> char -> unit = "%bytes_unsafe_set"
 external length : bytes -> int = "%bytes_length" 
 
 
-
+val caml_create_bytes : int -> bytes
+val caml_fill_bytes :  bytes -> int -> int -> char -> unit
 val get : bytes -> int -> char

jscomp/runtime/caml_string.ml

@@ -51,25 +51,6 @@ let caml_string_get s i=
   else Bs_string.unsafe_get s i
 
 
-let caml_create_bytes len : bytes = 
-  (* Node raise [RangeError] exception *)
-  if len < 0 then raise (Invalid_argument "String.create")
-  else 
-    let result = new_uninitialized len in 
-    for i = 0 to  len - 1 do 
-      unsafe_set result i '\000'
-    done ;
-    result 
-
-
-
-
-
-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 
-    done
 
 (**
    TODO: [min] is not type specialized in OCaml

jscomp/runtime/caml_string.mli

@@ -37,8 +37,8 @@ val bytes_to_string : bytes -> string
 val caml_string_of_char_array : char array -> string
 val caml_string_get : string -> int -> char 
 
-val caml_create_bytes : int -> bytes
-val caml_fill_bytes :  bytes -> int -> int -> char -> unit
+
+
 val caml_blit_string : string -> int -> bytes -> int -> int -> unit
 val caml_blit_bytes : bytes -> int -> bytes -> int -> int -> unit
 val caml_string_get16 : string -> int -> int

jscomp/test/bytes_split_gpr_743_test.js

@@ -28,7 +28,11 @@ function eq(loc, param) {
   return /* () */0;
 }
 
-var b = Caml_string.caml_create_bytes(3);
+var b = [
+  0,
+  0,
+  0
+];
 
 b[0] = /* "a" */97;
 
@@ -47,7 +51,11 @@ eq("File \"bytes_split_gpr_743_test.ml\", line 17, characters 5-12", /* tuple */
       res
     ]);
 
-var b$1 = Caml_string.caml_create_bytes(3);
+var b$1 = [
+  0,
+  0,
+  0
+];
 
 b$1[0] = /* "a" */97;
 

jscomp/test/complex_if_test.js

@@ -3,7 +3,7 @@
 var Mt = require("./mt.js");
 var Block = require("../../lib/js/block.js");
 var Bytes = require("../../lib/js/bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
+var Caml_bytes = require("../../lib/js/caml_bytes.js");
 
 function fib(n) {
   if (n !== 1 && n !== 23) {
@@ -37,7 +37,7 @@ function escaped(s) {
   if (n === s.length) {
     return Bytes.copy(s);
   } else {
-    var s$prime = Caml_string.caml_create_bytes(n);
+    var s$prime = Caml_bytes.caml_create_bytes(n);
     n = 0;
     for(var i$1 = 0 ,i_finish$1 = s.length - 1 | 0; i$1 <= i_finish$1; ++i$1){
       var c = s[i$1];

jscomp/test/ext_bytes_test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Bytes = require("../../lib/js/bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
+var Caml_bytes = require("../../lib/js/caml_bytes.js");
 
 function escaped(s) {
   var n = 0;
@@ -27,7 +27,7 @@ function escaped(s) {
   if (n === s.length) {
     return Bytes.copy(s);
   } else {
-    var s$prime = Caml_string.caml_create_bytes(n);
+    var s$prime = Caml_bytes.caml_create_bytes(n);
     n = 0;
     for(var i$1 = 0 ,i_finish$1 = s.length - 1 | 0; i$1 <= i_finish$1; ++i$1){
       var c = s[i$1];

jscomp/test/ext_string_test.js

@@ -4,6 +4,7 @@ var List = require("../../lib/js/list.js");
 var Bytes = require("../../lib/js/bytes.js");
 var Curry = require("../../lib/js/curry.js");
 var $$String = require("../../lib/js/string.js");
+var Caml_bytes = require("../../lib/js/caml_bytes.js");
 var Caml_int32 = require("../../lib/js/caml_int32.js");
 var Caml_string = require("../../lib/js/caml_string.js");
 var Ext_bytes_test = require("./ext_bytes_test.js");
@@ -245,7 +246,7 @@ function is_empty(s) {
 
 function repeat(n, s) {
   var len = s.length;
-  var res = Caml_string.caml_create_bytes(Caml_int32.imul(n, len));
+  var res = Caml_bytes.caml_create_bytes(Caml_int32.imul(n, len));
   for(var i = 0 ,i_finish = n - 1 | 0; i <= i_finish; ++i){
     $$String.blit(s, 0, res, Caml_int32.imul(i, len), len);
   }
@@ -403,7 +404,7 @@ function equal(x, y) {
 function unsafe_concat_with_length(len, sep, l) {
   if (l) {
     var hd = l[0];
-    var r = Caml_string.caml_create_bytes(len);
+    var r = Caml_bytes.caml_create_bytes(len);
     var hd_len = hd.length;
     var sep_len = sep.length;
     Caml_string.caml_blit_string(hd, 0, r, 0, hd_len);
@@ -647,7 +648,7 @@ function concat_array(sep, s) {
       for(var i = 0 ,i_finish = s_len - 1 | 0; i <= i_finish; ++i){
         len = len + s[i].length | 0;
       }
-      var target = Caml_string.caml_create_bytes(len + Caml_int32.imul(s_len - 1 | 0, sep_len) | 0);
+      var target = Caml_bytes.caml_create_bytes(len + Caml_int32.imul(s_len - 1 | 0, sep_len) | 0);
       var hd = s[0];
       var hd_len = hd.length;
       Caml_string.caml_blit_string(hd, 0, target, 0, hd_len);
@@ -674,7 +675,7 @@ function concat3(a, b, c) {
   var b_len = b.length;
   var c_len = c.length;
   var len = (a_len + b_len | 0) + c_len | 0;
-  var target = Caml_string.caml_create_bytes(len);
+  var target = Caml_bytes.caml_create_bytes(len);
   Caml_string.caml_blit_string(a, 0, target, 0, a_len);
   Caml_string.caml_blit_string(b, 0, target, a_len, b_len);
   Caml_string.caml_blit_string(c, 0, target, a_len + b_len | 0, c_len);
@@ -687,7 +688,7 @@ function concat4(a, b, c, d) {
   var c_len = c.length;
   var d_len = d.length;
   var len = ((a_len + b_len | 0) + c_len | 0) + d_len | 0;
-  var target = Caml_string.caml_create_bytes(len);
+  var target = Caml_bytes.caml_create_bytes(len);
   Caml_string.caml_blit_string(a, 0, target, 0, a_len);
   Caml_string.caml_blit_string(b, 0, target, a_len, b_len);
   Caml_string.caml_blit_string(c, 0, target, a_len + b_len | 0, c_len);
@@ -702,7 +703,7 @@ function concat5(a, b, c, d, e) {
   var d_len = d.length;
   var e_len = e.length;
   var len = (((a_len + b_len | 0) + c_len | 0) + d_len | 0) + e_len | 0;
-  var target = Caml_string.caml_create_bytes(len);
+  var target = Caml_bytes.caml_create_bytes(len);
   Caml_string.caml_blit_string(a, 0, target, 0, a_len);
   Caml_string.caml_blit_string(b, 0, target, a_len, b_len);
   Caml_string.caml_blit_string(c, 0, target, a_len + b_len | 0, c_len);

jscomp/test/ocaml_parsetree_test.js

@@ -10379,7 +10379,7 @@ var keyword_table = create_hashtable(149, /* :: */[
       ]
     ]);
 
-var initial_string_buffer = Caml_string.caml_create_bytes(256);
+var initial_string_buffer = Caml_bytes.caml_create_bytes(256);
 
 var string_buff = /* record */[/* contents */initial_string_buffer];
 
@@ -10393,7 +10393,7 @@ function reset_string_buffer(param) {
 
 function store_string_char(c) {
   if (string_index[0] >= string_buff[0].length) {
-    var new_buff = Caml_string.caml_create_bytes((string_buff[0].length << 1));
+    var new_buff = Caml_bytes.caml_create_bytes((string_buff[0].length << 1));
     Bytes.blit(string_buff[0], 0, new_buff, 0, string_buff[0].length);
     string_buff[0] = new_buff;
   }
@@ -10525,7 +10525,7 @@ function cvt_nativeint_literal(s) {
 
 function remove_underscores(s) {
   var l = s.length;
-  var b = Caml_string.caml_create_bytes(l);
+  var b = Caml_bytes.caml_create_bytes(l);
   var _src = 0;
   var _dst = 0;
   while(true) {

jscomp/test/ocaml_re_test.js

@@ -1873,8 +1873,8 @@ function colorize(c, regexp) {
 }
 
 function flatten_cmap(cm) {
-  var c = Caml_string.caml_create_bytes(256);
-  var col_repr = Caml_string.caml_create_bytes(256);
+  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;

jscomp/test/ocaml_typedtree_test.js

@@ -20725,7 +20725,7 @@ var keyword_table = create_hashtable(149, /* :: */[
       ]
     ]);
 
-var initial_string_buffer = Caml_string.caml_create_bytes(256);
+var initial_string_buffer = Caml_bytes.caml_create_bytes(256);
 
 var string_buff = /* record */[/* contents */initial_string_buffer];
 
@@ -20739,7 +20739,7 @@ function reset_string_buffer(param) {
 
 function store_string_char(c) {
   if (string_index[0] >= string_buff[0].length) {
-    var new_buff = Caml_string.caml_create_bytes((string_buff[0].length << 1));
+    var new_buff = Caml_bytes.caml_create_bytes((string_buff[0].length << 1));
     Bytes.blit(string_buff[0], 0, new_buff, 0, string_buff[0].length);
     string_buff[0] = new_buff;
   }
@@ -20871,7 +20871,7 @@ function cvt_nativeint_literal(s) {
 
 function remove_underscores(s) {
   var l = s.length;
-  var b = Caml_string.caml_create_bytes(l);
+  var b = Caml_bytes.caml_create_bytes(l);
   var _src = 0;
   var _dst = 0;
   while(true) {
@@ -47653,7 +47653,7 @@ function is_big(obj) {
   var size = error_size[0];
   if (size > 0) {
     if (buffer[0].length < size) {
-      buffer[0] = Caml_string.caml_create_bytes(size);
+      buffer[0] = Caml_bytes.caml_create_bytes(size);
     }
     try {
       Marshal.to_buffer(buffer[0], 0, size, obj, /* [] */0);

jscomp/test/parser_api.js

@@ -830,7 +830,7 @@ function create_hashtable(size, init) {
 }
 
 function copy_file(ic, oc) {
-  var buff = Caml_string.caml_create_bytes(4096);
+  var buff = Caml_bytes.caml_create_bytes(4096);
   var _param = /* () */0;
   while(true) {
     var n = Pervasives.input(ic, buff, 0, 4096);
@@ -845,7 +845,7 @@ function copy_file(ic, oc) {
 }
 
 function copy_file_chunk(ic, oc, len) {
-  var buff = Caml_string.caml_create_bytes(4096);
+  var buff = Caml_bytes.caml_create_bytes(4096);
   var _n = len;
   while(true) {
     var n = _n;
@@ -866,7 +866,7 @@ function copy_file_chunk(ic, oc, len) {
 
 function string_of_file(ic) {
   var b = $$Buffer.create(65536);
-  var buff = Caml_string.caml_create_bytes(4096);
+  var buff = Caml_bytes.caml_create_bytes(4096);
   var _param = /* () */0;
   while(true) {
     var n = Pervasives.input(ic, buff, 0, 4096);
@@ -1106,9 +1106,9 @@ function create(str_size) {
   var tbl_size = Caml_int32.div(str_size, Sys.max_string_length) + 1 | 0;
   var tbl = Caml_array.caml_make_vect(tbl_size, Bytes.empty);
   for(var i = 0 ,i_finish = tbl_size - 2 | 0; i <= i_finish; ++i){
-    Caml_array.caml_array_set(tbl, i, Caml_string.caml_create_bytes(Sys.max_string_length));
+    Caml_array.caml_array_set(tbl, i, Caml_bytes.caml_create_bytes(Sys.max_string_length));
   }
-  Caml_array.caml_array_set(tbl, tbl_size - 1 | 0, Caml_string.caml_create_bytes(Caml_int32.mod_(str_size, Sys.max_string_length)));
+  Caml_array.caml_array_set(tbl, tbl_size - 1 | 0, Caml_bytes.caml_create_bytes(Caml_int32.mod_(str_size, Sys.max_string_length)));
   return tbl;
 }
 
@@ -13133,7 +13133,7 @@ var keyword_table = create_hashtable(149, /* :: */[
       ]
     ]);
 
-var initial_string_buffer = Caml_string.caml_create_bytes(256);
+var initial_string_buffer = Caml_bytes.caml_create_bytes(256);
 
 var string_buff = /* record */[/* contents */initial_string_buffer];
 
@@ -13147,7 +13147,7 @@ function reset_string_buffer(param) {
 
 function store_string_char(c) {
   if (string_index[0] >= string_buff[0].length) {
-    var new_buff = Caml_string.caml_create_bytes((string_buff[0].length << 1));
+    var new_buff = Caml_bytes.caml_create_bytes((string_buff[0].length << 1));
     Bytes.blit(string_buff[0], 0, new_buff, 0, string_buff[0].length);
     string_buff[0] = new_buff;
   }
@@ -13287,7 +13287,7 @@ function cvt_nativeint_literal(s) {
 
 function remove_underscores(s) {
   var l = s.length;
-  var b = Caml_string.caml_create_bytes(l);
+  var b = Caml_bytes.caml_create_bytes(l);
   var _src = 0;
   var _dst = 0;
   while(true) {

jscomp/test/qcc.js

@@ -116,7 +116,7 @@ var glo = Bytes.make(4096, /* "\000" */0);
 
 var gpos = /* record */[/* contents */0];
 
-var s = Caml_string.caml_create_bytes(100);
+var s = Caml_bytes.caml_create_bytes(100);
 
 function getq(param) {
   var c = Curry._1(getch, /* () */0);