makes the code more readable

Author: bobzhang

jscomp/others/belt_internalAVLset.ml

@@ -80,26 +80,20 @@ let bal l v 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
-    match l with None -> assert false
-    | Some {left = ll; value = lv; right = lr} ->
-    if heightGe ll  lr then
-      create ll lv (create lr v r)
-    else begin
-      match lr with None -> assert false 
-      | Some lr -> 
-      create (create ll lv lr.left) lr.value (create lr.right v r)
-    end
-  end else if hr > hl + 2 then begin
-    match r with None -> assert false
-    | Some {left = rl; value = rv; right = rr} ->
-    if heightGe rr  rl then
-      create (create l v rl) rv rr
-    else begin
-      match rl with None -> assert false 
-      | Some rl -> 
-      create (create l v rl.left) rl.value (create rl.right rv rr)
-    end
-  end else
+    match l with None -> assert false | Some ({left = ll;  right = lr} as l) ->
+      if heightGe ll  lr then
+        create ll l.value (create lr v r)
+      else 
+        match lr with None -> assert false | Some lr -> 
+          create (create ll l.value lr.left) lr.value (create lr.right v r)    
+  end else if hr > hl + 2 then 
+    match r with None -> assert false | Some ({left = rl; right = rr} as r) ->
+      if heightGe rr  rl then
+        create (create l v rl) r.value rr
+      else 
+        match rl with None -> assert false | Some rl -> 
+          create (create l v rl.left) rl.value (create rl.right r.value rr)
+  else
     Some {left = l ; value = v ; right = r; height = (if hl >= hr then hl + 1 else hr + 1)}
 
 

lib/es6/belt_internalAVLset.js

@@ -61,13 +61,12 @@ function bal(l, v, r) {
   var hl = l !== undefined ? l.height : 0;
   var hr = r !== undefined ? r.height : 0;
   if (hl > (hr + 2 | 0)) {
-    var lv = l.value;
     var ll = l.left;
     var lr = l.right;
     if (heightGe(ll, lr)) {
-      return create(ll, lv, create(lr, v, r));
+      return create(ll, l.value, create(lr, v, r));
     } else {
-      return create(create(ll, lv, lr.left), lr.value, create(lr.right, v, r));
+      return create(create(ll, l.value, lr.left), lr.value, create(lr.right, v, r));
     }
   }
   if (hr <= (hl + 2 | 0)) {
@@ -78,13 +77,12 @@ function bal(l, v, r) {
             right: r
           };
   }
-  var rv = r.value;
   var rl = r.left;
   var rr = r.right;
   if (heightGe(rr, rl)) {
-    return create(create(l, v, rl), rv, rr);
+    return create(create(l, v, rl), r.value, rr);
   } else {
-    return create(create(l, v, rl.left), rl.value, create(rl.right, rv, rr));
+    return create(create(l, v, rl.left), rl.value, create(rl.right, r.value, rr));
   }
 }
 
@@ -372,7 +370,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 294, characters 6-12");
+      throw new Error("File \"belt_internalAVLset.ml\", line 288, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;

lib/js/belt_internalAVLset.js

@@ -61,13 +61,12 @@ function bal(l, v, r) {
   var hl = l !== undefined ? l.height : 0;
   var hr = r !== undefined ? r.height : 0;
   if (hl > (hr + 2 | 0)) {
-    var lv = l.value;
     var ll = l.left;
     var lr = l.right;
     if (heightGe(ll, lr)) {
-      return create(ll, lv, create(lr, v, r));
+      return create(ll, l.value, create(lr, v, r));
     } else {
-      return create(create(ll, lv, lr.left), lr.value, create(lr.right, v, r));
+      return create(create(ll, l.value, lr.left), lr.value, create(lr.right, v, r));
     }
   }
   if (hr <= (hl + 2 | 0)) {
@@ -78,13 +77,12 @@ function bal(l, v, r) {
             right: r
           };
   }
-  var rv = r.value;
   var rl = r.left;
   var rr = r.right;
   if (heightGe(rr, rl)) {
-    return create(create(l, v, rl), rv, rr);
+    return create(create(l, v, rl), r.value, rr);
   } else {
-    return create(create(l, v, rl.left), rl.value, create(rl.right, rv, rr));
+    return create(create(l, v, rl.left), rl.value, create(rl.right, r.value, rr));
   }
 }
 
@@ -372,7 +370,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 294, characters 6-12");
+      throw new Error("File \"belt_internalAVLset.ml\", line 288, characters 6-12");
     }
     checkInvariantInternal(l);
     _v = r;