not using ! in belt to keep deps clean

less magic for ref in runtime

Author: bobzhang

jscomp/others/belt_Array.ml

@@ -123,8 +123,8 @@ let rangeBy start finish ~step =
     let arr = makeUninitializedUnsafe  nb in
     let cur = ref start in
     for i = 0 to nb - 1 do
-      setUnsafe arr i !cur;
-      cur .contents<- !cur + step ;
+      setUnsafe arr i cur.contents;
+      cur.contents<- cur.contents + step ;
     done;
     arr
 
@@ -164,15 +164,15 @@ let concatMany arrs =
   let lenArrs = length arrs in
   let totalLen = ref 0 in
   for i = 0 to lenArrs - 1 do
-    totalLen .contents<- !totalLen + length (getUnsafe arrs i)
+    totalLen .contents<- totalLen.contents + length (getUnsafe arrs i)
   done;
-  let result = makeUninitializedUnsafe !totalLen in
-  totalLen .contents<- 0 ;
+  let result = makeUninitializedUnsafe totalLen.contents in
+  totalLen.contents<- 0 ;
   for j = 0 to lenArrs - 1 do
     let cur = getUnsafe arrs j in
     for k = 0 to length cur - 1 do
-      setUnsafe result !totalLen (getUnsafe cur k);
-      incr totalLen
+      setUnsafe result totalLen.contents (getUnsafe cur k);
+      totalLen.contents <- totalLen.contents + 1
     done
   done ;
   result
@@ -269,31 +269,31 @@ let getByU a p =
   let l = length a in
   let i = ref 0 in
   let r = ref None in
-  while !r = None && !i < l do
-    let v = (getUnsafe a !i) in
+  while r.contents = None && i.contents < l do
+    let v = getUnsafe a i.contents in
     if p v [@bs] then
       begin
-        r .contents<- Some v;
+        r.contents<- Some v;
       end;
-    incr i
+    i.contents <- i.contents + 1
   done;
-  !r
+  r.contents
 
 let getBy a p = getByU a (fun[@bs] a -> p a)
 
 let getIndexByU a p =
   let l = length a in
   let i = ref 0 in
   let r = ref None in
-  while !r = None && !i < l do
-    let v = (getUnsafe a !i) in
+  while r.contents = None && i.contents < l do
+    let v = getUnsafe a i.contents in
     if p v [@bs] then
       begin
-        r .contents<- Some !i;
+        r .contents<- Some i.contents;
       end;
-    incr i
+    i.contents <- i.contents + 1
   done;
-  !r
+  r.contents
 
 let getIndexBy a p = getIndexByU a (fun[@bs] a -> p a)
 
@@ -305,11 +305,11 @@ let keepU a f =
     let v = (getUnsafe a i) in
     if f v [@bs] then
       begin
-        setUnsafe r !j v;
-        incr j
+        setUnsafe r j.contents v;
+        j.contents <- j.contents + 1
       end
   done;
-  truncateToLengthUnsafe r !j;
+  truncateToLengthUnsafe r j.contents;
   r
 
 let keep a f = keepU a (fun [@bs] a -> f a)
@@ -322,11 +322,11 @@ let keepWithIndexU a f =
     let v = (getUnsafe a i) in
     if f v i [@bs] then
       begin
-        setUnsafe r !j v;
-        incr j
+        setUnsafe r j.contents v;
+        j.contents <- j.contents + 1
       end
   done;
-  truncateToLengthUnsafe r !j;
+  truncateToLengthUnsafe r j.contents;
   r
 
 let keepWithIndex a f = keepWithIndexU a (fun [@bs] a i -> f a i)
@@ -341,11 +341,11 @@ let keepMapU a f =
     | None -> ()
     | Some v ->
       begin
-        setUnsafe r !j v;
-        incr j
+        setUnsafe r j.contents v;
+        j.contents <- j.contents + 1
       end
   done;
-  truncateToLengthUnsafe r !j;
+  truncateToLengthUnsafe r j.contents;
   r
 
 let keepMap a f = keepMapU a (fun[@bs] a -> f a)
@@ -368,38 +368,38 @@ let mapWithIndex a f = mapWithIndexU a (fun[@bs] a b -> f a b)
 let reduceU a x f =
   let r = ref x in
   for i = 0 to length a - 1 do
-    r .contents<- f !r (getUnsafe a i) [@bs]
+    r .contents<- f r.contents (getUnsafe a i) [@bs]
   done;
-  !r
+  r.contents
 
 let reduce a x f = reduceU a x (fun[@bs] a b -> f a b)
 
 let reduceReverseU a x f =
   let r = ref x in
   for i = length a - 1 downto 0 do
-    r .contents<- f  !r (getUnsafe a i) [@bs]
+    r .contents<- f  r.contents (getUnsafe a i) [@bs]
   done;
-  !r
+  r.contents
 
 let reduceReverse a x f = reduceReverseU a x (fun[@bs] a b -> f a b)
 
 let reduceReverse2U a b x f =
   let r = ref x in
   let len = Pervasives.min (length a) (length b) in
   for i = len - 1 downto  0 do
-    r .contents<- f !r (getUnsafe a i) (getUnsafe b i) [@bs]
+    r .contents<- f r.contents (getUnsafe a i) (getUnsafe b i) [@bs]
   done;
-  !r
+  r.contents
 
 let reduceReverse2 a b x f =
   reduceReverse2U a b x (fun [@bs] a b c -> f a b c)
 
 let reduceWithIndexU a x f =
   let r = ref x in
   for i = 0 to length a - 1 do
-    r .contents<- f !r (getUnsafe a i) i [@bs]
+    r .contents<- f r.contents (getUnsafe a i) i [@bs]
   done;
-  !r
+  r.contents
 
 let reduceWithIndex a x f =
   reduceWithIndexU a x (fun[@bs] a b c -> f a b c)
@@ -485,16 +485,16 @@ let partitionU a f =
   for ii = 0 to l - 1 do
     let v = getUnsafe a ii in
     if f v [@bs] then (
-      setUnsafe a1 !i v;
-      incr i
+      setUnsafe a1 i.contents v;
+      i.contents <- i.contents + 1 
     )
     else (
-      setUnsafe a2 !j v;
-      incr j
+      setUnsafe a2 j.contents v;
+      j.contents <- j.contents + 1
     )
   done;
-  truncateToLengthUnsafe a1 !i;
-  truncateToLengthUnsafe a2 !j;
+  truncateToLengthUnsafe a1 i.contents;
+  truncateToLengthUnsafe a2 j.contents;
   (a1, a2)
 
 let partition a f = partitionU a (fun [@bs] x -> f x)

jscomp/others/belt_List.ml

@@ -366,11 +366,11 @@ let makeByU n f =
     let headX = mutableCell (f 0 [@bs]) [] in
     let cur = ref headX in
     let i = ref 1 in
-    while !i < n do
-      let v = mutableCell (f !i [@bs]) [] in
-      unsafeMutateTail !cur v ;
-      cur .contents<- v ;
-      incr i ;
+    while i.contents < n do
+      let v = mutableCell (f i.contents [@bs]) [] in
+      unsafeMutateTail cur.contents v ;
+      cur.contents<- v ;
+      i.contents <- i.contents + 1 ;
     done
     ;
     headX
@@ -383,11 +383,11 @@ let make n v =
     let headX = mutableCell v [] in
     let cur = ref headX in
     let i = ref 1 in
-    while !i < n do
+    while i.contents < n do
       let v = mutableCell v [] in
-      unsafeMutateTail !cur v ;
-      cur .contents<- v ;
-      incr i ;
+      unsafeMutateTail cur.contents v ;
+      cur.contents<- v ;
+      i.contents <- i.contents + 1 ;
     done
     ;
     headX
@@ -492,9 +492,9 @@ let concatMany xs =
     let len = A.length xs in
     let v = ref (A.getUnsafe xs (len - 1)) in
     for i = len - 2 downto 0 do
-      v .contents<- concat (A.getUnsafe xs i) !v
+      v .contents<- concat (A.getUnsafe xs i) v.contents
     done ;
-    !v
+    v.contents
 
 let rec mapRevAux f accu xs =
   match xs with

jscomp/others/belt_MapDict.ml

@@ -111,7 +111,7 @@ let rec updateU  (t : _ t) newK f  ~cmp :  _ t =
         | _, Some rn ->
           let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
           let r = N.removeMinAuxWithRef rn kr vr in
-          N.bal l !kr !vr r 
+          N.bal l kr.contents vr.contents r 
         end
       | Some newD -> N.return (N.updateValue n newD)
     else 
@@ -156,7 +156,7 @@ let rec removeAux0  n x ~cmp =
     | _, Some rn -> 
       let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in 
       let r = N.removeMinAuxWithRef rn kr vr in 
-      N.bal l !kr !vr r
+      N.bal l kr.contents vr.contents r
   else if c < 0 then
     match N.toOpt l with 
     | None -> N.return n (* Nothing to remove *)
@@ -183,9 +183,9 @@ let mergeMany   h arr ~cmp =
   let v = ref h in  
   for i = 0 to len - 1 do 
     let key,value = A.getUnsafe arr i in 
-    v .contents<- set !v  ~cmp key value
+    v .contents<- set v.contents  ~cmp key value
   done ;
-  !v 
+  v.contents 
 
 let rec splitAuxPivot n x pres  ~cmp =  
   let l,v,d,r = N.(leftGet n , keyGet n, valueGet n, rightGet n) in  
@@ -218,7 +218,7 @@ let split  n x ~cmp =
   | Some n  ->
     let pres = ref None in
     let v = splitAuxPivot ~cmp n x pres in 
-    v, !pres
+    v, pres.contents
 
 let findFirstByU = N.findFirstByU
 let findFirstBy = N.findFirstBy 
@@ -239,7 +239,7 @@ let rec mergeU s1 s2 f ~cmp =
       let l1, v1, d1, r1 = N.(leftGet s1n, keyGet s1n, valueGet s1n, rightGet s1n) in 
       let d2 = ref None in 
       let (l2, r2) = splitAuxPivot ~cmp s2n v1 d2 in
-      let d2 = !d2 in 
+      let d2 = d2.contents in 
       let newLeft = mergeU ~cmp l1 l2 f in 
       let newD = f v1 (Some d1) d2 [@bs] in 
       let newRight = mergeU ~cmp r1 r2 f in 
@@ -248,7 +248,7 @@ let rec mergeU s1 s2 f ~cmp =
       let l2,v2,d2,r2 = N.(leftGet s2n, keyGet s2n, valueGet s2n, rightGet s2n) in 
       let d1 = ref None in 
       let (l1,  r1) = splitAuxPivot ~cmp s1n v2 d1 in
-      let d1 = !d1 in 
+      let d1 = d1.contents in 
       let newLeft = mergeU ~cmp l1 l2 f in 
       let newD = (f v2 d1 (Some d2) [@bs]) in 
       let newRight = (mergeU ~cmp r1 r2 f) in 

jscomp/others/belt_MapInt.ml

@@ -78,7 +78,7 @@ let rec updateU  t (x : key) f  =
           | _, Some rn ->
             let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
             let r = N.removeMinAuxWithRef rn kr vr in
-            N.bal l !kr !vr r 
+            N.bal l kr.contents vr.contents r 
         end
       | Some data -> N.return (N.updateValue n data )
       end 
@@ -104,7 +104,7 @@ let rec removeAux n (x : key) =
       | _, Some rn -> 
         let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in 
         let r = N.removeMinAuxWithRef rn kr vr in 
-        N.bal l !kr !vr r 
+        N.bal l kr.contents vr.contents r 
     else if x < v then
       match N.toOpt l with 
       | None -> N.return n
@@ -148,9 +148,9 @@ let mergeMany h arr =
   let v = ref h in  
   for i = 0 to len - 1 do 
     let key,value = A.getUnsafe arr i in 
-    v .contents<- set !v key value
+    v.contents<- set v.contents key value
   done ;
-  !v 
+  v.contents 
 
 let mergeArray = mergeMany
 

jscomp/others/belt_MapString.ml

@@ -78,7 +78,7 @@ let rec updateU  t (x : key) f  =
           | _, Some rn ->
             let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
             let r = N.removeMinAuxWithRef rn kr vr in
-            N.bal l !kr !vr r 
+            N.bal l kr.contents vr.contents r 
         end
       | Some data -> N.return (N.updateValue n data )
       end 
@@ -104,7 +104,7 @@ let rec removeAux n (x : key) =
       | _, Some rn -> 
         let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in 
         let r = N.removeMinAuxWithRef rn kr vr in 
-        N.bal l !kr !vr r 
+        N.bal l kr.contents vr.contents r 
     else if x < v then
       match N.toOpt l with 
       | None -> N.return n
@@ -148,9 +148,9 @@ let mergeMany h arr =
   let v = ref h in  
   for i = 0 to len - 1 do 
     let key,value = A.getUnsafe arr i in 
-    v .contents<- set !v key value
+    v.contents<- set v.contents key value
   done ;
-  !v 
+  v.contents 
 
 let mergeArray = mergeMany
 

jscomp/others/belt_MutableMap.ml

@@ -231,9 +231,9 @@ let mergeManyAux t  xs ~cmp =
   let v = ref t in 
   for i = 0 to A.length xs - 1 do 
     let key,value = A.getUnsafe xs i in 
-    v .contents<- N.updateMutate !v key value ~cmp
+    v .contents<- N.updateMutate v.contents key value ~cmp
   done; 
-  !v 
+  v.contents 
 
 let mergeMany d xs =   
   let oldRoot = S.dataGet d in 

jscomp/others/belt_MutableSet.ml

@@ -141,7 +141,7 @@ let removeCheck d v =
     let newRoot = removeCheck0 ~cmp:(S.cmpGet d) oldRoot2 v removed in 
     if newRoot != oldRoot then  
       S.dataSet d newRoot ;   
-    !removed
+    removed.contents
 
 
 
@@ -170,7 +170,7 @@ let addCheck m e =
   let newRoot = addCheck0 ~cmp:(Belt_Id.getCmpInternal (S.cmpGet m)) oldRoot e added in 
   if newRoot != oldRoot then 
     S.dataSet m newRoot;
-  !added    
+  added.contents
 
 let add m e = 
   let oldRoot = S.dataGet m in 
@@ -181,9 +181,9 @@ let add m e =
 let addArrayMutate t xs ~cmp =     
   let v = ref t in 
   for i = 0 to A.length xs - 1 do 
-    v .contents<- N.addMutate !v (A.getUnsafe xs i)  ~cmp
+    v .contents<- N.addMutate v.contents (A.getUnsafe xs i)  ~cmp
   done; 
-  !v
+  v.contents
 
 let mergeMany d xs =   
   S.dataSet d (addArrayMutate (S.dataGet d) xs ~cmp:(S.cmpGet d))