remove some intermediate varaibles

Author: bobzhang

jscomp/others/belt_internalAVLset.ml

@@ -54,8 +54,7 @@ let rec copy n =
   match n with
   | None -> n
   | Some n ->
-    let l,r = n.left, n.right in
-    Some { left = (copy l) ; right = (copy r);
+    Some { left = (copy n.left) ; right = (copy n.right);
       value = n.value; height = n.height}
 
 (* Creates a new node with leftGet son l, value v and right son r.
@@ -91,8 +90,8 @@ let bal l v r =
       create ll lv (create lr v r)
     else begin
       (* [lr] could not be None*)
-      let {left = lrl; value = lrv; right = lrr} = lr |. unsafeCoerce in
-      create (create ll lv lrl) lrv (create lrr v r)
+      let lr = lr |. unsafeCoerce in
+      create (create ll lv lr.left) lr.value (create lr.right v r)
     end
   end else if hr > hl + 2 then begin
     (* [r] could not be None *)
@@ -101,8 +100,8 @@ let bal l v r =
       create (create l v rl) rv rr
     else begin
       (* [rl] could not be None *)
-      let {left = rll; value = rlv; right = rlr} = rl |. unsafeCoerce  in
-      create (create l v rll) rlv (create rlr rv rr)
+      let rl = rl |. unsafeCoerce  in
+      create (create l v rl.left) rl.value (create rl.right rv rr)
     end
   end else
     Some {left = l ; value = v ; right = r; height = (if hl >= hr then hl + 1 else hr + 1)}

lib/es6/belt_internalAVLset.js

@@ -13,17 +13,16 @@ function treeHeight(n) {
 }
 
 function copy(n) {
-  if (n === undefined) {
+  if (n !== undefined) {
+    return {
+            value: n.value,
+            height: n.height,
+            left: copy(n.left),
+            right: copy(n.right)
+          };
+  } else {
     return n;
   }
-  var l = n.left;
-  var r = n.right;
-  return {
-          value: n.value,
-          height: n.height,
-          left: copy(l),
-          right: copy(r)
-        };
 }
 
 function create(l, v, r) {
@@ -67,11 +66,9 @@ function bal(l, v, r) {
     var lr = l.right;
     if (heightGe(ll, lr)) {
       return create(ll, lv, create(lr, v, r));
+    } else {
+      return create(create(ll, lv, lr.left), lr.value, create(lr.right, v, r));
     }
-    var lrv = lr.value;
-    var lrl = lr.left;
-    var lrr = lr.right;
-    return create(create(ll, lv, lrl), lrv, create(lrr, v, r));
   }
   if (hr <= (hl + 2 | 0)) {
     return {
@@ -86,11 +83,9 @@ function bal(l, v, r) {
   var rr = r.right;
   if (heightGe(rr, rl)) {
     return create(create(l, v, rl), rv, rr);
+  } else {
+    return create(create(l, v, rl.left), rl.value, create(rl.right, rv, rr));
   }
-  var rlv = rl.value;
-  var rll = rl.left;
-  var rlr = rl.right;
-  return create(create(l, v, rll), rlv, create(rlr, rv, rr));
 }
 
 function min0Aux(_n) {
@@ -382,7 +377,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_internalAVLset.ml\", line 301, characters 6-12");
+      throw new Error("File \"belt_internalAVLset.ml\", line 300, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;

lib/js/belt_internalAVLset.js

@@ -13,17 +13,16 @@ function treeHeight(n) {
 }
 
 function copy(n) {
-  if (n === undefined) {
+  if (n !== undefined) {
+    return {
+            value: n.value,
+            height: n.height,
+            left: copy(n.left),
+            right: copy(n.right)
+          };
+  } else {
     return n;
   }
-  var l = n.left;
-  var r = n.right;
-  return {
-          value: n.value,
-          height: n.height,
-          left: copy(l),
-          right: copy(r)
-        };
 }
 
 function create(l, v, r) {
@@ -67,11 +66,9 @@ function bal(l, v, r) {
     var lr = l.right;
     if (heightGe(ll, lr)) {
       return create(ll, lv, create(lr, v, r));
+    } else {
+      return create(create(ll, lv, lr.left), lr.value, create(lr.right, v, r));
     }
-    var lrv = lr.value;
-    var lrl = lr.left;
-    var lrr = lr.right;
-    return create(create(ll, lv, lrl), lrv, create(lrr, v, r));
   }
   if (hr <= (hl + 2 | 0)) {
     return {
@@ -86,11 +83,9 @@ function bal(l, v, r) {
   var rr = r.right;
   if (heightGe(rr, rl)) {
     return create(create(l, v, rl), rv, rr);
+  } else {
+    return create(create(l, v, rl.left), rl.value, create(rl.right, rv, rr));
   }
-  var rlv = rl.value;
-  var rll = rl.left;
-  var rlr = rl.right;
-  return create(create(l, v, rll), rlv, create(rlr, rv, rr));
 }
 
 function min0Aux(_n) {
@@ -382,7 +377,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_internalAVLset.ml\", line 301, characters 6-12");
+      throw new Error("File \"belt_internalAVLset.ml\", line 300, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;