Skip to content

Commit f0b34c5

Browse files
committed
Update bs_stdlib_mini for ref
1 parent 5787d92 commit f0b34c5

19 files changed

+62
-62
lines changed

jscomp/runtime/bs_stdlib_mini.mli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ external ( mod ) : int -> int -> int = "%modint"
3232

3333
type 'a ref = { mutable contents : 'a }
3434
external ref : 'a -> 'a ref = "%makemutable"
35-
external ( ! ) : 'a ref -> 'a = "%field0"
36-
external ( := ) : 'a ref -> 'a -> unit = "%setfield0"
35+
external ( ! ) : 'a ref -> 'a = "%bs_ref_field0"
36+
external ( := ) : 'a ref -> 'a -> unit = "%bs_ref_setfield0"
3737
external incr : int ref -> unit = "%incr"
3838
external decr : int ref -> unit = "%decr"
3939

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124645,7 +124645,7 @@ and compile_send (meth_kind : Lam_compat.meth_kind)
124645124645
cont2 obj_code (k cobj) in
124646124646
match meth_kind with
124647124647
| Self ->
124648-
(* TODO: horrible hack -- fixed later *)
124648+
(* TODO: horrible hack -- fixed later -- CHECK*)
124649124649
cont3 nobj (fun aobj -> E.call ~info:Js_call_info.dummy
124650124650
(Js_of_lam_array.ref_array
124651124651
(E.array_index_by_int aobj 0l) label )

lib/4.06.1/whole_compiler.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116503,7 +116503,7 @@ and compile_send (meth_kind : Lam_compat.meth_kind)
116503116503
cont2 obj_code (k cobj) in
116504116504
match meth_kind with
116505116505
| Self ->
116506-
(* TODO: horrible hack -- fixed later *)
116506+
(* TODO: horrible hack -- fixed later -- CHECK*)
116507116507
cont3 nobj (fun aobj -> E.call ~info:Js_call_info.dummy
116508116508
(Js_of_lam_array.ref_array
116509116509
(E.array_index_by_int aobj 0l) label )

lib/js/belt_MapDict.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function updateU(t, newK, f, cmp) {
4141
var kr = [/* contents */r.key];
4242
var vr = [/* contents */r.value];
4343
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
44-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
44+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
4545
} else {
4646
return l;
4747
}
@@ -94,7 +94,7 @@ function removeAux0(n, x, cmp) {
9494
var kr = [/* contents */r.key];
9595
var vr = [/* contents */r.value];
9696
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
97-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
97+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
9898
} else {
9999
return l;
100100
}
@@ -149,7 +149,7 @@ function splitAuxPivot(n, x, pres, cmp) {
149149
var r = n.right;
150150
var c = cmp(x, v);
151151
if (c === 0) {
152-
pres[0] = Caml_option.some(d);
152+
pres[/* contents */0] = Caml_option.some(d);
153153
return /* tuple */[
154154
l,
155155
r
@@ -187,7 +187,7 @@ function split(n, x, cmp) {
187187
var v = splitAuxPivot(n, x, pres, cmp);
188188
return /* tuple */[
189189
v,
190-
pres[0]
190+
pres[/* contents */0]
191191
];
192192
} else {
193193
return /* tuple */[
@@ -210,7 +210,7 @@ function mergeU(s1, s2, f, cmp) {
210210
var r1 = s1.right;
211211
var d2 = [/* contents */undefined];
212212
var match = splitAuxPivot(s2, v1, d2, cmp);
213-
var d2$1 = d2[0];
213+
var d2$1 = d2[/* contents */0];
214214
var newLeft = mergeU(l1, match[0], f, cmp);
215215
var newD = f(v1, Caml_option.some(d1), d2$1);
216216
var newRight = mergeU(r1, match[1], f, cmp);
@@ -222,7 +222,7 @@ function mergeU(s1, s2, f, cmp) {
222222
var r2 = s2.right;
223223
var d1$1 = [/* contents */undefined];
224224
var match$1 = splitAuxPivot(s1, v2, d1$1, cmp);
225-
var d1$2 = d1$1[0];
225+
var d1$2 = d1$1[/* contents */0];
226226
var newLeft$1 = mergeU(match$1[0], l2, f, cmp);
227227
var newD$1 = f(v2, d1$2, Caml_option.some(d2$2));
228228
var newRight$1 = mergeU(match$1[1], r2, f, cmp);

lib/js/belt_MapInt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function updateU(t, x, f) {
3838
var kr = [/* contents */r.key];
3939
var vr = [/* contents */r.value];
4040
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
41-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
41+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
4242
} else {
4343
return l;
4444
}
@@ -90,7 +90,7 @@ function removeAux(n, x) {
9090
var kr = [/* contents */r.key];
9191
var vr = [/* contents */r.value];
9292
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
93-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
93+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
9494
} else {
9595
return l;
9696
}

lib/js/belt_MapString.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function updateU(t, x, f) {
3838
var kr = [/* contents */r.key];
3939
var vr = [/* contents */r.value];
4040
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
41-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
41+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
4242
} else {
4343
return l;
4444
}
@@ -90,7 +90,7 @@ function removeAux(n, x) {
9090
var kr = [/* contents */r.key];
9191
var vr = [/* contents */r.value];
9292
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
93-
return Belt_internalAVLtree.bal(l, kr[0], vr[0], r$1);
93+
return Belt_internalAVLtree.bal(l, kr[/* contents */0], vr[/* contents */0], r$1);
9494
} else {
9595
return l;
9696
}

lib/js/belt_MutableSet.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function removeCheck0(nt, x, removed, cmp) {
8989
var k = nt.value;
9090
var c = cmp(x, k);
9191
if (c === 0) {
92-
removed[0] = true;
92+
removed[/* contents */0] = true;
9393
var l = nt.left;
9494
var r = nt.right;
9595
if (l !== null) {
@@ -129,7 +129,7 @@ function removeCheck(d, v) {
129129
if (newRoot !== oldRoot) {
130130
d.data = newRoot;
131131
}
132-
return removed[0];
132+
return removed[/* contents */0];
133133
} else {
134134
return false;
135135
}
@@ -153,7 +153,7 @@ function addCheck0(t, x, added, cmp) {
153153
return Belt_internalAVLset.balMutate(t);
154154
}
155155
} else {
156-
added[0] = true;
156+
added[/* contents */0] = true;
157157
return Belt_internalAVLset.singleton(x);
158158
}
159159
}
@@ -165,7 +165,7 @@ function addCheck(m, e) {
165165
if (newRoot !== oldRoot) {
166166
m.data = newRoot;
167167
}
168-
return added[0];
168+
return added[/* contents */0];
169169
}
170170

171171
function add(m, e) {

lib/js/belt_MutableSetInt.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function removeMany(d, xs) {
8888
function removeCheck0(nt, x, removed) {
8989
var k = nt.value;
9090
if (x === k) {
91-
removed[0] = true;
91+
removed[/* contents */0] = true;
9292
var l = nt.left;
9393
var r = nt.right;
9494
if (l !== null) {
@@ -128,7 +128,7 @@ function removeCheck(d, v) {
128128
if (newRoot !== oldRoot) {
129129
d.data = newRoot;
130130
}
131-
return removed[0];
131+
return removed[/* contents */0];
132132
} else {
133133
return false;
134134
}
@@ -151,7 +151,7 @@ function addCheck0(t, x, added) {
151151
return Belt_internalAVLset.balMutate(t);
152152
}
153153
} else {
154-
added[0] = true;
154+
added[/* contents */0] = true;
155155
return Belt_internalAVLset.singleton(x);
156156
}
157157
}
@@ -163,7 +163,7 @@ function addCheck(m, e) {
163163
if (newRoot !== oldRoot) {
164164
m.data = newRoot;
165165
}
166-
return added[0];
166+
return added[/* contents */0];
167167
}
168168

169169
function add(d, k) {

lib/js/belt_MutableSetString.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function removeMany(d, xs) {
8888
function removeCheck0(nt, x, removed) {
8989
var k = nt.value;
9090
if (x === k) {
91-
removed[0] = true;
91+
removed[/* contents */0] = true;
9292
var l = nt.left;
9393
var r = nt.right;
9494
if (l !== null) {
@@ -128,7 +128,7 @@ function removeCheck(d, v) {
128128
if (newRoot !== oldRoot) {
129129
d.data = newRoot;
130130
}
131-
return removed[0];
131+
return removed[/* contents */0];
132132
} else {
133133
return false;
134134
}
@@ -151,7 +151,7 @@ function addCheck0(t, x, added) {
151151
return Belt_internalAVLset.balMutate(t);
152152
}
153153
} else {
154-
added[0] = true;
154+
added[/* contents */0] = true;
155155
return Belt_internalAVLset.singleton(x);
156156
}
157157
}
@@ -163,7 +163,7 @@ function addCheck(m, e) {
163163
if (newRoot !== oldRoot) {
164164
m.data = newRoot;
165165
}
166-
return added[0];
166+
return added[/* contents */0];
167167
}
168168

169169
function add(d, k) {

lib/js/belt_SetDict.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function remove(t, x, cmp) {
4343
if (r !== null) {
4444
var v$1 = [/* contents */r.value];
4545
var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1);
46-
return Belt_internalAVLset.bal(l, v$1[0], r$1);
46+
return Belt_internalAVLset.bal(l, v$1[/* contents */0], r$1);
4747
} else {
4848
return l;
4949
}
@@ -133,7 +133,7 @@ function splitAuxPivot(cmp, n, x, pres) {
133133
var r = n.right;
134134
var c = cmp(x, v);
135135
if (c === 0) {
136-
pres[0] = true;
136+
pres[/* contents */0] = true;
137137
return /* tuple */[
138138
l,
139139
r
@@ -171,7 +171,7 @@ function split(t, x, cmp) {
171171
var v = splitAuxPivot(cmp, t, x, pres);
172172
return /* tuple */[
173173
v,
174-
pres[0]
174+
pres[/* contents */0]
175175
];
176176
} else {
177177
return /* tuple */[
@@ -225,7 +225,7 @@ function intersect(s1, s2, cmp) {
225225
var match = splitAuxPivot(cmp, s2, v1, pres);
226226
var ll = intersect(l1, match[0], cmp);
227227
var rr = intersect(r1, match[1], cmp);
228-
if (pres[0]) {
228+
if (pres[/* contents */0]) {
229229
return Belt_internalAVLset.joinShared(ll, v1, rr);
230230
} else {
231231
return Belt_internalAVLset.concatShared(ll, rr);
@@ -244,7 +244,7 @@ function diff(s1, s2, cmp) {
244244
var match = splitAuxPivot(cmp, s2, v1, pres);
245245
var ll = diff(l1, match[0], cmp);
246246
var rr = diff(r1, match[1], cmp);
247-
if (pres[0]) {
247+
if (pres[/* contents */0]) {
248248
return Belt_internalAVLset.concatShared(ll, rr);
249249
} else {
250250
return Belt_internalAVLset.joinShared(ll, v1, rr);

lib/js/belt_SetInt.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function remove(t, x) {
5252
if (r !== null) {
5353
var v$1 = [/* contents */r.value];
5454
var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1);
55-
return Belt_internalAVLset.bal(l, v$1[0], r$1);
55+
return Belt_internalAVLset.bal(l, v$1[/* contents */0], r$1);
5656
} else {
5757
return l;
5858
}
@@ -130,7 +130,7 @@ function splitAuxPivot(n, x, pres) {
130130
var v = n.value;
131131
var r = n.right;
132132
if (x === v) {
133-
pres[0] = true;
133+
pres[/* contents */0] = true;
134134
return /* tuple */[
135135
l,
136136
r
@@ -168,7 +168,7 @@ function split(t, x) {
168168
var v = splitAuxPivot(t, x, pres);
169169
return /* tuple */[
170170
v,
171-
pres[0]
171+
pres[/* contents */0]
172172
];
173173
} else {
174174
return /* tuple */[
@@ -222,7 +222,7 @@ function intersect(s1, s2) {
222222
var match = splitAuxPivot(s2, v1, pres);
223223
var ll = intersect(l1, match[0]);
224224
var rr = intersect(r1, match[1]);
225-
if (pres[0]) {
225+
if (pres[/* contents */0]) {
226226
return Belt_internalAVLset.joinShared(ll, v1, rr);
227227
} else {
228228
return Belt_internalAVLset.concatShared(ll, rr);
@@ -241,7 +241,7 @@ function diff(s1, s2) {
241241
var match = splitAuxPivot(s2, v1, pres);
242242
var ll = diff(l1, match[0]);
243243
var rr = diff(r1, match[1]);
244-
if (pres[0]) {
244+
if (pres[/* contents */0]) {
245245
return Belt_internalAVLset.concatShared(ll, rr);
246246
} else {
247247
return Belt_internalAVLset.joinShared(ll, v1, rr);

lib/js/belt_SetString.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function remove(t, x) {
5252
if (r !== null) {
5353
var v$1 = [/* contents */r.value];
5454
var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1);
55-
return Belt_internalAVLset.bal(l, v$1[0], r$1);
55+
return Belt_internalAVLset.bal(l, v$1[/* contents */0], r$1);
5656
} else {
5757
return l;
5858
}
@@ -130,7 +130,7 @@ function splitAuxPivot(n, x, pres) {
130130
var v = n.value;
131131
var r = n.right;
132132
if (x === v) {
133-
pres[0] = true;
133+
pres[/* contents */0] = true;
134134
return /* tuple */[
135135
l,
136136
r
@@ -168,7 +168,7 @@ function split(t, x) {
168168
var v = splitAuxPivot(t, x, pres);
169169
return /* tuple */[
170170
v,
171-
pres[0]
171+
pres[/* contents */0]
172172
];
173173
} else {
174174
return /* tuple */[
@@ -222,7 +222,7 @@ function intersect(s1, s2) {
222222
var match = splitAuxPivot(s2, v1, pres);
223223
var ll = intersect(l1, match[0]);
224224
var rr = intersect(r1, match[1]);
225-
if (pres[0]) {
225+
if (pres[/* contents */0]) {
226226
return Belt_internalAVLset.joinShared(ll, v1, rr);
227227
} else {
228228
return Belt_internalAVLset.concatShared(ll, rr);
@@ -241,7 +241,7 @@ function diff(s1, s2) {
241241
var match = splitAuxPivot(s2, v1, pres);
242242
var ll = diff(l1, match[0]);
243243
var rr = diff(r1, match[1]);
244-
if (pres[0]) {
244+
if (pres[/* contents */0]) {
245245
return Belt_internalAVLset.concatShared(ll, rr);
246246
} else {
247247
return Belt_internalAVLset.joinShared(ll, v1, rr);

lib/js/belt_internalAVLset.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function removeMinAuxWithRef(n, v) {
157157
if (ln !== null) {
158158
return bal(removeMinAuxWithRef(ln, v), kn, rn);
159159
} else {
160-
v[0] = kn;
160+
v[/* contents */0] = kn;
161161
return rn;
162162
}
163163
}
@@ -303,7 +303,7 @@ function concatShared(t1, t2) {
303303
if (t2 !== null) {
304304
var v = [/* contents */t2.value];
305305
var t2r = removeMinAuxWithRef(t2, v);
306-
return joinShared(t1, v[0], t2r);
306+
return joinShared(t1, v[/* contents */0], t2r);
307307
} else {
308308
return t1;
309309
}

lib/js/belt_internalAVLtree.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ function removeMinAuxWithRef(n, kr, vr) {
240240
if (ln !== null) {
241241
return bal(removeMinAuxWithRef(ln, kr, vr), kn, vn, rn);
242242
} else {
243-
kr[0] = kn;
244-
vr[0] = vn;
243+
kr[/* contents */0] = kn;
244+
vr[/* contents */0] = vn;
245245
return rn;
246246
}
247247
}
@@ -471,7 +471,7 @@ function concat(t1, t2) {
471471
var kr = [/* contents */t2.key];
472472
var vr = [/* contents */t2.value];
473473
var t2r = removeMinAuxWithRef(t2, kr, vr);
474-
return join(t1, kr[0], vr[0], t2r);
474+
return join(t1, kr[/* contents */0], vr[/* contents */0], t2r);
475475
} else {
476476
return t1;
477477
}

0 commit comments

Comments
 (0)