Skip to content

Commit 2761279

Browse files
bobzhangbobzhang
authored
Merge pull request #3978 from BuckleScript/less_magic_in_ref_runtime
Not relying on ref internal
2 parents f36ac63 + 8ad0f96 commit 2761279

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+529
-520
lines changed

‎jscomp/bsb/bsb_templates.ml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,6 @@ let root = OCamlRes.Res.([
921921
\n\
922922
**How come we don't need any bundler during development**? We highly encourage you to open up `index.html` to check for yourself!\n\
923923
\n\
924-
If you start handling routes via `ReasonReactRouter` change the server script in package.json to `moduleserve ./ --port 8000 --spa` to make sure your routes don't result in a 404 not found error. With the added `--spa` flag your routes will return the index.html on page load and you can handle them client-side.\n\
925-
\n\
926924
# Features Used\n\
927925
\n\
928926
| | Blinking Greeting | Reducer from ReactJS Docs | Fetch Dog Pictures | Reason Using JS Using Reason |\n\
@@ -954,6 +952,12 @@ let root = OCamlRes.Res.([
954952
./node_modules/.bin/webpack\n\
955953
open indexProduction.html\n\
956954
```\n\
955+
\n\
956+
# Handle Routing Yourself\n\
957+
\n\
958+
To serve the files, this template uses a minimal dependency called `moduleserve`. A URL such as `localhost:8000/scores/john` resolves to the file `scores/john.html`. If you'd like to override this and handle URL resolution yourself, change the `server` command in `package.json` from `moduleserve ./ --port 8000` to `moduleserve ./ --port 8000 --spa` (for \"single page application\"). This will make `moduleserve` serve the default `index.html` for any URL. Since `index.html` loads `Index.bs.js`, you can grab hold of the URL in the corresponding `Index.re` and do whatever you want.\n\
959+
\n\
960+
By the way, ReasonReact comes with a small [router](https://reasonml.github.io/reason-react/docs/en/router) you might be interested in.\n\
957961
") ;
958962
File ("indexProduction.html",
959963
"<!DOCTYPE html>\n\

‎jscomp/others/belt_Array.ml‎

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

@@ -164,15 +164,15 @@ 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 .contents<- !totalLen + length (getUnsafe arrs i)
167+
totalLen .contents<- totalLen.contents + length (getUnsafe arrs i)
168168
done;
169-
let result = makeUninitializedUnsafe !totalLen in
170-
totalLen .contents<- 0 ;
169+
let result = makeUninitializedUnsafe totalLen.contents in
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
174-
setUnsafe result !totalLen (getUnsafe cur k);
175-
incr totalLen
174+
setUnsafe result totalLen.contents (getUnsafe cur k);
175+
totalLen.contents <- totalLen.contents + 1
176176
done
177177
done ;
178178
result
@@ -269,31 +269,31 @@ let getByU a p =
269269
let l = length a in
270270
let i = ref 0 in
271271
let r = ref None in
272-
while !r = None && !i < l do
273-
let v = (getUnsafe a !i) in
272+
while r.contents = None && i.contents < l do
273+
let v = getUnsafe a i.contents in
274274
if p v [@bs] then
275275
begin
276-
r .contents<- Some v;
276+
r.contents<- Some v;
277277
end;
278-
incr i
278+
i.contents <- i.contents + 1
279279
done;
280-
!r
280+
r.contents
281281

282282
let getBy a p = getByU a (fun[@bs] a -> p a)
283283

284284
let getIndexByU a p =
285285
let l = length a in
286286
let i = ref 0 in
287287
let r = ref None in
288-
while !r = None && !i < l do
289-
let v = (getUnsafe a !i) in
288+
while r.contents = None && i.contents < l do
289+
let v = getUnsafe a i.contents in
290290
if p v [@bs] then
291291
begin
292-
r .contents<- Some !i;
292+
r .contents<- Some i.contents;
293293
end;
294-
incr i
294+
i.contents <- i.contents + 1
295295
done;
296-
!r
296+
r.contents
297297

298298
let getIndexBy a p = getIndexByU a (fun[@bs] a -> p a)
299299

@@ -305,11 +305,11 @@ let keepU a f =
305305
let v = (getUnsafe a i) in
306306
if f v [@bs] then
307307
begin
308-
setUnsafe r !j v;
309-
incr j
308+
setUnsafe r j.contents v;
309+
j.contents <- j.contents + 1
310310
end
311311
done;
312-
truncateToLengthUnsafe r !j;
312+
truncateToLengthUnsafe r j.contents;
313313
r
314314

315315
let keep a f = keepU a (fun [@bs] a -> f a)
@@ -322,11 +322,11 @@ let keepWithIndexU a f =
322322
let v = (getUnsafe a i) in
323323
if f v i [@bs] then
324324
begin
325-
setUnsafe r !j v;
326-
incr j
325+
setUnsafe r j.contents v;
326+
j.contents <- j.contents + 1
327327
end
328328
done;
329-
truncateToLengthUnsafe r !j;
329+
truncateToLengthUnsafe r j.contents;
330330
r
331331

332332
let keepWithIndex a f = keepWithIndexU a (fun [@bs] a i -> f a i)
@@ -341,11 +341,11 @@ let keepMapU a f =
341341
| None -> ()
342342
| Some v ->
343343
begin
344-
setUnsafe r !j v;
345-
incr j
344+
setUnsafe r j.contents v;
345+
j.contents <- j.contents + 1
346346
end
347347
done;
348-
truncateToLengthUnsafe r !j;
348+
truncateToLengthUnsafe r j.contents;
349349
r
350350

351351
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)
368368
let reduceU a x f =
369369
let r = ref x in
370370
for i = 0 to length a - 1 do
371-
r .contents<- f !r (getUnsafe a i) [@bs]
371+
r .contents<- f r.contents (getUnsafe a i) [@bs]
372372
done;
373-
!r
373+
r.contents
374374

375375
let reduce a x f = reduceU a x (fun[@bs] a b -> f a b)
376376

377377
let reduceReverseU a x f =
378378
let r = ref x in
379379
for i = length a - 1 downto 0 do
380-
r .contents<- f !r (getUnsafe a i) [@bs]
380+
r .contents<- f r.contents (getUnsafe a i) [@bs]
381381
done;
382-
!r
382+
r.contents
383383

384384
let reduceReverse a x f = reduceReverseU a x (fun[@bs] a b -> f a b)
385385

386386
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 .contents<- f !r (getUnsafe a i) (getUnsafe b i) [@bs]
390+
r .contents<- f r.contents (getUnsafe a i) (getUnsafe b i) [@bs]
391391
done;
392-
!r
392+
r.contents
393393

394394
let reduceReverse2 a b x f =
395395
reduceReverse2U a b x (fun [@bs] a b c -> f a b c)
396396

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

404404
let reduceWithIndex a x f =
405405
reduceWithIndexU a x (fun[@bs] a b c -> f a b c)
@@ -485,16 +485,16 @@ let partitionU a f =
485485
for ii = 0 to l - 1 do
486486
let v = getUnsafe a ii in
487487
if f v [@bs] then (
488-
setUnsafe a1 !i v;
489-
incr i
488+
setUnsafe a1 i.contents v;
489+
i.contents <- i.contents + 1
490490
)
491491
else (
492-
setUnsafe a2 !j v;
493-
incr j
492+
setUnsafe a2 j.contents v;
493+
j.contents <- j.contents + 1
494494
)
495495
done;
496-
truncateToLengthUnsafe a1 !i;
497-
truncateToLengthUnsafe a2 !j;
496+
truncateToLengthUnsafe a1 i.contents;
497+
truncateToLengthUnsafe a2 j.contents;
498498
(a1, a2)
499499

500500
let partition a f = partitionU a (fun [@bs] x -> f x)

‎jscomp/others/belt_List.ml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,11 @@ let makeByU n f =
366366
let headX = mutableCell (f 0 [@bs]) [] in
367367
let cur = ref headX in
368368
let i = ref 1 in
369-
while !i < n do
370-
let v = mutableCell (f !i [@bs]) [] in
371-
unsafeMutateTail !cur v ;
372-
cur .contents<- v ;
373-
incr i ;
369+
while i.contents < n do
370+
let v = mutableCell (f i.contents [@bs]) [] in
371+
unsafeMutateTail cur.contents v ;
372+
cur.contents<- v ;
373+
i.contents <- i.contents + 1 ;
374374
done
375375
;
376376
headX
@@ -383,11 +383,11 @@ let make n v =
383383
let headX = mutableCell v [] in
384384
let cur = ref headX in
385385
let i = ref 1 in
386-
while !i < n do
386+
while i.contents < n do
387387
let v = mutableCell v [] in
388-
unsafeMutateTail !cur v ;
389-
cur .contents<- v ;
390-
incr i ;
388+
unsafeMutateTail cur.contents v ;
389+
cur.contents<- v ;
390+
i.contents <- i.contents + 1 ;
391391
done
392392
;
393393
headX
@@ -492,9 +492,9 @@ 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 .contents<- concat (A.getUnsafe xs i) !v
495+
v .contents<- concat (A.getUnsafe xs i) v.contents
496496
done ;
497-
!v
497+
v.contents
498498

499499
let rec mapRevAux f accu xs =
500500
match xs with

‎jscomp/others/belt_MapDict.ml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ let rec updateU (t : _ t) newK f ~cmp : _ t =
111111
| _, Some rn ->
112112
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
113113
let r = N.removeMinAuxWithRef rn kr vr in
114-
N.bal l !kr !vr r
114+
N.bal l kr.contents vr.contents r
115115
end
116116
| Some newD -> N.return (N.updateValue n newD)
117117
else
@@ -156,7 +156,7 @@ let rec removeAux0 n x ~cmp =
156156
| _, Some rn ->
157157
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
158158
let r = N.removeMinAuxWithRef rn kr vr in
159-
N.bal l !kr !vr r
159+
N.bal l kr.contents vr.contents r
160160
else if c < 0 then
161161
match N.toOpt l with
162162
| None -> N.return n (* Nothing to remove *)
@@ -183,9 +183,9 @@ 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 .contents<- set !v ~cmp key value
186+
v .contents<- set v.contents ~cmp key value
187187
done ;
188-
!v
188+
v.contents
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
@@ -218,7 +218,7 @@ let split n x ~cmp =
218218
| Some n ->
219219
let pres = ref None in
220220
let v = splitAuxPivot ~cmp n x pres in
221-
v, !pres
221+
v, pres.contents
222222

223223
let findFirstByU = N.findFirstByU
224224
let findFirstBy = N.findFirstBy
@@ -239,7 +239,7 @@ let rec mergeU s1 s2 f ~cmp =
239239
let l1, v1, d1, r1 = N.(leftGet s1n, keyGet s1n, valueGet s1n, rightGet s1n) in
240240
let d2 = ref None in
241241
let (l2, r2) = splitAuxPivot ~cmp s2n v1 d2 in
242-
let d2 = !d2 in
242+
let d2 = d2.contents in
243243
let newLeft = mergeU ~cmp l1 l2 f in
244244
let newD = f v1 (Some d1) d2 [@bs] in
245245
let newRight = mergeU ~cmp r1 r2 f in
@@ -248,7 +248,7 @@ let rec mergeU s1 s2 f ~cmp =
248248
let l2,v2,d2,r2 = N.(leftGet s2n, keyGet s2n, valueGet s2n, rightGet s2n) in
249249
let d1 = ref None in
250250
let (l1, r1) = splitAuxPivot ~cmp s1n v2 d1 in
251-
let d1 = !d1 in
251+
let d1 = d1.contents in
252252
let newLeft = mergeU ~cmp l1 l2 f in
253253
let newD = (f v2 d1 (Some d2) [@bs]) in
254254
let newRight = (mergeU ~cmp r1 r2 f) in

‎jscomp/others/belt_MapInt.ml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ let rec updateU t (x : key) f =
7878
| _, Some rn ->
7979
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
8080
let r = N.removeMinAuxWithRef rn kr vr in
81-
N.bal l !kr !vr r
81+
N.bal l kr.contents vr.contents r
8282
end
8383
| Some data -> N.return (N.updateValue n data )
8484
end
@@ -104,7 +104,7 @@ let rec removeAux n (x : key) =
104104
| _, Some rn ->
105105
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
106106
let r = N.removeMinAuxWithRef rn kr vr in
107-
N.bal l !kr !vr r
107+
N.bal l kr.contents vr.contents r
108108
else if x < v then
109109
match N.toOpt l with
110110
| None -> N.return n
@@ -148,9 +148,9 @@ 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 .contents<- set !v key value
151+
v.contents<- set v.contents key value
152152
done ;
153-
!v
153+
v.contents
154154

155155
let mergeArray = mergeMany
156156

‎jscomp/others/belt_MapString.ml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ let rec updateU t (x : key) f =
7878
| _, Some rn ->
7979
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
8080
let r = N.removeMinAuxWithRef rn kr vr in
81-
N.bal l !kr !vr r
81+
N.bal l kr.contents vr.contents r
8282
end
8383
| Some data -> N.return (N.updateValue n data )
8484
end
@@ -104,7 +104,7 @@ let rec removeAux n (x : key) =
104104
| _, Some rn ->
105105
let kr, vr = ref (N.keyGet rn), ref (N.valueGet rn) in
106106
let r = N.removeMinAuxWithRef rn kr vr in
107-
N.bal l !kr !vr r
107+
N.bal l kr.contents vr.contents r
108108
else if x < v then
109109
match N.toOpt l with
110110
| None -> N.return n
@@ -148,9 +148,9 @@ 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 .contents<- set !v key value
151+
v.contents<- set v.contents key value
152152
done ;
153-
!v
153+
v.contents
154154

155155
let mergeArray = mergeMany
156156

‎jscomp/others/belt_MutableMap.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ 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 .contents<- N.updateMutate !v key value ~cmp
234+
v .contents<- N.updateMutate v.contents key value ~cmp
235235
done;
236-
!v
236+
v.contents
237237

238238
let mergeMany d xs =
239239
let oldRoot = S.dataGet d in

0 commit comments

Comments
 (0)