Skip to content

Commit c9301e0

Browse files
bobzhangbobzhang
committedJul 14, 2020
shave some bytes
1 parent e50df91 commit c9301e0

20 files changed

+710
-710
lines changed
 

‎jscomp/others/belt_internalAVLset.ml

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2525
[@@@bs.config {flags = [|"-bs-noassertfalse" |] }]
2626
type 'value node = {
27-
mutable value : 'value;
28-
mutable height : int;
29-
mutable left : 'value t;
30-
mutable right : 'value t;
27+
mutable value : 'value; [@bs.as "v"]
28+
mutable height : int; [@bs.as "h"]
29+
mutable left : 'value t; [@bs.as "l"]
30+
mutable right : 'value t; [@bs.as "r"]
3131
}
3232
and 'value t = 'value node option
3333

@@ -181,9 +181,9 @@ let rec someU n p =
181181
match n with
182182
| None -> false
183183
| Some n ->
184-
p (n.value) [@bs] ||
185-
n .left|. someU p ||
186-
n .right |. someU p
184+
p n.value [@bs] ||
185+
someU n.left p ||
186+
someU n.right p
187187

188188
let some n p = someU n (fun[@bs] a -> p a )
189189
(* [addMinElement v n] and [addMaxElement v n]
@@ -197,7 +197,7 @@ let rec addMinElement n v =
197197
match n with
198198
| None -> singleton v
199199
| Some n ->
200-
bal (addMinElement n.left v) (n.value) n.right
200+
bal (addMinElement n.left v) n.value n.right
201201

202202
let rec addMaxElement n v =
203203
match n with

‎jscomp/others/belt_internalAVLset.mli

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
*)
3232
type 'value t = 'value node option
3333
and 'value node = {
34-
mutable value : 'value;
35-
mutable height : int;
36-
mutable left : 'value t;
37-
mutable right : 'value t;
34+
mutable value : 'value; [@bs.as "v"]
35+
mutable height : int; [@bs.as "h"]
36+
mutable left : 'value t; [@bs.as "l"]
37+
mutable right : 'value t; [@bs.as "r"]
3838
}
3939

4040
type ('a, 'b) cmp = ('a, 'b) Belt_Id.cmp

‎lib/es6/belt_MutableSet.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import * as Belt_SortArray from "./belt_SortArray.js";
55
import * as Belt_internalAVLset from "./belt_internalAVLset.js";
66

77
function remove0(nt, x, cmp) {
8-
var k = nt.value;
8+
var k = nt.v;
99
var c = cmp(x, k);
1010
if (c === 0) {
11-
var l = nt.left;
12-
var r = nt.right;
11+
var l = nt.l;
12+
var r = nt.r;
1313
if (l !== undefined) {
1414
if (r !== undefined) {
15-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
15+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
1616
return Belt_internalAVLset.balMutate(nt);
1717
} else {
1818
return l;
@@ -22,17 +22,17 @@ function remove0(nt, x, cmp) {
2222
}
2323
}
2424
if (c < 0) {
25-
var l$1 = nt.left;
25+
var l$1 = nt.l;
2626
if (l$1 !== undefined) {
27-
nt.left = remove0(l$1, x, cmp);
27+
nt.l = remove0(l$1, x, cmp);
2828
return Belt_internalAVLset.balMutate(nt);
2929
} else {
3030
return nt;
3131
}
3232
}
33-
var r$1 = nt.right;
33+
var r$1 = nt.r;
3434
if (r$1 !== undefined) {
35-
nt.right = remove0(r$1, x, cmp);
35+
nt.r = remove0(r$1, x, cmp);
3636
return Belt_internalAVLset.balMutate(nt);
3737
} else {
3838
return nt;
@@ -81,15 +81,15 @@ function removeMany(d, xs) {
8181
}
8282

8383
function removeCheck0(nt, x, removed, cmp) {
84-
var k = nt.value;
84+
var k = nt.v;
8585
var c = cmp(x, k);
8686
if (c === 0) {
8787
removed.contents = true;
88-
var l = nt.left;
89-
var r = nt.right;
88+
var l = nt.l;
89+
var r = nt.r;
9090
if (l !== undefined) {
9191
if (r !== undefined) {
92-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
92+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
9393
return Belt_internalAVLset.balMutate(nt);
9494
} else {
9595
return l;
@@ -99,17 +99,17 @@ function removeCheck0(nt, x, removed, cmp) {
9999
}
100100
}
101101
if (c < 0) {
102-
var l$1 = nt.left;
102+
var l$1 = nt.l;
103103
if (l$1 !== undefined) {
104-
nt.left = removeCheck0(l$1, x, removed, cmp);
104+
nt.l = removeCheck0(l$1, x, removed, cmp);
105105
return Belt_internalAVLset.balMutate(nt);
106106
} else {
107107
return nt;
108108
}
109109
}
110-
var r$1 = nt.right;
110+
var r$1 = nt.r;
111111
if (r$1 !== undefined) {
112-
nt.right = removeCheck0(r$1, x, removed, cmp);
112+
nt.r = removeCheck0(r$1, x, removed, cmp);
113113
return Belt_internalAVLset.balMutate(nt);
114114
} else {
115115
return nt;
@@ -133,18 +133,18 @@ function removeCheck(d, v) {
133133

134134
function addCheck0(t, x, added, cmp) {
135135
if (t !== undefined) {
136-
var k = t.value;
136+
var k = t.v;
137137
var c = cmp(x, k);
138138
if (c === 0) {
139139
return t;
140140
}
141-
var l = t.left;
142-
var r = t.right;
141+
var l = t.l;
142+
var r = t.r;
143143
if (c < 0) {
144144
var ll = addCheck0(l, x, added, cmp);
145-
t.left = ll;
145+
t.l = ll;
146146
} else {
147-
t.right = addCheck0(r, x, added, cmp);
147+
t.r = addCheck0(r, x, added, cmp);
148148
}
149149
return Belt_internalAVLset.balMutate(t);
150150
}

‎lib/es6/belt_MutableSetInt.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import * as Belt_internalAVLset from "./belt_internalAVLset.js";
66
import * as Belt_internalSetInt from "./belt_internalSetInt.js";
77

88
function remove0(nt, x) {
9-
var k = nt.value;
9+
var k = nt.v;
1010
if (x === k) {
11-
var l = nt.left;
12-
var r = nt.right;
11+
var l = nt.l;
12+
var r = nt.r;
1313
if (l !== undefined) {
1414
if (r !== undefined) {
15-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
15+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
1616
return Belt_internalAVLset.balMutate(nt);
1717
} else {
1818
return l;
@@ -22,17 +22,17 @@ function remove0(nt, x) {
2222
}
2323
}
2424
if (x < k) {
25-
var l$1 = nt.left;
25+
var l$1 = nt.l;
2626
if (l$1 !== undefined) {
27-
nt.left = remove0(l$1, x);
27+
nt.l = remove0(l$1, x);
2828
return Belt_internalAVLset.balMutate(nt);
2929
} else {
3030
return nt;
3131
}
3232
}
33-
var r$1 = nt.right;
33+
var r$1 = nt.r;
3434
if (r$1 !== undefined) {
35-
nt.right = remove0(r$1, x);
35+
nt.r = remove0(r$1, x);
3636
return Belt_internalAVLset.balMutate(nt);
3737
} else {
3838
return nt;
@@ -81,14 +81,14 @@ function removeMany(d, xs) {
8181
}
8282

8383
function removeCheck0(nt, x, removed) {
84-
var k = nt.value;
84+
var k = nt.v;
8585
if (x === k) {
8686
removed.contents = true;
87-
var l = nt.left;
88-
var r = nt.right;
87+
var l = nt.l;
88+
var r = nt.r;
8989
if (l !== undefined) {
9090
if (r !== undefined) {
91-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
91+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
9292
return Belt_internalAVLset.balMutate(nt);
9393
} else {
9494
return l;
@@ -98,17 +98,17 @@ function removeCheck0(nt, x, removed) {
9898
}
9999
}
100100
if (x < k) {
101-
var l$1 = nt.left;
101+
var l$1 = nt.l;
102102
if (l$1 !== undefined) {
103-
nt.left = removeCheck0(l$1, x, removed);
103+
nt.l = removeCheck0(l$1, x, removed);
104104
return Belt_internalAVLset.balMutate(nt);
105105
} else {
106106
return nt;
107107
}
108108
}
109-
var r$1 = nt.right;
109+
var r$1 = nt.r;
110110
if (r$1 !== undefined) {
111-
nt.right = removeCheck0(r$1, x, removed);
111+
nt.r = removeCheck0(r$1, x, removed);
112112
return Belt_internalAVLset.balMutate(nt);
113113
} else {
114114
return nt;
@@ -132,17 +132,17 @@ function removeCheck(d, v) {
132132

133133
function addCheck0(t, x, added) {
134134
if (t !== undefined) {
135-
var k = t.value;
135+
var k = t.v;
136136
if (x === k) {
137137
return t;
138138
}
139-
var l = t.left;
140-
var r = t.right;
139+
var l = t.l;
140+
var r = t.r;
141141
if (x < k) {
142142
var ll = addCheck0(l, x, added);
143-
t.left = ll;
143+
t.l = ll;
144144
} else {
145-
t.right = addCheck0(r, x, added);
145+
t.r = addCheck0(r, x, added);
146146
}
147147
return Belt_internalAVLset.balMutate(t);
148148
}

‎lib/es6/belt_MutableSetString.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import * as Belt_SortArrayString from "./belt_SortArrayString.js";
66
import * as Belt_internalSetString from "./belt_internalSetString.js";
77

88
function remove0(nt, x) {
9-
var k = nt.value;
9+
var k = nt.v;
1010
if (x === k) {
11-
var l = nt.left;
12-
var r = nt.right;
11+
var l = nt.l;
12+
var r = nt.r;
1313
if (l !== undefined) {
1414
if (r !== undefined) {
15-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
15+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
1616
return Belt_internalAVLset.balMutate(nt);
1717
} else {
1818
return l;
@@ -22,17 +22,17 @@ function remove0(nt, x) {
2222
}
2323
}
2424
if (x < k) {
25-
var l$1 = nt.left;
25+
var l$1 = nt.l;
2626
if (l$1 !== undefined) {
27-
nt.left = remove0(l$1, x);
27+
nt.l = remove0(l$1, x);
2828
return Belt_internalAVLset.balMutate(nt);
2929
} else {
3030
return nt;
3131
}
3232
}
33-
var r$1 = nt.right;
33+
var r$1 = nt.r;
3434
if (r$1 !== undefined) {
35-
nt.right = remove0(r$1, x);
35+
nt.r = remove0(r$1, x);
3636
return Belt_internalAVLset.balMutate(nt);
3737
} else {
3838
return nt;
@@ -81,14 +81,14 @@ function removeMany(d, xs) {
8181
}
8282

8383
function removeCheck0(nt, x, removed) {
84-
var k = nt.value;
84+
var k = nt.v;
8585
if (x === k) {
8686
removed.contents = true;
87-
var l = nt.left;
88-
var r = nt.right;
87+
var l = nt.l;
88+
var r = nt.r;
8989
if (l !== undefined) {
9090
if (r !== undefined) {
91-
nt.right = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
91+
nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r);
9292
return Belt_internalAVLset.balMutate(nt);
9393
} else {
9494
return l;
@@ -98,17 +98,17 @@ function removeCheck0(nt, x, removed) {
9898
}
9999
}
100100
if (x < k) {
101-
var l$1 = nt.left;
101+
var l$1 = nt.l;
102102
if (l$1 !== undefined) {
103-
nt.left = removeCheck0(l$1, x, removed);
103+
nt.l = removeCheck0(l$1, x, removed);
104104
return Belt_internalAVLset.balMutate(nt);
105105
} else {
106106
return nt;
107107
}
108108
}
109-
var r$1 = nt.right;
109+
var r$1 = nt.r;
110110
if (r$1 !== undefined) {
111-
nt.right = removeCheck0(r$1, x, removed);
111+
nt.r = removeCheck0(r$1, x, removed);
112112
return Belt_internalAVLset.balMutate(nt);
113113
} else {
114114
return nt;
@@ -132,17 +132,17 @@ function removeCheck(d, v) {
132132

133133
function addCheck0(t, x, added) {
134134
if (t !== undefined) {
135-
var k = t.value;
135+
var k = t.v;
136136
if (x === k) {
137137
return t;
138138
}
139-
var l = t.left;
140-
var r = t.right;
139+
var l = t.l;
140+
var r = t.r;
141141
if (x < k) {
142142
var ll = addCheck0(l, x, added);
143-
t.left = ll;
143+
t.l = ll;
144144
} else {
145-
t.right = addCheck0(r, x, added);
145+
t.r = addCheck0(r, x, added);
146146
}
147147
return Belt_internalAVLset.balMutate(t);
148148
}

0 commit comments

Comments
 (0)