remove unused code

Author: bobzhang

jscomp/core/js_block_runtime.ml

@@ -23,74 +23,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-let tag_is_zero (tag : J.expression) = 
-  match tag.expression_desc with 
-  | Number (Int {i = 0l; _}) -> true 
-  | _ -> false;;
-
- let needChromeRuntime 
-  (tag : J.expression)
-  (tag_info : J.tag_info) = 
-  match tag_info with 
-  | Blk_poly_var _     
-  | Blk_constructor _   -> true
-  | Blk_record_inlined _ -> true  
-  | Blk_record _   
-  | Blk_module_export
-  | Blk_module _ -> false
-  | Blk_tuple 
-  | Blk_extension
-  | Blk_class
-  | Blk_array   
-  | Blk_record_ext _ -> false
-  | Blk_na _ ->  not (tag_is_zero tag )
-
-let needBlockRuntime (tag : J.expression) (tag_info : J.tag_info) = 
-  match  tag_info with 
-  | Blk_poly_var _ 
-  | Blk_module _
-  | Blk_module_export
-  | Blk_record _  
-  | Blk_tuple 
-  | Blk_extension
-  | Blk_class
-  | Blk_array -> false   
-  | Blk_record_inlined {num_nonconst = 1}  
-  | Blk_constructor {num_nonconst = 1}        
-  | Blk_na _ -> not (tag_is_zero tag)
-  | Blk_record_inlined _ 
-  | Blk_constructor _   -> true  
-  | Blk_record_ext _ 
-   -> false 
-    (* converted to [Pcreate_extension] in the beginning*)
-
 let option_id =   
   Ident.create_persistent Js_runtime_modules.option
 let curry_id =   
   Ident.create_persistent Js_runtime_modules.curry
-let block_id = 
-  Ident.create_persistent Js_runtime_modules.block
-let caml_chrome_id = 
-  Ident.create_persistent Js_runtime_modules.caml_chrome_block
 
-let check_additional_id (x : J.expression) =
+let check_additional_id (x : J.expression) : Ident.t option =
   match x.expression_desc with
   | Optional_block(_,false) -> 
     Some option_id  
   | Call(_, _, {arity = NA}) ->  
     Some curry_id
-  | Caml_block(_,_,tag,tag_info) 
-    -> 
-    if not !Js_config.debug then
-      if needBlockRuntime tag tag_info then 
-        Some block_id
-      else None   
-    else
-    if needChromeRuntime tag tag_info then 
-      (* This may depends on two modules, so in the runtime
-        we let chrome depends on block
-      *)
-      Some caml_chrome_id
-    else None
   | _ -> 
     None

jscomp/core/js_block_runtime.mli

@@ -22,18 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-val tag_is_zero : 
-  J.expression -> bool
 
-val needChromeRuntime:
-  J.expression -> 
-  J.tag_info -> 
-  bool 
-  
-val needBlockRuntime: 
-  J.expression -> 
-  J.tag_info -> 
-  bool 
 
 val check_additional_id :
   J.expression -> Ident.t option  

jscomp/core/js_dump.ml

@@ -59,7 +59,6 @@ module L = Js_dump_lit
 
 (* There modules are dynamically inserted in the last stage
   {Caml_curry}
-  {Caml_block}
   {Caml_option}
 
   They can appear anywhere so even if you have a module 
@@ -95,36 +94,6 @@ module Curry_gen = struct
     P.string f (Printf.sprintf "%d" len)
 end 
 
-let block_dot f = 
-  P.string f Js_runtime_modules.block;
-  P.string f L.dot 
-
-let pp_block_create f =   
-  block_dot f ;
-  P.string f L.caml_block_create
-
-let dbg_block_dot f =   
-  P.string f Js_runtime_modules.caml_chrome_block;
-  P.string f L.dot 
-
-let dbg_block_create f =   
-  dbg_block_dot f ;
-  P.string f L.caml_block_create
-
-
-
-let dbg_poly_var f =   
-  dbg_block_dot f;
-  P.string f L.block_poly_var
-
-let dbg_simple_variant f =   
-  dbg_block_dot f ;
-  P.string f L.block_simple_variant
-
-let dbg_variant f =   
-  dbg_block_dot f ; 
-  P.string f L.block_variant
-
 
 
 let return_indent = String.length L.return / Ext_pp.indent_length
@@ -899,79 +868,12 @@ and expression_desc cxt ~(level:int) f x : cxt  =
     if p.num_nonconst = 1 && not !Js_config.debug then 
       pp_comment_option f (Some p.name);
     expression_desc cxt ~level f (Object objs)
-  | Caml_block( el, mutable_flag, tag, tag_info)
+  | Caml_block ( _, _, _, (Blk_module_export | Blk_na _ )) -> assert false
+  | Caml_block( el, mutable_flag, _tag, (Blk_tuple  | Blk_class | Blk_array  as tag_info))
     ->
-    pp_comment_option f (Lam_compile_util.comment_of_tag_info tag_info);
-    (* Note that, if we ignore more than tag [0] we loose some information
-       with regard tag  
-
-       TODO: for numbers like 248, 255 we can reverse engineer to make it
-         [Obj.xx_flag], but we can not do this in runtime libraries
-
-       When it does not need block runtime, it means it will be compiled 
-       as an array, note exception or open variant it is outer-most is 
-       simply an array
-    *)
-    if not !Js_config.debug then begin 
-      if not (Js_block_runtime.needBlockRuntime tag tag_info) then 
-        expression_desc cxt ~level f  (Array (el, mutable_flag))
-      else  
-        begin
-          pp_block_create f;
-          P.paren_group f 1 (fun _ -> arguments cxt f [tag; E.array mutable_flag el])
-        end  
-    end 
-      else
-        if not (Js_block_runtime.needChromeRuntime tag tag_info) then 
-          expression_desc cxt ~level f  (Array (el, mutable_flag))
-        else 
-      (  
-        match tag_info with 
-        | Blk_record _ 
-        | Blk_module _ 
-        | Blk_module_export -> 
-          assert false 
-            (* 
-              This can not happen, see the pattern match on previous branch 
-              TODO: we still need clean up local module compilation 
-              to make it more obvious
-            *)
-        | Blk_poly_var name ->  
-          dbg_poly_var f;
-          P.paren_group f 1 (fun _ -> arguments cxt f [ 
-              E.str name;
-              E.array mutable_flag el])        
-        | Blk_constructor{name; num_nonconst = number}
-
-          -> (* has to be debug mode *)          
-          if number = 1 && Js_block_runtime.tag_is_zero tag then 
-            begin
-              dbg_simple_variant f; 
-              P.paren_group f 1 (fun _ ->
-                  arguments cxt f 
-                    [E.str name; E.array mutable_flag el])             
-            end
-          else begin 
-            dbg_variant f;
-            P.paren_group f 1 (fun _ ->
-                arguments cxt f 
-                  [E.str name; tag; E.array mutable_flag el])
-          end
-
-          
-
-        | Blk_record_inlined _ (* TODO: No support for debug mode yet *)
-        | Blk_tuple
-        | Blk_extension
-        | Blk_class
-        | Blk_array
-        | Blk_record_ext _
-        | Blk_na _
-           ->           
-          dbg_block_create f;
-          P.paren_group f 1 (fun _ -> arguments cxt f [tag; E.array mutable_flag el])
-    )
-
+    pp_comment_option f (Lam_compile_util.comment_of_tag_info tag_info);   
+    expression_desc cxt ~level f  (Array (el, mutable_flag))
+ 
   | Caml_block_tag e ->
     P.group f 1 (fun _ ->
         let cxt = expression ~level:15 cxt f  e in

jscomp/ext/js_runtime_modules.ml

@@ -45,8 +45,8 @@ let int64 = "Caml_int64"
 let md5 = "Caml_md5"
 let gc = "Caml_gc"
 let int32 = "Caml_int32"
-let block = "Block"
-let caml_chrome_block = "Caml_chrome_debugger"
+
+
 let option = "Caml_option"
 let module_ = "Caml_module"
 let external_polyfill = "Caml_external_polyfill"