add transformation: if a then { if b then d else e } else e

Author: bobzhang

jscomp/core/js_stmt_make.ml

@@ -284,11 +284,11 @@ let rec if_ ?comment  ?declaration ?else_ (e : J.expression) (then_ : J.block)
 
        => if a && b then d else e 
     *)
-    (* | _,
+    | _,
       [ {statement_desc = If (pred, then_, Some ([else_] as cont)) }],
       [ another_else] when Js_analyzer.eq_statement else_ another_else
       ->
-      aux ?comment (E.and_ e pred) then_ cont acc  *)
+      aux ?comment (E.and_ e pred) then_ cont acc 
     | _ -> 
       let e = E.ocaml_boolean_under_condition e in 
       { statement_desc =

jscomp/test/exception_rebound_err_test.js

@@ -45,12 +45,8 @@ function test_js_error4() {
     var exit$1 = 0;
     if (e === Caml_builtin_exceptions.not_found) {
       return 2;
-    } else if (e[0] === Caml_builtin_exceptions.invalid_argument) {
-      if (e[1] === "x") {
-        return 3;
-      } else {
-        exit$1 = 2;
-      }
+    } else if (e[0] === Caml_builtin_exceptions.invalid_argument && e[1] === "x") {
+      return 3;
     } else {
       exit$1 = 2;
     }

jscomp/test/ext_filename_test.js

@@ -128,19 +128,11 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
       var dir2 = _dir2;
       var dir1 = _dir1;
       var exit = 0;
-      if (dir1) {
-        if (dir2) {
-          if (dir1[0] === dir2[0]) {
-            _dir2 = dir2[1];
-            _dir1 = dir1[1];
-            continue ;
-            
-          } else {
-            exit = 1;
-          }
-        } else {
-          exit = 1;
-        }
+      if (dir1 && dir2 && dir1[0] === dir2[0]) {
+        _dir2 = dir2[1];
+        _dir1 = dir1[1];
+        continue ;
+        
       } else {
         exit = 1;
       }

jscomp/test/ext_list_test.js

@@ -715,15 +715,11 @@ function for_all2_no_exn(p, _l1, _l2) {
     var l2 = _l2;
     var l1 = _l1;
     if (l1) {
-      if (l2) {
-        if (Curry._2(p, l1[0], l2[0])) {
-          _l2 = l2[1];
-          _l1 = l1[1];
-          continue ;
-          
-        } else {
-          return /* false */0;
-        }
+      if (l2 && Curry._2(p, l1[0], l2[0])) {
+        _l2 = l2[1];
+        _l1 = l1[1];
+        continue ;
+        
       } else {
         return /* false */0;
       }

jscomp/test/ext_pervasives_test.js

@@ -131,14 +131,10 @@ function dump(r) {
         } else {
           var s = r.length;
           var t = r.tag | 0;
-          if (t === 0) {
-            if (s === 2) {
-              _r = r[1];
-              continue ;
-              
-            } else {
-              return /* false */0;
-            }
+          if (t === 0 && s === 2) {
+            _r = r[1];
+            continue ;
+            
           } else {
             return /* false */0;
           }

jscomp/test/ext_string_test.js

@@ -516,46 +516,42 @@ function is_valid_module_file(s) {
 
 function is_valid_npm_package_name(s) {
   var len = s.length;
-  if (len <= 214) {
-    if (len > 0) {
-      var match = s.charCodeAt(0);
-      var exit = 0;
-      if (match >= 97) {
-        if (match >= 123) {
-          return /* false */0;
-        } else {
-          exit = 1;
-        }
-      } else if (match !== 64) {
+  if (len <= 214 && len > 0) {
+    var match = s.charCodeAt(0);
+    var exit = 0;
+    if (match >= 97) {
+      if (match >= 123) {
         return /* false */0;
       } else {
         exit = 1;
       }
-      if (exit === 1) {
-        return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
-                      if (x >= 58) {
-                        if (x >= 97) {
-                          if (x >= 123) {
-                            return /* false */0;
-                          } else {
-                            return /* true */1;
-                          }
-                        } else if (x !== 95) {
+    } else if (match !== 64) {
+      return /* false */0;
+    } else {
+      exit = 1;
+    }
+    if (exit === 1) {
+      return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
+                    if (x >= 58) {
+                      if (x >= 97) {
+                        if (x >= 123) {
                           return /* false */0;
                         } else {
                           return /* true */1;
                         }
-                      } else if (x !== 45 && x < 48) {
+                      } else if (x !== 95) {
                         return /* false */0;
                       } else {
                         return /* true */1;
                       }
-                    }));
-      }
-      
-    } else {
-      return /* false */0;
+                    } else if (x !== 45 && x < 48) {
+                      return /* false */0;
+                    } else {
+                      return /* true */1;
+                    }
+                  }));
     }
+    
   } else {
     return /* false */0;
   }