Merge pull request #2790 from BuckleScript/fix_expoentional_behavior

fix an embarassing bug which caused exponential behavior

Author: bobzhang

jscomp/others/belt_SetInt.ml

@@ -49,7 +49,7 @@ let rec add  (t : t) (x : value) : t =
       else 
         let rr = add r x in 
         if rr == r then t
-        else N.bal l v (add  r x)
+        else N.bal l v rr
 
 let mergeMany h arr =   
   let len = A.length arr in 

jscomp/others/belt_SetString.ml

@@ -49,7 +49,7 @@ let rec add  (t : t) (x : value) : t =
       else 
         let rr = add r x in 
         if rr == r then t
-        else N.bal l v (add  r x)
+        else N.bal l v rr
 
 let mergeMany h arr =   
   let len = A.length arr in 

jscomp/others/set.cppo.ml

@@ -53,7 +53,7 @@ let rec add  (t : t) (x : value) : t =
       else 
         let rr = add r x in 
         if rr == r then t
-        else N.bal l v (add  r x)
+        else N.bal l v rr
 
 let mergeMany h arr =   
   let len = A.length arr in 

jscomp/test/.depend

@@ -125,7 +125,7 @@ bs_sort_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
 bs_splice_partial.cmj : ../runtime/js.cmj
 bs_stack_test.cmj : ../runtime/js.cmj ../others/belt.cmj
 bs_string_test.cmj : mt.cmj ../runtime/js.cmj
-bs_unwrap_test.cmj : ../runtime/js.cmj
+bs_unwrap_test.cmj :
 buffer_test.cmj : ../stdlib/string.cmj mt.cmj ../stdlib/bytes.cmj \
     ../stdlib/buffer.cmj
 bytes_split_gpr_743_test.cmj : mt.cmj ../runtime/js.cmj ../stdlib/bytes.cmj
@@ -261,7 +261,7 @@ global_exception_regression_test.cmj : mt.cmj
 global_mangles.cmj :
 global_module_alias_test.cmj : mt.cmj ../stdlib/list.cmj
 google_closure_test.cmj : test_google_closure.cmj mt.cmj
-gpr496_test.cmj : ../stdlib/pervasives.cmj mt.cmj ../runtime/js.cmj
+gpr496_test.cmj : ../stdlib/pervasives.cmj mt.cmj
 gpr_1063_test.cmj :
 gpr_1072.cmj : ../runtime/js.cmj
 gpr_1072_reg.cmj :
@@ -367,7 +367,7 @@ int_overflow_test.cmj : ../stdlib/string.cmj mt.cmj ../runtime/js.cmj \
     ../stdlib/int32.cmj ../stdlib/char.cmj
 io_test.cmj : ../runtime/js.cmj
 js_array_test.cmj : mt.cmj ../runtime/js.cmj ../stdlib/array.cmj
-js_bool_test.cmj : mt.cmj ../runtime/js.cmj
+js_bool_test.cmj : mt.cmj
 js_cast_test.cmj : mt.cmj ../others/js_cast.cmj
 js_date_test.cmj : mt.cmj ../runtime/js_float.cmj ../runtime/js.cmj
 js_dict_test.cmj : ../stdlib/obj.cmj mt.cmj ../others/js_dict.cmj
@@ -376,7 +376,7 @@ js_float_test.cmj : mt.cmj ../runtime/js_float.cmj
 js_global_test.cmj : mt.cmj ../others/js_global.cmj
 js_int_test.cmj : mt.cmj ../runtime/js_int.cmj
 js_json_test.cmj : mt.cmj ../others/js_json.cmj ../others/js_dict.cmj \
-    ../others/js_boolean.cmj ../runtime/js.cmj ../stdlib/array.cmj
+    ../runtime/js.cmj ../stdlib/array.cmj
 js_list_test.cmj : mt.cmj ../runtime/js.cmj
 js_math_test.cmj : mt.cmj ../runtime/js.cmj
 js_null_test.cmj : mt.cmj ../runtime/js_null.cmj
@@ -586,7 +586,7 @@ test_ari.cmj : ../stdlib/list.cmj
 test_array.cmj : ../stdlib/array.cmj
 test_array_append.cmj : ../stdlib/array.cmj
 test_array_primitive.cmj : ../stdlib/array.cmj
-test_bool_equal.cmj : ../runtime/js.cmj ../others/belt.cmj
+test_bool_equal.cmj : ../others/belt.cmj
 test_bs_this.cmj : ../runtime/js.cmj
 test_bug.cmj : ../stdlib/bytes.cmj
 test_bytes.cmj : ../stdlib/bytes.cmj

lib/js/belt_SetInt.js

@@ -23,7 +23,7 @@ function add(t, x) {
         if (rr === r) {
           return t;
         } else {
-          return Belt_internalAVLset.bal(l, v, add(r, x));
+          return Belt_internalAVLset.bal(l, v, rr);
         }
       }
     }

lib/js/belt_SetString.js

@@ -23,7 +23,7 @@ function add(t, x) {
         if (rr === r) {
           return t;
         } else {
-          return Belt_internalAVLset.bal(l, v, add(r, x));
+          return Belt_internalAVLset.bal(l, v, rr);
         }
       }
     }