tweak

Author: bobzhang

Diff for: jscomp/others/belt_internalAVLtree.ml

@@ -70,22 +70,21 @@ let bal l x d r =
   let hl = match  l with None -> 0 | Some n -> n.height in
   let hr = match  r with None -> 0 | Some n -> n.height in
   if hl > hr + 2 then begin
-    let {left = ll; key = lv; value = ld; right = lr} =
-      l |. unsafeCoerce 
+    let {left = ll; key = lv; value = ld; right = lr} = l |. unsafeCoerce 
     in
     if treeHeight ll >= treeHeight lr then
       create ll lv ld (create lr x d r)
     else begin
-      let {left = lrl; key = lrv; value = lrd; right = lrr} = lr |. unsafeCoerce in
-      create (create ll lv ld lrl) lrv lrd (create lrr x d r)
+      let lr = lr |. unsafeCoerce in
+      create (create ll lv ld lr.left) lr.key lr.value (create lr.right x d r)
     end
   end else if hr > hl + 2 then begin
     let {left = rl; key = rv; value = rd; right = rr} = r |. unsafeCoerce in
     if treeHeight rr >= treeHeight rl then
       create (create l x d rl) rv rd rr
     else begin
-      let {left = rll; key = rlv; value = rld; right = rlr} = rl |. unsafeCoerce  in
-      create (create l x d rll) rlv rld (create rlr rv rd rr)
+      let  rl = rl |. unsafeCoerce  in
+      create (create l x d rl.left) rl.key rl.value (create rl.right rv rd rr)
     end
   end else
     Some { left = l; key = x ; value = d ; right = r ; height = (if hl >= hr then hl + 1 else hr + 1)}

Diff for: lib/es6/belt_internalAVLtree.js

@@ -84,12 +84,9 @@ function bal(l, x, d, r) {
     var lr = l.right;
     if (treeHeight(ll) >= treeHeight(lr)) {
       return create(ll, lv, ld, create(lr, x, d, r));
+    } else {
+      return create(create(ll, lv, ld, lr.left), lr.key, lr.value, create(lr.right, x, d, r));
     }
-    var lrv = lr.key;
-    var lrd = lr.value;
-    var lrl = lr.left;
-    var lrr = lr.right;
-    return create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r));
   }
   if (hr <= (hl + 2 | 0)) {
     return {
@@ -106,12 +103,9 @@ function bal(l, x, d, r) {
   var rr = r.right;
   if (treeHeight(rr) >= treeHeight(rl)) {
     return create(create(l, x, d, rl), rv, rd, rr);
+  } else {
+    return create(create(l, x, d, rl.left), rl.key, rl.value, create(rl.right, rv, rd, rr));
   }
-  var rlv = rl.key;
-  var rld = rl.value;
-  var rll = rl.left;
-  var rlr = rl.right;
-  return create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr));
 }
 
 function minKey0Aux(_n) {
@@ -600,7 +594,7 @@ function checkInvariantInternal(_v) {
     var r = v.right;
     var diff = treeHeight(l) - treeHeight(r) | 0;
     if (!(diff <= 2 && diff >= -2)) {
-      throw new Error("File \"belt_internalAVLtree.ml\", line 382, characters 6-12");
+      throw new Error("File \"belt_internalAVLtree.ml\", line 381, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;

Diff for: lib/js/belt_internalAVLtree.js

@@ -84,12 +84,9 @@ function bal(l, x, d, r) {
     var lr = l.right;
     if (treeHeight(ll) >= treeHeight(lr)) {
       return create(ll, lv, ld, create(lr, x, d, r));
+    } else {
+      return create(create(ll, lv, ld, lr.left), lr.key, lr.value, create(lr.right, x, d, r));
     }
-    var lrv = lr.key;
-    var lrd = lr.value;
-    var lrl = lr.left;
-    var lrr = lr.right;
-    return create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r));
   }
   if (hr <= (hl + 2 | 0)) {
     return {
@@ -106,12 +103,9 @@ function bal(l, x, d, r) {
   var rr = r.right;
   if (treeHeight(rr) >= treeHeight(rl)) {
     return create(create(l, x, d, rl), rv, rd, rr);
+  } else {
+    return create(create(l, x, d, rl.left), rl.key, rl.value, create(rl.right, rv, rd, rr));
   }
-  var rlv = rl.key;
-  var rld = rl.value;
-  var rll = rl.left;
-  var rlr = rl.right;
-  return create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr));
 }
 
 function minKey0Aux(_n) {
@@ -600,7 +594,7 @@ function checkInvariantInternal(_v) {
     var r = v.right;
     var diff = treeHeight(l) - treeHeight(r) | 0;
     if (!(diff <= 2 && diff >= -2)) {
-      throw new Error("File \"belt_internalAVLtree.ml\", line 382, characters 6-12");
+      throw new Error("File \"belt_internalAVLtree.ml\", line 381, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;