add more utilities, improve dev experience, todo: more testing before making utilities available

Author: bobzhang

jscomp/bin/bsb_watcher.future.js

@@ -5,6 +5,59 @@ var Process = require('process');
 var Fs = require('fs');
 var Child_process = require('child_process');
 
+function getExn(x) {
+  if (x) {
+    return x[0];
+  } else {
+    throw new Error("Bs_option.getExn");
+  }
+}
+
+
+/* No side effect */
+
+var invalid_argument = /* tuple */[
+  "Invalid_argument",
+  -3
+];
+
+invalid_argument.tag = 248;
+
+
+/*  Not a pure module */
+
+/* No side effect */
+
+/* No side effect */
+
+/* No side effect */
+
+/* No side effect */
+
+/* stdin Not a pure module */
+
+/* No side effect */
+
+/* imul Not a pure module */
+
+/* repeat Not a pure module */
+
+/* two_ptr_32_dbl Not a pure module */
+
+/* float_of_string Not a pure module */
+
+/* No side effect */
+
+/* No side effect */
+
+/* not_implemented Not a pure module */
+
+/* No side effect */
+
+/* No side effect */
+
+/* No side effect */
+
 function filterInPlace(p, a) {
   var i = 0;
   var j = 0;
@@ -25,18 +78,6 @@ function memByRef(x, xs) {
 }
 
 
-/* No side effect */
-
-function getExn(x) {
-  if (x) {
-    return x[0];
-  } else {
-    var str = " " + (String("File \"bs_option.ml\", line 39, characters 34-42") + ": Bs.Option.unsafeGet");
-    throw new Error(str);
-  }
-}
-
-
 /* No side effect */
 
 function undefined_to_opt(x) {

jscomp/others/.depend

@@ -12,7 +12,7 @@ js_json.cmj : js_types.cmj js_string.cmj js_dict.cmj js_array.cmj \
 js_obj.cmj :
 bs_dyn.cmj : bs_dyn.cmi
 bs_dyn_lib.cmj : bs_dyn.cmj bs_dyn_lib.cmi
-bs_array.cmj : js_array.cmj bs_array.cmi
+bs_vector.cmj : js_array.cmj bs_vector.cmi
 bs_list.cmj : bs_list.cmi
 bs_option.cmj : bs_option.cmi
 bs_result.cmj :
@@ -31,7 +31,7 @@ js_types.cmi :
 js_json.cmi : js_types.cmi js_string.cmj js_dict.cmi
 bs_dyn.cmi :
 bs_dyn_lib.cmi : bs_dyn.cmi
-bs_array.cmi :
+bs_vector.cmi : bs_list.cmi
 bs_list.cmi :
 bs_option.cmi :
 js_boolean.cmi :

jscomp/others/Makefile

@@ -6,7 +6,7 @@ MAP_FILES= node bs
 
 SOURCE_LIST= node_path node_fs node_process dict node_module js_array js_string \
 	js_re js_null_undefined node_buffer js_types js_json js_obj \
-	bs_dyn bs_dyn_lib bs_array bs_list bs_option bs_result \
+	bs_dyn bs_dyn_lib bs_vector bs_list bs_option bs_result \
 	node_child_process js_boolean js_math js_dict js_date js_global js_cast js_promise dom
 
 $(addsuffix .cmj, $(SOURCE_LIST)): $(addsuffix .cmj, $(MAP_FILES))

jscomp/others/bs.ml

@@ -30,7 +30,7 @@ module Dyn = Bs_dyn
 module Dyn_lib = Bs_dyn_lib
 (**/*)
 
-module Array = Bs_array
+module Vector = Bs_vector
 module List = Bs_list 
 module Option = Bs_option 
 module Result = Bs_result

jscomp/others/bs_array.mli

@@ -73,4 +73,23 @@ let mapRev f ls = mapRevAux f [] ls
 
 let rec map f ls = rev @@ mapRevAux f [] ls 
 
+let rec iter f = function
+    [] -> ()
+  | a::l -> f a [@bs]; iter f l
+
+let rec iteri i f = function
+    [] -> ()
+  | a::l -> f i a [@bs]; iteri (i + 1) f l
+
+let iteri f l = iteri 0 f l
+
+let rec foldLeft f accu l =
+  match l with
+    [] -> accu
+  | a::l -> foldLeft f (f accu a [@bs]) l
+
+let rec foldRight f l accu =
+  match l with
+    [] -> accu
+  | a::l -> f a (foldRight f l accu) [@bs]
 

jscomp/others/bs_list.ml

@@ -44,3 +44,15 @@ val rev : 'a t -> 'a t
 val mapRev : ('a -> 'b [@bs]) -> 'a t -> 'b t
 
 val map : ('a -> 'b [@bs]) -> 'a t -> 'b t
+
+val iter : ('a -> unit [@bs]) -> 'a t -> unit 
+
+val iteri : (int -> 'a -> unit [@bs]) -> 'a t -> unit 
+
+val foldLeft : ('a -> 'b -> 'a [@bs]) -> 'a -> 'b list -> 'a
+(** [Bs.List.foldLeft f a [b1; ...; bn]] is
+   [f (... (f (f a b1 [@bs]) b2) ...) bn]. *)
+
+val foldRight : ('a -> 'b -> 'b [@bs]) -> 'a list -> 'b -> 'b
+(** [Bs.List.foldRight f [a1; ...; an] b] is
+   [f a1 (f a2 (... (f an b [@bs]) ...))].  Not tail-recursive. *)

jscomp/others/bs_list.mli

@@ -24,6 +24,13 @@
 
 type 'a t = 'a array
 
+external length : 'a array -> int = "%array_length"
+external get : 'a array -> int -> 'a = "%array_safe_get"
+external set : 'a array -> int -> 'a -> unit = "%array_safe_set"
+external make: int -> 'a -> 'a array = "caml_make_vect"
+external unsafe_get : 'a t -> int -> 'a = "%array_unsafe_get"
+external unsafe_set : 'a t -> int -> 'a -> unit = "%array_unsafe_set"
+
 (** @param a array 
     @param p predicate 
 *)
@@ -56,12 +63,10 @@ let iter f  xs =
     f (Array.unsafe_get xs i) [@bs]
   done 
 
-(* here [f] is of type ['a -> 'b]
-let iterX f  xs = 
-  for i = 0 to Array.length xs - 1 do 
-    f (Array.unsafe_get xs i) 
-  done 
-*)
+let iteri f a =
+  for i = 0 to length a - 1 do f i (unsafe_get a i) [@bs] done  
+
+
 
 external createUnsafe : int -> 'a t = "Array" [@@bs.new]
 
@@ -75,11 +80,60 @@ let ofList xs =
         | hd::tl -> Array.unsafe_set a i hd; fill (i+1) tl in
     fill 0 l
 
+let toList a =
+  let rec tolist i res =
+    if i < 0 then res else tolist (i - 1) (unsafe_get a i :: res) in
+  tolist (length a - 1) []
+    
+
+let init n f  = 
+  let v = createUnsafe n in 
+  for i = 0 to n - 1 do 
+    unsafe_set v i (f i [@bs])
+  done ;
+  v 
+
+let copy x =   
+  let len = length x in 
+  let b = createUnsafe len in 
+  for i = 0 to len - 1 do 
+    unsafe_set b i (unsafe_get x i)
+  done  ;
+  b 
+
 let map f a =
   let l = Array.length a in
   let r = createUnsafe l in
   for i = 0 to l - 1 do
       Array.unsafe_set r i (f(Array.unsafe_get a i) [@bs])
   done;
   r
-  
+  
+
+let foldLeft f x a =
+  let r = ref x in
+  for i = 0 to length a - 1 do
+    r := f !r (unsafe_get a i) [@bs]
+  done;
+  !r
+
+
+let foldRight f a x =
+  let r = ref x in
+  for i = length a - 1 downto 0 do
+    r := f (unsafe_get a i) !r [@bs]
+  done;
+  !r
+
+
+let mapi f a =
+  let l = length a in
+  if l = 0 then [||] else begin
+    let r= createUnsafe l in 
+    for i = 0 to l - 1 do
+      unsafe_set r i (f i (unsafe_get a i) [@bs])
+    done;
+    r
+  end
+
+(* TODO: add [append] *)  

jscomp/others/bs_array.ml jscomp/others/bs_vector.ml

@@ -0,0 +1,93 @@
+(* 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. *)
+
+type 'a t = 'a array
+
+val filterInPlace : ('a -> bool [@bs]) -> 'a t -> unit
+
+val empty : 'a t -> unit
+
+val pushBack : 'a -> 'a t -> unit
+
+val copy : 'a t -> 'a t 
+(** shallow copy *)
+
+val memByRef : 'a -> 'a t -> bool
+
+val iter : ('a -> unit [@bs]) -> 'a t -> unit
+val iteri : (int -> 'a -> unit [@bs]) -> 'a t -> unit 
+val ofList : 'a Bs_list.t -> 'a t 
+val toList : 'a t -> 'a Bs_list.t 
+
+val map : ('a -> 'b [@bs]) -> 'a t -> 'b t 
+val mapi : (int -> 'a -> 'b [@bs]) -> 'a t -> 'b t 
+val foldLeft : ('a -> 'b -> 'a [@bs]) -> 'a -> 'b t -> 'a 
+val foldRight : ('b -> 'a -> 'a [@bs]) -> 'b t -> 'a -> 'a 
+external length : 'a t -> int = "%array_length"
+(** Return the length (number of elements) of the given array. *)
+
+external get : 'a t -> int -> 'a = "%array_safe_get"
+(** [Array.get a n] returns the element number [n] of array [a].
+   The first element has number 0.
+   The last element has number [Array.length a - 1].
+   You can also write [a.(n)] instead of [Array.get a n].
+
+   Raise [Invalid_argument "index out of bounds"]
+   if [n] is outside the range 0 to [(Array.length a - 1)]. *)
+
+external set : 'a t -> int -> 'a -> unit = "%array_safe_set"
+(** [Array.set a n x] modifies array [a] in place, replacing
+   element number [n] with [x].
+   You can also write [a.(n) <- x] instead of [Array.set a n x].
+
+   Raise [Invalid_argument "index out of bounds"]
+   if [n] is outside the range 0 to [Array.length a - 1]. *)
+
+
+external make : int -> 'a -> 'a t = "caml_make_vect"
+(** [Array.make n x] returns a fresh array of length [n],
+   initialized with [x].
+   All the elements of this new array are initially
+   physically equal to [x] (in the sense of the [==] predicate).
+   Consequently, if [x] is mutable, it is shared among all elements
+   of the array, and modifying [x] through one of the array entries
+   will modify all other entries at the same time.
+
+   Raise [Invalid_argument] if [n < 0] or [n > Sys.max_array_length].
+   If the value of [x] is a floating-point number, then the maximum
+   size is only [Sys.max_array_length / 2].*)
+
+
+val init : int -> (int -> 'a [@bs]) -> 'a t 
+(** @raise RangeError *)
+
+(*val append : 'a t -> 'a t -> 'a t *)
+(** create a new array, there is no shallow-sharing
+    between the output and input
+*)
+
+external unsafe_get : 'a t -> int -> 'a = "%array_unsafe_get"
+external unsafe_set : 'a t -> int -> 'a -> unit = "%array_unsafe_set"
+
+

jscomp/others/bs_vector.mli

@@ -25,7 +25,7 @@ caml_gc.cmj : caml_gc.cmi
 js_typed_array.cmj : js.cmj
 js_primitive.cmj : js_undefined.cmj js.cmj js_primitive.cmi
 caml_basic.cmj : js_undefined.cmj js.cmj caml_basic.cmi
-caml_oo.cmj : caml_array.cmj bs_obj.cmj caml_oo.cmi
+caml_oo.cmj : bs_obj.cmj caml_oo.cmi
 curry.cmj : caml_array.cmj
 caml_oo_curry.cmj : curry.cmj caml_oo.cmj
 caml_module.cmj :