Skip to content

Commit 24b8ac4

Browse files
bobzhangbobzhang
committed
shave some bytes
1 parent 38cc849 commit 24b8ac4

20 files changed

+906
-906
lines changed

Diff for: ‎jscomp/others/belt_internalAVLtree.ml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
[@@@bs.config {flags = [|"-bs-noassertfalse" |] }]
1616
type ('k, 'v) node = {
17-
mutable key : 'k;
18-
mutable value : 'v;
19-
mutable height : int;
20-
mutable left : ('k,'v) t;
21-
mutable right : ('k,'v) t
17+
mutable key : 'k; [@bs.as "k"]
18+
mutable value : 'v; [@bs.as "v"]
19+
mutable height : int; [@bs.as "h"]
20+
mutable left : ('k,'v) t; [@bs.as "l"]
21+
mutable right : ('k,'v) t [@bs.as "r"]
2222
}
2323
and ('key, 'a) t = ('key, 'a) node option
2424

Diff for: ‎jscomp/others/belt_internalAVLtree.mli

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
type ('key, 'a) t = ('key, 'a) node option
2828

2929
and ('k, 'v) node = {
30-
mutable key : 'k;
31-
mutable value : 'v;
32-
mutable height : int;
33-
mutable left : ('k,'v) t;
34-
mutable right : ('k,'v) t
30+
mutable key : 'k; [@bs.as "k"]
31+
mutable value : 'v; [@bs.as "v"]
32+
mutable height : int; [@bs.as "h"]
33+
mutable left : ('k,'v) t; [@bs.as "l"]
34+
mutable right : ('k,'v) t [@bs.as "r"]
3535
}
3636

3737

Diff for: ‎lib/es6/belt_MapDict.js

+33-33
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ function set(t, newK, newD, cmp) {
88
if (t === undefined) {
99
return Belt_internalAVLtree.singleton(newK, newD);
1010
}
11-
var k = t.key;
11+
var k = t.k;
1212
var c = cmp(newK, k);
1313
if (c === 0) {
1414
return Belt_internalAVLtree.updateValue(t, newD);
1515
}
16-
var l = t.left;
17-
var r = t.right;
18-
var v = t.value;
16+
var l = t.l;
17+
var r = t.r;
18+
var v = t.v;
1919
if (c < 0) {
2020
return Belt_internalAVLtree.bal(set(l, newK, newD, cmp), k, v, r);
2121
} else {
@@ -25,33 +25,33 @@ function set(t, newK, newD, cmp) {
2525

2626
function updateU(t, newK, f, cmp) {
2727
if (t !== undefined) {
28-
var k = t.key;
28+
var k = t.k;
2929
var c = cmp(newK, k);
3030
if (c === 0) {
31-
var newD = f(Caml_option.some(t.value));
31+
var newD = f(Caml_option.some(t.v));
3232
if (newD !== undefined) {
3333
return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD));
3434
}
35-
var l = t.left;
36-
var r = t.right;
35+
var l = t.l;
36+
var r = t.r;
3737
if (l === undefined) {
3838
return r;
3939
}
4040
if (r === undefined) {
4141
return l;
4242
}
4343
var kr = {
44-
contents: r.key
44+
contents: r.k
4545
};
4646
var vr = {
47-
contents: r.value
47+
contents: r.v
4848
};
4949
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
5050
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
5151
}
52-
var l$1 = t.left;
53-
var r$2 = t.right;
54-
var v = t.value;
52+
var l$1 = t.l;
53+
var r$2 = t.r;
54+
var v = t.v;
5555
if (c < 0) {
5656
var ll = updateU(l$1, newK, f, cmp);
5757
if (l$1 === ll) {
@@ -80,9 +80,9 @@ function update(t, newK, f, cmp) {
8080
}
8181

8282
function removeAux0(n, x, cmp) {
83-
var v = n.key;
84-
var l = n.left;
85-
var r = n.right;
83+
var v = n.k;
84+
var l = n.l;
85+
var r = n.r;
8686
var c = cmp(x, v);
8787
if (c === 0) {
8888
if (l === undefined) {
@@ -92,10 +92,10 @@ function removeAux0(n, x, cmp) {
9292
return l;
9393
}
9494
var kr = {
95-
contents: r.key
95+
contents: r.k
9696
};
9797
var vr = {
98-
contents: r.value
98+
contents: r.v
9999
};
100100
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
101101
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
@@ -108,7 +108,7 @@ function removeAux0(n, x, cmp) {
108108
if (ll === l) {
109109
return n;
110110
} else {
111-
return Belt_internalAVLtree.bal(ll, v, n.value, r);
111+
return Belt_internalAVLtree.bal(ll, v, n.v, r);
112112
}
113113
}
114114
if (r === undefined) {
@@ -118,7 +118,7 @@ function removeAux0(n, x, cmp) {
118118
if (rr === r) {
119119
return n;
120120
} else {
121-
return Belt_internalAVLtree.bal(l, v, n.value, rr);
121+
return Belt_internalAVLtree.bal(l, v, n.v, rr);
122122
}
123123
}
124124

@@ -140,10 +140,10 @@ function mergeMany(h, arr, cmp) {
140140
}
141141

142142
function splitAuxPivot(n, x, pres, cmp) {
143-
var v = n.key;
144-
var d = n.value;
145-
var l = n.left;
146-
var r = n.right;
143+
var v = n.k;
144+
var d = n.v;
145+
var l = n.l;
146+
var r = n.r;
147147
var c = cmp(x, v);
148148
if (c === 0) {
149149
pres.contents = Caml_option.some(d);
@@ -213,11 +213,11 @@ function mergeU(s1, s2, f, cmp) {
213213
return f(k, Caml_option.some(v), undefined);
214214
}));
215215
}
216-
if (s1.height >= s2.height) {
217-
var v1 = s1.key;
218-
var d1 = s1.value;
219-
var l1 = s1.left;
220-
var r1 = s1.right;
216+
if (s1.h >= s2.h) {
217+
var v1 = s1.k;
218+
var d1 = s1.v;
219+
var l1 = s1.l;
220+
var r1 = s1.r;
221221
var d2 = {
222222
contents: undefined
223223
};
@@ -228,10 +228,10 @@ function mergeU(s1, s2, f, cmp) {
228228
var newRight = mergeU(r1, match[1], f, cmp);
229229
return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight);
230230
}
231-
var v2 = s2.key;
232-
var d2$2 = s2.value;
233-
var l2 = s2.left;
234-
var r2 = s2.right;
231+
var v2 = s2.k;
232+
var d2$2 = s2.v;
233+
var l2 = s2.l;
234+
var r2 = s2.r;
235235
var d1$1 = {
236236
contents: undefined
237237
};

Diff for: ‎lib/es6/belt_MapInt.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,46 @@ function set(t, newK, newD) {
99
if (t === undefined) {
1010
return Belt_internalAVLtree.singleton(newK, newD);
1111
}
12-
var k = t.key;
12+
var k = t.k;
1313
if (newK === k) {
1414
return Belt_internalAVLtree.updateValue(t, newD);
1515
}
16-
var v = t.value;
16+
var v = t.v;
1717
if (newK < k) {
18-
return Belt_internalAVLtree.bal(set(t.left, newK, newD), k, v, t.right);
18+
return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r);
1919
} else {
20-
return Belt_internalAVLtree.bal(t.left, k, v, set(t.right, newK, newD));
20+
return Belt_internalAVLtree.bal(t.l, k, v, set(t.r, newK, newD));
2121
}
2222
}
2323

2424
function updateU(t, x, f) {
2525
if (t !== undefined) {
26-
var k = t.key;
26+
var k = t.k;
2727
if (x === k) {
28-
var data = f(Caml_option.some(t.value));
28+
var data = f(Caml_option.some(t.v));
2929
if (data !== undefined) {
3030
return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data));
3131
}
32-
var l = t.left;
33-
var r = t.right;
32+
var l = t.l;
33+
var r = t.r;
3434
if (l === undefined) {
3535
return r;
3636
}
3737
if (r === undefined) {
3838
return l;
3939
}
4040
var kr = {
41-
contents: r.key
41+
contents: r.k
4242
};
4343
var vr = {
44-
contents: r.value
44+
contents: r.v
4545
};
4646
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
4747
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
4848
}
49-
var v = t.value;
50-
var l$1 = t.left;
51-
var r$2 = t.right;
49+
var v = t.v;
50+
var l$1 = t.l;
51+
var r$2 = t.r;
5252
if (x < k) {
5353
var ll = updateU(l$1, x, f);
5454
if (l$1 === ll) {
@@ -77,9 +77,9 @@ function update(t, x, f) {
7777
}
7878

7979
function removeAux(n, x) {
80-
var v = n.key;
81-
var l = n.left;
82-
var r = n.right;
80+
var v = n.k;
81+
var l = n.l;
82+
var r = n.r;
8383
if (x === v) {
8484
if (l === undefined) {
8585
return r;
@@ -88,10 +88,10 @@ function removeAux(n, x) {
8888
return l;
8989
}
9090
var kr = {
91-
contents: r.key
91+
contents: r.k
9292
};
9393
var vr = {
94-
contents: r.value
94+
contents: r.v
9595
};
9696
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
9797
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
@@ -104,14 +104,14 @@ function removeAux(n, x) {
104104
if (ll === l) {
105105
return n;
106106
} else {
107-
return Belt_internalAVLtree.bal(ll, v, n.value, r);
107+
return Belt_internalAVLtree.bal(ll, v, n.v, r);
108108
}
109109
}
110110
if (r === undefined) {
111111
return n;
112112
}
113113
var rr = removeAux(r, x);
114-
return Belt_internalAVLtree.bal(l, v, n.value, rr);
114+
return Belt_internalAVLtree.bal(l, v, n.v, rr);
115115
}
116116

117117
function remove(n, x) {

Diff for: ‎lib/es6/belt_MapString.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,46 @@ function set(t, newK, newD) {
99
if (t === undefined) {
1010
return Belt_internalAVLtree.singleton(newK, newD);
1111
}
12-
var k = t.key;
12+
var k = t.k;
1313
if (newK === k) {
1414
return Belt_internalAVLtree.updateValue(t, newD);
1515
}
16-
var v = t.value;
16+
var v = t.v;
1717
if (newK < k) {
18-
return Belt_internalAVLtree.bal(set(t.left, newK, newD), k, v, t.right);
18+
return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r);
1919
} else {
20-
return Belt_internalAVLtree.bal(t.left, k, v, set(t.right, newK, newD));
20+
return Belt_internalAVLtree.bal(t.l, k, v, set(t.r, newK, newD));
2121
}
2222
}
2323

2424
function updateU(t, x, f) {
2525
if (t !== undefined) {
26-
var k = t.key;
26+
var k = t.k;
2727
if (x === k) {
28-
var data = f(Caml_option.some(t.value));
28+
var data = f(Caml_option.some(t.v));
2929
if (data !== undefined) {
3030
return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data));
3131
}
32-
var l = t.left;
33-
var r = t.right;
32+
var l = t.l;
33+
var r = t.r;
3434
if (l === undefined) {
3535
return r;
3636
}
3737
if (r === undefined) {
3838
return l;
3939
}
4040
var kr = {
41-
contents: r.key
41+
contents: r.k
4242
};
4343
var vr = {
44-
contents: r.value
44+
contents: r.v
4545
};
4646
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
4747
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
4848
}
49-
var v = t.value;
50-
var l$1 = t.left;
51-
var r$2 = t.right;
49+
var v = t.v;
50+
var l$1 = t.l;
51+
var r$2 = t.r;
5252
if (x < k) {
5353
var ll = updateU(l$1, x, f);
5454
if (l$1 === ll) {
@@ -77,9 +77,9 @@ function update(t, x, f) {
7777
}
7878

7979
function removeAux(n, x) {
80-
var v = n.key;
81-
var l = n.left;
82-
var r = n.right;
80+
var v = n.k;
81+
var l = n.l;
82+
var r = n.r;
8383
if (x === v) {
8484
if (l === undefined) {
8585
return r;
@@ -88,10 +88,10 @@ function removeAux(n, x) {
8888
return l;
8989
}
9090
var kr = {
91-
contents: r.key
91+
contents: r.k
9292
};
9393
var vr = {
94-
contents: r.value
94+
contents: r.v
9595
};
9696
var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr);
9797
return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1);
@@ -104,14 +104,14 @@ function removeAux(n, x) {
104104
if (ll === l) {
105105
return n;
106106
} else {
107-
return Belt_internalAVLtree.bal(ll, v, n.value, r);
107+
return Belt_internalAVLtree.bal(ll, v, n.v, r);
108108
}
109109
}
110110
if (r === undefined) {
111111
return n;
112112
}
113113
var rr = removeAux(r, x);
114-
return Belt_internalAVLtree.bal(l, v, n.value, rr);
114+
return Belt_internalAVLtree.bal(l, v, n.v, rr);
115115
}
116116

117117
function remove(n, x) {

0 commit comments

Comments
 (0)