remove unused code

Author: bobzhang

jscomp/core/bs_conditional_initial.ml

@@ -25,7 +25,7 @@
 
 let setup_env () =
 #if BS_DEBUG then
-    Js_config.set_debug_file "pipe_syntax.ml";
+    Js_config.set_debug_file "gpr_2700_test.ml";
 #end
   Lexer.replace_directive_bool "BS" true;
   Lexer.replace_directive_string "BS_VERSION"  Bs_version.version

jscomp/core/j.ml

@@ -111,10 +111,7 @@ and expression_desc =
      *)
   | Array_copy of expression (* shallow copy, like [x.slice] *)
   | Array_append of expression * expression (* For [caml_array_append]*)
-  (* | Tag_ml_obj of expression *)
   | String_append of expression * expression 
-
-  | Anything_to_number of expression
   | Bool of bool (* js true/false*)
   (* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence 
      [typeof] is an operator     
@@ -178,11 +175,6 @@ and expression_desc =
        if it's know at compile time, we can turn it into
        f(args[0], args[1], ... )
      *)
-  | Bind of expression * expression
-  (* {[ Bind (a,b) ]}
-     is literally
-     {[ a.bind(b) ]}
-  *)
   | Call of expression * expression list * Js_call_info.t
     (* Analysze over J expression is hard since, 
         some primitive  call is translated 

jscomp/core/js_analyzer.ml

@@ -100,7 +100,6 @@ let rec no_side_effect_expression_desc (x : J.expression_desc)  =
         the block is mutable does not mean this operation is non-pure
     *)
     List.for_all no_side_effect  xs 
-  | Bind(fn, obj) -> no_side_effect fn && no_side_effect obj
   | Object kvs -> 
     List.for_all (fun (_property_name, y) -> no_side_effect y ) kvs 
   | Array_append (a,b) 
@@ -117,8 +116,6 @@ let rec no_side_effect_expression_desc (x : J.expression_desc)  =
   | Math _ 
   | Array_of_size _
   | Array_copy _ 
-  (* | Tag_ml_obj _ *)
-  | J.Anything_to_number _
   | Js_not _
   | String_of_small_int_array _ 
   | Json_stringify _ 
@@ -269,8 +266,6 @@ let rec eq_expression
     | Array_copy _ 
     | Array_append _ 
     | String_append _ 
-    | Anything_to_number _ 
-
     | Typeof _ 
     | Js_not _ 
     | String_of_small_int_array _ 
@@ -280,7 +275,6 @@ let rec eq_expression
 
     | Cond _ 
     | FlatCall  _
-    | Bind _ 
     | String_access _ 
 
     | New _ 

jscomp/core/js_dump.ml

@@ -476,16 +476,7 @@ and
     in
     if l > 15 then P.paren_group f 1 action
     else action ()
-  | Bind (a,b) ->
-    (* a.bind(b)
-       {[ fun b -> a.bind(b) ==? a.bind ]}
-    *)
-    begin
-      expression_desc cxt l f
-        (Call ({expression_desc = Dot(a,L.bind, true); comment = None }, [b],
-               {arity = Full; call_info = Call_na}))
-    end
-
+  
   | FlatCall(e,el) ->
     P.group f 1 (fun _ ->
         let cxt = expression 15 cxt f e in
@@ -640,19 +631,6 @@ and
       else action ()
     );
     cxt
-  | J.Anything_to_number e
-    ->
-    let action () =
-      P.group f 0 @@ fun _ ->
-      P.string f "+" ;
-      expression 13 cxt f e
-    in
-    (* need to tweak precedence carefully
-       here [++x --> +(+x)]
-    *)
-    if l > 12
-    then P.paren_group f 1 action
-    else action ()
   | Is_null_undefined_to_boolean e ->
     let action = (fun _ ->
         let cxt = expression 1 cxt f e in
@@ -1146,12 +1124,10 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
       | Caml_block  _
       | FlatCall _
       | Typeof _
-      | Bind _
       | Number _
       | Js_not _
       | Bool _
       | New _
-      | J.Anything_to_number _
         -> false
       (* e = function(x){...}(x);  is good
       *)

jscomp/core/js_fold.ml

@@ -130,8 +130,7 @@ class virtual fold =
        since GC does not rely on it
      *)
                  (* shallow copy, like [x.slice] *)
-                 (* For [caml_array_append]*)
-                 (* | Tag_ml_obj of expression *) (* js true/false*)
+                 (* For [caml_array_append]*) (* js true/false*)
                  (* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence 
      [typeof] is an operator     
   *)
@@ -182,10 +181,6 @@ class virtual fold =
        if it's know at compile time, we can turn it into
        f(args[0], args[1], ... )
      *)
-                 (* {[ Bind (a,b) ]}
-     is literally
-     {[ a.bind(b) ]}
-  *)
                  (* Analysze over J expression is hard since, 
         some primitive  call is translated 
         into a plain call, it's better to keep them
@@ -373,7 +368,6 @@ class virtual fold =
           let o = o#expression _x in let o = o#expression _x_i1 in o
       | String_append (_x, _x_i1) ->
           let o = o#expression _x in let o = o#expression _x_i1 in o
-      | Anything_to_number _x -> let o = o#expression _x in o
       | Bool _x -> let o = o#bool _x in o
       | Typeof _x -> let o = o#expression _x in o
       | Js_not _x -> let o = o#expression _x in o
@@ -393,8 +387,6 @@ class virtual fold =
           let o = o#expression _x_i1 in let o = o#expression _x_i2 in o
       | FlatCall (_x, _x_i1) ->
           let o = o#expression _x in let o = o#expression _x_i1 in o
-      | Bind (_x, _x_i1) ->
-          let o = o#expression _x in let o = o#expression _x_i1 in o
       | Call (_x, _x_i1, _x_i2) ->
           let o = o#expression _x in
           let o = o#list (fun o -> o#expression) _x_i1 in

jscomp/core/js_map.ml

@@ -143,8 +143,7 @@ class virtual map =
        since GC does not rely on it
      *)
                  (* shallow copy, like [x.slice] *)
-                 (* For [caml_array_append]*)
-                 (* | Tag_ml_obj of expression *) (* js true/false*)
+                 (* For [caml_array_append]*) (* js true/false*)
                  (* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence 
      [typeof] is an operator     
   *)
@@ -195,10 +194,6 @@ class virtual map =
        if it's know at compile time, we can turn it into
        f(args[0], args[1], ... )
      *)
-                 (* {[ Bind (a,b) ]}
-     is literally
-     {[ a.bind(b) ]}
-  *)
                  (* Analysze over J expression is hard since, 
         some primitive  call is translated 
         into a plain call, it's better to keep them
@@ -401,8 +396,6 @@ class virtual map =
       | String_append (_x, _x_i1) ->
           let _x = o#expression _x in
           let _x_i1 = o#expression _x_i1 in String_append (_x, _x_i1)
-      | Anything_to_number _x ->
-          let _x = o#expression _x in Anything_to_number _x
       | Bool _x -> let _x = o#bool _x in Bool _x
       | Typeof _x -> let _x = o#expression _x in Typeof _x
       | Js_not _x -> let _x = o#expression _x in Js_not _x
@@ -429,9 +422,6 @@ class virtual map =
       | FlatCall (_x, _x_i1) ->
           let _x = o#expression _x in
           let _x_i1 = o#expression _x_i1 in FlatCall (_x, _x_i1)
-      | Bind (_x, _x_i1) ->
-          let _x = o#expression _x in
-          let _x_i1 = o#expression _x_i1 in Bind (_x, _x_i1)
       | Call (_x, _x_i1, _x_i2) ->
           let _x = o#expression _x in
           let _x_i1 = o#list (fun o -> o#expression) _x_i1 in

jscomp/core/js_pass_tailcall_inline.ml

@@ -220,7 +220,7 @@ let subst name export_set stats  =
             (* Mark a function as dead means it will never be scanned, 
                here we inline the function
             *)
-            Ext_list.append block @@ self#block rest
+            Ext_list.append block (self#block rest)
           | (None | Some _) ->
             self#statement st :: self#block rest
         end
@@ -235,9 +235,8 @@ let subst name export_set stats  =
 
 
 let tailcall_inline (program : J.program) = 
-  let _stats = get_stats program in
-  let _export_set = program.export_set in
-  program
-  |> (subst program.name _export_set _stats )# program
-  (* |> pass_beta #program *)
+  let stats = get_stats program in
+  let export_set = program.export_set in
+  (subst program.name export_set stats )#program program
+
 

jscomp/core/lam_compile_primitive.ml

@@ -703,9 +703,7 @@ let translate  loc
   (*   assert false (\* already handled *\) *)
   (* assert false *)
   | Pduprecord ((Record_regular 
-                | Record_float ),0)
-  | Pduprecord ((Record_regular 
-                | Record_float ),_) -> 
+                | Record_float ),_size) -> (* _size is the length of all_lables*)
     begin match args with 
       | [e] -> Js_of_lam_record.copy e
       | _ -> assert false       

jscomp/core/lam_dispatch_primitive.ml

@@ -659,8 +659,6 @@ let translate loc (prim_name : string)
             *)
             | _ -> E.array_copy a
           end
-        (* if Js_analyzer.is_constant a then a
-           else E.array_copy a *)
         | _ -> assert false 
       end
     | "caml_obj_block" -> 

jscomp/test/.depend

@@ -311,6 +311,7 @@ gpr_2614_test.cmj :
 gpr_2633_test.cmj :
 gpr_2642_test.cmj :
 gpr_2652_test.cmj : ../others/node.cmj ../stdlib/buffer.cmj
+gpr_2700_test.cmj :
 gpr_405_test.cmj : ../stdlib/hashtbl.cmj gpr_405_test.cmi
 gpr_441.cmj :
 gpr_459_test.cmj : mt.cmj

jscomp/test/Makefile

@@ -249,6 +249,7 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	gpr_2642_test\
 	gpr_2652_test\
 	gpr_2614_test\
+	gpr_2700_test\
 # bs_uncurry_test
 # needs Lam to get rid of Uncurry arity first
 # simple_derive_test

jscomp/test/gpr_2700_test.js

@@ -0,0 +1,13 @@
+'use strict';
+
+
+function f(x) {
+  if (x === 3) {
+    return true;
+  } else {
+    return x === 4;
+  }
+}
+
+exports.f = f;
+/* No side effect */

jscomp/test/gpr_2700_test.ml

@@ -0,0 +1,4 @@
+
+
+
+let f x = x = 3 || x = 4