Merge pull request #4610 from BuckleScript/remove_assert

[refactoring] remove internal usage of %assert, given ocaml exception already produce good stacktrace

Author: bobzhang

jscomp/main/builtin_cmj_datasets.ml

@@ -22,13 +22,13 @@ external getUndefined: 'a array -> int -> 'a Js.undefined = "%array_unsafe_get"
 let get arr i =
   if i >= 0 && i < length arr then Some (getUnsafe arr i) else None
 let getExn arr i =
-    [%assert i >= 0 && i < length arr] ;
+    assert (i >= 0 && i < length arr) ;
     getUnsafe arr i
 let set arr i v =
   if i >= 0 && i < length arr then (setUnsafe arr i v; true) else false
 
 let setExn arr i v =
-  [%assert i >= 0 && i < length arr];
+  assert (i >= 0 && i < length arr);
   setUnsafe arr i v
 
 

jscomp/others/belt_Array.ml

@@ -92,7 +92,7 @@ let head x =
 
 let headExn x =
   match x with
-  | [] -> [%assert "headExn"]
+  | [] -> raise Not_found
   | x::_ -> x
 
 let tail x =
@@ -102,7 +102,7 @@ let tail x =
 
 let tailExn x =
   match x with
-  | [] -> [%assert "tailExn"]
+  | [] -> raise Not_found
   | _::t -> t
 
 let add xs x  = x :: xs
@@ -116,14 +116,14 @@ let rec nthAux x n =
 let rec nthAuxAssert x n =
   match x with
   | h::t -> if n = 0 then h else nthAuxAssert t (n - 1)
-  | _ -> [%assert "getExn"]
+  | _ -> raise Not_found
 
 let get x n =
   if n < 0 then None
   else nthAux x n
 
 let getExn x n =
-  if n < 0 then [%assert "getExn"]
+  if n < 0 then raise Not_found
   else nthAuxAssert x n
 
 let rec partitionAux p cell precX precY =
@@ -447,22 +447,7 @@ let shuffle xs =
    2. raise JS exception, how to pattern match
 *)
 
-(* let fromJson j f =    *)
-(*   match J.decodeArray j with  *)
-(*   | Some arr ->      *)
-(*     let len = Belt_Array.length arr in  *)
-(*     if len = 0 then [] *)
-(*     else  *)
-(*       let head = (mutableCell (f (A.getUnsafe arr 0) [@bs]) []) in  *)
-(*       let cell = ref head in    *)
-(*       for i = 1 to len - 1 do    *)
-(*         let next = mutableCell (f (A.getUnsafe arr i) [@bs]) [] in  *)
-(*         unsafeMutateTail.unsafeMutateTail !cell next ; *)
-(*         cell .contents<- next  *)
-(*       done ; *)
-(*       head *)
-(*   | None -> *)
-(*     [%assert "Not array when decoding list"] *)
+
 
 let rec reverseConcat l1 l2 =
   match l1 with

jscomp/others/belt_List.ml

@@ -71,7 +71,7 @@ let peekUndefined q =
 
 let peekExn q =
   match  q.first with
-  | None -> [%assert "Belt.Queue.Empty"]
+  | None -> raise Not_found
   | Some v -> v.content
 
 let pop q =
@@ -92,7 +92,7 @@ let pop q =
 
 let popExn q = (* TO fix *)
   match  q.first with 
-  | None -> [%assert "Empty"]
+  | None -> raise Not_found
   | Some x  ->
     let next = x.next in 
     if next = None then 

jscomp/others/belt_MutableQueue.ml

@@ -30,7 +30,7 @@ let forEach opt f = forEachU opt (fun[@bs] x -> f x)
 
 let getExn = function
   | Some x -> x
-  | None -> [%assert "getExn"]
+  | None -> raise Not_found
 
 external getUnsafe : 'a option -> 'a = "%identity"  
 

jscomp/others/belt_Option.ml

@@ -26,7 +26,7 @@ type ('a,'b) t = Ok of 'a | Error of 'b
 
 let getExn = function
   | Ok x -> x
-  | Error _ -> [%assert "getExn"]
+  | Error _ -> raise Not_found
 
 let mapWithDefaultU opt default f = match opt with
   | Ok x -> (f x [@bs])

jscomp/others/belt_Result.ml

@@ -287,7 +287,7 @@ let rec checkInvariantInternal (v : _ t) =
   | Some n ->
     let {left = l; right = r} = n   in
     let diff = height l - height r  in
-    [%assert diff <=2 && diff >= -2];
+    assert (diff <=2 && diff >= -2);
     checkInvariantInternal l;
     checkInvariantInternal r
 
@@ -529,7 +529,7 @@ let rec getUndefined (n : _ t) x ~cmp  =
 
 let rec getExn  (n : _ t) x ~cmp =
   match n with
-    None -> [%assert "getExn0"]
+    None -> raise Not_found
   | Some t (* Node(l, v, r, _) *) ->
     let v = t.value in
     let c = (Belt_Id.getCmpInternal cmp) x v [@bs] in

jscomp/others/belt_internalAVLset.ml

@@ -370,7 +370,7 @@ let rec checkInvariantInternal (v : _ t) =
   | Some n ->
     let l,r = n.left , n.right in
     let diff = treeHeight l - treeHeight r  in
-    [%assert diff <=2 && diff >= -2 ];
+    assert (diff <=2 && diff >= -2 );
     checkInvariantInternal l;
     checkInvariantInternal r
 
@@ -604,7 +604,7 @@ let rec getUndefined  n x ~cmp =
 let rec getExn   n x  ~cmp =
   match  n with
     None ->
-    [%assert "getExn0"]
+    raise Not_found
   | Some n (* Node(l, v, d, r, _)*) ->
     let v = n.key  in
     let c = (Belt_Id.getCmpInternal cmp) x v [@bs] in

jscomp/others/belt_internalAVLtree.ml

@@ -46,7 +46,7 @@ let rec getUndefined n (x : key) =
 
 let rec getExn n (x : key) =
   match n with 
-  | None -> [%assert "getExn"]
+  | None -> raise Not_found
   | Some n -> 
     let v = n.N.key in 
     if x = v then n.N.value

jscomp/others/belt_internalMapInt.ml

@@ -46,7 +46,7 @@ let rec getUndefined n (x : key) =
 
 let rec getExn n (x : key) =
   match n with 
-  | None -> [%assert "getExn"]
+  | None -> raise Not_found
   | Some n -> 
     let v = n.N.key in 
     if x = v then n.N.value