Merge pull request #3779 from BuckleScript/improve_codegen

improve code gen, better code equality for block

Author: bobzhang

jscomp/core/j.ml

@@ -278,7 +278,7 @@ and statement_desc =
   | Variable of variable_declaration
         (* Function declaration and Variable declaration  *)
   | Exp of expression
-  | If of expression * block * block option
+  | If of expression * block * block 
   | While of label option *  expression * block 
         * Js_closure.t (* check if it contains loop mutable values, happens in nested loop *)
   | ForRange of for_ident_expression option * finish_ident_expression * 

jscomp/core/js_dump.ml

@@ -1126,17 +1126,17 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
     P.space f;
     let cxt = block cxt f s1 in
     (match s2 with
-     | None | (Some [])
-     | Some [{statement_desc = (Block [] | Exp {expression_desc = Var _;} ); }]
+     | []
+     | [{statement_desc = (Block [] | Exp {expression_desc = Var _;} ); }]
        -> P.newline f; cxt
-     | Some [{statement_desc = If _} as nest]
-     | Some [{statement_desc = Block [ {statement_desc = If _ ; _} as nest] ; _}]
+     | [{statement_desc = If _} as nest]
+     | [{statement_desc = Block [ {statement_desc = If _ ; _} as nest] ; _}]
        ->
        P.space f;
        P.string f L.else_;
        P.space f;
        statement false cxt f nest
-     | Some s2 ->
+     | (_::_) as s2 ->
        P.space f;
        P.string f L.else_;
        P.space f ;
@@ -1340,11 +1340,11 @@ and function_body cxt f b =
     begin match s.statement_desc with
     | If (bool,
           then_,
-          Some [{
+           [{
               statement_desc =
                 Return {return_value = {expression_desc = Undefined}} }])
         ->
-        statement false cxt f {s with statement_desc = If(bool,then_,None)}
+        statement false cxt f {s with statement_desc = If(bool,then_, [])}
     | _ ->        
       statement false  cxt f  s
     end

jscomp/core/js_fold.ml

@@ -54,8 +54,7 @@ class virtual fold =
       | Exp _x -> let o = o#expression _x in o
       | If (_x, _x_i1, _x_i2) ->
           let o = o#expression _x in
-          let o = o#block _x_i1 in
-          let o = o#option (fun o -> o#block) _x_i2 in o
+          let o = o#block _x_i1 in let o = o#block _x_i2 in o
       | While (_x, _x_i1, _x_i2, _x_i3) ->
           let o = o#option (fun o -> o#label) _x in
           let o = o#expression _x_i1 in

jscomp/core/js_map.ml

@@ -64,8 +64,7 @@ class virtual map =
       | If (_x, _x_i1, _x_i2) ->
           let _x = o#expression _x in
           let _x_i1 = o#block _x_i1 in
-          let _x_i2 = o#option (fun o -> o#block) _x_i2
-          in If (_x, _x_i1, _x_i2)
+          let _x_i2 = o#block _x_i2 in If (_x, _x_i1, _x_i2)
       | While (_x, _x_i1, _x_i2, _x_i3) ->
           let _x = o#option (fun o -> o#label) _x in
           let _x_i1 = o#expression _x_i1 in

jscomp/core/js_pass_flatten.ml

@@ -46,7 +46,7 @@ let flatten_map =
           S.block ( List.rev_map self#statement (Js_analyzer.rev_flatten_seq v ))
       |  Exp ({expression_desc = Cond(a,b,c); comment} ) -> 
           { statement_desc = If (a, [ self#statement (S.exp b)],  
-                                 Some [ self#statement (S.exp c)]); comment}
+                                  [ self#statement (S.exp c)]); comment}
 
       |  Exp ({expression_desc = Bin(Eq, a, ({expression_desc = Seq _; _ } as v)); _} )
         ->
@@ -67,7 +67,7 @@ let flatten_map =
       | Return ( {return_value = {expression_desc = Cond (a,b,c);  comment}}) 
         -> 
           { statement_desc = If (a, [self#statement (S.return_stmt b)],  
-                                 Some [ self#statement (S.return_stmt c)]); comment}
+                                  [ self#statement (S.return_stmt c)]); comment}
 
       | Return ({return_value = {expression_desc = Seq _; _} as v}) ->
           let block = Js_analyzer.rev_flatten_seq v  in

jscomp/core/js_stmt_make.ml

@@ -223,7 +223,7 @@ let rec if_ ?comment  ?declaration ?else_ (e : J.expression) (then_ : J.block)
       |  [], [] -> exp e 
       |  [], _ ->
         {
-          statement_desc = If ( E.not e, ifnot, None); comment
+          statement_desc = If ( E.not e, ifnot, []); comment
         }
       | [ {statement_desc = Return {return_value = ret_ifso; _}; _}], 
         [ {statement_desc = Return {return_value = ret_ifnot; _}; _} as _ifnot_stmt]
@@ -250,21 +250,21 @@ let rec if_ ?comment  ?declaration ?else_ (e : J.expression) (then_ : J.block)
         ->
         exp (E.econd e exp_ifso exp_ifnot)
 
-      | [ {statement_desc = If (pred1, ifso1, Some ifnot1) }],
+      | [ {statement_desc = If (pred1, ifso1, ifnot1) }],
         _ when Js_analyzer.eq_block ifnot1 ifnot
         ->
         aux ?comment (E.and_ e pred1) ifso1 ifnot1 
-      | [ {statement_desc = If (pred1, ifso1, Some ifnot1) }],
+      | [ {statement_desc = If (pred1, ifso1, ifnot1) }],
         _  when Js_analyzer.eq_block ifso1 ifnot
         ->
         aux ?comment (E.and_ e (E.not pred1)) ifnot1 ifso1 
       | _ , 
-        [ {statement_desc = If (pred1,  ifso1, Some (else_ )) }]
+        [ {statement_desc = If (pred1,  ifso1, (else_ )) }]
         when Js_analyzer.eq_block ifso ifso1 
         ->
         aux ?comment (E.or_ e pred1) ifso else_
       | _  , 
-        [ {statement_desc = If (pred1, ifso1, Some ifnot1 ) }]
+        [ {statement_desc = If (pred1, ifso1, ifnot1 ) }]
         when Js_analyzer.eq_block ifso ifnot1
         ->
         aux ?comment (E.or_ e (E.not pred1)) ifso ifso1 
@@ -280,8 +280,7 @@ let rec if_ ?comment  ?declaration ?else_ (e : J.expression) (then_ : J.block)
         { statement_desc =
             If (e, 
                 ifso,
-                if ifnot = [] then None 
-                else Some  ifnot); 
+                  ifnot); 
           comment } in
   let if_block = 
     aux ?comment e then_ (match else_ with None -> [] | Some v -> v)  in

jscomp/test/build.ninja

@@ -296,6 +296,7 @@ build test/gpr_3595_test.cmi test/gpr_3595_test.cmj : cc test/gpr_3595_test.ml |
 build test/gpr_3609_test.cmi test/gpr_3609_test.cmj : cc test/gpr_3609_test.ml | $stdlib
 build test/gpr_3697_test.cmi test/gpr_3697_test.cmj : cc test/gpr_3697_test.ml | $stdlib
 build test/gpr_373_test.cmi test/gpr_373_test.cmj : cc test/gpr_373_test.ml | $stdlib
+build test/gpr_3770_test.cmi test/gpr_3770_test.cmj : cc test/gpr_3770_test.ml | $stdlib
 build test/gpr_405_test.cmj : cc_cmi test/gpr_405_test.ml | test/gpr_405_test.cmi $stdlib
 build test/gpr_405_test.cmi : cc test/gpr_405_test.mli | $stdlib
 build test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.ml | $stdlib

jscomp/test/exception_rebound_err_test.js

@@ -49,14 +49,8 @@ function test_js_error4(param) {
     } else {
       exit = 2;
     }
-    if (exit === 2) {
-      if (e[0] === A) {
-        if (e[1] === 2) {
-          return 4;
-        }
-        
-      }
-      
+    if (exit === 2 && e[0] === A && e[1] === 2) {
+      return 4;
     }
     if (e === B) {
       return 5;

jscomp/test/ext_filename_test.js

@@ -119,16 +119,10 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
     while(true) {
       var dir2 = _dir2;
       var dir1 = _dir1;
-      if (dir1) {
-        if (dir2) {
-          if (dir1[0] === dir2[0]) {
-            _dir2 = dir2[1];
-            _dir1 = dir1[1];
-            continue ;
-          }
-          
-        }
-        
+      if (dir1 && dir2 && dir1[0] === dir2[0]) {
+        _dir2 = dir2[1];
+        _dir1 = dir1[1];
+        continue ;
       }
       return Pervasives.$at(List.map((function (param) {
                         return node_parent;