clean up list as well

Author: bobzhang

jscomp/others/.depend

@@ -25,7 +25,7 @@ bs_SetIntM.cmj : bs_internalSetInt.cmj bs_internalAVLset.cmj bs_SortInt.cmj \
     bs_Array.cmj bs_SetIntM.cmi
 bs_Hash.cmj : bs_Hash.cmi
 bs_Queue.cmj : bs_Array.cmj bs_Queue.cmi
-bs_List.cmj : js_json.cmj bs_Array.cmj bs_List.cmi
+bs_List.cmj : bs_Array.cmj bs_List.cmi
 bs_Sort.cmj : bs_Array.cmj bs_Sort.cmi
 bs_Range.cmj :
 bs_internalBucketsType.cmj : bs_Array.cmj bs_internalBucketsType.cmi

jscomp/others/bs_Array.ml

@@ -33,29 +33,40 @@ external makeUninitialized : int -> 'a Js.undefined array = "Array" [@@bs.new]
 external makeUninitializedUnsafe : int -> 'a  array = "Array" [@@bs.new]
 
 
-
+let copy a =
+  let l = length a in 
+  let v = makeUninitializedUnsafe l in 
+  for i = 0 to l - 1 do 
+    setUnsafe v i (getUnsafe a i)
+  done ;
+  v
 
 let swapUnsafe xs i j =    
   let tmp = getUnsafe xs i in 
   setUnsafe xs i (getUnsafe xs j) ;
   setUnsafe xs j tmp
 
-let shuffle xs =     
+let shuffleInPlace xs =     
   let len = length xs in 
   for i = 0 to len - 1 do
     swapUnsafe xs i (Js_math.random_int i len) (* [i,len)*)
   done 
 
+let shuffle xs =
+  let result = copy xs in
+  shuffleInPlace result; (* TODO: improve*)
+  result
+
 let reverseAux xs ofs len =
   for i = 0 to len/2 - 1 do
     swapUnsafe xs (ofs + i) (ofs + len - i - 1)
   done
 
-let reverse xs =
+let reverseInPlace xs =
   let len = length xs in
   reverseAux xs 0 len
 
-let reverseCopy xs =
+let reverse xs =
   let len = length xs in
   let result = makeUninitializedUnsafe len in 
   for i = 0 to len - 1 do
@@ -86,17 +97,10 @@ let makeBy l f =
 
 let makeByAndShuffle l f =
   let u  = makeBy l f in
-  shuffle u ;
+  shuffleInPlace u ;
   u
 
 
-let copy a =
-  let l = length a in 
-  let v = makeUninitializedUnsafe l in 
-  for i = 0 to l - 1 do 
-    setUnsafe v i (getUnsafe a i)
-  done ;
-  v
 
 
 let zip xs ys = 
@@ -327,7 +331,7 @@ let every2  a b p =
   else 
     everyAux2  a b 0 p lena
 
-let eq = every2
+let equalTo = every2
 
 let rec everyCmpAux2 arr1 arr2 i b len =   
   if i = len then 0
@@ -337,7 +341,7 @@ let rec everyCmpAux2 arr1 arr2 i b len =
       everyCmpAux2 arr1 arr2 (i + 1) b len
     else c
 
-let cmp a b p =
+let compareTo a b p =
   let lena = length a in  
   let lenb = length b in
   if lena > lenb then 1

jscomp/others/bs_Array.mli

@@ -27,9 +27,10 @@ external getUndefined: 'a array -> int -> 'a Js.undefined = "%array_unsafe_get"
 val getExn: 'a array -> int -> 'a  
 external setUnsafe: 'a array -> int -> 'a -> unit = "%array_unsafe_set"
 
-val shuffle: 'a array -> unit
-val reverse: 'a array -> unit
-val reverseCopy: 'a array -> 'a array
+val shuffleInPlace: 'a array -> unit
+val shuffle: 'a array -> 'a array  
+val reverseInPlace: 'a array -> unit
+val reverse: 'a array -> 'a array
 external makeUninitialized: int -> 'a Js.undefined array = "Array" [@@bs.new]
 external makeUninitializedUnsafe: int -> 'a array = "Array" [@@bs.new]
 
@@ -120,7 +121,7 @@ val every: 'a array -> ('a -> bool [@bs]) -> bool
 (** [every2 a b] return false when [length a <> length b] *)
 val every2: 'a array -> 'b array -> ('a -> 'b -> bool [@bs]) -> bool
 
-val cmp: 'a array -> 'a array -> ('a -> 'a -> int [@bs]) -> int
-val eq:  'a array -> 'a array -> ('a -> 'a -> bool [@bs]) -> bool
+val compareTo: 'a array -> 'a array -> ('a -> 'a -> int [@bs]) -> int
+val equalTo:  'a array -> 'a array -> ('a -> 'a -> bool [@bs]) -> bool
 
 external truncateToLengthUnsafe: 'a array -> int ->  unit = "length" [@@bs.set]