Skip to content

Commit 7578563

Browse files
committed
belt not depending on stdlib, this is to make it not depending on ref as well
1 parent e52f0aa commit 7578563

40 files changed

+421
-418
lines changed

jscomp/others/belt_Array.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ let rangeBy start finish ~step =
124124
let cur = ref start in
125125
for i = 0 to nb - 1 do
126126
setUnsafe arr i !cur;
127-
cur := !cur + step ;
127+
cur .contents<- !cur + step ;
128128
done;
129129
arr
130130

@@ -164,10 +164,10 @@ let concatMany arrs =
164164
let lenArrs = length arrs in
165165
let totalLen = ref 0 in
166166
for i = 0 to lenArrs - 1 do
167-
totalLen := !totalLen + length (getUnsafe arrs i)
167+
totalLen .contents<- !totalLen + length (getUnsafe arrs i)
168168
done;
169169
let result = makeUninitializedUnsafe !totalLen in
170-
totalLen := 0 ;
170+
totalLen .contents<- 0 ;
171171
for j = 0 to lenArrs - 1 do
172172
let cur = getUnsafe arrs j in
173173
for k = 0 to length cur - 1 do
@@ -273,7 +273,7 @@ let getByU a p =
273273
let v = (getUnsafe a !i) in
274274
if p v [@bs] then
275275
begin
276-
r := Some v;
276+
r .contents<- Some v;
277277
end;
278278
incr i
279279
done;
@@ -289,7 +289,7 @@ let getIndexByU a p =
289289
let v = (getUnsafe a !i) in
290290
if p v [@bs] then
291291
begin
292-
r := Some !i;
292+
r .contents<- Some !i;
293293
end;
294294
incr i
295295
done;
@@ -368,7 +368,7 @@ let mapWithIndex a f = mapWithIndexU a (fun[@bs] a b -> f a b)
368368
let reduceU a x f =
369369
let r = ref x in
370370
for i = 0 to length a - 1 do
371-
r := f !r (getUnsafe a i) [@bs]
371+
r .contents<- f !r (getUnsafe a i) [@bs]
372372
done;
373373
!r
374374

@@ -377,7 +377,7 @@ let reduce a x f = reduceU a x (fun[@bs] a b -> f a b)
377377
let reduceReverseU a x f =
378378
let r = ref x in
379379
for i = length a - 1 downto 0 do
380-
r := f !r (getUnsafe a i) [@bs]
380+
r .contents<- f !r (getUnsafe a i) [@bs]
381381
done;
382382
!r
383383

@@ -387,7 +387,7 @@ let reduceReverse2U a b x f =
387387
let r = ref x in
388388
let len = Pervasives.min (length a) (length b) in
389389
for i = len - 1 downto 0 do
390-
r := f !r (getUnsafe a i) (getUnsafe b i) [@bs]
390+
r .contents<- f !r (getUnsafe a i) (getUnsafe b i) [@bs]
391391
done;
392392
!r
393393

@@ -397,7 +397,7 @@ let reduceReverse2 a b x f =
397397
let reduceWithIndexU a x f =
398398
let r = ref x in
399399
for i = 0 to length a - 1 do
400-
r := f !r (getUnsafe a i) i [@bs]
400+
r .contents<- f !r (getUnsafe a i) i [@bs]
401401
done;
402402
!r
403403

jscomp/others/belt_List.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ let makeByU n f =
369369
while !i < n do
370370
let v = mutableCell (f !i [@bs]) [] in
371371
unsafeMutateTail !cur v ;
372-
cur := v ;
372+
cur .contents<- v ;
373373
incr i ;
374374
done
375375
;
@@ -386,7 +386,7 @@ let make n v =
386386
while !i < n do
387387
let v = mutableCell v [] in
388388
unsafeMutateTail !cur v ;
389-
cur := v ;
389+
cur .contents<- v ;
390390
incr i ;
391391
done
392392
;
@@ -456,7 +456,7 @@ let rec fillAuxMap arr i x f =
456456
(* for i = 1 to len - 1 do *)
457457
(* let next = mutableCell (f (A.getUnsafe arr i) [@bs]) [] in *)
458458
(* unsafeMutateTail !cell next ; *)
459-
(* cell := next *)
459+
(* cell .contents<- next *)
460460
(* done ; *)
461461
(* head *)
462462
(* | None -> *)
@@ -492,7 +492,7 @@ let concatMany xs =
492492
let len = A.length xs in
493493
let v = ref (A.getUnsafe xs (len - 1)) in
494494
for i = len - 2 downto 0 do
495-
v := concat (A.getUnsafe xs i) !v
495+
v .contents<- concat (A.getUnsafe xs i) !v
496496
done ;
497497
!v
498498

jscomp/others/belt_MapDict.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ let mergeMany h arr ~cmp =
183183
let v = ref h in
184184
for i = 0 to len - 1 do
185185
let key,value = A.getUnsafe arr i in
186-
v := set !v ~cmp key value
186+
v .contents<- set !v ~cmp key value
187187
done ;
188188
!v
189189

190190
let rec splitAuxPivot n x pres ~cmp =
191191
let l,v,d,r = N.(leftGet n , keyGet n, valueGet n, rightGet n) in
192192
let c = (Belt_Id.getCmpInternal cmp) x v [@bs] in
193193
if c = 0 then begin
194-
pres := Some d;
194+
pres .contents<- Some d;
195195
(l, r)
196196
end
197197
else

jscomp/others/belt_MapInt.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ let mergeMany h arr =
148148
let v = ref h in
149149
for i = 0 to len - 1 do
150150
let key,value = A.getUnsafe arr i in
151-
v := set !v key value
151+
v .contents<- set !v key value
152152
done ;
153153
!v
154154

jscomp/others/belt_MapString.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ let mergeMany h arr =
148148
let v = ref h in
149149
for i = 0 to len - 1 do
150150
let key,value = A.getUnsafe arr i in
151-
v := set !v key value
151+
v .contents<- set !v key value
152152
done ;
153153
!v
154154

jscomp/others/belt_MutableMap.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ let mergeManyAux t xs ~cmp =
231231
let v = ref t in
232232
for i = 0 to A.length xs - 1 do
233233
let key,value = A.getUnsafe xs i in
234-
v := N.updateMutate !v key value ~cmp
234+
v .contents<- N.updateMutate !v key value ~cmp
235235
done;
236236
!v
237237

jscomp/others/belt_MutableSet.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ let rec removeCheck0 nt x removed ~cmp=
106106
let k = N.valueGet nt in
107107
let c = (Belt_Id.getCmpInternal cmp) x k [@bs] in
108108
if c = 0 then
109-
let () = removed := true in
109+
let () = removed .contents<- true in
110110
let l,r = N.(leftGet nt, rightGet nt) in
111111
match N.(toOpt l, toOpt r) with
112112
| None, _ -> r
@@ -148,7 +148,7 @@ let removeCheck d v =
148148
let rec addCheck0 t x added ~cmp =
149149
match N.toOpt t with
150150
| None ->
151-
added := true;
151+
added .contents<- true;
152152
N.singleton x
153153
| Some nt ->
154154
let k = N.valueGet nt in
@@ -181,7 +181,7 @@ let add m e =
181181
let addArrayMutate t xs ~cmp =
182182
let v = ref t in
183183
for i = 0 to A.length xs - 1 do
184-
v := N.addMutate !v (A.getUnsafe xs i) ~cmp
184+
v .contents<- N.addMutate !v (A.getUnsafe xs i) ~cmp
185185
done;
186186
!v
187187

jscomp/others/belt_MutableSetInt.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let removeMany (d : t) xs =
101101
let rec removeCheck0 nt (x : value) removed =
102102
let k = N.valueGet nt in
103103
if x = k then
104-
let () = removed := true in
104+
let () = removed .contents<- true in
105105
let l,r = N.(leftGet nt, rightGet nt) in
106106
match N.(toOpt l, toOpt r) with
107107
| None, _ -> r
@@ -142,7 +142,7 @@ let removeCheck (d : t) v =
142142
let rec addCheck0 t (x : value) added =
143143
match N.toOpt t with
144144
| None ->
145-
added := true;
145+
added .contents<- true;
146146
N.singleton x
147147
| Some nt ->
148148
let k = N.valueGet nt in
@@ -175,7 +175,7 @@ let add d k =
175175
let addArrayMutate t xs =
176176
let v = ref t in
177177
for i = 0 to A.length xs - 1 do
178-
v := I.addMutate !v (A.getUnsafe xs i)
178+
v .contents<- I.addMutate !v (A.getUnsafe xs i)
179179
done ;
180180
!v
181181

jscomp/others/belt_MutableSetString.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let removeMany (d : t) xs =
101101
let rec removeCheck0 nt (x : value) removed =
102102
let k = N.valueGet nt in
103103
if x = k then
104-
let () = removed := true in
104+
let () = removed .contents<- true in
105105
let l,r = N.(leftGet nt, rightGet nt) in
106106
match N.(toOpt l, toOpt r) with
107107
| None, _ -> r
@@ -142,7 +142,7 @@ let removeCheck (d : t) v =
142142
let rec addCheck0 t (x : value) added =
143143
match N.toOpt t with
144144
| None ->
145-
added := true;
145+
added .contents<- true;
146146
N.singleton x
147147
| Some nt ->
148148
let k = N.valueGet nt in
@@ -175,7 +175,7 @@ let add d k =
175175
let addArrayMutate t xs =
176176
let v = ref t in
177177
for i = 0 to A.length xs - 1 do
178-
v := I.addMutate !v (A.getUnsafe xs i)
178+
v .contents<- I.addMutate !v (A.getUnsafe xs i)
179179
done ;
180180
!v
181181

jscomp/others/belt_MutableStack.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ let dynamicPopIterU s f =
9696
let v = Js_null.getUnsafe !cursor in
9797
rootSet s (tailGet v);
9898
f (headGet v) [@bs];
99-
cursor := rootGet s (* using root, [f] may change it*)
99+
cursor .contents<- rootGet s (* using root, [f] may change it*)
100100
done
101101

102102
let dynamicPopIter s f = dynamicPopIterU s (fun [@bs] x -> f x)

0 commit comments

Comments
 (0)