Revert "unparen shift ops"

This reverts commit 5d308e7.

Author: cometkim

compiler/core/js_dump.ml

@@ -717,7 +717,13 @@ and expression_desc cxt ~(level : int) f x : cxt =
     expression_desc cxt ~level:(level : int) f (Is_null_or_undefined e1)
   | Bin (op, e1, e2) ->
     let out, lft, rght = Js_op_util.op_prec op in
-    let need_paren = level > out in
+    let need_paren =
+      level > out
+      ||
+      match op with
+      | Lsl | Lsr | Asr -> true
+      | _ -> false
+    in
     (* We are more conservative here, to make the generated code more readable
           to the user *)
     P.cond_paren_group f need_paren (fun _ ->
@@ -729,7 +735,13 @@ and expression_desc cxt ~(level : int) f x : cxt =
   | String_append (e1, e2) ->
     let op : Js_op.binop = Plus in
     let out, lft, rght = Js_op_util.op_prec op in
-    let need_paren = level > out in
+    let need_paren =
+      level > out
+      ||
+      match op with
+      | Lsl | Lsr | Asr -> true
+      | _ -> false
+    in
     P.cond_paren_group f need_paren (fun _ ->
         let cxt = expression ~level:lft cxt f e1 in
         P.space f;

lib/es6/Belt_HashMap.js

@@ -66,10 +66,10 @@ function set0(h, key, value, eq, hash) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_HashMapInt.js

@@ -63,10 +63,10 @@ function set(h, key, value) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_HashMapString.js

@@ -63,10 +63,10 @@ function set(h, key, value) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_HashSet.js

@@ -93,10 +93,10 @@ function add0(h, key, hash, eq) {
       next: undefined
     };
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_HashSetInt.js

@@ -93,10 +93,10 @@ function add(h, key) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_HashSetString.js

@@ -93,10 +93,10 @@ function add(h, key) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }

lib/es6/Belt_internalBucketsType.js

@@ -7,10 +7,10 @@ function power_2_above(_x, n) {
     if (x >= n) {
       return x;
     }
-    if (x << 1 < x) {
+    if ((x << 1) < x) {
       return x;
     }
-    _x = x << 1;
+    _x = (x << 1);
     continue;
   };
 }

lib/es6/Primitive_hash.js

@@ -44,7 +44,7 @@ function unsafe_pop(q) {
 }
 
 function rotl32(x, n) {
-  return x << n | x >>> (32 - n | 0) | 0;
+  return (x << n) | (x >>> (32 - n | 0)) | 0;
 }
 
 function hash_mix_int(h, d) {
@@ -58,26 +58,26 @@ function hash_mix_int(h, d) {
 }
 
 function hash_final_mix(h) {
-  let h$1 = h ^ h >>> 16;
+  let h$1 = h ^ (h >>> 16);
   h$1 = Math.imul(h$1, -2048144789);
-  h$1 = h$1 ^ h$1 >>> 13;
+  h$1 = h$1 ^ (h$1 >>> 13);
   h$1 = Math.imul(h$1, -1028477387);
-  return h$1 ^ h$1 >>> 16;
+  return h$1 ^ (h$1 >>> 16);
 }
 
 function hash_mix_string(h, s) {
   let len = s.length;
   let block = (len / 4 | 0) - 1 | 0;
   let hash = h;
   for (let i = 0; i <= block; ++i) {
-    let j = i << 2;
-    let w = s.charCodeAt(j) | s.charCodeAt(j + 1 | 0) << 8 | s.charCodeAt(j + 2 | 0) << 16 | s.charCodeAt(j + 3 | 0) << 24;
+    let j = (i << 2);
+    let w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24);
     hash = hash_mix_int(hash, w);
   }
   let modulo = len & 3;
   if (modulo !== 0) {
-    let w$1 = modulo === 3 ? s.charCodeAt(len - 1 | 0) << 16 | s.charCodeAt(len - 2 | 0) << 8 | s.charCodeAt(len - 3 | 0) : (
-        modulo === 2 ? s.charCodeAt(len - 1 | 0) << 8 | s.charCodeAt(len - 2 | 0) : s.charCodeAt(len - 1 | 0)
+    let w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : (
+        modulo === 2 ? (s.charCodeAt(len - 1 | 0) << 8) | s.charCodeAt(len - 2 | 0) : s.charCodeAt(len - 1 | 0)
       );
     hash = hash_mix_int(hash, w$1);
   }
@@ -117,7 +117,7 @@ function hash(count, _limit, seed, obj) {
       let size = obj$1.length | 0;
       if (size !== 0) {
         let obj_tag = obj$1.TAG;
-        let tag = size << 10 | obj_tag;
+        let tag = (size << 10) | obj_tag;
         s = hash_mix_int(s, tag);
         let v = size - 1 | 0;
         let block = v < num ? v : num;
@@ -133,7 +133,7 @@ function hash(count, _limit, seed, obj) {
             }
             return size
           })(obj$1, v => push_back(queue, v));
-        s = hash_mix_int(s, size$1 << 10 | 0);
+        s = hash_mix_int(s, (size$1 << 10) | 0);
       }
     }
 

lib/js/Belt_HashMap.js

@@ -66,10 +66,10 @@ function set0(h, key, value, eq, hash) {
     };
     h.size = h.size + 1 | 0;
   }
-  if (h.size > buckets_len << 1) {
+  if (h.size > (buckets_len << 1)) {
     let odata = h.buckets;
     let osize = odata.length;
-    let nsize = osize << 1;
+    let nsize = (osize << 1);
     if (nsize < osize) {
       return;
     }