Skip to content

Commit ec565c5

Browse files
committed
remove vestigial code path
1 parent 855e53d commit ec565c5

File tree

2 files changed

+12
-30
lines changed

2 files changed

+12
-30
lines changed

jscomp/others/belt_internalAVLtree.ml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,16 @@ let rec stackAllLeft v s =
170170
| None -> s
171171
| Some x -> stackAllLeft (leftGet x) (x::s)
172172

173-
let checkPredicate (candidate: ('k, 'v) node option) (p: 'k -> 'v -> bool [@bs]): ('k * 'v) option =
174-
Belt.Option.flatMap
175-
candidate
176-
(fun x ->
177-
let v, d = x |. (keyGet, valueGet) in
178-
let pvd = p v d [@bs] in
179-
if pvd then Some(v, d) else None)
180-
181173
let rec findFirstByU n p =
182174
match toOpt n with
183175
| None -> None
184176
| Some n ->
185177
let left = n |. leftGet |. findFirstByU p in
186178
if Belt.Option.isSome(left) then left
187179
else
188-
let pvd = checkPredicate (Some(n)) p in
189-
if Belt.Option.isSome(pvd) then pvd
180+
let v, d = n |. (keyGet, valueGet) in
181+
let pvd = p v d [@bs] in
182+
if pvd then Some(v, d)
190183
else
191184
let right = n |. rightGet |. findFirstByU p in
192185
if Belt.Option.isSome(right) then right else None

lib/js/belt_internalAVLtree.js

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
var Curry = require("./curry.js");
4-
var Belt_Option = require("./belt_Option.js");
54
var Js_primitive = require("./js_primitive.js");
65
var Belt_SortArray = require("./belt_SortArray.js");
76

@@ -268,30 +267,20 @@ function stackAllLeft(_v, _s) {
268267
};
269268
}
270269

271-
function checkPredicate(candidate, p) {
272-
return Belt_Option.flatMap(candidate, (function (x) {
273-
var v = x.key;
274-
var d = x.value;
275-
var pvd = p(v, d);
276-
if (pvd) {
277-
return /* tuple */[
278-
v,
279-
d
280-
];
281-
}
282-
283-
}));
284-
}
285-
286270
function findFirstByU(n, p) {
287271
if (n !== null) {
288272
var left = findFirstByU(n.left, p);
289273
if (left !== undefined) {
290274
return left;
291275
} else {
292-
var pvd = checkPredicate(Js_primitive.some(n), p);
293-
if (pvd !== undefined) {
294-
return pvd;
276+
var v = n.key;
277+
var d = n.value;
278+
var pvd = p(v, d);
279+
if (pvd) {
280+
return /* tuple */[
281+
v,
282+
d
283+
];
295284
} else {
296285
var right = findFirstByU(n.right, p);
297286
if (right !== undefined) {
@@ -627,7 +616,7 @@ function checkInvariantInternal(_v) {
627616
var r = v.right;
628617
var diff = treeHeight(l) - treeHeight(r) | 0;
629618
if (!(diff <= 2 && diff >= -2)) {
630-
throw new Error("File \"belt_internalAVLtree.ml\", line 392, characters 6-12");
619+
throw new Error("File \"belt_internalAVLtree.ml\", line 385, characters 6-12");
631620
}
632621
checkInvariantInternal(l);
633622
_v = r;

0 commit comments

Comments
 (0)