peephole if then else

Author: bobzhang

jscomp/all.depend

@@ -349,7 +349,7 @@ core/js_closure.cmi : ext/ident_set.cmi
 core/js_number.cmi :
 core/js_cmj_datasets.cmi : ext/string_map.cmi core/js_cmj_format.cmi
 core/lam_exit_code.cmi : core/lam.cmi
-core/lam_compile_util.cmi : core/js_op.cmx
+core/lam_compile_util.cmi : core/lam.cmi core/js_op.cmx
 core/lam_id_kind.cmi : core/lam_arity.cmi core/lam.cmi
 core/lam_stats.cmi : core/lam_id_kind.cmi ext/ident_set.cmi \
     ext/ident_hashtbl.cmi
@@ -481,7 +481,8 @@ core/js_cmj_datasets.cmx : ext/string_map.cmx core/js_cmj_format.cmx \
 core/lam_exit_code.cmx : core/lam.cmx core/lam_exit_code.cmi
 core/j.cmx : core/js_op.cmx core/js_fun_env.cmx core/js_closure.cmx \
     core/js_call_info.cmx ext/ident_set.cmx
-core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
+core/lam_compile_util.cmx : core/lam.cmx core/js_op.cmx \
+    core/lam_compile_util.cmi
 core/lam_id_kind.cmx : core/lam_arity.cmx core/lam.cmx core/lam_id_kind.cmi
 core/lam_stats.cmx : core/lam_id_kind.cmx ext/ident_set.cmx \
     ext/ident_hashtbl.cmx core/lam_stats.cmi

jscomp/core/lam.ml

@@ -53,6 +53,12 @@ type meth_kind = Lambda.meth_kind
 | Public of string option
 | Cached
 
+type pointer_info = 
+  | Pt_constructor of string 
+  | Pt_variant of string 
+  | Pt_module_alias
+  | Pt_na 
+
 type constant =
   | Const_js_null
   | Const_js_undefined
@@ -66,7 +72,7 @@ type constant =
   | Const_int32 of int32
   | Const_int64 of int64
   | Const_nativeint of nativeint
-  | Const_pointer of int * Lambda.pointer_info
+  | Const_pointer of int * pointer_info
   | Const_block of int * Lambda.tag_info * constant list
   | Const_float_array of string list
   | Const_immstring of string
@@ -1141,7 +1147,14 @@ let if_ (a : t) (b : t) c =
       | Const_float_array _
       | Const_immstring _ -> b
     end
-  | _ ->  Lifthenelse (a,b,c)
+  | _ -> 
+    begin match a, b, c with 
+    | Lprim {primitive = Pintcomp _;}, Lconst(Const_js_true), Lconst(Const_js_false)
+      ->  a
+    | _ -> 
+      
+     Lifthenelse (a,b,c)
+  end 
 
 
 let abs_int x = if x < 0 then - x else x
@@ -1195,10 +1208,10 @@ let stringswitch (lam : t) cases default : t =
 
 
 let true_ : t =
-  Lconst (Const_pointer ( 1, Pt_builtin_boolean))
+  Lconst (Const_js_true)
 
 let false_ : t =
-  Lconst (Const_pointer( 0, Pt_builtin_boolean))
+  Lconst (Const_js_false)
 
 let unit : t =
   Lconst (Const_pointer( 0, Pt_constructor "()"))
@@ -1909,7 +1922,14 @@ let convert exports lam : _ * _  =
     | Const_base (Const_int32 i) -> (Const_int32 i)
     | Const_base (Const_int64 i) -> (Const_int64 i)
     | Const_base (Const_nativeint i) -> (Const_nativeint i)
-    | Const_pointer(i,p) -> Const_pointer (i,p)
+    | Const_pointer(i,p) ->
+      begin match p with 
+      | Pt_constructor p -> Const_pointer(i, Pt_constructor p)
+      | Pt_variant p -> Const_pointer(i,Pt_variant p)
+      | Pt_module_alias -> Const_pointer(i, Pt_module_alias)
+      | Pt_builtin_boolean -> if i = 0 then Const_js_false else Const_js_true
+      | Pt_na ->  Const_pointer(i, Pt_na)      
+       end 
     | Const_float_array (s) -> Const_float_array(s)
     | Const_immstring s -> Const_immstring s
     | Const_block (i,t,xs) ->

jscomp/core/lam.mli

@@ -51,6 +51,12 @@ type function_kind
    = Curried
    (* | Tupled *)
 
+type pointer_info = 
+  | Pt_constructor of string 
+  | Pt_variant of string 
+  | Pt_module_alias
+  | Pt_na    
+  
 type constant = 
   | Const_js_null 
   | Const_js_undefined 
@@ -64,7 +70,7 @@ type constant =
   | Const_int32 of int32
   | Const_int64 of int64
   | Const_nativeint of nativeint
-  | Const_pointer of int * Lambda.pointer_info
+  | Const_pointer of int * pointer_info
   | Const_block of int * Lambda.tag_info * constant list
   | Const_float_array of string list
   | Const_immstring of string

jscomp/core/lam_analysis.ml

@@ -621,5 +621,5 @@ and eq_primitive ( lhs : Lam.primitive) (rhs : Lam.primitive) =
 let safe_to_inline (lam : Lam.t) = 
   match lam with 
   | Lfunction _ ->  true
-  | Lconst (Const_pointer _  | Const_immstring _ ) -> true
+  | Lconst (Const_pointer _  | Const_immstring _ | Const_js_true | Const_js_false) -> true
   | _ -> false

jscomp/core/lam_compile_const.ml

@@ -68,14 +68,10 @@ let rec translate (x : Lam.constant ) : J.expression =
     E.unicode i 
     (* E.str i ~delimiter:Literals.escaped_j_delimiter *)   
 
-  | Const_pointer (c,pointer_info) -> 
-    begin match pointer_info with
-    | Pt_builtin_boolean ->
-      E.bool (c <> 0)
-    | _ ->
+  | Const_pointer (c,pointer_info) ->     
     E.int ?comment:(Lam_compile_util.comment_of_pointer_info pointer_info)
       (Int32.of_int c )
-    end
+    
   | Const_block(tag, tag_info, xs ) -> 
     Js_of_lam_block.make_block NA tag_info 
       (E.small_int  tag) (Ext_list.map translate xs)

jscomp/core/lam_compile_util.ml

@@ -54,10 +54,9 @@ let comment_of_tag_info  (x : Lambda.tag_info) =
   | Blk_exception -> Some "exception"
   | Blk_extension -> Some "extension"
   | Blk_na -> None 
-let comment_of_pointer_info (x :  Lambda.pointer_info)= 
+let comment_of_pointer_info (x :  Lam.pointer_info)= 
   match x with 
   | Pt_constructor x -> Some x 
   | Pt_variant x -> Some x 
-  | Pt_builtin_boolean -> Some "boolean"
-  | Lambda.Pt_module_alias -> None (* FIXME *)
+  | Pt_module_alias -> None (* FIXME *)
   | Pt_na -> None

jscomp/core/lam_compile_util.mli

@@ -36,4 +36,4 @@ val jsop_of_comp : Lambda.comparison -> Js_op.binop
 
 val comment_of_tag_info : Lambda.tag_info -> string option
 
-val comment_of_pointer_info : Lambda.pointer_info -> string option
+val comment_of_pointer_info : Lam.pointer_info -> string option

jscomp/core/lam_eta_conversion.ml

@@ -46,7 +46,7 @@ let transform_under_supply n loc status fn args =
         | Const_char _ | Const_string _ 
         | Const_float _ | Const_int32 _ 
         | Const_int64 _ | Const_nativeint _ 
-        | Const_pointer _ | Const_immstring _ ) 
+        | Const_pointer _ | Const_immstring _ | Const_js_true | Const_js_false) 
       | Lprim {primitive = Pfield _;
                args =  [ Lglobal_module _ ]; _ }
       | Lfunction _ 

jscomp/core/lam_pass_lets_dce.ml

@@ -53,7 +53,7 @@ let lets_helper (count_var : Ident.t -> Lam_pass_count.used_info) lam =
                  ((
                      Const_int _ | Const_char _ | Const_float _ | Const_int32 _ 
                      | Const_nativeint _ )
-                 | Const_pointer _ ) (* could be poly-variant [`A] -> [65a]*)
+                 | Const_pointer _ |Const_js_true | Const_js_false) (* could be poly-variant [`A] -> [65a]*)
               | Lprim {primitive = Pfield (_);
                        args = [ 
                          Lglobal_module _

jscomp/test/compare_test.js

@@ -28,11 +28,7 @@ function compare2(x, y) {
           return true;
         }
     case 2 : 
-        if (y >= 2) {
-          return true;
-        } else {
-          return false;
-        }
+        return y >= 2;
 
   }
 }

jscomp/test/ext_string_test.js

@@ -537,8 +537,8 @@ function is_valid_npm_package_name(s) {
                       } else {
                         return true;
                       }
-                    } else if (x !== 45 && x < 48) {
-                      return false;
+                    } else if (x !== 45) {
+                      return x >= 48;
                     } else {
                       return true;
                     }

jscomp/test/mario_game.js

@@ -1238,7 +1238,7 @@ function col_bypass(c1, c2) {
   var ctypes;
   switch (c1.tag | 0) {
     case 0 : 
-        ctypes = c2.tag === 1 && c1[2][/* invuln */7] > 0 ? true : false;
+        ctypes = c2.tag === 1 ? c1[2][/* invuln */7] > 0 : false;
         break;
     case 1 : 
         ctypes = c2.tag === 2 ? true : false;

jscomp/test/ocaml_re_test.js

@@ -1953,8 +1953,8 @@ function equal$2(_x1, _x2) {
               return false;
             }
         case 9 : 
-            if (typeof x2 === "number" && x2 >= 9) {
-              return true;
+            if (typeof x2 === "number") {
+              return x2 >= 9;
             } else {
               return false;
             }

jscomp/test/ocaml_typedtree_test.js

@@ -24264,8 +24264,8 @@ function in_pervasives(p) {
 
 function is_datatype(decl) {
   var match = decl[/* type_kind */2];
-  if (typeof match === "number" && match === 0) {
-    return false;
+  if (typeof match === "number") {
+    return match !== 0;
   } else {
     return true;
   }
@@ -35150,17 +35150,11 @@ function parenthesized_ident(name) {
         } else {
           return true;
         }
-      } else if (match >= 123) {
-        return true;
       } else {
-        return false;
+        return match >= 123;
       }
     } else if (match >= 91) {
-      if (match !== 95) {
-        return true;
-      } else {
-        return false;
-      }
+      return match !== 95;
     } else if (match >= 65) {
       return false;
     } else {
@@ -41505,10 +41499,10 @@ function same_path(t, t$prime) {
       var exit = 0;
       if (typeof s1 === "number" || s1.tag) {
         exit = 1;
-      } else if (typeof s2 === "number" || !(!s2.tag && s1[0] === s2[0])) {
+      } else if (typeof s2 === "number" || s2.tag) {
         return false;
       } else {
-        return true;
+        return s1[0] === s2[0];
       }
       if (exit === 1) {
         var exit$1 = 0;
@@ -58357,11 +58351,7 @@ function is_nonexpansive(_exp) {
           _exp = match[1];
           continue ;
       case 19 : 
-          if (class_type_arity(match[2][/* cty_type */1]) > 0) {
-            return true;
-          } else {
-            return false;
-          }
+          return class_type_arity(match[2][/* cty_type */1]) > 0;
       case 23 : 
           if (is_nonexpansive_mod(match[2])) {
             _exp = match[3];

jscomp/test/pipe_syntax.js

@@ -74,6 +74,10 @@ function f7(a) {
         ];
 }
 
+function f8(a) {
+  return /* Some */[/* Some */[a]];
+}
+
 exports.t0 = t0;
 exports.t1 = t1;
 exports.t2 = t2;
@@ -86,4 +90,5 @@ exports.f4 = f4;
 exports.f5 = f5;
 exports.f6 = f6;
 exports.f7 = f7;
+exports.f8 = f8;
 /* No side effect */

jscomp/test/pipe_syntax.ml

@@ -50,4 +50,6 @@ let f5 a b c d =
 
 let f6 a = a |. Some
 
-let f7 a  = a |. (Some, Some, Some)
+let f7 a  = a |. (Some, Some, Some)
+
+let f8 a = a |. Some |. Some 

jscomp/test/testing.js

@@ -145,11 +145,7 @@ function failure_test(f, x, s) {
 
 function scan_failure_test(f, x) {
   return test_raises_exc_p((function (param) {
-                if (param[0] === Scanf.Scan_failure) {
-                  return true;
-                } else {
-                  return false;
-                }
+                return param[0] === Scanf.Scan_failure;
               }), f, x);
 }
 

lib/js/bytes.js

@@ -166,10 +166,8 @@ function is_space(param) {
     } else {
       return true;
     }
-  } else if (switcher !== 2) {
-    return true;
   } else {
-    return false;
+    return switcher !== 2;
   }
 }
 

lib/js/string.js

@@ -72,10 +72,8 @@ function is_space(param) {
     } else {
       return true;
     }
-  } else if (switcher !== 2) {
-    return true;
   } else {
-    return false;
+    return switcher !== 2;
   }
 }