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

Author: bobzhang

jscomp/core/js_stmt_make.ml

@@ -293,6 +293,12 @@ let rec if_ ?comment  ?declaration ?else_ (e : J.expression) (then_ : J.block)
       [ another_else] when Js_analyzer.eq_statement then_ another_else
       ->
       aux ?comment (E.and_ e (E.not pred)) else_ cont acc   
+    | _,      
+      ([ another_then] as cont), 
+      [ {statement_desc = If (pred, [then_], Some (else_ )) }]
+      when Js_analyzer.eq_statement then_ another_then
+      ->
+      aux ?comment (E.or_ e pred) cont else_ acc       
     | _ -> 
       let e = E.ocaml_boolean_under_condition e in 
       { statement_desc =

jscomp/test/exception_raise_test.js

@@ -101,9 +101,7 @@ try {
 }
 catch (raw_exn$3){
   var exn$3 = Js_exn.internalToOCamlException(raw_exn$3);
-  if (exn$3[0] === A) {
-    a0 = exn$3[1];
-  } else if (exn$3[0] === Js_exn.$$Error) {
+  if (exn$3[0] === A || exn$3[0] === Js_exn.$$Error) {
     a0 = exn$3[1];
   } else {
     throw [

jscomp/test/ext_array_test.js

@@ -202,9 +202,7 @@ function rfind_with_index(arr, cmp, v) {
   var _i = len - 1 | 0;
   while(true) {
     var i = _i;
-    if (i < 0) {
-      return i;
-    } else if (Curry._2(cmp, arr[i], v)) {
+    if (i < 0 || Curry._2(cmp, arr[i], v)) {
       return i;
     } else {
       _i = i - 1 | 0;

jscomp/test/ext_string_test.js

@@ -429,9 +429,7 @@ function unsafe_concat_with_length(len, sep, l) {
 function rindex_rec(s, _i, c) {
   while(true) {
     var i = _i;
-    if (i < 0) {
-      return i;
-    } else if (s.charCodeAt(i) === c) {
+    if (i < 0 || s.charCodeAt(i) === c) {
       return i;
     } else {
       _i = i - 1 | 0;

jscomp/test/flow_parser_reg_test.js

@@ -9255,9 +9255,7 @@ function property$1(env) {
     var match$1 = key(env);
     var tmp;
     var exit = 0;
-    if (async$1 !== 0) {
-      exit = 1;
-    } else if (match !== 0) {
+    if (async$1 !== 0 || match !== 0) {
       exit = 1;
     } else {
       var key$1 = match$1[1];
@@ -9802,9 +9800,7 @@ function class_element(env) {
   var generator$1 = generator(env, async$1);
   var match = key(env);
   var exit = 0;
-  if (async$1 !== 0) {
-    exit = 1;
-  } else if (generator$1 !== 0) {
+  if (async$1 !== 0 || generator$1 !== 0) {
     exit = 1;
   } else {
     var key$1 = match[1];
@@ -11042,7 +11038,7 @@ function assert_can_be_forin_or_forof(env, err, param) {
       var match$2 = match[0];
       var declarations = match$2[1][/* declarations */0];
       var exit = 0;
-      if (declarations && !declarations[0][1][/* init */1] && !declarations[1]) {
+      if (declarations && !(declarations[0][1][/* init */1] || declarations[1])) {
         return /* () */0;
       } else {
         exit = 1;

jscomp/test/inline_map2_test.js

@@ -328,9 +328,7 @@ function Make(Ord) {
     while(true) {
       var param = _param;
       if (param) {
-        if (Curry._2(p, param[1], param[2])) {
-          return /* true */1;
-        } else if (exists(p, param[0])) {
+        if (Curry._2(p, param[1], param[2]) || exists(p, param[0])) {
           return /* true */1;
         } else {
           _param = param[3];
@@ -997,9 +995,7 @@ function exists(p, _param) {
   while(true) {
     var param = _param;
     if (param) {
-      if (Curry._2(p, param[1], param[2])) {
-        return /* true */1;
-      } else if (exists(p, param[0])) {
+      if (Curry._2(p, param[1], param[2]) || exists(p, param[0])) {
         return /* true */1;
       } else {
         _param = param[3];
@@ -1714,9 +1710,7 @@ function exists$1(p, _param) {
   while(true) {
     var param = _param;
     if (param) {
-      if (Curry._2(p, param[1], param[2])) {
-        return /* true */1;
-      } else if (exists$1(p, param[0])) {
+      if (Curry._2(p, param[1], param[2]) || exists$1(p, param[0])) {
         return /* true */1;
       } else {
         _param = param[3];

jscomp/test/int_map.js

@@ -341,9 +341,7 @@ function exists(p, _param) {
   while(true) {
     var param = _param;
     if (param) {
-      if (Curry._2(p, param[1], param[2])) {
-        return /* true */1;
-      } else if (exists(p, param[0])) {
+      if (Curry._2(p, param[1], param[2]) || exists(p, param[0])) {
         return /* true */1;
       } else {
         _param = param[3];

jscomp/test/miss_colon_test.js

@@ -72,18 +72,14 @@ function $star$colon(_f, _g) {
       }
     }
     if (exit$2 === 3) {
-      if (g.tag) {
-        exit$1 = 2;
-      } else if (g[0] !== 0) {
+      if (g.tag || g[0] !== 0) {
         exit$1 = 2;
       } else {
         return /* Int */Block.__(0, [0]);
       }
     }
     if (exit$1 === 2) {
-      if (f.tag) {
-        exit = 1;
-      } else if (f[0] !== 1) {
+      if (f.tag || f[0] !== 1) {
         exit = 1;
       } else {
         return g;